From 1b9a56fcf3ffcf0f69ed8b7447322d0a75ba99ac Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期四, 02 三月 2023 15:31:14 +0800
Subject: [PATCH] 清理dataAccess，避免报错
---
web/web/GwClient.ashx | 56 ++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 38 insertions(+), 18 deletions(-)
diff --git a/web/web/GwClient.ashx b/web/web/GwClient.ashx
index 47443d7..ebb9d56 100644
--- a/web/web/GwClient.ashx
+++ b/web/web/GwClient.ashx
@@ -22,7 +22,7 @@
private List<SysUser> _SysUserList;
private int _userId = -1;
- private int _userType = -1;
+ private string _userType = "";
private string _account = "";
private string initPwd = ConfigurationManager.AppSettings["initPwd"];
@@ -117,11 +117,13 @@
string serverIp = ConfigurationManager.AppSettings["serverIp"];
string clientPort = ConfigurationManager.AppSettings["clientPort"];
+ int isSub = context.GetInt("isSub",0);
+
string str = "";
using (GwClientDao dao = new GwClientDao())
{
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);
+ var list = dao.LoadInfoList(out recordCount, pageIndex, pageSize, ClientID, ClientName, Telephone, Agent, Company, Salesman, SupportStaff, ProductId, IsEnable,isSub, permissionsSQL);
if (list != null && list.Count > 0)
{
@@ -141,11 +143,12 @@
+ "<td>"+ (item.Is_Enable == 1 ? "<span class='label label-primary'>鍚敤</span>" : "<span class='label label-default'>鍋滅敤</span>") + "</td>";
str += @"<td>";
-
+
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 ;
+ string token = DESEncrypt.Encrypt(item.Password);//瀵圭О鍔犲瘑
+ string loginStr = "http://" + serverIp + ":" + clientPort + "/Attachedlogin.aspx?action=Attachedlogin&account=" + item.Account+"&token="+token ;
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> ";
@@ -157,9 +160,9 @@
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-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 += @"閲嶇疆瀵嗙爜";
@@ -323,8 +326,10 @@
{
throw new ArgumentException("鐧诲綍瀵嗙爜涓嶈兘涓虹┖锛屼笖蹇呴』涓�4-10浣嶈嫳鏂囨垨鏁板瓧瀛楃缁勫悎锛�");
}
+ GwClient gwClient = _Dao.Get(clientID);
//瀵嗙爜MD5鍔犲瘑锛�
+ newPwd += gwClient.Salt;
newPwd = DataHelper.MD5Hex(newPwd);
_Dao.UpdatePassword(clientID, newPwd);
@@ -404,7 +409,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");
@@ -416,8 +421,8 @@
string financialStaff = context.GetString("financialStaff");
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");
@@ -527,8 +532,8 @@
client.FinancialStaff = financialStaff;
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);
@@ -539,7 +544,7 @@
client.IsLoginIpAllowGather = isLoginIpAllowGather;
client.IsLoginCityRestrict = string.IsNullOrEmpty(isLoginCityRestrict) ? 0 : int.Parse(isLoginCityRestrict);
client.IsLoginCityAllowGather = isLoginCityAllowGather;
-
+
client.PermissionData = permissionData;
_Dao.Update(client);
@@ -550,6 +555,8 @@
///鍒涘缓鏂板鎴�
private JsonPageResult Save(PageContext<Model.SysUser> context)
{
+
+ //娴嬭瘯
string clientID = context.GetString("clientID");
string password = context.GetString("password");
string clientName = context.GetString("clientName");
@@ -564,8 +571,8 @@
string financialStaff = context.GetString("financialStaff");
string chargeType = context.GetString("chargeType");
string smsStatusReport = context.GetString("smsStatusReport");
- string mmsStatusReport = context.GetString("mmsStatusReport");
-
+ string mmsStatusReport = context.GetString("mmsStatusReport");
+
string isEnableWhite = context.GetString("isEnableWhite");
string isEnableBlack = context.GetString("isEnableBlack");
string isRemoteLoginNotice = context.GetString("isRemoteLoginNotice");
@@ -591,6 +598,16 @@
if (string.IsNullOrEmpty(clientID))
{
throw new ArgumentException("瀹㈡埛璐﹀彿涓嶈兘涓虹┖锛屼笖蹇呴』涓哄叕鍙稿悕绉帮紒");
+ }
+
+ if (address.Length >= 150)
+ {
+ throw new ArgumentException("鍦板潃闀垮害瓒呭嚭闄愬埗锛�");
+ }
+
+ if (string.IsNullOrEmpty(company))
+ {
+ throw new AggregateException("鍏徃鍚嶇О涓嶈兘涓虹┖锛屼笖蹇呴』鏄叏绉�");
}
if (string.IsNullOrEmpty(password) || !System.Text.RegularExpressions.Regex.IsMatch(password, @"[a-zA-Z0-9]{4,10}"))
@@ -691,12 +708,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;
@@ -704,7 +724,7 @@
client.Telephone = telephone;
client.Agent = agent;
client.PermissionData = permissionData;
- client.ParentId = context.OperatorID;
+ client.Client_Parentid = context.OperatorID;
client.Certification_Status = 1;
client.Company = company;
client.CustomerManager = customerManager;
@@ -713,8 +733,8 @@
client.FinancialStaff = financialStaff;
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.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);
--
Gitblit v1.9.1