diff --git a/Logger/DebugLogger.cs b/Logger/DebugLogger.cs index 31cf449..578fdff 100644 --- a/Logger/DebugLogger.cs +++ b/Logger/DebugLogger.cs @@ -14,7 +14,7 @@ public class DebugLogger : AbstractLogger protected override void Log(string data, string eventName, MsgType msgType, uint uin, string message) { - if (msgType == MsgType.Public) + if (msgType == MsgType.Group) { var chain = MessageBuilder.Group(uin).Text($"[{data}] [{eventName}] [Debug] {message}"); BotService.Instance.Client!.SendMessage(chain.Build()); diff --git a/Logger/ErrorLogger.cs b/Logger/ErrorLogger.cs index 817542c..0439924 100644 --- a/Logger/ErrorLogger.cs +++ b/Logger/ErrorLogger.cs @@ -14,7 +14,7 @@ public class ErrorLogger : AbstractLogger protected override void Log(string data, string eventName, MsgType msgType, uint uin, string message) { - if (msgType == MsgType.Public) + if (msgType == MsgType.Group) { var chain = MessageBuilder.Group(uin).Text($"[{data}] [{eventName}] [Error] {message}"); BotService.Instance.Client!.SendMessage(chain.Build()); diff --git a/Logger/FatalLogger.cs b/Logger/FatalLogger.cs index 6d55719..918ad65 100644 --- a/Logger/FatalLogger.cs +++ b/Logger/FatalLogger.cs @@ -14,7 +14,7 @@ public class FatalLogger : AbstractLogger protected override void Log(string data, string eventName, MsgType msgType, uint uin, string message) { - if (msgType == MsgType.Public) + if (msgType == MsgType.Group) { var chain = MessageBuilder.Group(uin).Text($"[{data}] [{eventName}] [Fatal] {message}"); BotService.Instance.Client!.SendMessage(chain.Build()); diff --git a/Logger/InfoLogger.cs b/Logger/InfoLogger.cs index 01e4e6f..53b307b 100644 --- a/Logger/InfoLogger.cs +++ b/Logger/InfoLogger.cs @@ -14,7 +14,7 @@ public class InfoLogger : AbstractLogger protected override void Log(string data, string eventName, MsgType msgType, uint uin, string message) { - if (msgType == MsgType.Public) + if (msgType == MsgType.Group) { var chain = MessageBuilder.Group(uin).Text($"[{data}] [{eventName}] [Info] {message}"); BotService.Instance.Client!.SendMessage(chain.Build()); diff --git a/Logger/VerboseLogger.cs b/Logger/VerboseLogger.cs index 50a03b3..5887902 100644 --- a/Logger/VerboseLogger.cs +++ b/Logger/VerboseLogger.cs @@ -14,7 +14,7 @@ public class VerboseLogger : AbstractLogger protected override void Log(string data, string eventName, MsgType msgType, uint uin, string message) { - if (msgType == MsgType.Public) + if (msgType == MsgType.Group) { var chain = MessageBuilder.Group(uin).Text($"[{data}] [{eventName}] [Verbose] {message}"); BotService.Instance.Client!.SendMessage(chain.Build()); diff --git a/Logger/WarnLogger.cs b/Logger/WarnLogger.cs index 8406daf..d312d94 100644 --- a/Logger/WarnLogger.cs +++ b/Logger/WarnLogger.cs @@ -14,7 +14,7 @@ public class WarnLogger : AbstractLogger protected override void Log(string data, string eventName, MsgType msgType, uint uin, string message) { - if (msgType == MsgType.Public) + if (msgType == MsgType.Group) { var chain = MessageBuilder.Group(uin).Text($"[{data}] [{eventName}] [Warn] {message}"); BotService.Instance.Client!.SendMessage(chain.Build()); diff --git a/Service/BotService.cs b/Service/BotService.cs index 1bc2002..a409399 100644 --- a/Service/BotService.cs +++ b/Service/BotService.cs @@ -33,7 +33,7 @@ public class BotService var server = new Server { Services = { APIService.BindService(new ApiService()) }, - Ports = { new ServerPort("localhost", port, ServerCredentials.Insecure) } + Ports = { new ServerPort("192.168.0.114", port, ServerCredentials.Insecure) } }; var deviceInfo = File.Exists(DeviceInfoFilePath) @@ -67,7 +67,7 @@ public class BotService server.Start(); Console.WriteLine($"[{DateTime.Now}] [gRPC Server] [Info]: Listening on port: {port}"); await Task.Delay(1000); - LogManager.Instance.LogChain.LogMessage($"{DateTime.Now}", "LoginEvent", LogLevel.Info, MsgType.Public, + LogManager.Instance.LogChain.LogMessage($"{DateTime.Now}", "LoginEvent", LogLevel.Info, MsgType.Group, 620902312, "Login"); }; Client.Invoker.OnBotOfflineEvent += async (_, @event) => diff --git a/proto/apiService.proto b/proto/apiService.proto index f510688..dae8fa2 100644 --- a/proto/apiService.proto +++ b/proto/apiService.proto @@ -8,8 +8,8 @@ service APIService { rpc SendData (DataRequest) returns (DataResponse); } enum MsgType{ - public = 0; - private = 1; + group = 0; + friend = 1; } enum LogLevel{ fatal = 0;