diff --git a/Api/Utility/TextReader.cs b/Api/Utility/TextReader.cs index 07a90ae..f6382d0 100644 --- a/Api/Utility/TextReader.cs +++ b/Api/Utility/TextReader.cs @@ -1,5 +1,6 @@ using System.Runtime.InteropServices; using Milimoe.FunGame.Core.Library.Constant; +using Milimoe.FunGame.Core.Library.Exception; namespace Milimoe.FunGame.Core.Api.Utility { @@ -180,7 +181,7 @@ namespace Milimoe.FunGame.Core.Api.Utility if (!Directory.Exists(path)) Directory.CreateDirectory(path); path = Path.Combine(path, filename); } - else path = $@"{AppDomain.CurrentDomain.BaseDirectory}{filename}"; + else path = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, filename); // 写入内容 StreamWriter writer = File.Exists(path) ? new(path, !overwrite, General.DefaultEncoding) : new(path, false, General.DefaultEncoding); writer.WriteLine(content); @@ -200,5 +201,11 @@ namespace Milimoe.FunGame.Core.Api.Utility /// /// public static void AppendErrorLog(string msg) => WriteTXT(DateTimeUtility.GetDateTimeToString(TimeType.General) + ": " + msg + "\r\n", DateTimeUtility.GetDateTimeToString("yyyy-MM-dd") + ".log", "logs"); + + /// + /// 追加错误日志 默认写入logs文件夹下的当日日期.log文件 + /// + /// + public static void AppendErrorLog(Exception e) => AppendErrorLog(e.GetErrorInfo()); } } diff --git a/Library/Common/Architecture/HeartBeat.cs b/Library/Common/Architecture/HeartBeat.cs index 0c13af4..8332984 100644 --- a/Library/Common/Architecture/HeartBeat.cs +++ b/Library/Common/Architecture/HeartBeat.cs @@ -77,10 +77,11 @@ namespace Milimoe.FunGame.Core.Library.Common.Architecture { if (!SendingHeartBeat) _SendingHeartBeat = true; // 发送心跳包 + _LastHeartbeatReceived = false; if (await _HTTPClient.Send(SocketMessageType.HeartBeat) == SocketResult.Success) { await Task.Delay(4 * 1000); - AddHeartBeatFaileds(); + if (!_LastHeartbeatReceived) AddHeartBeatFaileds(); } else AddHeartBeatFaileds(); await Task.Delay(20 * 1000);