From 57efd8d4199156215ae83efb33007f184102efc4 Mon Sep 17 00:00:00 2001
From: Argo-MacBookPro <Argo@163.com>
Date: Sun, 28 Oct 2018 21:14:03 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81=EF=BC=9A?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=BC=93=E5=AD=98=E9=94=AE=E5=80=BC=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/appsettings.json           | 12 ++++++------
 Bootstrap.DataAccess/Helper/GroupHelper.cs |  2 +-
 Bootstrap.DataAccess/Helper/RoleHelper.cs  |  4 ++--
 Bootstrap.DataAccess/Helper/UserHelper.cs  |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Bootstrap.Admin/appsettings.json b/Bootstrap.Admin/appsettings.json
index e293ea64..0fea8933 100644
--- a/Bootstrap.Admin/appsettings.json
+++ b/Bootstrap.Admin/appsettings.json
@@ -65,21 +65,21 @@
     "CacheItems": [
       {
         "Enabled": true,
-        "Key": "BootstrapAdminAuthorizeFilter-RetrieveRolesByUrl",
+        "Key": "RoleHelper-RetrieveRolesByUrl",
         "Interval": 600,
         "SlidingExpiration": true,
         "Desc": "通过菜单获得角色数据"
       },
       {
         "Enabled": true,
-        "Key": "BootstrapAdminGroupMiddleware-RetrieveGroupsByUserName",
+        "Key": "GroupHelper-RetrieveGroupsByUserName",
         "Interval": 600,
         "SlidingExpiration": true,
         "Desc": "指定用户组数据缓存"
       },
       {
         "Enabled": true,
-        "Key": "BootstrapAdminRoleMiddleware-RetrieveRolesByUserName",
+        "Key": "RoleHelper-RetrieveRolesByUserName",
         "Interval": 600,
         "SlidingExpiration": true,
         "Desc": "指定用户角色数据缓存"
@@ -100,7 +100,7 @@
       },
       {
         "Enabled": true,
-        "Key": "BootstrapUser-RetrieveUsers",
+        "Key": "UserHelper-RetrieveUsers",
         "Interval": 600,
         "SlidingExpiration": true,
         "Desc": "所有用户数据"
@@ -114,14 +114,14 @@
       },
       {
         "Enabled": true,
-        "Key": "BootstrapUser-RetrieveUsersByRoleId",
+        "Key": "UserHelper-RetrieveUsersByRoleId",
         "Interval": 600,
         "SlidingExpiration": true,
         "Desc": "通过角色ID获得所有用户数据"
       },
       {
         "Enabled": true,
-        "Key": "BootstrapUser-RetrieveUsersByGroupId",
+        "Key": "UserHelper-RetrieveUsersByGroupId",
         "Interval": 600,
         "SlidingExpiration": true,
         "Desc": "通过部门ID获得所有用户数据"
diff --git a/Bootstrap.DataAccess/Helper/GroupHelper.cs b/Bootstrap.DataAccess/Helper/GroupHelper.cs
index 1a296e07..cd479670 100644
--- a/Bootstrap.DataAccess/Helper/GroupHelper.cs
+++ b/Bootstrap.DataAccess/Helper/GroupHelper.cs
@@ -13,7 +13,7 @@ namespace Bootstrap.DataAccess
         public const string RetrieveGroupsDataKey = "GroupHelper-RetrieveGroups";
         public const string RetrieveGroupsByUserIdDataKey = "GroupHelper-RetrieveGroupsByUserId";
         public const string RetrieveGroupsByRoleIdDataKey = "GroupHelper-RetrieveGroupsByRoleId";
-        public const string RetrieveGroupsByUserNameDataKey = "BootstrapAdminGroupMiddleware-RetrieveGroupsByUserName";
+        public const string RetrieveGroupsByUserNameDataKey = "GroupHelper-RetrieveGroupsByUserName";
         /// <summary>
         /// 查询所有群组信息
         /// </summary>
diff --git a/Bootstrap.DataAccess/Helper/RoleHelper.cs b/Bootstrap.DataAccess/Helper/RoleHelper.cs
index 517a95c9..8ba0d553 100644
--- a/Bootstrap.DataAccess/Helper/RoleHelper.cs
+++ b/Bootstrap.DataAccess/Helper/RoleHelper.cs
@@ -14,8 +14,8 @@ namespace Bootstrap.DataAccess
         public const string RetrieveRolesByUserIdDataKey = "RoleHelper-RetrieveRolesByUserId";
         public const string RetrieveRolesByMenuIdDataKey = "RoleHelper-RetrieveRolesByMenuId";
         public const string RetrieveRolesByGroupIdDataKey = "RoleHelper-RetrieveRolesByGroupId";
-        public const string RetrieveRolesByUserNameDataKey = "BootstrapAdminRoleMiddleware-RetrieveRolesByUserName";
-        public const string RetrieveRolesByUrlDataKey = "BootstrapAdminAuthorizeFilter-RetrieveRolesByUrl";
+        public const string RetrieveRolesByUserNameDataKey = "RoleHelper-RetrieveRolesByUserName";
+        public const string RetrieveRolesByUrlDataKey = "RoleHelper-RetrieveRolesByUrl";
         /// <summary>
         /// 查询所有角色
         /// </summary>
diff --git a/Bootstrap.DataAccess/Helper/UserHelper.cs b/Bootstrap.DataAccess/Helper/UserHelper.cs
index 6f14fdbd..4d0e85fe 100644
--- a/Bootstrap.DataAccess/Helper/UserHelper.cs
+++ b/Bootstrap.DataAccess/Helper/UserHelper.cs
@@ -10,9 +10,9 @@ namespace Bootstrap.DataAccess
     /// </summary>
     public static class UserHelper
     {
-        public const string RetrieveUsersDataKey = "BootstrapUser-RetrieveUsers";
-        public const string RetrieveUsersByRoleIdDataKey = "BootstrapUser-RetrieveUsersByRoleId";
-        public const string RetrieveUsersByGroupIdDataKey = "BootstrapUser-RetrieveUsersByGroupId";
+        public const string RetrieveUsersDataKey = "UserHelper-RetrieveUsers";
+        public const string RetrieveUsersByRoleIdDataKey = "UserHelper-RetrieveUsersByRoleId";
+        public const string RetrieveUsersByGroupIdDataKey = "UserHelper-RetrieveUsersByGroupId";
         public const string RetrieveNewUsersDataKey = "UserHelper-RetrieveNewUsers";
         public const string RetrieveUsersByNameDataKey = "BootstrapUser-RetrieveUsersByName";
         /// <summary>