From 705909e14fe4e9f2fc261ee4eb40a8b41fa2f6d4 Mon Sep 17 00:00:00 2001
From: wzp <2880584989@qq.com>
Date: 星期二, 12 七月 2022 17:37:26 +0800
Subject: [PATCH] 增加免密登陆的token

---
 web/web/GwClient.ashx |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/web/web/GwClient.ashx b/web/web/GwClient.ashx
index 47443d7..d7bd4e7 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"];
 
@@ -141,11 +141,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 += "&nbsp;鐧诲綍</a>&nbsp;";
 
@@ -323,8 +324,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 +407,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");
@@ -417,7 +420,7 @@
         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");
@@ -528,7 +531,7 @@
         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 +542,7 @@
         client.IsLoginIpAllowGather = isLoginIpAllowGather;
         client.IsLoginCityRestrict = string.IsNullOrEmpty(isLoginCityRestrict) ? 0 : int.Parse(isLoginCityRestrict);
         client.IsLoginCityAllowGather = isLoginCityAllowGather;
-                        
+
         client.PermissionData = permissionData;
 
         _Dao.Update(client);
@@ -564,8 +567,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");
@@ -691,12 +694,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;
@@ -713,8 +719,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