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"; /// /// 查询所有群组信息 /// 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"; /// /// 查询所有角色 /// 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 /// 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"; ///