user safe delete.

shaohaozhi · shaohaozhi · commit 037c8182ee2e · 2019-05-28T21:12:47.000+08:00
diff --git a/src/NSmartProxy.Infrastructure/Shared/IDbOperator.cs b/src/NSmartProxy.Infrastructure/Shared/IDbOperator.cs
@@ -13,6 +13,7 @@ public interface IDbOperator : IDisposable
         string Get(long key);
         string Get(string key);
         void Delete(int index);
+        void DeleteHash(string key);
         long GetLength();
         void Close();
         bool Exist(string key);
diff --git a/src/NSmartProxy/Database/NSmartDb.cs b/src/NSmartProxy/Database/NSmartDb.cs
@@ -122,13 +122,24 @@ public List<string> Select(int startIndex, int length)
             //输出
         }
 
+        /// <summary>
+        /// 通过序列删除数据，并且返回id
+        /// </summary>
+        /// <param name="index"></param>
+        /// <returns></returns>
         public void Delete(int index)
         {
             var key = seqf.Get(index);
             seqf.Delete(index);
+
             hashf.Remove(BitConverter.GetBytes(key));
         }
 
+        public void DeleteHash(string key)
+        {
+            hashf.Remove(String2Bytes(key));
+        }
+
         public string GetOne(string key)
         {
             return Bytes2String(hashf.Get(String2Bytes(key)));
diff --git a/src/NSmartProxy/Extension/HttpServer.cs b/src/NSmartProxy/Extension/HttpServer.cs
@@ -40,6 +40,12 @@ public HttpServer(INSmartLogger logger, IDbOperator dbop)
 
         }
 
