update 5.3.3.7

yswenli · Sep 11, 2020 · b45fba0 · b45fba0
1 parent b4de4de
commit b45fba0
Show file tree

Hide file tree

Showing 14 changed files with 57 additions and 36 deletions.
diff --git a/SAEA.WebRedisManager/Libs/CurrentRedisClient.cs b/SAEA.WebRedisManager/Libs/CurrentRedisClient.cs
@@ -257,7 +257,7 @@ public static List<string> GetKeys(int offset, string name, int dbIndex, string
                             }
                             else
                             {
-                                using (CancellationTokenSource cts = new CancellationTokenSource(TimeSpan.FromSeconds(20)))
+                                using (CancellationTokenSource cts = new CancellationTokenSource(TimeSpan.FromSeconds(10)))
                                 {
                                     var token = cts.Token;
 
@@ -266,7 +266,7 @@ public static List<string> GetKeys(int offset, string name, int dbIndex, string
                                         var o = 0;
                                         do
                                         {
-                                            var scanData = redisClient.GetDataBase(dbIndex).Scan(o, key, 50);
+                                            var scanData = redisClient.GetDataBase(dbIndex).Scan(o, key, 10000);
 
                                             if (scanData != null)
                                             {
@@ -281,7 +281,7 @@ public static List<string> GetKeys(int offset, string name, int dbIndex, string
                                             if (result.Count >= count) break;
                                         }
                                         while (o > 0 && !token.IsCancellationRequested);
-                                    }).Wait(token);
+                                    }).Wait();
                                 }
                             }
                         }
@@ -306,7 +306,7 @@ public static List<string> GetKeys(int offset, string name, int dbIndex, string
         /// <param name="key"></param>
         /// <param name="count"></param>
         /// <returns></returns>
-        public static List<string> GetAllKeys(ref int offset, string name, int dbIndex, string key = "*", int count = 50)
+        public static List<string> GetAllKeys(ref int offset, string name, int dbIndex, string key = "*", int count = 10000)
         {
             List<string> result = new List<string>();
 

diff --git a/SAEA.WebRedisManager/wwwroot/AddItem.html b/SAEA.WebRedisManager/wwwroot/AddItem.html
@@ -3,9 +3,10 @@
 <head>
     <meta charset="utf-8" />
     <title>添加数据</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <meta name="renderer" content="webkit" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+    <meta name="author" content="yswenli" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="format-detection" content="telephone=no">

diff --git a/SAEA.WebRedisManager/wwwroot/Chart.html b/SAEA.WebRedisManager/wwwroot/Chart.html
@@ -2,7 +2,10 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <meta name="renderer" content="webkit" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+    <meta name="author" content="yswenli" />
     <title>报表</title>
     <link href="/content/css/layui.css" rel="stylesheet" />
     <link href="/content/css/global.css" rel="stylesheet" />

diff --git a/SAEA.WebRedisManager/wwwroot/Console.html b/SAEA.WebRedisManager/wwwroot/Console.html
@@ -2,7 +2,10 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <meta name="renderer" content="webkit" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+    <meta name="author" content="yswenli" />
     <title>命令行</title>
     <link href="/content/css/layui.css" rel="stylesheet" />
     <link href="/content/css/global.css" rel="stylesheet" />

diff --git a/SAEA.WebRedisManager/wwwroot/Index.html b/SAEA.WebRedisManager/wwwroot/Index.html
@@ -3,11 +3,12 @@
 <head>
     <meta charset="utf-8">
     <title>WebRedisManager</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="renderer" content="webkit" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+    <meta name="author" content="yswenli" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <link rel=icon sizes=any mask href="/favicon.svg">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="format-detection" content="telephone=no">

diff --git a/SAEA.WebRedisManager/wwwroot/IndexContent.html b/SAEA.WebRedisManager/wwwroot/IndexContent.html
@@ -3,9 +3,10 @@
 <head>
     <meta charset="utf-8" />
     <title>IndexItem</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <meta name="renderer" content="webkit" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+    <meta name="author" content="yswenli" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="format-detection" content="telephone=no">

diff --git a/SAEA.WebRedisManager/wwwroot/ItemsView.html b/SAEA.WebRedisManager/wwwroot/ItemsView.html
@@ -2,7 +2,10 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <meta name="renderer" content="webkit" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+    <meta name="author" content="yswenli" />
     <title>ItemsView</title>
     <link href="/content/css/layui.css" rel="stylesheet" />
     <link href="/content/css/global.css" rel="stylesheet" />

diff --git a/SAEA.WebRedisManager/wwwroot/Keys.html b/SAEA.WebRedisManager/wwwroot/Keys.html
@@ -2,7 +2,10 @@
 <html>
 <head>
     <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <meta name="renderer" content="webkit" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+    <meta name="author" content="yswenli" />
     <title>Keys</title>
     <link href="/content/css/layui.css" rel="stylesheet" />
     <link href="/content/css/global.css" rel="stylesheet" />

diff --git a/SAEA.WebRedisManager/wwwroot/RedisAdd.html b/SAEA.WebRedisManager/wwwroot/RedisAdd.html
@@ -3,9 +3,10 @@
 <head>
     <meta charset="utf-8" />
     <title>添加redis服务器</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <meta name="renderer" content="webkit" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+    <meta name="author" content="yswenli" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="format-detection" content="telephone=no">

diff --git a/SAEA.WebRedisManager/wwwroot/Remove.html b/SAEA.WebRedisManager/wwwroot/Remove.html
@@ -3,9 +3,10 @@
 <head>
     <meta charset="utf-8" />
     <title>删除redis服务器</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <meta name="renderer" content="webkit" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+    <meta name="author" content="yswenli" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="format-detection" content="telephone=no">

diff --git a/SAEA.WebRedisManager/wwwroot/Rename.html b/SAEA.WebRedisManager/wwwroot/Rename.html
@@ -3,9 +3,10 @@
 <head>
     <meta charset="utf-8" />
     <title>rename</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <meta name="renderer" content="webkit" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+    <meta name="author" content="yswenli" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="format-detection" content="telephone=no">

diff --git a/SAEA.WebRedisManager/wwwroot/configs.html b/SAEA.WebRedisManager/wwwroot/configs.html
@@ -3,9 +3,10 @@
 <head>
     <meta charset="utf-8" />
     <title>redis server configs</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <meta name="renderer" content="webkit" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+    <meta name="author" content="yswenli" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="format-detection" content="telephone=no">

diff --git a/SAEA.WebRedisManager/wwwroot/login.html b/SAEA.WebRedisManager/wwwroot/login.html
@@ -3,9 +3,10 @@
 <head>
     <meta charset="utf-8">
     <title>login - WebRedisManager</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+    <meta name="renderer" content="webkit"/>
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0"/>
+    <meta name="author" content="yswenli"/>
     <link href="Content/css/layui.css" rel="stylesheet" media="all" />
     <link href="Content/css/admin.css" rel="stylesheet" />
     <link href="Content/css/login.css" rel="stylesheet" />
@@ -53,7 +54,7 @@ <h2>WebRedisManager</h2>
         </div>
 
         <div class="layui-trans layadmin-user-login-footer">
-            <p>© 2020 <a href="https://github.com/yswenli/WebRedisManager" target="_blank">yswenli version:5.3.3.2</a></p>
+            <p>© 2020 <a href="https://github.com/yswenli/WebRedisManager" target="_blank">yswenli version:5.3.3.7</a></p>
         </div>
 
     </div>

diff --git a/SAEA.WebRedisManager/wwwroot/userlist.html b/SAEA.WebRedisManager/wwwroot/userlist.html
@@ -3,9 +3,10 @@
 <head>
     <meta charset="utf-8" />
     <title>User List</title>
-    <meta name="renderer" content="webkit">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <meta name="renderer" content="webkit" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0" />
+    <meta name="author" content="yswenli" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="format-detection" content="telephone=no">