update to v4.6.3.2

yswenli · Jul 25, 2019 · 9342314 · 9342314
1 parent 0603f57
commit 9342314
Show file tree

Hide file tree

Showing 12 changed files with 169 additions and 59 deletions.
diff --git a/SAEA.WebRedisManager/Controllers/RedisController.cs b/SAEA.WebRedisManager/Controllers/RedisController.cs
@@ -96,20 +96,19 @@ public ActionResult GetInfo(string name, bool isCpu)
                 if (data != null)
                 {
                     var result = "0";
+
                     if (isCpu)
-                        result = data.used_cpu_user.ToString();
-                    else
                     {
-                        if (long.TryParse(data.used_memory, out long used_memory))
-                        {
-                            result = (used_memory / 1024 / 1024).ToString();
-                        }
-                        else
-                        {
-                            result = "0";
-                        }
+                        result = CurrentRedisClient.CpuUsed(name).ToString();
                     }
+                    else
+                    {
+                        var totalmem = CurrentRedisClient.GetMaxMem(name);
+
+                        var usemem = double.Parse(data.used_memory);
 
+                        result = (usemem / totalmem * 100).ToString();
+                    }
 
                     return Json(new JsonResult<string>() { Code = 1, Data = result, Message = "OK" });
                 }
@@ -422,6 +421,16 @@ public ActionResult DelItem(RedisData redisData)
                 object data = string.Empty;
                 if (redisData != null)
                 {
+                    redisData.Name = SAEA.Http.Base.HttpUtility.UrlDecode(redisData.Name);
+                    redisData.ID = SAEA.Http.Base.HttpUtility.UrlDecode(redisData.ID);
+                    if (!string.IsNullOrEmpty(redisData.Key))
+                    {
+                        redisData.Key = SAEA.Http.Base.HttpUtility.UrlDecode(redisData.Key);
+                    }
+                    if (!string.IsNullOrEmpty(redisData.Value))
+                    {
+                        redisData.Value = SAEA.Http.Base.HttpUtility.UrlDecode(redisData.Value);
+                    }
                     CurrentRedisClient.DelItem(redisData);
                 }
                 result.Code = 1;

diff --git a/SAEA.WebRedisManager/Libs/CurrentRedisClient.cs b/SAEA.WebRedisManager/Libs/CurrentRedisClient.cs
@@ -2,6 +2,7 @@
 using SAEA.RedisSocket;
 using SAEA.RedisSocket.Model;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -93,6 +94,68 @@ public static ServerInfo GetServerInfo(string name)
         }
 
 
+        static ConcurrentDictionary<string, double> _cpuUsed = new ConcurrentDictionary<string, double>();
+
+        public static double CpuUsed(string name)
+        {
+            var data = CurrentRedisClient.GetServerInfo(name);
+
+            var before = 0D;
+
+            var now = double.Parse(data.used_cpu_sys);
+
+            if (_cpuUsed.ContainsKey(name))
+            {
+                before = _cpuUsed[name];
+            }
+
+            _cpuUsed[name] = now;
+
+            return (now - before) * 100;
+        }
+
+
+        public static double GetMaxMem(string name)
+        {
+            lock (_locker)
+            {
+                if (_redisClients.ContainsKey(name))
+                {
+                    var redisClient = _redisClients[name];
+
+                    if (redisClient.IsConnected)
+                    {
+                        var str = redisClient.Info("Memory");
+
+                        if (string.IsNullOrEmpty(str))
+                        {
+                            return 0D;
+                        }
+
+                        var arr = str.Split(new string[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
+
+                        if (arr == null || !arr.Any())
+                        {
+                            return 0D;
+                        }
+
+                        foreach (var item in arr)
+                        {
+                            var sarr = item.Split(new string[] { ":" }, StringSplitOptions.RemoveEmptyEntries);
+
+                            if (sarr[0] == "maxmemory")
+                            {
+                                return double.Parse(sarr[1]);
+                            }
+                        }
+
+                    }
+                }
+                return 0D;
+            }
+        }
+
+
         public static bool IsCluster(string name)
         {
             if (_redisClients.ContainsKey(name))

diff --git a/SAEA.WebRedisManager/Program.cs b/SAEA.WebRedisManager/Program.cs
@@ -12,7 +12,7 @@ static void Main(string[] args)
             var config = SAEAMvcApplicationConfigBuilder.Read();
 
             config.Port = 16379;
-            config.Count = 1;
+            config.Count = 100;
 
             SAEAMvcApplicationConfigBuilder.Write(config);
 

diff --git a/SAEA.WebRedisManager/wwwroot/Chart.html b/SAEA.WebRedisManager/wwwroot/Chart.html
@@ -42,7 +42,7 @@
         </div>
         <div class="layui-row layui-col-space15 cluster-content" style="margin-top:15px;">
             <div class="layui-card">
-                <div class="layui-card-header" style="font-size:18px;">
+                <div class="layui-card-header" style="font-size:18px;display:none;">
                     redis cluster nodes <button class="layui-btn">add node</button>
                 </div>
                 <div class="layui-card-body layuiadmin-card-list" style="height:650px; overflow:auto">

diff --git a/SAEA.WebRedisManager/wwwroot/Content/css/layui.css b/SAEA.WebRedisManager/wwwroot/Content/css/layui.css
@@ -4451,7 +4451,11 @@ body .layui-util-face {
     animation-name: layui-fadeout
 }
 
-#edit-form-container {
-    width: 590px;
-    margin-right:10px;
-}
+#add_form{
+    display:block;
+    height:312px;
+}
+
+#edit_form {
+    padding-right: 15px;
+}
diff --git a/SAEA.WebRedisManager/wwwroot/Content/js/redis.console.js b/SAEA.WebRedisManager/wwwroot/Content/js/redis.console.js
@@ -6,7 +6,11 @@
 
     var layerIndex = -1;
 
-
+    $("#cmdTxt").keypress(function (e) {
+        if (e.which === 13) {
+            $("#runBtn").click();
+        }
+    });
 
     $("#runBtn").click(function () {