+        /// <summary>
+        /// http服务启动，初始化代码写在这里
+        /// </summary>
+        /// <param name="ctsHttp"></param>
+        /// <param name="WebManagementPort"></param>
+        /// <returns></returns>
         public async Task StartHttpService(CancellationTokenSource ctsHttp, int WebManagementPort)
         {
             try
@@ -59,6 +65,12 @@ public async Task StartHttpService(CancellationTokenSource ctsHttp, int WebManag
                 }
                 Logger.Debug($"{files.Length} files cached.");
 
+                //如果库中没有任何记录，则增加默认用户
+                if (Dbop.GetLength() < 1)
+                {
+                    AddUserV2("admin","admin","1");
+                }
+
                 listener.Prefixes.Add($"http://+:{WebManagementPort}/");
                 Logger.Debug("Listening HTTP request on port " + WebManagementPort.ToString() + "...");
                 await AcceptHttpRequest(listener, ctsHttp);
diff --git a/src/NSmartProxy/Extension/HttpServerStaticFiles/users.js b/src/NSmartProxy/Extension/HttpServerStaticFiles/users.js
@@ -30,11 +30,13 @@ function delUser() {
         return;
     }
     var ids = [];
+    var userNames = [];
     $('input[name="cbxUserIds"]:checked').each(function () {//遍历每一个名字为interest的复选框，其中选中的执行函数    
         ids.push($(this).val());//将选中的值添加到数组chk_value中    
+        userNames.push($(this).closest("tr").find(".td_username").html());
     });
-
-    $.get(basepath + "RemoveUser?id=" + ids.join(','), function (res) {
+    
+    $.get(basepath + "RemoveUser?id=" + ids.join(',') + '&usernames=' + userNames.join(','), function (res) {
         alert('删除成功');
         selectUsers();
     });
@@ -52,7 +54,7 @@ function selectUsers() {
                 "<td> <input type='checkbox' name='cbxUserIds' value='" + i + "'></td>" +
                 "<td>" + i + "</td>" +
                 "<td>" + user.userId + "</td>" +
-                "<td>" + user.userName + "</td>" +
+                "<td class='td_username'>" + user.userName + "</td>" +
                 "<td>" + user.regTime + "</td>" +
                 "<td>" + 1 + "</td>" +
                 "</tr>";
diff --git a/src/NSmartProxy/Extension/HttpServer_APIs.cs b/src/NSmartProxy/Extension/HttpServer_APIs.cs
@@ -54,7 +54,6 @@ public string[] GetLogInfo(string filekey)
         [FormAPI]
         public string Login(string username, string userpwd)
         {
-
             //1.校验
             dynamic user = Dbop.Get(username)?.ToDynamic();
             if (user == null)
@@ -155,6 +154,12 @@ public void AddUser(string userid, string userpwd, string isAdmin)
             Dbop.Insert(long.Parse(userid), user.ToJsonString());
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="userName"></param>
+        /// <param name="userpwd"></param>
+        /// <param name="isAdmin">1代表是 0代表否</param>
         [API]
         public void AddUserV2(string userName, string userpwd, string isAdmin)
         {
@@ -179,14 +184,16 @@ public void AddUserV2(string userName, string userpwd, string isAdmin)
 
 
         [API]
-        public void RemoveUser(string userIndex)
+        public void RemoveUser(string userIndex, string userNames)
         {
             try
             {
                 var arr = userIndex.Split(',');
+                var userNameArr = userNames.Split(',');
                 for (var i = arr.Length - 1; i > -1; i--)
                 {
                     Dbop.Delete(int.Parse(arr[i]));
+                    Dbop.DeleteHash(userNameArr[i]);
                 }
 
             }

Original file line number	Diff line number	Diff line change
`@@ -122,13 +122,24 @@ public List<string> Select(int startIndex, int length)`
`122`	`122`	`//输出`
`123`	`123`	`}`
`124`	`124`
	`125`	`+ /// <summary>`
	`126`	`+ /// 通过序列删除数据，并且返回id`
	`127`	`+ /// </summary>`
	`128`	`+ /// <param name="index"></param>`
	`129`	`+ /// <returns></returns>`
`125`	`130`	`public void Delete(int index)`
`126`	`131`	`{`
`127`	`132`	`var key = seqf.Get(index);`
`128`	`133`	`seqf.Delete(index);`
	`134`	`+`
`129`	`135`	`hashf.Remove(BitConverter.GetBytes(key));`
`130`	`136`	`}`
`131`	`137`
	`138`	`+ public void DeleteHash(string key)`
	`139`	`+ {`
	`140`	`+ hashf.Remove(String2Bytes(key));`
	`141`	`+ }`
	`142`	`+`
`132`	`143`	`public string GetOne(string key)`
`133`	`144`	`{`
`134`	`145`	`return Bytes2String(hashf.Get(String2Bytes(key)));`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,6 @@ public string[] GetLogInfo(string filekey)`
`54`	`54`	`[FormAPI]`
`55`	`55`	`public string Login(string username, string userpwd)`
`56`	`56`	`{`
`57`		`-`
`58`	`57`	`//1.校验`
`59`	`58`	`dynamic user = Dbop.Get(username)?.ToDynamic();`
`60`	`59`	`if (user == null)`
`@@ -155,6 +154,12 @@ public void AddUser(string userid, string userpwd, string isAdmin)`
`155`	`154`	`Dbop.Insert(long.Parse(userid), user.ToJsonString());`
`156`	`155`	`}`
`157`	`156`
	`157`	`+ /// <summary>`
	`158`	`+ ///`
	`159`	`+ /// </summary>`
	`160`	`+ /// <param name="userName"></param>`
	`161`	`+ /// <param name="userpwd"></param>`
	`162`	`+ /// <param name="isAdmin">1代表是 0代表否</param>`
`158`	`163`	`[API]`
`159`	`164`	`public void AddUserV2(string userName, string userpwd, string isAdmin)`
`160`	`165`	`{`
`@@ -179,14 +184,16 @@ public void AddUserV2(string userName, string userpwd, string isAdmin)`
`179`	`184`
`180`	`185`
`181`	`186`	`[API]`
`182`		`- public void RemoveUser(string userIndex)`
	`187`	`+ public void RemoveUser(string userIndex, string userNames)`
`183`	`188`	`{`
`184`	`189`	`try`
`185`	`190`	`{`
`186`	`191`	`var arr = userIndex.Split(',');`
	`192`	`+ var userNameArr = userNames.Split(',');`
`187`	`193`	`for (var i = arr.Length - 1; i > -1; i--)`
`188`	`194`	`{`
`189`	`195`	`Dbop.Delete(int.Parse(arr[i]));`
	`196`	`+ Dbop.DeleteHash(userNameArr[i]);`
`190`	`197`	`}`
`191`	`198`
`192`	`199`	`}`