😁调整缓存关键字名称

Admin.NET/Admin.NET.Core/Const/CacheConst.cs

@@ -17,60 +17,50 @@ public class CacheConst
     /// <summary>
     /// 用户缓存
     /// </summary>
-    public const string KeyUser = "user:";
+    public const string KeyUser = "sys_user:";
 
     /// <summary>
-    /// 菜单缓存
+    /// 用户菜单缓存
     /// </summary>
-    public const string KeyMenu = "menu:";
+    public const string KeyUserMenu = "sys_user_menu:";
 
     /// <summary>
-    /// 权限缓存（按钮集合）
+    /// 用户权限缓存（按钮集合）
     /// </summary>
-    public const string KeyPermission = "permission:";
+    public const string KeyUserButton = "sys_user_button:";
 
     /// <summary>
-    /// 机构Id集合缓存
+    /// 用户机构缓存
     /// </summary>
-    public const string KeyOrgIdList = "org:";
+    public const string KeyUserOrg = "sys_user_org:";
 
     /// <summary>
     /// 角色最大数据范围缓存
     /// </summary>
-    public const string KeyMaxDataScope = "maxDataScope:";
+    public const string KeyRoleMaxDataScope = "sys_role_maxDataScope:";
 
     /// <summary>
-    /// 验证码缓存
-    /// </summary>
-    public const string KeyVerCode = "verCode:";
-
-    /// <summary>
-    /// 所有缓存关键字集合
+    /// 在线用户缓存
     /// </summary>
-    public const string KeyAll = "keys";
+    public const string KeyUserOnline = "sys_user_online:";
 
     /// <summary>
-    /// 定时任务缓存
+    /// 验证码缓存
     /// </summary>
-    public const string KeyTimer = "timer:";
+    public const string KeyVerCode = "sys_verCode:";
 
     /// <summary>
-    /// 在线用户缓存
+    /// 租户缓存
     /// </summary>
-    public const string KeyOnlineUser = "onlineuser:";
+    public const string KeyTenant = "sys_tenant";
 
     /// <summary>
     /// 常量下拉框
     /// </summary>
-    public const string KeyConst = "const:";
+    public const string KeyConst = "sys_const:";
 
     /// <summary>
-    /// swagger登录缓存
-    /// </summary>
-    public const string SwaggerLogin = "swaggerLogin:";
-
-    /// <summary>
-    /// 租户缓存
+    /// 所有缓存关键字集合
     /// </summary>
-    public const string KeyTenant = "tenant:list";
+    public const string KeyAll = "sys_keys";
 }

Admin.NET/Admin.NET.Core/Hub/OnlineUserHub.cs

@@ -62,7 +62,7 @@ public class OnlineUserHub : Hub<IOnlineUserHub>
         };
         await _sysOnlineUerRep.InsertAsync(user);
         //缓存
-        _sysCacheService.Set(CacheConst.KeyOnlineUser + user.UserId, user);
+        _sysCacheService.Set(CacheConst.KeyUserOnline + user.UserId, user);
         // 以租户Id分组方便区分
         var groupName = $"{GROUP_ONLINE}{user.TenantId}";
         await _onlineUserHubContext.Groups.AddToGroupAsync(Context.ConnectionId, groupName);
@@ -90,7 +90,7 @@ public class OnlineUserHub : Hub<IOnlineUserHub>
         if (user == null) return;
 
         await _sysOnlineUerRep.DeleteAsync(u => u.Id == user.Id);
-        _sysCacheService.Remove(CacheConst.KeyOnlineUser + user.UserId);
+        _sysCacheService.Remove(CacheConst.KeyUserOnline + user.UserId);
 
         // 通知当前组用户变动
         var userList = await _sysOnlineUerRep.AsQueryable().Filter("", true)

Admin.NET/Admin.NET.Core/Service/Cache/SysCacheService.cs

@@ -29,7 +29,7 @@ public class SysCacheService : IDynamicApiController, ISingleton
     [DisplayName("获取缓存键名集合")]
     public List<string> GetKeyList()
     {
-        return _cache.Keys.ToList();
+        return _cache.Keys.OrderBy(u => u).ToList();
     }
 
     /// <summary>

Admin.NET/Admin.NET.Core/Service/Menu/SysMenuService.cs

