update

yswenli · Aug 28, 2019 · dd5bcdb · dd5bcdb
1 parent 1ec8cc4
commit dd5bcdb
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 40 deletions.
diff --git a/SAEA.WebRedisManager/Controllers/RedisController.cs b/SAEA.WebRedisManager/Controllers/RedisController.cs
@@ -24,29 +24,35 @@ public ActionResult Connect(string name)
         {
             try
             {
-                var config = ConfigHelper.Get(name);
+                if (!string.IsNullOrEmpty(name))
+                {
+                    name = SAEA.Http.HttpUtility.UrlDecode(name);
 
-                var cnnResult = CurrentRedisClient.Connect(config);
+                    var config = ConfigHelper.Get(name);
 
-                if (string.Compare(cnnResult, "OK", true) != 0)
-                {
-                    throw new Exception(cnnResult);
-                }
+                    var cnnResult = CurrentRedisClient.Connect(config);
 
-                var isCluster = CurrentRedisClient.IsCluster(config.Name);
+                    if (string.Compare(cnnResult, "OK", true) != 0)
+                    {
+                        throw new Exception(cnnResult);
+                    }
 
-                var data = new List<int>();
+                    var isCluster = CurrentRedisClient.IsCluster(config.Name);
 
-                if (!isCluster)
-                {
-                    data = CurrentRedisClient.GetDBs(name);
-                }
-                else
-                {
-                    data.Add(0);
+                    var data = new List<int>();
+
+                    if (!isCluster)
+                    {
+                        data = CurrentRedisClient.GetDBs(name);
+                    }
+                    else
+                    {
+                        data.Add(0);
+                    }
+                    return Json(new JsonResult<List<int>>() { Code = 1, Data = data, Message = "OK" });
                 }
 
-                return Json(new JsonResult<List<int>>() { Code = 1, Data = data, Message = "OK" });
+                return Json(new JsonResult<List<int>>() { Code = 3, Data = null, Message = "找不到配置~" });
             }
             catch (Exception ex)
             {
@@ -440,15 +446,15 @@ public ActionResult DelItem(RedisData redisData)
                 object data = string.Empty;
                 if (redisData != null)
                 {
-                    redisData.ID = SAEA.Http.Base.HttpUtility.UrlDecode(redisData.ID);
+                    redisData.ID = SAEA.Http.HttpUtility.UrlDecode(redisData.ID);
 
                     if (!string.IsNullOrEmpty(redisData.Key))
                     {
-                        redisData.Key = SAEA.Http.Base.HttpUtility.UrlDecode(redisData.Key);
+                        redisData.Key = SAEA.Http.HttpUtility.UrlDecode(redisData.Key);
                     }
                     if (!string.IsNullOrEmpty(redisData.Value))
                     {
-                        redisData.Value = SAEA.Http.Base.HttpUtility.UrlDecode(redisData.Value);
+                        redisData.Value = SAEA.Http.HttpUtility.UrlDecode(redisData.Value);
                     }
                     CurrentRedisClient.DelItem(redisData);
                 }

diff --git a/SAEA.WebRedisManager/Program.cs b/SAEA.WebRedisManager/Program.cs
@@ -7,7 +7,7 @@ class Program
     {
         static void Main(string[] args)
         {
-            ConsoleHelper.Title = "WebRedisManager v5.0.0.2";
+            ConsoleHelper.Title = "WebRedisManager v5.1.7.1";
 
             var config = SAEAMvcApplicationConfigBuilder.Read();
 

diff --git a/SAEA.WebRedisManager/SAEA.WebRedisManager.csproj b/SAEA.WebRedisManager/SAEA.WebRedisManager.csproj
@@ -230,8 +230,8 @@
     <Folder Include="Properties\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="SAEA.MVC" Version="5.0.0.2" />
-    <PackageReference Include="SAEA.RedisSocket" Version="5.0.0.2" />
+    <PackageReference Include="SAEA.MVC" Version="5.1.7.1" />
+    <PackageReference Include="SAEA.RedisSocket" Version="5.1.6.8" />
   </ItemGroup>
   <ItemGroup>
     <None Update="wwwroot\console.html">

diff --git a/SAEA.WebRedisManager/wwwroot/Content/js/redis.js b/SAEA.WebRedisManager/wwwroot/Content/js/redis.js
@@ -39,9 +39,9 @@
                         layerIndex = layer.msg('加载中', {
                             icon: 16
                             , shade: 0.01
-                            , time: 30000 
+                            , time: 30000
                         });
-                        $.post("/api/redis/connect", "name=" + name, function (dbData) {
+                        $.post("/api/redis/connect?name=" + encodeURI(name), null, function (dbData) {
                             layer.close(layerIndex);
                             if (dbData.Code === 1) {
                                 if (dbData.Data !== undefined && dbData.Data.length > 0) {

diff --git a/SAEA.WebRedisManager/wwwroot/Index.html b/SAEA.WebRedisManager/wwwroot/Index.html
@@ -21,7 +21,7 @@
                 <a href="https://github.com/yswenli/WebRedisManager/releases" target="_blank" style="font-size: 35px;color: #c5c5c5;display: inline-block;margin-top: 8px;">
                     <img id="markImg" src="/content/img/6139455.png" />&nbsp;WebRedisManager
                     <span style="font-size:15px;">
-                        v5.0.0.2
+                        v5.1.7.1
                     </span>
                 </a>
                 <ul class="layui-nav">

diff --git a/SAEA.WebRedisManagerForNet/SAEA.WebRedisManagerForNet.csproj b/SAEA.WebRedisManagerForNet/SAEA.WebRedisManagerForNet.csproj
@@ -80,20 +80,20 @@
     <Reference Include="protobuf-net, Version=2.4.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
       <HintPath>..\packages\protobuf-net.2.4.0\lib\net40\protobuf-net.dll</HintPath>
     </Reference>
-    <Reference Include="SAEA.Common, Version=5.0.0.2, Culture=neutral, PublicKeyToken=01a82380791791ab, processorArchitecture=MSIL">
-      <HintPath>..\packages\SAEA.Common.5.0.0.2\lib\netstandard2.0\SAEA.Common.dll</HintPath>
+    <Reference Include="SAEA.Common, Version=5.1.6.8, Culture=neutral, PublicKeyToken=01a82380791791ab, processorArchitecture=MSIL">
+      <HintPath>..\packages\SAEA.Common.5.1.6.8\lib\netstandard2.0\SAEA.Common.dll</HintPath>
     </Reference>
-    <Reference Include="SAEA.Http, Version=5.0.0.2, Culture=neutral, PublicKeyToken=01a82380791791ab, processorArchitecture=MSIL">
-      <HintPath>..\packages\SAEA.Http.5.0.0.2\lib\netstandard2.0\SAEA.Http.dll</HintPath>
+    <Reference Include="SAEA.Http, Version=5.1.7.1, Culture=neutral, PublicKeyToken=01a82380791791ab, processorArchitecture=MSIL">
+      <HintPath>..\packages\SAEA.Http.5.1.7.1\lib\netstandard2.0\SAEA.Http.dll</HintPath>
     </Reference>
-    <Reference Include="SAEA.MVC, Version=5.0.0.2, Culture=neutral, PublicKeyToken=01a82380791791ab, processorArchitecture=MSIL">
-      <HintPath>..\packages\SAEA.MVC.5.0.0.2\lib\netstandard2.0\SAEA.MVC.dll</HintPath>
+    <Reference Include="SAEA.MVC, Version=5.1.7.1, Culture=neutral, PublicKeyToken=01a82380791791ab, processorArchitecture=MSIL">
+      <HintPath>..\packages\SAEA.MVC.5.1.7.1\lib\netstandard2.0\SAEA.MVC.dll</HintPath>
     </Reference>
-    <Reference Include="SAEA.RedisSocket, Version=5.0.0.2, Culture=neutral, PublicKeyToken=01a82380791791ab, processorArchitecture=MSIL">
-      <HintPath>..\packages\SAEA.RedisSocket.5.0.0.2\lib\netstandard2.0\SAEA.RedisSocket.dll</HintPath>
+    <Reference Include="SAEA.RedisSocket, Version=5.1.6.8, Culture=neutral, PublicKeyToken=01a82380791791ab, processorArchitecture=MSIL">
+      <HintPath>..\packages\SAEA.RedisSocket.5.1.6.8\lib\netstandard2.0\SAEA.RedisSocket.dll</HintPath>
     </Reference>
-    <Reference Include="SAEA.Sockets, Version=5.0.0.2, Culture=neutral, PublicKeyToken=01a82380791791ab, processorArchitecture=MSIL">
-      <HintPath>..\packages\SAEA.Sockets.5.0.0.2\lib\netstandard2.0\SAEA.Sockets.dll</HintPath>
+    <Reference Include="SAEA.Sockets, Version=5.1.6.8, Culture=neutral, PublicKeyToken=01a82380791791ab, processorArchitecture=MSIL">
+      <HintPath>..\packages\SAEA.Sockets.5.1.6.8\lib\netstandard2.0\SAEA.Sockets.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">

diff --git a/SAEA.WebRedisManagerForNet/packages.config b/SAEA.WebRedisManagerForNet/packages.config
@@ -3,11 +3,11 @@
   <package id="Microsoft.DependencyValidation.Analyzers" version="0.10.0" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" />
   <package id="protobuf-net" version="2.4.0" targetFramework="net462" />
-  <package id="SAEA.Common" version="5.0.0.2" targetFramework="net462" />
-  <package id="SAEA.Http" version="5.0.0.2" targetFramework="net462" />
-  <package id="SAEA.MVC" version="5.0.0.2" targetFramework="net462" />
-  <package id="SAEA.RedisSocket" version="5.0.0.2" targetFramework="net462" />
-  <package id="SAEA.Sockets" version="5.0.0.2" targetFramework="net462" />
+  <package id="SAEA.Common" version="5.1.6.8" targetFramework="net462" />
+  <package id="SAEA.Http" version="5.1.7.1" targetFramework="net462" />
+  <package id="SAEA.MVC" version="5.1.7.1" targetFramework="net462" />
+  <package id="SAEA.RedisSocket" version="5.1.6.8" targetFramework="net462" />
+  <package id="SAEA.Sockets" version="5.1.6.8" targetFramework="net462" />
   <package id="System.Buffers" version="4.5.0" targetFramework="net462" />
   <package id="System.Memory" version="4.5.3" targetFramework="net462" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />