From aa3615830dbad499130cf88896b2bdd790fc35aa Mon Sep 17 00:00:00 2001
From: Savorboard <yangxiaodong1214@126.com>
Date: Sun, 24 Sep 2017 21:58:44 +0800
Subject: [PATCH] refactor

---
 src/DotNetCore.CAP.MySql/DotNetCore.CAP.MySql.csproj           | 2 +-
 src/DotNetCore.CAP/Dashboard/CAP.DashboardOptionsExtensions.cs | 2 +-
 src/DotNetCore.CAP/Dashboard/DashboardContext.cs               | 3 ---
 src/DotNetCore.CAP/Dashboard/HtmlHelper.cs                     | 2 +-
 src/DotNetCore.CAP/Dashboard/UrlHelper.cs                      | 3 ++-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/DotNetCore.CAP.MySql/DotNetCore.CAP.MySql.csproj b/src/DotNetCore.CAP.MySql/DotNetCore.CAP.MySql.csproj
index 00316dd..00ab5c2 100644
--- a/src/DotNetCore.CAP.MySql/DotNetCore.CAP.MySql.csproj
+++ b/src/DotNetCore.CAP.MySql/DotNetCore.CAP.MySql.csproj
@@ -12,7 +12,7 @@
     <PackageReference Include="Dapper" Version="1.50.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="2.0.0" />
-    <PackageReference Include="MySqlConnector" Version="0.25.1" />
+    <PackageReference Include="MySqlConnector" Version="0.26.5" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/DotNetCore.CAP/Dashboard/CAP.DashboardOptionsExtensions.cs b/src/DotNetCore.CAP/Dashboard/CAP.DashboardOptionsExtensions.cs
index e4afbaa..4ba5515 100644
--- a/src/DotNetCore.CAP/Dashboard/CAP.DashboardOptionsExtensions.cs
+++ b/src/DotNetCore.CAP/Dashboard/CAP.DashboardOptionsExtensions.cs
@@ -26,7 +26,7 @@ namespace DotNetCore.CAP
             services.AddSingleton<IHttpClientCache, MemoryHttpClientCache>();
             services.AddSingleton<IRequestMapper, RequestMapper>();
             //services.AddScoped<IRequestScopedDataRepository, ScopedDataRepository>();
-            services.AddScoped<IRequestScopedDataRepository, HttpDataRepository>();
+            //services.AddScoped<IRequestScopedDataRepository, HttpDataRepository>();
         }
     }
 }
diff --git a/src/DotNetCore.CAP/Dashboard/DashboardContext.cs b/src/DotNetCore.CAP/Dashboard/DashboardContext.cs
index e0b8ecc..de6dd43 100644
--- a/src/DotNetCore.CAP/Dashboard/DashboardContext.cs
+++ b/src/DotNetCore.CAP/Dashboard/DashboardContext.cs
@@ -25,8 +25,6 @@ namespace DotNetCore.CAP.Dashboard
 
         public DashboardResponse Response { get; protected set; }
 
-        public ISession Session { get; protected set; }
-
         public IServiceProvider RequestServices { get; protected set; }
     }
 
@@ -44,7 +42,6 @@ namespace DotNetCore.CAP.Dashboard
             Request = new CapDashboardRequest(httpContext);
             Response = new CapDashboardResponse(httpContext);
             RequestServices = httpContext.RequestServices;
-            Session = httpContext.Session;
         }
 
         public HttpContext HttpContext { get; }
diff --git a/src/DotNetCore.CAP/Dashboard/HtmlHelper.cs b/src/DotNetCore.CAP/Dashboard/HtmlHelper.cs
index 1a4c33c..8d7e42e 100644
--- a/src/DotNetCore.CAP/Dashboard/HtmlHelper.cs
+++ b/src/DotNetCore.CAP/Dashboard/HtmlHelper.cs
@@ -192,7 +192,7 @@ namespace DotNetCore.CAP.Dashboard
 
         public NonEscapedString NodeSwitchLink(string id)
         {
-            return Raw($"<a class=\"job-method\" href=\"{_page.Url.NodeSwitch(id)}\">{Strings.NodePage_Switch}</a>");
+            return Raw($"<a class=\"job-method\" onclick=\"nodeSwitch({id});\" href=\"javascript:;\">{Strings.NodePage_Switch}</a>");
         }
 
         #region MethodEscaped
diff --git a/src/DotNetCore.CAP/Dashboard/UrlHelper.cs b/src/DotNetCore.CAP/Dashboard/UrlHelper.cs
index 5cfb758..9222379 100644
--- a/src/DotNetCore.CAP/Dashboard/UrlHelper.cs
+++ b/src/DotNetCore.CAP/Dashboard/UrlHelper.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Net;
 
 namespace DotNetCore.CAP.Dashboard
 {
@@ -31,7 +32,7 @@ namespace DotNetCore.CAP.Dashboard
 
         public string NodeSwitch(string id)
         {
-            return To("/nodes/node/" + id);
+            return To("/nodes/node/" + WebUtility.UrlEncode(id));
         }
 
         public string LinkToPublished()