From 3bf021ed05b7ae7a50b4287b2831588495bb06e6 Mon Sep 17 00:00:00 2001
From: yzh <snbbt@21cn.com>
Date: 星期四, 30 六月 2022 12:35:39 +0800
Subject: [PATCH] 优化金额或条数的长度处理。
---
web/web/GwClient.ashx | 263 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 234 insertions(+), 29 deletions(-)
diff --git a/web/web/GwClient.ashx b/web/web/GwClient.ashx
index 667d11a..ccb85a6 100644
--- a/web/web/GwClient.ashx
+++ b/web/web/GwClient.ashx
@@ -22,13 +22,14 @@
private List<SysUser> _SysUserList;
private int _userId = -1;
- private int _userType = -1;
+ private string _userType = "";
private string _account = "";
+ private string initPwd = ConfigurationManager.AppSettings["initPwd"];
public override JsonPageResult ProcessRequestInternal(PageContext<Model.SysUser> context)
{
string action = context.GetString("action");
-
+
_userId = context.SessionObject.UserID;
_userType = context.SessionObject.UserType;
_account = context.SessionObject.Account;
@@ -66,6 +67,24 @@
//鎵归噺鍒嗛厤瀹㈡埛鐨勪釜鎬т骇鍝�
case "batchUpdateClientProduct":
return BatchUpdateClientProduct(context);
+ //閲嶇疆瀵嗙爜
+ case "resetPwd":
+ return ResetPwd(context);
+ //淇敼瀵嗙爜
+ case "updatePwd":
+ return UpdatePwd(context);
+ //鑾峰彇瀹㈡埛鍒嗛厤涓�т骇鍝�
+ case "getPersonalityProduct":
+ return GetPersonalityProduct(context);
+ //淇敼鍒嗛厤涓�т骇鍝�
+ case "updateProduct":
+ return UpdateProduct(context);
+ //鍚敤鎴栧仠鐢�
+ case "updateStatus":
+ return UpdateStatus(context);
+ //鑾峰彇Token锛氭湭瀹炵幇鐢熸垚Token
+ case "getToken":
+ return GetToken(context);
default:
throw new Exception("Invalid Action=" + action);
@@ -87,7 +106,9 @@
string ClientName = context.GetString("ClientName");
string Telephone = context.GetString("Telephone");
string Salesman = context.GetString("Salesman");
+ string SupportStaff = context.GetString("SupportStaff");
string ProductId = context.GetString("ProductId");
+ int IsEnable = context.GetInt("IsEnable", -1);
int pageIndex = context.GetInt("pageIndex", 1);
string Agent = context.GetString("Agent");
@@ -99,8 +120,8 @@
string str = "";
using (GwClientDao dao = new GwClientDao())
{
- string permissionsSQL = dao.GetClientPermissions(_userId, _userType, null);
- var list = dao.LoadInfoList(out recordCount, pageIndex, pageSize, ClientID, ClientName, Telephone, Agent, Company, Salesman, ProductId, permissionsSQL);
+ string permissionsSQL = dao.GetClientPermissions(_userId, _userType, "gwc");
+ var list = dao.LoadInfoList(out recordCount, pageIndex, pageSize, ClientID, ClientName, Telephone, Agent, Company, Salesman, SupportStaff, ProductId, IsEnable, permissionsSQL);
if (list != null && list.Count > 0)
{
@@ -114,36 +135,80 @@
//edit:yangzh by 20220511
//str += @"<tr ><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Top_up_Amount_Total + "鍏�</td><td>" + item.Agent + "</td><td>" + Certification_StatusResult + "</td>";
//str += @"<tr ><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Balance/1000 + "鍏�</td><td>" + item.Top_up_Amount_Total/1000 + "鍏�</td><td>" + item.Agent + "</td><td>" + Certification_StatusResult + "</td>";
- str += @"<tr ><td rowspan='1' ><input type='checkbox' name='checkbox' value='" + item.ClientID + "'/></td><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Balance/1000 + "鍏�</td><td>" + item.Top_up_Amount_Total/1000 + "鍏�</td><td>" + SysUserName(string.IsNullOrEmpty(item.Salesman)? 0: int.Parse(item.Salesman) ) + "</td><td>" + Certification_StatusResult + "</td>";
-
+ //str += @"<tr ><td rowspan='1' ><input type='checkbox' name='checkbox' value='" + item.ClientID + "'/></td><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Balance/1000 + "鍏�</td><td>" + item.Top_up_Amount_Total/1000 + "鍏�</td><td>" + SysUserName(string.IsNullOrEmpty(item.Salesman)? 0: int.Parse(item.Salesman) ) + "</td><td>" + Certification_StatusResult + "</td>";
+ str += @"<tr ><td rowspan='1' ><input type='checkbox' name='checkbox' value='" + item.ClientID + "'/></td><td>" + item.ClientID + "</td><td>" + item.Company + "</td><td>" + item.ClientName + "</td><td>" + item.Telephone + "</td><td>" + item.Balance/1000 + "</td><td>" + item.Top_up_Amount_Total/1000 + "</td><td>" + SysUserName(string.IsNullOrEmpty(item.Salesman)? 0: int.Parse(item.Salesman) ) + "</td>"
+ + "<td>" + item.ProductIds + "</td>"
+ + "<td>"+ (item.Is_Enable == 1 ? "<span class='label label-primary'>鍚敤</span>" : "<span class='label label-default'>鍋滅敤</span>") + "</td>";
str += @"<td>";
- string loginStr = "http://" + serverIp + ":" + clientPort + "/Attachedlogin.aspx?action=Attachedlogin&account=" + item.Account + "&password=" + item.Password;
- str += string.Format("<a class=\"action-modal-login btn btn-success btn-xs \" href=\"{0}\" data-id=\"{1}\" target=\"_blank\">", (object)loginStr, (object)item.ClientID);
- str += " 鐧诲綍</a> ";
- str += string.Format(@"<a class=""action-modal-edit btn btn-xs btn-primary"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
- str += @"缂栬緫";
+ if (item.Is_Enable == 1)
+ {
+ //string loginStr = "http://" + serverIp + ":" + clientPort + "/Attachedlogin.aspx?action=Attachedlogin&account=" + item.Account + "&password=" + item.Password;
+ string loginStr = "http://" + serverIp + ":" + clientPort + "/Attachedlogin.aspx?action=Attachedlogin&account=" + item.Account ;
+ str += string.Format("<a class=\"action-modal-login btn btn-success btn-xs \" href=\"javascript:;\" data-url=\"{0}\" data-id=\"{1}\" target=\"_blank\">", (object)loginStr, (object)item.ClientID);
+ str += " 鐧诲綍</a> ";
+
+ str += string.Format(@"<a class=""action-modal-edit btn btn-xs btn-primary"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
+ str += @"缂栬緫";
+ str += @"</a> ";
+
+ str += string.Format(@"<a class=""action-modal-white btn btn-xs btn-primary"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
+ str += @"鐧藉悕鍗�";
+ str += @"</a> ";
+
+ str += string.Format(@"<a class=""action-modal-black btn btn-xs btn-primary"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
+ str += @"榛戝悕鍗�";
+ str += @"</a> ";
+
+ //str += string.Format(@"<a class=""action-modal-resetPwd btn btn-xs btn-primary"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
+ //str += @"閲嶇疆瀵嗙爜";
+ //str += @"</a> ";
+
+ str += string.Format(@"<a class=""action-modal-updatePwd btn btn-xs btn-primary"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
+ str += @"淇敼瀵嗙爜";
+ str += @"</a> ";
+
+ str += string.Format(@"<a class=""action-modal-updateProduct btn btn-xs btn-primary"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
+ str += @"淇敼浜у搧";
+ str += @"</a> ";
+
+ str += string.Format(@"<a class=""action-modal-orderCreate btn btn-xs btn-primary"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
+ str += @"鍏呭��";
+ str += @"</a> ";
+ }
+
+ str += string.Format(@"<a class=""action-modal-orderLog btn btn-xs btn-primary"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
+ str += @"鍏呭�兼棩蹇�";
str += @"</a> ";
- str += string.Format(@"<a class=""action-modal-white btn btn-xs btn-primary"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
- str += @"鐧藉悕鍗�";
- str += @"</a> ";
+ if(item.Is_Enable == 1)
+ {
+ str += string.Format(@"<a class=""action-modal-updateStatus btn btn-xs btn-default"" href=""javascript:;"" data-id=""{0}"" data-status=0 >", item.ClientID);
+ str += @"<i class='fa fa-toggle-on'></i>鍋滅敤</a> ";
- str += string.Format(@"<a class=""action-modal-black btn btn-xs btn-primary"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
- str += @"榛戝悕鍗�";
- str += @"</a> ";
+ }
+ else
+ {
+ str += string.Format(@"<a class=""action-modal-updateStatus btn btn-xs btn-primary"" href=""javascript:;"" data-id=""{0}"" data-status=1 >", item.ClientID);
+ str += @"<i class='fa fa-toggle-off'></i>鍚敤</a> ";
- str += string.Format(@"<a class=""action-delete btn btn-xs btn-default"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
- str += @"鍒犻櫎";
- str += @"</a>";
+ }
+
+ if (item.Is_Enable == 0)
+ {
+ str += string.Format(@"<a class=""action-delete btn btn-xs btn-default"" href=""javascript:;"" data-id=""{0}"">", item.ClientID);
+ str += @"鍒犻櫎";
+ str += @"</a>";
+ }
+
str += @"</td>";
str += @"</tr>";
}
}
else
{
- str += @"<tr><td colspan=""10"">鏆傛棤淇℃伅</td></tr>";
+ str += @"<tr><td colspan=""11"">鏆傛棤淇℃伅</td></tr>";
}
}
@@ -218,6 +283,91 @@
return new JsonPageResult(true, _Dao.GetBlackList(clientID));
}
+ //鏍规嵁瀹㈡埛璐﹀彿鐢熸垚Token
+ private JsonPageResult GetToken(PageContext<Model.SysUser> context)
+ {
+ string clientID = context.GetString("clientID");
+ if (string.IsNullOrEmpty(clientID) )
+ {
+ throw new ArgumentException("瀹㈡埛璐﹀彿鍙傛暟寮傚父锛�");
+ }
+
+ //鐢熸垚Token
+ string token = clientID;
+
+ return new JsonPageResult(true, token);
+ }
+
+
+ //閲嶇疆瀵嗙爜
+ private JsonPageResult ResetPwd(PageContext<Model.SysUser> context)
+ {
+ string clientID = context.GetString("clientID");
+ string password = string.IsNullOrEmpty(initPwd ) ? "123456" : initPwd;
+
+ //瀵嗙爜MD5鍔犲瘑锛�
+ password = DataHelper.MD5Hex(password);
+
+ _Dao.UpdatePassword(clientID, password);
+
+ return new JsonPageResult(true, "閲嶇疆瀵嗙爜鎴愬姛锛�");
+ }
+
+ //淇敼瀵嗙爜
+ private JsonPageResult UpdatePwd(PageContext<Model.SysUser> context)
+ {
+ string clientID = context.GetString("clientID");
+ string newPwd = context.GetString("newPwd");
+
+ if (string.IsNullOrEmpty(newPwd) || !System.Text.RegularExpressions.Regex.IsMatch(newPwd, @"[a-zA-Z0-9]{4,10}"))
+ {
+ throw new ArgumentException("鐧诲綍瀵嗙爜涓嶈兘涓虹┖锛屼笖蹇呴』涓�4-10浣嶈嫳鏂囨垨鏁板瓧瀛楃缁勫悎锛�");
+ }
+ GwClient gwClient = _Dao.Get(clientID);
+
+ //瀵嗙爜MD5鍔犲瘑锛�
+ newPwd += gwClient.Salt;
+ newPwd = DataHelper.MD5Hex(newPwd);
+
+ _Dao.UpdatePassword(clientID, newPwd);
+
+ return new JsonPageResult(true, "淇敼瀵嗙爜鎴愬姛锛�");
+ }
+
+ //鑾峰彇瀹㈡埛涓�т骇鍝�
+ private JsonPageResult GetPersonalityProduct(PageContext<Model.SysUser> context)
+ {
+ string clientId = context.GetString("clientId");
+
+ return new JsonPageResult(true, _Dao.GetPersonalityProduct(clientId).Keys);
+ }
+
+ //淇敼鍒嗛厤涓�т骇鍝侊細淇敼纭
+ private JsonPageResult UpdateProduct(PageContext<SysUser> context)
+ {
+ //context.CheckRight("1042", FailedOperation.PromptOnly);
+ string @string = context.GetString("productIdArray");
+ string clientId = context.GetString("clientId");
+ string[] productIdArray = JsonConvert.DeserializeObject<string[]>(@string);
+ if (productIdArray == null)
+ throw new ArgumentException("涓�у垎閰嶄骇鍝佹暟鎹紓甯革紒");
+ if (string.IsNullOrEmpty(clientId) )
+ throw new ArgumentException("瀹㈡埛璐﹀彿鍙傛暟寮傚父锛�");
+ this._Dao.UpdateProduct(clientId, productIdArray);
+ return new JsonPageResult(true, (object) "淇敼鍒嗛厤涓�т骇鍝佹垚鍔燂紒");
+ }
+
+ //鏇存柊淇℃伅鍚敤鎴栧仠鐢�
+ private JsonPageResult UpdateStatus(PageContext<SysUser> context)
+ {
+ string clientId = context.GetString("clientId");
+ string isEnable = context.GetString("isEnable");
+
+ this._Dao.UpdateStatus(clientId, isEnable);
+ return new JsonPageResult(true, "鏇存柊淇℃伅鐘舵�佹垚鍔燂紒");
+
+ }
+
/// <summary>
/// 閫氳繃璐﹀彿鍚嶈幏鍙栦唬鐞嗗晢淇℃伅
/// </summary>
@@ -256,7 +406,7 @@
int id = Int32.Parse(context.GetString("id"));
string clientID = context.GetString("clientID");
string company = context.GetString("company");
- string password = context.GetString("password");
+ //string password = context.GetString("password");
string clientName = context.GetString("clientName");
string address = context.GetString("address");
string telephone = context.GetString("telephone");
@@ -269,6 +419,18 @@
string chargeType = context.GetString("chargeType");
string smsStatusReport = context.GetString("smsStatusReport");
string mmsStatusReport = context.GetString("mmsStatusReport");
+
+ string isEnableWhite = context.GetString("isEnableWhite");
+ string isEnableBlack = context.GetString("isEnableBlack");
+ string isRemoteLoginNotice = context.GetString("isRemoteLoginNotice");
+ string isMobileCaptcha = context.GetString("isMobileCaptcha");
+ string isHideMobile = context.GetString("isHideMobile");
+ string isDisplayStatus = context.GetString("isDisplayStatus");
+ string isLoginIpRestrict = context.GetString("isLoginIpRestrict");
+ string isLoginIpAllowGather = context.GetString("isLoginIpAllowGather");
+ string isLoginCityRestrict = context.GetString("isLoginCityRestrict");
+ string isLoginCityAllowGather = context.GetString("isLoginCityAllowGather");
+
string data = context.GetString("permissionData");
if(data.Contains("1"))
{
@@ -285,10 +447,11 @@
throw new ArgumentException("瀹㈡埛璐﹀彿涓嶈兘涓虹┖锛屼笖蹇呴』涓哄叕鍙稿悕绉帮紒");
}
+ /**
if (string.IsNullOrEmpty(password) || !System.Text.RegularExpressions.Regex.IsMatch(password, @"[a-zA-Z0-9]{4,10}"))
{
throw new ArgumentException("瀹㈡埛瀵嗙爜涓嶈兘涓虹┖锛屼笖蹇呴』涓�4-10浣嶈嫳鏂囨垨鏁板瓧瀛楃缁勫悎锛�");
- }
+ }**/
if (string.IsNullOrEmpty(clientName) || string.IsNullOrEmpty(telephone))
{
@@ -325,11 +488,14 @@
throw new ArgumentException("鐭俊鏄惁鏀寔鏄剧ず鐘舵�佹姤鍛婁笉鑳戒负绌猴紝璇烽�夋嫨锛�");
}
+ /**
if (string.IsNullOrEmpty(mmsStatusReport))
{
throw new ArgumentException("褰╀俊鏄惁鏀寔鏄剧ず鐘舵�佹姤鍛婁笉鑳戒负绌猴紝璇烽�夋嫨锛�");
- }
+ }**/
+ /**
+ //缂栬緫鏃朵笉鏀寔涓�у瘑鐮�
string savePassword = "";
if (!string.IsNullOrEmpty(clientID))
{
@@ -341,6 +507,7 @@
savePassword = DataHelper.MD5Hex(password);
}
+ **/
var client = new Model.GwClient();
@@ -348,7 +515,7 @@
client.ClientID = clientID;
client.Company = company;
//client.Password = password;
- client.Password = savePassword;
+ //client.Password = savePassword;
client.ClientName = clientName;
client.Address = address;
@@ -363,6 +530,18 @@
client.ChargeType = string.IsNullOrEmpty(chargeType) ? 0 : int.Parse(chargeType);
client.SmsStatusReport = string.IsNullOrEmpty(smsStatusReport) ? 0 : int.Parse(smsStatusReport);
client.MmsStatusReport = string.IsNullOrEmpty(mmsStatusReport) ? 0 : int.Parse(mmsStatusReport);
+
+ client.IsEnableWhite = string.IsNullOrEmpty(isEnableWhite) ? 0 : int.Parse(isEnableWhite);
+ client.IsEnableBlack = string.IsNullOrEmpty(isEnableBlack) ? 0 : int.Parse(isEnableBlack);
+ client.IsRemoteLoginNotice = string.IsNullOrEmpty(isRemoteLoginNotice) ? 0 : int.Parse(isRemoteLoginNotice);
+ client.IsMobileCaptcha = string.IsNullOrEmpty(isMobileCaptcha) ? 0 : int.Parse(isMobileCaptcha);
+ client.IsHideMobile = string.IsNullOrEmpty(isHideMobile) ? 0 : int.Parse(isHideMobile);
+ client.IsDisplayStatus = string.IsNullOrEmpty(isDisplayStatus) ? 0 : int.Parse(isDisplayStatus);
+ client.IsLoginIpRestrict = string.IsNullOrEmpty(isLoginIpRestrict) ? 0 : int.Parse(isLoginIpRestrict);
+ client.IsLoginIpAllowGather = isLoginIpAllowGather;
+ client.IsLoginCityRestrict = string.IsNullOrEmpty(isLoginCityRestrict) ? 0 : int.Parse(isLoginCityRestrict);
+ client.IsLoginCityAllowGather = isLoginCityAllowGather;
+
client.PermissionData = permissionData;
_Dao.Update(client);
@@ -388,6 +567,18 @@
string chargeType = context.GetString("chargeType");
string smsStatusReport = context.GetString("smsStatusReport");
string mmsStatusReport = context.GetString("mmsStatusReport");
+
+ string isEnableWhite = context.GetString("isEnableWhite");
+ string isEnableBlack = context.GetString("isEnableBlack");
+ string isRemoteLoginNotice = context.GetString("isRemoteLoginNotice");
+ string isMobileCaptcha = context.GetString("isMobileCaptcha");
+ string isHideMobile = context.GetString("isHideMobile");
+ string isDisplayStatus = context.GetString("isDisplayStatus");
+ string isLoginIpRestrict = context.GetString("isLoginIpRestrict");
+ string isLoginIpAllowGather = context.GetString("isLoginIpAllowGather");
+ string isLoginCityRestrict = context.GetString("isLoginCityRestrict");
+ string isLoginCityAllowGather = context.GetString("isLoginCityAllowGather");
+
string data = context.GetString("permissionData");
if(data.Contains("1"))
{
@@ -453,11 +644,11 @@
{
throw new ArgumentException("鐭俊鏄惁鏀寔鏄剧ず鐘舵�佹姤鍛婁笉鑳戒负绌猴紝璇烽�夋嫨锛�");
}
-
+ /**
if (string.IsNullOrEmpty(mmsStatusReport))
{
throw new ArgumentException("褰╀俊鏄惁鏀寔鏄剧ず鐘舵�佹姤鍛婁笉鑳戒负绌猴紝璇烽�夋嫨锛�");
- }
+ }**/
HttpFileCollection _file = HttpContext.Current.Request.Files;
if (_file.Count > 0)
@@ -502,12 +693,15 @@
}
}
+ string salt = DataConverter.getRandom(6);
+ password += salt;
//瀵嗙爜鍔犲瘑
password = DataHelper.MD5Hex(password);
var client = new Model.GwClient();
client.ClientID = clientID;
client.Password = password;
+ client.Salt = salt;
client.ClientName = clientName;
client.Address = address;
@@ -525,6 +719,17 @@
client.ChargeType = string.IsNullOrEmpty(chargeType) ? 0 : int.Parse(chargeType);
client.SmsStatusReport = string.IsNullOrEmpty(smsStatusReport) ? 0 : int.Parse(smsStatusReport);
client.MmsStatusReport = string.IsNullOrEmpty(mmsStatusReport) ? 0 : int.Parse(mmsStatusReport);
+
+ client.IsEnableWhite = string.IsNullOrEmpty(isEnableWhite) ? 0 : int.Parse(isEnableWhite);
+ client.IsEnableBlack = string.IsNullOrEmpty(isEnableBlack) ? 0 : int.Parse(isEnableBlack);
+ client.IsRemoteLoginNotice = string.IsNullOrEmpty(isRemoteLoginNotice) ? 0 : int.Parse(isRemoteLoginNotice);
+ client.IsMobileCaptcha = string.IsNullOrEmpty(isMobileCaptcha) ? 0 : int.Parse(isMobileCaptcha);
+ client.IsHideMobile = string.IsNullOrEmpty(isHideMobile) ? 0 : int.Parse(isHideMobile);
+ client.IsDisplayStatus = string.IsNullOrEmpty(isDisplayStatus) ? 0 : int.Parse(isDisplayStatus);
+ client.IsLoginIpRestrict = string.IsNullOrEmpty(isLoginIpRestrict) ? 0 : int.Parse(isLoginIpRestrict);
+ client.IsLoginIpAllowGather = isLoginIpAllowGather;
+ client.IsLoginCityRestrict = string.IsNullOrEmpty(isLoginCityRestrict) ? 0 : int.Parse(isLoginCityRestrict);
+ client.IsLoginCityAllowGather = isLoginCityAllowGather;
_Dao.Add(client);//鎻掑叆鏁版嵁搴撱�傚垱寤鸿处鎴�
@@ -620,14 +825,14 @@
}
}
- //绠＄悊绔处鎴峰悕绉�
+ //绠＄悊绔敤鎴稩D杞悕绉�
private string SysUserName(int userId)
{
if (this.SysUserList == null)
return string.Empty;
SysUser sysUser = this._SysUserList.Find((Predicate<SysUser>)(bean => bean.UserID == userId));
if (sysUser != null)
- return string.Format("{0}-{1}", (object)sysUser.UserID, (object)sysUser.UserName);
+ return string.Format("{0}", (object)sysUser.UserName);
return string.Empty;
}
}
--
Gitblit v1.9.1