@@ -213,7 +213,7 @@ public class SysMenuService : IDynamicApiController, ITransient
     public async Task<List<string>> GetOwnBtnPermList()
     {
         var userId = _userManager.UserId;
-        var permissions = _sysCacheService.Get<List<string>>(CacheConst.KeyPermission + userId);
+        var permissions = _sysCacheService.Get<List<string>>(CacheConst.KeyUserButton + userId);
         if (permissions == null || permissions.Count == 0)
         {
             var menuIdList = _userManager.SuperAdmin ? new List<long>() : await GetMenuIdList();
@@ -221,7 +221,7 @@ public class SysMenuService : IDynamicApiController, ITransient
                 .Where(u => u.Type == MenuTypeEnum.Btn)
                 .WhereIF(menuIdList.Count > 0, u => menuIdList.Contains(u.Id))
                 .Select(u => u.Permission).ToListAsync();
-            _sysCacheService.Set(CacheConst.KeyPermission + userId, permissions);
+            _sysCacheService.Set(CacheConst.KeyUserButton + userId, permissions);
         }
         return permissions;
     }
@@ -233,13 +233,13 @@ public class SysMenuService : IDynamicApiController, ITransient
     [ApiDescriptionSettings(false)]
     public async Task<List<string>> GetAllBtnPermList()
     {
-        var permissions = _sysCacheService.Get<List<string>>(CacheConst.KeyPermission + 0);
+        var permissions = _sysCacheService.Get<List<string>>(CacheConst.KeyUserButton + 0);
         if (permissions == null || permissions.Count == 0)
         {
             permissions = await _sysMenuRep.AsQueryable()
                 .Where(u => u.Type == MenuTypeEnum.Btn)
                 .Select(u => u.Permission).ToListAsync();
-            _sysCacheService.Set(CacheConst.KeyPermission + 0, permissions);
+            _sysCacheService.Set(CacheConst.KeyUserButton + 0, permissions);
         }
         return permissions;
     }
@@ -249,8 +249,8 @@ public class SysMenuService : IDynamicApiController, ITransient
     /// </summary>
     private void DeleteMenuCache()
     {
-        _sysCacheService.RemoveByPrefixKey(CacheConst.KeyMenu);
-        _sysCacheService.RemoveByPrefixKey(CacheConst.KeyPermission);
+        _sysCacheService.RemoveByPrefixKey(CacheConst.KeyUserMenu);
+        _sysCacheService.RemoveByPrefixKey(CacheConst.KeyUserButton);
     }
 
     /// <summary>

Admin.NET/Admin.NET.Core/Service/Message/SysMessageService.cs

