diff --git a/src/Libraries/Core/src/Config/UniSpyConfig.cs b/src/Libraries/Core/src/Config/UniSpyConfig.cs index 4f0a56ffc..fbc431b2b 100755 --- a/src/Libraries/Core/src/Config/UniSpyConfig.cs +++ b/src/Libraries/Core/src/Config/UniSpyConfig.cs @@ -44,7 +44,7 @@ public class UniSpyDatabaseConfig } public class UniSpyRedisConfig { - public string ConnectionString => $"{Server}:{Port},user={User},password={Password},ssl={SSL},sslHost={SSLHost}"; + public string ConnectionString => $"{Server}:{Port},user={User},password={Password},ssl={SSL},sslHost={SSLHost},abortConnect=false"; public string Server; public int Port; public string User; diff --git a/src/Servers/QueryReport/src/Application/Client.cs b/src/Servers/QueryReport/src/Application/Client.cs index d33a6acbd..f02b504a0 100644 --- a/src/Servers/QueryReport/src/Application/Client.cs +++ b/src/Servers/QueryReport/src/Application/Client.cs @@ -1,6 +1,8 @@ +using System.Text; +using System; using UniSpy.Server.Core.Abstraction.BaseClass; using UniSpy.Server.Core.Abstraction.Interface; -using UniSpy.Server.QueryReport.V2.Handler; +using UniSpy.Server.Core.Encryption; namespace UniSpy.Server.QueryReport.Application { @@ -9,13 +11,20 @@ public sealed class Client : ClientBase public Client(IConnection connection, IServer server) : base(connection, server) { IsLogRaw = true; - // launch redis channel Info = new ClientInfo(); } - public new ClientInfo Info { get => (ClientInfo)base.Info; private set => base.Info = value; } - - - protected override ISwitcher CreateSwitcher(object buffer) => new CmdSwitcher(this, (byte[])buffer); + protected override ISwitcher CreateSwitcher(object buffer) + { + var data = (byte[])buffer; + if (data[0] == Convert.ToInt32('\\')) + { + return new V1.Handler.CmdSwitcher(this, UniSpyEncoding.GetString(data)); + } + else + { + return new V2.Handler.CmdSwitcher(this, data); + } + } } } \ No newline at end of file diff --git a/src/Servers/QueryReport/src/V1/Handler/CmdSwitcher.cs b/src/Servers/QueryReport/src/V1/Handler/CmdSwitcher.cs index 6f61a8bc8..94864744b 100644 --- a/src/Servers/QueryReport/src/V1/Handler/CmdSwitcher.cs +++ b/src/Servers/QueryReport/src/V1/Handler/CmdSwitcher.cs @@ -11,7 +11,7 @@ public sealed class CmdSwitcher : CmdSwitcherBase { private new string _rawRequest => (string)base._rawRequest; private new Client _client => (Client)base._client; - public CmdSwitcher(Client client, object rawRequest) : base(client, rawRequest) + public CmdSwitcher(Client client, string rawRequest) : base(client, rawRequest) { }