diff --git a/FunGame.Server/Controllers/DataRequestController.cs b/FunGame.Server/Controllers/DataRequestController.cs index 9dcaf7e..4a213f7 100644 --- a/FunGame.Server/Controllers/DataRequestController.cs +++ b/FunGame.Server/Controllers/DataRequestController.cs @@ -55,7 +55,7 @@ namespace Milimoe.FunGame.Server.Controller string msg = "无法找回您的密码，请稍后再试。"; // 返回的验证信息 if (RequestData.Count >= 2) { - ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(SocketMessageType.DataRequest) + "] " + ServerHelper.MakeClientName(Server.ClientName, Server.User) + " -> ForgetPassword"); + ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(SocketMessageType.DataRequest) + "] " + Server.GetClientName() + " -> ForgetPassword"); string username = DataRequest.GetHashtableJsonObject(RequestData, ForgetVerifyCodes.Column_Username) ?? ""; string email = DataRequest.GetHashtableJsonObject(RequestData, ForgetVerifyCodes.Column_Email) ?? ""; string verifycode = DataRequest.GetHashtableJsonObject(RequestData, ForgetVerifyCodes.Column_ForgetVerifyCode) ?? ""; @@ -71,7 +71,7 @@ namespace Milimoe.FunGame.Server.Controller DateTime SendTime = (DateTime)SQLHelper.DataSet.Tables[0].Rows[0][ForgetVerifyCodes.Column_SendTime]; if ((DateTime.Now - SendTime).TotalMinutes >= 10) { - ServerHelper.WriteLine(ServerHelper.MakeClientName(Server.ClientName, Server.User) + " 验证码已过期"); + ServerHelper.WriteLine(Server.GetClientName() + " 验证码已过期"); msg = "此验证码已过期，请重新找回密码。"; SQLHelper.Execute(ForgetVerifyCodes.Delete_ForgetVerifyCode(username, email)); } @@ -118,18 +118,18 @@ namespace Milimoe.FunGame.Server.Controller string[] To = new string[] { email }; if (MailSender.Send(MailSender.CreateMail(Subject, Body, System.Net.Mail.MailPriority.Normal, true, To)) == MailSendResult.Success) { - ServerHelper.WriteLine(ServerHelper.MakeClientName(Server.ClientName, Server.User) + $" 已向{email}发送验证码：{ForgetVerify}"); + ServerHelper.WriteLine(Server.GetClientName() + $" 已向{email}发送验证码：{ForgetVerify}"); msg = ""; } else { - ServerHelper.WriteLine(ServerHelper.MakeClientName(Server.ClientName, Server.User) + " 无法发送验证码"); + ServerHelper.WriteLine(Server.GetClientName() + " 无法发送验证码"); ServerHelper.WriteLine(MailSender.ErrorMsg); } } else // 不使用MailSender的情况 { - ServerHelper.WriteLine(ServerHelper.MakeClientName(Server.ClientName, Server.User) + $" 验证码为：{ForgetVerify}，请服务器管理员告知此用户"); + ServerHelper.WriteLine(Server.GetClientName() + $" 验证码为：{ForgetVerify}，请服务器管理员告知此用户"); msg = ""; } } @@ -138,7 +138,7 @@ namespace Milimoe.FunGame.Server.Controller { // 发送过验证码且验证码没有过期 string ForgetVerifyCode = (string)SQLHelper.DataSet.Tables[0].Rows[0][ForgetVerifyCodes.Column_ForgetVerifyCode]; - ServerHelper.WriteLine(ServerHelper.MakeClientName(Server.ClientName, Server.User) + $" 十分钟内已向{email}发送过验证码：{ForgetVerifyCode}"); + ServerHelper.WriteLine(Server.GetClientName() + $" 十分钟内已向{email}发送过验证码：{ForgetVerifyCode}"); msg = ""; } } @@ -157,7 +157,7 @@ namespace Milimoe.FunGame.Server.Controller string msg = "无法更新您的密码，请稍后再试。"; if (RequestData.Count >= 2) { - ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(SocketMessageType.DataRequest) + "] " + ServerHelper.MakeClientName(Server.ClientName, Server.User) + " -> UpdatePassword"); + ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(SocketMessageType.DataRequest) + "] " + Server.GetClientName() + " -> UpdatePassword"); string username = DataRequest.GetHashtableJsonObject(RequestData, UserQuery.Column_Username) ?? ""; string password = DataRequest.GetHashtableJsonObject(RequestData, UserQuery.Column_Password) ?? ""; if (username.Trim() != "" && password.Trim() != "") diff --git a/FunGame.Server/Models/ServerModel.cs b/FunGame.Server/Models/ServerModel.cs index c7e0435..7d3e8dd 100644 --- a/FunGame.Server/Models/ServerModel.cs +++ b/FunGame.Server/Models/ServerModel.cs @@ -75,7 +75,7 @@ namespace Milimoe.FunGame.Server.Model // 验证Token if (type != SocketMessageType.RunTime_HeartBeat && token != Token) { - ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 使用了非法方式传输消息，服务器拒绝回应 -> [" + ServerSocket.GetTypeString(type) + "] "); + ServerHelper.WriteLine(GetClientName() + " 使用了非法方式传输消息，服务器拒绝回应 -> [" + ServerSocket.GetTypeString(type) + "] "); return false; } @@ -90,9 +90,9 @@ namespace Milimoe.FunGame.Server.Model if (!IgnoreType.Contains(type)) { if (msg.Trim() == "") - ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(type) + "] " + ServerHelper.MakeClientName(ClientName, User)); + ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(type) + "] " + GetClientName()); else - ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(type) + "] " + ServerHelper.MakeClientName(ClientName, User) + " -> " + msg); + ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(type) + "] " + GetClientName() + " -> " + msg); } switch (type) @@ -236,14 +236,14 @@ namespace Milimoe.FunGame.Server.Model SQLHelper.ExecuteDataSet(UserQuery.Select_IsExistUsername(username)); if (SQLHelper.Result == SQLResult.Success) { - ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 账号已被注册"); + ServerHelper.WriteLine(GetClientName() + " 账号已被注册"); return Send(socket, type, RegInvokeType.DuplicateUserName); } // 检查邮箱是否重复 SQLHelper.ExecuteDataSet(UserQuery.Select_IsExistEmail(email)); if (SQLHelper.Result == SQLResult.Success) { - ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 邮箱已被注册"); + ServerHelper.WriteLine(GetClientName() + " 邮箱已被注册"); return Send(socket, type, RegInvokeType.DuplicateEmail); } // 检查验证码是否发送过 @@ -254,7 +254,7 @@ namespace Milimoe.FunGame.Server.Model string RegVerifyCode = (string)SQLHelper.DataSet.Tables[0].Rows[0][RegVerifyCodes.Column_RegVerifyCode]; if ((DateTime.Now - RegTime).TotalMinutes < 10) { - ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + $" 十分钟内已向{email}发送过验证码：{RegVerifyCode}"); + ServerHelper.WriteLine(GetClientName() + $" 十分钟内已向{email}发送过验证码：{RegVerifyCode}"); } return Send(socket, type, RegInvokeType.InputVerifyCode); } @@ -273,17 +273,17 @@ namespace Milimoe.FunGame.Server.Model string[] To = new string[] { email }; if (MailSender.Send(MailSender.CreateMail(Subject, Body, System.Net.Mail.MailPriority.Normal, true, To)) == MailSendResult.Success) { - ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + $" 已向{email}发送验证码：{RegVerify}"); + ServerHelper.WriteLine(GetClientName() + $" 已向{email}发送验证码：{RegVerify}"); } else { - ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 无法发送验证码"); + ServerHelper.WriteLine(GetClientName() + " 无法发送验证码"); ServerHelper.WriteLine(MailSender.ErrorMsg); } } else // 不使用MailSender的情况 { - ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + $" 验证码为：{RegVerify}，请服务器管理员告知此用户"); + ServerHelper.WriteLine(GetClientName() + $" 验证码为：{RegVerify}，请服务器管理员告知此用户"); } return Send(socket, type, RegInvokeType.InputVerifyCode); } @@ -309,7 +309,7 @@ namespace Milimoe.FunGame.Server.Model DateTime RegTime = (DateTime)SQLHelper.DataSet.Tables[0].Rows[0][RegVerifyCodes.Column_RegTime]; if ((DateTime.Now - RegTime).TotalMinutes >= 10) { - ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 验证码已过期"); + ServerHelper.WriteLine(GetClientName() + " 验证码已过期"); msg = "此验证码已过期，请重新注册。"; SQLHelper.Execute(RegVerifyCodes.Delete_RegVerifyCode(username, email)); return Send(socket, type, false, msg); @@ -413,7 +413,7 @@ namespace Milimoe.FunGame.Server.Model SQLHelper.Execute(RoomQuery.Delete_QuitRoom(roomid, User.Id)); if (SQLHelper.Result == SQLResult.Success) { - ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 解散了房间 " + roomid); + ServerHelper.WriteLine(GetClientName() + " 解散了房间 " + roomid); } } } @@ -461,7 +461,7 @@ namespace Milimoe.FunGame.Server.Model } catch (Exception e) { - ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 没有回应。"); + ServerHelper.WriteLine(GetClientName() + " 没有回应。"); ServerHelper.Error(e); return false; } @@ -515,14 +515,14 @@ namespace Milimoe.FunGame.Server.Model } object obj = objs[0]; if (obj.GetType() == typeof(string) && (string)obj != "") - ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(type) + "] " + ServerHelper.MakeClientName(ClientName, User) + " <- " + obj); + ServerHelper.WriteLine("[" + ServerSocket.GetTypeString(type) + "] " + GetClientName() + " <- " + obj); return true; } throw new CanNotSendToClientException(); } catch (Exception e) { - ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " 没有回应。"); + ServerHelper.WriteLine(GetClientName() + " 没有回应。"); ServerHelper.Error(e); return false; } @@ -540,6 +540,11 @@ namespace Milimoe.FunGame.Server.Model _ClientName = ClientName; } + public string GetClientName() + { + return ServerHelper.MakeClientName(ClientName, User); + } + private void KickUser() { if (User.Id != 0) @@ -596,7 +601,7 @@ namespace Milimoe.FunGame.Server.Model private void CreateStreamReader() { Thread.Sleep(100); - ServerHelper.WriteLine("Creating: StreamReader -> " + ServerHelper.MakeClientName(ClientName, User) + " ...OK"); + ServerHelper.WriteLine("Creating: StreamReader -> " + GetClientName() + " ...OK"); while (Running) { if (Socket != null) @@ -608,8 +613,8 @@ namespace Milimoe.FunGame.Server.Model { RemoveUser(); Close(); - ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " Error -> Too Many Faileds."); - ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " Close -> StreamReader is Closed."); + ServerHelper.WriteLine(GetClientName() + " Error -> Too Many Faileds."); + ServerHelper.WriteLine(GetClientName() + " Close -> StreamReader is Closed."); break; } } @@ -619,8 +624,8 @@ namespace Milimoe.FunGame.Server.Model { RemoveUser(); Close(); - ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " Error -> Socket is Closed."); - ServerHelper.WriteLine(ServerHelper.MakeClientName(ClientName, User) + " Close -> StringStream is Closed."); + ServerHelper.WriteLine(GetClientName() + " Error -> Socket is Closed."); + ServerHelper.WriteLine(GetClientName() + " Close -> StringStream is Closed."); break; } } @@ -629,7 +634,7 @@ namespace Milimoe.FunGame.Server.Model private void CreatePeriodicalQuerier() { Thread.Sleep(100); - ServerHelper.WriteLine("Creating: PeriodicalQuerier -> " + ServerHelper.MakeClientName(ClientName, User) + " ...OK"); + ServerHelper.WriteLine("Creating: PeriodicalQuerier -> " + GetClientName() + " ...OK"); while (Running) { // 每两小时触发一次SQL服务器的心跳查询，防止SQL服务器掉线 diff --git a/FunGame.Server/Utilities/MySQLHelper.cs b/FunGame.Server/Utilities/MySQLHelper.cs index c0b9777..c5b775a 100644 --- a/FunGame.Server/Utilities/MySQLHelper.cs +++ b/FunGame.Server/Utilities/MySQLHelper.cs @@ -104,7 +104,7 @@ namespace Milimoe.FunGame.Server.Utility { // _IsOneTime = false需要手动调用此方法 _Connection?.Close(); - ServerHelper.WriteLine($"{GetClientName()}已释放MySQL连接"); + ServerHelper.WriteLine($"{GetClientName()} 已释放MySQL连接"); } /// @@ -167,8 +167,7 @@ namespace Milimoe.FunGame.Server.Utility /// private string GetClientName() { - if (ServerModel is null) return ""; - return ServerHelper.MakeClientName(ServerModel.ClientName, ServerModel.User) + " "; + return ServerModel?.GetClientName() ?? string.Empty; } } }