From 721e84c73664837f062810f0688ba2f59ca5750b Mon Sep 17 00:00:00 2001
From: Argo-Lenovo <Argo@163.com>
Date: Fri, 14 Apr 2017 15:22:39 +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=A0=B9=E6=8D=AEBootstrap.Security=E7=BB=84=E4=BB=B6=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=EF=BC=8C=E7=A7=BB=E9=99=A4=E4=B8=8D=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E7=BC=93=E5=AD=98Key=EF=BC=8C=E6=9B=B4=E6=96=B0Retrie?=
 =?UTF-8?q?veAllRoles=E9=94=AE=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bootstrap.Admin/Web.config                | 4 +---
 Bootstrap.DataAccess/CacheCleanUtility.cs | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/Bootstrap.Admin/Web.config b/Bootstrap.Admin/Web.config
index 1e5333c8..965fb8ed 100644
--- a/Bootstrap.Admin/Web.config
+++ b/Bootstrap.Admin/Web.config
@@ -27,11 +27,9 @@
   </connectionStrings>
 
   <cacheManager>
-    <add key="BootstrapAdminPrincipal-RetrieveAllRoles" interval="600" desc="系统所有角色列表数据" />
+    <add key="BootstrapAdminPrincipal-RetrieveRoles" interval="600" desc="系统所有角色列表数据" />
     <add key="BootstrapAdminPrincipal-RetrieveRolesByUrl" interval="600" desc="指定菜单的角色数据缓存" />
     <add key="BootstrapAdminPrincipal-RetrieveRolesByUserName" interval="600" desc="指定用户名角色数据缓存" />
-    <add key="BootstrapAdminPrincipal-RetrieveAllGroups-BA" interval="600" desc="系统所有用户组列表数据" />
-    <add key="BootstrapAdminPrincipal-RetrieveGroupsByUserName" interval="600" desc="通过用户获得用户组数据" />
     <add key="BootstrapMenu-RetrieveMenus" interval="600" desc="所有菜单数据缓存" />
     <add key="BootstrapDict-RetrieveDicts" interval="600" desc="所有字典数据缓存" />
     <add key="BootstrapUser-RetrieveUsers" interval="600" desc="所有用户数据缓存" />
diff --git a/Bootstrap.DataAccess/CacheCleanUtility.cs b/Bootstrap.DataAccess/CacheCleanUtility.cs
index bfb27688..85ed366d 100644
--- a/Bootstrap.DataAccess/CacheCleanUtility.cs
+++ b/Bootstrap.DataAccess/CacheCleanUtility.cs
@@ -9,7 +9,6 @@ namespace Bootstrap.DataAccess
 {
     internal static class CacheCleanUtility
     {
-        private const string BootstrapAdminPrincipalDataKey = "BootstrapAdminPrincipal-*";
         /// <summary>
         /// 
         /// </summary>
@@ -34,7 +33,7 @@ namespace Bootstrap.DataAccess
                 });
                 cacheKeys.Add(RoleHelper.RetrieveRolesDataKey + "*");
                 cacheKeys.Add(BootstrapMenu.RetrieveMenusDataKey + "*");
-                cacheKeys.Add(BootstrapAdminPrincipalDataKey);
+                cacheKeys.Add(BootstrapAdminRolePrincipal.RetrieveAllRolesDataKey + "*");
             }
             if (userIds != null)
             {
@@ -56,7 +55,7 @@ namespace Bootstrap.DataAccess
                 });
                 cacheKeys.Add(GroupHelper.RetrieveGroupsDataKey + "*");
                 cacheKeys.Add(BootstrapMenu.RetrieveMenusDataKey + "*");
-                cacheKeys.Add(BootstrapAdminPrincipalDataKey);
+                cacheKeys.Add(BootstrapAdminRolePrincipal.RetrieveAllRolesDataKey + "*");
             }
             if (menuIds != null)
             {