@@ -53,7 +53,7 @@ public class SysMessageService : IDynamicApiController, ITransient
     [DisplayName("发送消息给除了发送人的其他人")]
     public async Task SendOtherUser(MessageInput input)
     {
-        var user = _sysCacheService.Get<SysOnlineUser>(CacheConst.KeyOnlineUser + input.UserId);
+        var user = _sysCacheService.Get<SysOnlineUser>(CacheConst.KeyUserOnline + input.UserId);
         if (user != null)
         {
             await _chatHubContext.Clients.AllExcept(user.ConnectionId).ReceiveMessage(input);
@@ -68,7 +68,7 @@ public class SysMessageService : IDynamicApiController, ITransient
     [DisplayName("发送消息给某个人")]
     public async Task SendUser(MessageInput input)
     {
-        var user = _sysCacheService.Get<SysOnlineUser>(CacheConst.KeyOnlineUser + input.UserId);
+        var user = _sysCacheService.Get<SysOnlineUser>(CacheConst.KeyUserOnline + input.UserId);
         if (user == null) return;
         await _chatHubContext.Clients.Client(user.ConnectionId).ReceiveMessage(input);
     }
@@ -84,7 +84,7 @@ public class SysMessageService : IDynamicApiController, ITransient
         var userlist = new List<string>();
         foreach (var userid in input.UserIds)
         {
-            var user = _sysCacheService.Get<SysOnlineUser>(CacheConst.KeyOnlineUser + userid);
+            var user = _sysCacheService.Get<SysOnlineUser>(CacheConst.KeyUserOnline + userid);
             if (user != null) userlist.Add(user.ConnectionId);
         }
         await _chatHubContext.Clients.Clients(userlist).ReceiveMessage(input);

Admin.NET/Admin.NET.Core/Service/Org/SysOrgService.cs

@@ -97,7 +97,7 @@ public class SysOrgService : IDynamicApiController, ITransient
             //    throw Oops.Oh(ErrorCodeEnum.D2006);
 
             // 删除当前用户机构缓存
-            _sysCacheService.Remove($"{CacheConst.KeyOrgIdList}{_userManager.UserId}");
+            _sysCacheService.Remove($"{CacheConst.KeyUserOrg}{_userManager.UserId}");
         }
         var sysOrg = input.Adapt<SysOrg>();
         var newOrg = await _sysOrgRep.AsInsertable(sysOrg).ExecuteReturnEntityAsync();
@@ -207,7 +207,7 @@ public class SysOrgService : IDynamicApiController, ITransient
             return new List<long>();
 
         var userId = _userManager.UserId;
-        var orgIdList = _sysCacheService.Get<List<long>>($"{CacheConst.KeyOrgIdList}{userId}"); // 取缓存
+        var orgIdList = _sysCacheService.Get<List<long>>($"{CacheConst.KeyUserOrg}{userId}"); // 取缓存
         if (orgIdList == null || orgIdList.Count < 1)
         {
             // 扩展机构集合
@@ -219,7 +219,7 @@ public class SysOrgService : IDynamicApiController, ITransient
             // 当前所属机构
             if (!orgIdList.Contains(_userManager.OrgId))
                 orgIdList.Add(_userManager.OrgId);
-            _sysCacheService.Set($"{CacheConst.KeyOrgIdList}{userId}", orgIdList); // 存缓存
+            _sysCacheService.Set($"{CacheConst.KeyUserOrg}{userId}", orgIdList); // 存缓存
         }
         return orgIdList;
     }
@@ -270,7 +270,7 @@ public class SysOrgService : IDynamicApiController, ITransient
         var orgIdList2 = await GetOrgIdListByDataScope(strongerDataScopeType);
 
         // 缓存当前用户最大角色数据范围
-        _sysCacheService.Set(CacheConst.KeyMaxDataScope + _userManager.UserId, strongerDataScopeType);
+        _sysCacheService.Set(CacheConst.KeyRoleMaxDataScope + _userManager.UserId, strongerDataScopeType);
 
         // 并集机构集合
         return orgIdList1.Union(orgIdList2).ToList();

Admin.NET/Admin.NET.Core/Service/Role/SysRoleMenuService.cs

@@ -53,8 +53,8 @@ public class SysRoleMenuService : ITransient
         await _sysRoleMenuRep.InsertRangeAsync(menus);
 
         // 清除缓存
-        _sysCacheService.RemoveByPrefixKey(CacheConst.KeyMenu);
-        _sysCacheService.RemoveByPrefixKey(CacheConst.KeyPermission);
+        _sysCacheService.RemoveByPrefixKey(CacheConst.KeyUserMenu);
+        _sysCacheService.RemoveByPrefixKey(CacheConst.KeyUserButton);
     }
 
     /// <summary>

Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarFilter.cs

@@ -24,7 +24,7 @@ public static class SqlSugarFilter
     public static void DeleteUserOrgCache(long userId, string dbConfigId)
     {
         // 删除用户机构集合缓存
-        App.GetService<SysCacheService>().Remove($"{CacheConst.KeyOrgIdList}{userId}");
+        App.GetService<SysCacheService>().Remove($"{CacheConst.KeyUserOrg}{userId}");
         // 删除用户机构（数据范围）过滤器缓存
         SqlSugarFilter._cache.Remove($"db:{dbConfigId}:orgList:{userId}");
     }
@@ -87,7 +87,7 @@ public static class SqlSugarFilter
         if (string.IsNullOrWhiteSpace(userId)) return maxDataScope;
 
         // 获取用户最大数据范围---仅本人数据
-        maxDataScope = App.GetService<SysCacheService>().Get<int>(CacheConst.KeyMaxDataScope + userId);
+        maxDataScope = App.GetService<SysCacheService>().Get<int>(CacheConst.KeyRoleMaxDataScope + userId);
         if (maxDataScope != (int)DataScopeEnum.Self) return maxDataScope;
 
         // 配置用户数据范围缓存