From b7e5b66de795f3754ef63bfd47bcaa1cec72aa4a Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 07 九月 2018 11:22:03 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
Utility/OperationLogCollect.cs | 6 +++---
Utility/LanguageVerify.cs | 8 ++++----
Utility/UIHelper.cs | 9 +++++++++
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/Utility/LanguageVerify.cs b/Utility/LanguageVerify.cs
index 2d4c83d..5fc1b01 100644
--- a/Utility/LanguageVerify.cs
+++ b/Utility/LanguageVerify.cs
@@ -113,7 +113,7 @@
tables["edit_uid"] = account;
tables["edit_rid"] = playerId.ToString();
- tables["edit_name"] = playerName;
+ tables["edit_name"] = UIHelper.ServerStringTrim(playerName);
tables["notice"] = op_type == 2 ? string.Empty : verifyContent;
var ts = System.DateTime.UtcNow - new System.DateTime(1970, 1, 1, 0, 0, 0, 0);
@@ -170,16 +170,16 @@
tables["server_name"] = StringUtility.Contact("s", ServerListCenter.Instance.currentServer.region_flag);
tables["chat_type"] = 1.ToString();
tables["chat_channel"] = channel.ToString();
- tables["chat_content"] = content;
+ tables["chat_content"] = WWW.EscapeURL(UIHelper.TrimContentToServer(content));
tables["sender_uid"] = account;
tables["sender_rid"] = playerId.ToString();
- tables["sender_name"] = playerName;
+ tables["sender_name"] = UIHelper.ServerStringTrim(playerName);
tables["sender_level"] = PlayerDatas.Instance.baseData.PlayerID.ToString();
tables["sender_vip_level"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
tables["receiver_uid"] = string.Empty;
tables["receiver_rid"] = channel == 3 ? toPlayer.ToString() : string.Empty;
- tables["receiver_name"] = channel == 3 ? toPlayerName : string.Empty;
+ tables["receiver_name"] = channel == 3 ? UIHelper.ServerStringTrim(toPlayerName) : string.Empty;
tables["receiver_level"] = channel == 3 ? (toPlayerLevel == 0 ? string.Empty : toPlayerLevel.ToString()) : string.Empty;
tables["receiver_vip_level"] = string.Empty;
diff --git a/Utility/OperationLogCollect.cs b/Utility/OperationLogCollect.cs
index 6caf0b2..18590b8 100644
--- a/Utility/OperationLogCollect.cs
+++ b/Utility/OperationLogCollect.cs
@@ -146,12 +146,12 @@
tables["IP"] = DeviceUtility.GetIp();
tables["ChatChannel"] = channelName;
tables["AccountID"] = ModelCenter.Instance.GetModel<LoginModel>().sdkLoginResult.account;
- tables["RoleID"] = StringUtility.Contact(isFairy ? PlayerDatas.Instance.baseData.FamilyName : string.Empty,
- isFairy ? "-" : string.Empty, PlayerDatas.Instance.baseData.PlayerName);
+ tables["RoleID"] = StringUtility.Contact(isFairy ? UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.FamilyName) : string.Empty,
+ isFairy ? "-" : string.Empty, UIHelper.ServerStringTrim(PlayerDatas.Instance.baseData.PlayerName));
tables["ToRoleID"] = toPlayer;
tables["Level"] = PlayerDatas.Instance.baseData.LV.ToString();
tables["VIPLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
- tables["Content"] = content;
+ tables["Content"] = WWW.EscapeURL(UIHelper.TrimContentToServer(content));
HttpRequest.Instance.RequestHttpGet(StringUtility.Contact(chatReportUrl, HttpRequest.HashtablaToString(tables)), HttpRequest.defaultHttpContentType);
#endif
diff --git a/Utility/UIHelper.cs b/Utility/UIHelper.cs
index 00c7a5e..5791fd1 100644
--- a/Utility/UIHelper.cs
+++ b/Utility/UIHelper.cs
@@ -764,4 +764,13 @@
}
return "D";
}
+
+ public static string TrimContentToServer(string content)
+ {
+ content = WordAnalysis.Color_Start_Regex.Replace(content, string.Empty);
+ content = WordAnalysis.Color_End_Regex.Replace(content, string.Empty);
+ content = content.Replace("=", string.Empty);
+ content = content.Replace(" ", string.Empty);
+ return content;
+ }
}
--
Gitblit v1.8.0