[fix] 修复缓存数据异常问题

xianhc · xianhc · commit cd8f11581486 · 2024-05-31T09:07:17.000+08:00
diff --git a/Ape.Volo.Api/Authentication/Jwt/ApiResponseHandler.cs b/Ape.Volo.Api/Authentication/Jwt/ApiResponseHandler.cs
@@ -44,7 +44,7 @@ await Response.WriteAsync(new ActionResultVm
     protected override async Task HandleForbiddenAsync(AuthenticationProperties properties)
     {
         var loginUserInfo = await _apeContext.Cache.GetAsync<LoginUserInfo>(
-            GlobalConstants.CacheKey.OnlineKey +
+            GlobalConstants.CachePrefix.OnlineKey +
             _apeContext.HttpUser.JwtToken.ToMd5String16());
         if (loginUserInfo.IsNull())
         {
diff --git a/Ape.Volo.Api/Authentication/Jwt/PermissionHandler.cs b/Ape.Volo.Api/Authentication/Jwt/PermissionHandler.cs
@@ -108,7 +108,7 @@ protected override async Task HandleRequirementAsync(AuthorizationHandlerContext
                         var nowTime = DateTime.Now.ToLocalTime();
                         if (expTime < nowTime)
                         {
-                            await _apeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.OnlineKey +
+                            await _apeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.OnlineKey +
                                                                 _apeContext.HttpUser.JwtToken.ToMd5String16());
                             context.Fail();
                             return;
@@ -120,7 +120,7 @@ await _apeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.OnlineKey +
                     #region 用户缓存信息是否已过期
 
                     var loginUserInfo = await _apeContext.Cache.GetAsync<LoginUserInfo>(
-                        GlobalConstants.CacheKey.OnlineKey +
+                        GlobalConstants.CachePrefix.OnlineKey +
                         _apeContext.HttpUser.JwtToken.ToMd5String16());
                     if (loginUserInfo == null)
                     {
@@ -160,7 +160,7 @@ await _apeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.OnlineKey +
                         };
                         var onlineKey = onlineUser.AccessToken.ToMd5String16();
                         var isTrue = await _apeContext.Cache.SetAsync(
-                            GlobalConstants.CacheKey.OnlineKey + onlineKey, onlineUser, TimeSpan.FromHours(2),
+                            GlobalConstants.CachePrefix.OnlineKey + onlineKey, onlineUser, TimeSpan.FromHours(2),
                             null);
                         if (!isTrue)
                         {
diff --git a/Ape.Volo.Api/Controllers/Auth/AuthorizationController.cs b/Ape.Volo.Api/Controllers/Auth/AuthorizationController.cs
@@ -181,7 +181,7 @@ public async Task<ActionResult<object>> Captcha()
     {
         var (imgBytes, code) = SixLaborsImageHelper.BuildVerifyCode();
         var imgUrl = ImgHelper.ToBase64StringUrl(imgBytes);
-        var captchaId = GlobalConstants.CacheKey.CaptchaId + GuidHelper.GenerateKey();
+        var captchaId = GlobalConstants.CachePrefix.CaptchaId + GuidHelper.GenerateKey();
         await _apeContext.Cache.SetAsync(captchaId, code, TimeSpan.FromMinutes(2), null);
         var dic = new Dictionary<string, string> { { "img", imgUrl }, { "captchaId", captchaId } };
         return dic.ToJson();
@@ -215,12 +215,14 @@ public async Task<ActionResult<object>> Logout()
     {
         //清理缓存
         if (!_apeContext.HttpUser.IsNotNull()) return Success();
-        await _apeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.OnlineKey +
+        await _apeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.OnlineKey +
                                             _apeContext.HttpUser.JwtToken.ToMd5String16());
-        await _apeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.UserInfoById +
+        await _apeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.UserInfoById +
                                             _apeContext.HttpUser.Id.ToString().ToMd5String16());
-        await _apeContext.Cache.RemoveAsync(
-            GlobalConstants.CacheKey.UserInfoByName + _apeContext.HttpUser.Account.ToMd5String16());
+
+        await _apeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.UserMenuById +
+                                            _apeContext.HttpUser.Id.ToString().ToMd5String16());
+
 
         return Success();
     }
@@ -253,7 +255,7 @@ private async Task<string> LoginResult(UserDto userDto, string type)
         loginUserInfo.AccessToken = refresh ? token.RefreshToken : token.AccessToken;
         var onlineKey = loginUserInfo.AccessToken.ToMd5String16();
         await _apeContext.Cache.SetAsync(
-            GlobalConstants.CacheKey.OnlineKey + onlineKey,
+            GlobalConstants.CachePrefix.OnlineKey + onlineKey,
             loginUserInfo, TimeSpan.FromHours(2), CacheExpireType.Absolute);
 
         switch (type)
diff --git a/Ape.Volo.Api/Controllers/Permission/MenuController.cs b/Ape.Volo.Api/Controllers/Permission/MenuController.cs
@@ -130,8 +130,8 @@ public async Task<ActionResult<object>> GetMenuLazy(long pid)
             return Error("pid cannot be empty");
         }
 
-        var menulist = await _menuService.FindByPIdAsync(pid);
-        return menulist.ToJsonByIgnore();
+        var menuList = await _menuService.FindByPIdAsync(pid);
+        return menuList.ToJsonByIgnore();
     }
 
     /// <summary>
diff --git a/Ape.Volo.Business/Monitor/OnlineUserService.cs b/Ape.Volo.Business/Monitor/OnlineUserService.cs
@@ -27,7 +27,7 @@ public OnlineUserService(ICache cache, ITokenBlacklistService tokenBlacklistServ
     public async Task<List<LoginUserInfo>> QueryAsync(Pagination pagination)
     {
         List<LoginUserInfo> loginUserInfos = new List<LoginUserInfo>();
-        var arrayList = await _cache.ScriptEvaluateKeys(GlobalConstants.CacheKey.OnlineKey);
+        var arrayList = await _cache.ScriptEvaluateKeys(GlobalConstants.CachePrefix.OnlineKey);
         if (arrayList.Length > 0)
         {
             foreach (var item in arrayList)
@@ -59,15 +59,15 @@ public async Task DropOutAsync(HashSet<string> ids)
         {
             foreach (var item in ids)
             {
-                await _cache.RemoveAsync(GlobalConstants.CacheKey.OnlineKey + item);
+                await _cache.RemoveAsync(GlobalConstants.CachePrefix.OnlineKey + item);
             }
         }
     }
 
     public async Task<List<ExportBase>> DownloadAsync()
     {
         List<ExportBase> onlineUserExports = new List<ExportBase>();
-        var arrayList = await _cache.ScriptEvaluateKeys(GlobalConstants.CacheKey.OnlineKey);
+        var arrayList = await _cache.ScriptEvaluateKeys(GlobalConstants.CachePrefix.OnlineKey);
         if (arrayList.Length > 0)
         {
             foreach (var item in arrayList)
diff --git a/Ape.Volo.Business/Permission/MenuService.cs b/Ape.Volo.Business/Permission/MenuService.cs
@@ -92,7 +92,7 @@ await TableWhere(x => x.Permission == createUpdateMenuDto.Permission)
         if (menu.ParentId > 0)
         {
             //清理缓存
-            await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.LoadMenusByPId +
+            await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.LoadMenusByPId +
                                                menu.ParentId.ToString().ToMd5String16());
             var tempMenu = await TableWhere(x => x.Id == menu.ParentId).FirstAsync();
             if (tempMenu.IsNotNull())
@@ -103,6 +103,7 @@ await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.LoadMenusByPId +
             }
         }
 
+        await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.LoadAllMenu);
         return true;
     }
 
@@ -152,11 +153,11 @@ await TableWhere(m => m.ComponentName.Equals(createUpdateMenuDto.ComponentName))
         var createUpdateMenu = ApeContext.Mapper.Map<Menu>(createUpdateMenuDto);
         await UpdateEntityAsync(createUpdateMenu);
         //清理缓存
-        await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.LoadMenusById +
+        await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.LoadMenusById +
                                            createUpdateMenu.Id.ToString().ToMd5String16());
         if (createUpdateMenu.ParentId > 0)
         {
-            await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.LoadMenusByPId +
+            await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.LoadMenusByPId +
                                                createUpdateMenu.ParentId.ToString().ToMd5String16());
         }
 
@@ -186,6 +187,7 @@ await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.LoadMenusByPId +
             }
         }
 
+        await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.LoadAllMenu);
         return true;
     }
 
@@ -209,13 +211,14 @@ public async Task<bool> DeleteAsync(HashSet<long> ids)
             //清除缓存
             foreach (var id in idList)
             {
-                await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.LoadMenusById +
+                await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.LoadMenusById +
                                                    id.ToString().ToMd5String16());
-                await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.LoadMenusByPId +
+                await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.LoadMenusByPId +
                                                    id.ToString().ToMd5String16());
             }
         }
 
+        await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.LoadAllMenu);
         return isTrue;
     }
 
@@ -261,15 +264,16 @@ public async Task<List<ExportBase>> DownloadAsync(MenuQueryCriteria menuQueryCri
     public async Task<List<MenuDto>> QueryAllAsync()
     {
         var menuDtos = await ApeContext.Cache.GetAsync<List<MenuDto>>("menus:LoadAllMenu");
-        if (menuDtos.IsNotNull())
+        if (menuDtos.Any())
         {
             return menuDtos;
         }
 
         menuDtos = ApeContext.Mapper.Map<List<MenuDto>>(await Table.ToListAsync());
-        if (menuDtos.IsNotNull())
+        if (menuDtos.Any())
         {
-            await ApeContext.Cache.SetAsync("menus:LoadAllMenu", menuDtos, TimeSpan.FromSeconds(120), null);
+            await ApeContext.Cache.SetAsync(GlobalConstants.CachePrefix.LoadAllMenu, menuDtos,
+                TimeSpan.FromSeconds(120), null);
         }
 
         return menuDtos;
@@ -280,7 +284,7 @@ public async Task<List<MenuDto>> QueryAllAsync()
     /// </summary>
     /// <param name="userId">用户ID</param>
     /// <returns></returns>
-    [UseCache(KeyPrefix = GlobalConstants.CacheKey.UserBuildMenuById)]
+    [UseCache(Expiration = 120, KeyPrefix = GlobalConstants.CachePrefix.UserMenuById)]
     public async Task<List<MenuTreeVo>> BuildTreeAsync(long userId)
     {
         var user = await _userService.QueryByIdAsync(userId);
@@ -317,7 +321,7 @@ public async Task<List<MenuTreeVo>> BuildTreeAsync(long userId)
     }
 
 
-    [UseCache(Expiration = 30, KeyPrefix = GlobalConstants.CacheKey.LoadMenusById)]
+    [UseCache(Expiration = 30, KeyPrefix = GlobalConstants.CachePrefix.LoadMenusById)]
     public async Task<List<MenuDto>> FindSuperiorAsync(long id)
     {
         Expression<Func<Menu, bool>> whereLambda = m => true;
@@ -428,7 +432,7 @@ private async Task<List<MenuTreeVo>> BuildAsync(List<MenuDto> menuDtOs)
         return menuVos;
     }
 
-    [UseCache(Expiration = 30, KeyPrefix = GlobalConstants.CacheKey.LoadMenusByPId)]
+    [UseCache(Expiration = 30, KeyPrefix = GlobalConstants.CachePrefix.LoadMenusByPId)]
     public async Task<List<MenuDto>> FindByPIdAsync(long pid = 0)
     {
         List<MenuDto> menuDtos = ApeContext.Mapper.Map<List<MenuDto>>(await TableWhere(x => x.ParentId == pid,
diff --git a/Ape.Volo.Business/Permission/PermissionService.cs b/Ape.Volo.Business/Permission/PermissionService.cs
@@ -21,7 +21,7 @@ public class PermissionService : BaseServices<Role>, IPermissionService
     /// </summary>
     /// <param name="userId"></param>
     /// <returns></returns>
-    [UseCache(Expiration = 30, KeyPrefix = GlobalConstants.CacheKey.UserPermissionRoles)]
+    [UseCache(Expiration = 30, KeyPrefix = GlobalConstants.CachePrefix.UserPermissionRoles)]
     public async Task<List<string>> GetPermissionRolesAsync(long userId)
     {
         var permissionRoles =
@@ -44,7 +44,7 @@ await SugarRepository.QueryMuchAsync<Menu, RoleMenu, UserRole, string>(
     /// </summary>
     /// <param name="userId"></param>
     /// <returns></returns>
-    [UseCache(Expiration = 60, KeyPrefix = GlobalConstants.CacheKey.UserPermissionUrls)]
+    [UseCache(Expiration = 60, KeyPrefix = GlobalConstants.CachePrefix.UserPermissionUrls)]
     public async Task<List<PermissionVo>> GetPermissionVoAsync(long userId)
     {
         var permissionVos =
diff --git a/Ape.Volo.Business/Permission/RoleService.cs b/Ape.Volo.Business/Permission/RoleService.cs
@@ -239,7 +239,9 @@ public async Task<bool> UpdateRolesMenusAsync(CreateUpdateRoleDto createUpdateRo
         //删除用户缓存
         foreach (var user in role.Users)
         {
-            await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.UserPermissionRoles +
+            await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.UserPermissionRoles +
+                                               user.Id.ToString().ToMd5String16());
+            await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.UserMenuById +
                                                user.Id.ToString().ToMd5String16());
         }
 
@@ -270,7 +272,9 @@ public async Task<bool> UpdateRolesApisAsync(CreateUpdateRoleDto createUpdateRol
             //删除用户缓存
             foreach (var user in role.Users)
             {
-                await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.UserPermissionUrls +
+                await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.UserPermissionUrls +
+                                                   user.Id.ToString().ToMd5String16());
+                await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.UserMenuById +
                                                    user.Id.ToString().ToMd5String16());
             }
         }
diff --git a/Ape.Volo.Business/Permission/UserService.cs b/Ape.Volo.Business/Permission/UserService.cs
@@ -160,7 +160,7 @@ await TableWhere(x => x.Phone == createUpdateUserDto.Phone).AnyAsync())
         await SugarClient.Insertable(userJobs).ExecuteCommandAsync();
 
         //清理缓存
-        await ClearUserCache(user);
+        await ClearUserCache(user.Id);
         return true;
     }
 
@@ -176,7 +176,7 @@ public async Task<bool> DeleteAsync(HashSet<long> ids)
         var users = await TableWhere(x => ids.Contains(x.Id)).ToListAsync();
         foreach (var user in users)
         {
-            await ClearUserCache(user);
+            await ClearUserCache(user.Id);
         }
 
         return await LogicDelete<User>(x => ids.Contains(x.Id)) > 0;
@@ -227,7 +227,7 @@ public async Task<List<ExportBase>> DownloadAsync(UserQueryCriteria userQueryCri
 
     #region 扩展方法
 
-    [UseCache(Expiration = 30, KeyPrefix = GlobalConstants.CacheKey.UserInfoById)]
+    [UseCache(Expiration = 60, KeyPrefix = GlobalConstants.CachePrefix.UserInfoById)]
     public async Task<UserDto> QueryByIdAsync(long userId)
     {
         var user = await TableWhere(x => x.Id == userId).Includes(x => x.Dept).Includes(x => x.Roles)
@@ -241,7 +241,6 @@ public async Task<UserDto> QueryByIdAsync(long userId)
     /// </summary>
     /// <param name="userName">邮箱 or 用户名</param>
     /// <returns></returns>
-    [UseCache(Expiration = 30, KeyPrefix = GlobalConstants.CacheKey.UserInfoByName)]
     public async Task<UserDto> QueryByNameAsync(string userName)
     {
         User user;
@@ -326,13 +325,11 @@ public async Task<bool> UpdatePasswordAsync(UpdateUserPassDto userPassDto)
         if (isTrue)
         {
             //清理缓存
-            await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.UserInfoById +
+            await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.UserInfoById +
                                                curUser.Id.ToString().ToMd5String16());
-            await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.UserInfoByName +
-                                               curUser.Username.ToMd5String16());
 
             //退出当前用户
-            await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.OnlineKey +
+            await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.OnlineKey +
                                                ApeContext.HttpUser.JwtToken.ToMd5String16());
         }
 
@@ -357,7 +354,7 @@ public async Task<bool> UpdateEmailAsync(UpdateUserEmailDto updateUserEmailDto)
         }
 
         var code = await ApeContext.Cache.GetAsync<string>(
-            GlobalConstants.CacheKey.EmailCaptchaKey + updateUserEmailDto.Email.ToMd5String16());
+            GlobalConstants.CachePrefix.EmailCaptcha + updateUserEmailDto.Email.ToMd5String16());
         if (code.IsNullOrEmpty() || !code.Equals(updateUserEmailDto.Code))
         {
             throw new BadRequestException("验证码错误");
@@ -393,7 +390,7 @@ public async Task<bool> UpdateAvatarAsync(IFormFile file)
         string relativePath = Path.GetRelativePath(prefix, avatarPath);
         relativePath = "/" + relativePath.Replace("\\", "/");
         curUser.AvatarPath = relativePath;
-        await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.UserInfoById +
+        await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.UserInfoById +
                                            curUser.Id.ToString().ToMd5String16());
         return await UpdateEntityAsync(curUser);
     }
@@ -402,23 +399,17 @@ await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.UserInfoById +
 
     #region 用户缓存
 
-    private async Task ClearUserCache(User user)
+    private async Task ClearUserCache(long userId)
     {
         //清理缓存
-        await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.UserInfoById +
-                                           user.Id.ToString().ToMd5String16());
-        await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.UserInfoByName +
-                                           user.Username.ToMd5String16());
-        await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.UserRolesById +
-                                           user.Id.ToString().ToMd5String16());
-        await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.UserJobsById +
-                                           user.Id.ToString().ToMd5String16());
+        await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.UserInfoById +
+                                           userId.ToString().ToMd5String16());
         await ApeContext.Cache.RemoveAsync(
-            GlobalConstants.CacheKey.UserPermissionUrls + user.Id.ToString().ToMd5String16());
+            GlobalConstants.CachePrefix.UserPermissionUrls + userId.ToString().ToMd5String16());
         await ApeContext.Cache.RemoveAsync(
-            GlobalConstants.CacheKey.UserPermissionRoles + user.Id.ToString().ToMd5String16());
-        await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.UserBuildMenuById +
-                                           user.Id.ToString().ToMd5String16());
+            GlobalConstants.CachePrefix.UserPermissionRoles + userId.ToString().ToMd5String16());
+        await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.UserMenuById +
+                                           userId.ToString().ToMd5String16());
     }
 
     #endregion
diff --git a/Ape.Volo.Business/Queued/QueuedEmailService.cs b/Ape.Volo.Business/Queued/QueuedEmailService.cs
@@ -148,10 +148,10 @@ public async Task<bool> ResetEmail(string emailAddress, string messageTemplateNa
         queuedEmail.SentTries = 1;
         queuedEmail.EmailAccountId = emailAccount.Id;
 
-        await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.EmailCaptchaKey +
+        await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.EmailCaptcha +
                                            queuedEmail.To.ToMd5String());
         var isTrue = await ApeContext.Cache.SetAsync(
-            GlobalConstants.CacheKey.EmailCaptchaKey + queuedEmail.To.ToMd5String(), captcha,
+            GlobalConstants.CachePrefix.EmailCaptcha + queuedEmail.To.ToMd5String(), captcha,
             TimeSpan.FromMinutes(5), null);
 
         if (isTrue)
diff --git a/Ape.Volo.Business/System/SettingService.cs b/Ape.Volo.Business/System/SettingService.cs
diff --git a/Ape.Volo.Common/Global/GlobalConstants.cs b/Ape.Volo.Common/Global/GlobalConstants.cs
diff --git a/Ape.Volo.Common/WebApp/ApeContext.cs b/Ape.Volo.Common/WebApp/ApeContext.cs

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ await Response.WriteAsync(new ActionResultVm`
`44`	`44`	`protected override async Task HandleForbiddenAsync(AuthenticationProperties properties)`
`45`	`45`	`{`
`46`	`46`	`var loginUserInfo = await _apeContext.Cache.GetAsync<LoginUserInfo>(`
`47`		`- GlobalConstants.CacheKey.OnlineKey +`
	`47`	`+ GlobalConstants.CachePrefix.OnlineKey +`
`48`	`48`	`_apeContext.HttpUser.JwtToken.ToMd5String16());`
`49`	`49`	`if (loginUserInfo.IsNull())`
`50`	`50`	`{`
Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,8 @@ public async Task<ActionResult<object>> GetMenuLazy(long pid)`
`130`	`130`	`return Error("pid cannot be empty");`
`131`	`131`	`}`
`132`	`132`
`133`		`- var menulist = await _menuService.FindByPIdAsync(pid);`
`134`		`- return menulist.ToJsonByIgnore();`
	`133`	`+ var menuList = await _menuService.FindByPIdAsync(pid);`
	`134`	`+ return menuList.ToJsonByIgnore();`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public OnlineUserService(ICache cache, ITokenBlacklistService tokenBlacklistServ`
`27`	`27`	`public async Task<List<LoginUserInfo>> QueryAsync(Pagination pagination)`
`28`	`28`	`{`
`29`	`29`	`List<LoginUserInfo> loginUserInfos = new List<LoginUserInfo>();`
`30`		`- var arrayList = await _cache.ScriptEvaluateKeys(GlobalConstants.CacheKey.OnlineKey);`
	`30`	`+ var arrayList = await _cache.ScriptEvaluateKeys(GlobalConstants.CachePrefix.OnlineKey);`
`31`	`31`	`if (arrayList.Length > 0)`
`32`	`32`	`{`
`33`	`33`	`foreach (var item in arrayList)`
`@@ -59,15 +59,15 @@ public async Task DropOutAsync(HashSet<string> ids)`
`59`	`59`	`{`
`60`	`60`	`foreach (var item in ids)`
`61`	`61`	`{`
`62`		`- await _cache.RemoveAsync(GlobalConstants.CacheKey.OnlineKey + item);`
	`62`	`+ await _cache.RemoveAsync(GlobalConstants.CachePrefix.OnlineKey + item);`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`public async Task<List<ExportBase>> DownloadAsync()`
`68`	`68`	`{`
`69`	`69`	`List<ExportBase> onlineUserExports = new List<ExportBase>();`
`70`		`- var arrayList = await _cache.ScriptEvaluateKeys(GlobalConstants.CacheKey.OnlineKey);`
	`70`	`+ var arrayList = await _cache.ScriptEvaluateKeys(GlobalConstants.CachePrefix.OnlineKey);`
`71`	`71`	`if (arrayList.Length > 0)`
`72`	`72`	`{`
`73`	`73`	`foreach (var item in arrayList)`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ await TableWhere(x => x.Permission == createUpdateMenuDto.Permission)`
`92`	`92`	`if (menu.ParentId > 0)`
`93`	`93`	`{`
`94`	`94`	`//清理缓存`
`95`		`- await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.LoadMenusByPId +`
	`95`	`+ await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.LoadMenusByPId +`
`96`	`96`	`menu.ParentId.ToString().ToMd5String16());`
`97`	`97`	`var tempMenu = await TableWhere(x => x.Id == menu.ParentId).FirstAsync();`
`98`	`98`	`if (tempMenu.IsNotNull())`
`@@ -103,6 +103,7 @@ await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.LoadMenusByPId +`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`
	`106`	`+ await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.LoadAllMenu);`
`106`	`107`	`return true;`
`107`	`108`	`}`
`108`	`109`
`@@ -152,11 +153,11 @@ await TableWhere(m => m.ComponentName.Equals(createUpdateMenuDto.ComponentName))`
`152`	`153`	`var createUpdateMenu = ApeContext.Mapper.Map<Menu>(createUpdateMenuDto);`
`153`	`154`	`await UpdateEntityAsync(createUpdateMenu);`
`154`	`155`	`//清理缓存`
`155`		`- await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.LoadMenusById +`
	`156`	`+ await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.LoadMenusById +`
`156`	`157`	`createUpdateMenu.Id.ToString().ToMd5String16());`
`157`	`158`	`if (createUpdateMenu.ParentId > 0)`
`158`	`159`	`{`
`159`		`- await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.LoadMenusByPId +`
	`160`	`+ await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.LoadMenusByPId +`
`160`	`161`	`createUpdateMenu.ParentId.ToString().ToMd5String16());`
`161`	`162`	`}`
`162`	`163`
`@@ -186,6 +187,7 @@ await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.LoadMenusByPId +`
`186`	`187`	`}`
`187`	`188`	`}`
`188`	`189`
	`190`	`+ await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.LoadAllMenu);`
`189`	`191`	`return true;`
`190`	`192`	`}`
`191`	`193`
`@@ -209,13 +211,14 @@ public async Task<bool> DeleteAsync(HashSet<long> ids)`
`209`	`211`	`//清除缓存`
`210`	`212`	`foreach (var id in idList)`
`211`	`213`	`{`
`212`		`- await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.LoadMenusById +`
	`214`	`+ await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.LoadMenusById +`
`213`	`215`	`id.ToString().ToMd5String16());`
`214`		`- await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.LoadMenusByPId +`
	`216`	`+ await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.LoadMenusByPId +`
`215`	`217`	`id.ToString().ToMd5String16());`
`216`	`218`	`}`
`217`	`219`	`}`
`218`	`220`
	`221`	`+ await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.LoadAllMenu);`
`219`	`222`	`return isTrue;`
`220`	`223`	`}`
`221`	`224`
`@@ -261,15 +264,16 @@ public async Task<List<ExportBase>> DownloadAsync(MenuQueryCriteria menuQueryCri`
`261`	`264`	`public async Task<List<MenuDto>> QueryAllAsync()`
`262`	`265`	`{`
`263`	`266`	`var menuDtos = await ApeContext.Cache.GetAsync<List<MenuDto>>("menus:LoadAllMenu");`
`264`		`- if (menuDtos.IsNotNull())`
	`267`	`+ if (menuDtos.Any())`
`265`	`268`	`{`
`266`	`269`	`return menuDtos;`
`267`	`270`	`}`
`268`	`271`
`269`	`272`	`menuDtos = ApeContext.Mapper.Map<List<MenuDto>>(await Table.ToListAsync());`
`270`		`- if (menuDtos.IsNotNull())`
	`273`	`+ if (menuDtos.Any())`
`271`	`274`	`{`
`272`		`- await ApeContext.Cache.SetAsync("menus:LoadAllMenu", menuDtos, TimeSpan.FromSeconds(120), null);`
	`275`	`+ await ApeContext.Cache.SetAsync(GlobalConstants.CachePrefix.LoadAllMenu, menuDtos,`
	`276`	`+ TimeSpan.FromSeconds(120), null);`
`273`	`277`	`}`
`274`	`278`
`275`	`279`	`return menuDtos;`
`@@ -280,7 +284,7 @@ public async Task<List<MenuDto>> QueryAllAsync()`
`280`	`284`	`/// </summary>`
`281`	`285`	`/// <param name="userId">用户ID</param>`
`282`	`286`	`/// <returns></returns>`
`283`		`- [UseCache(KeyPrefix = GlobalConstants.CacheKey.UserBuildMenuById)]`
	`287`	`+ [UseCache(Expiration = 120, KeyPrefix = GlobalConstants.CachePrefix.UserMenuById)]`
`284`	`288`	`public async Task<List<MenuTreeVo>> BuildTreeAsync(long userId)`
`285`	`289`	`{`
`286`	`290`	`var user = await _userService.QueryByIdAsync(userId);`
`@@ -317,7 +321,7 @@ public async Task<List<MenuTreeVo>> BuildTreeAsync(long userId)`
`317`	`321`	`}`
`318`	`322`
`319`	`323`
`320`		`- [UseCache(Expiration = 30, KeyPrefix = GlobalConstants.CacheKey.LoadMenusById)]`
	`324`	`+ [UseCache(Expiration = 30, KeyPrefix = GlobalConstants.CachePrefix.LoadMenusById)]`
`321`	`325`	`public async Task<List<MenuDto>> FindSuperiorAsync(long id)`
`322`	`326`	`{`
`323`	`327`	`Expression<Func<Menu, bool>> whereLambda = m => true;`
`@@ -428,7 +432,7 @@ private async Task<List<MenuTreeVo>> BuildAsync(List<MenuDto> menuDtOs)`
`428`	`432`	`return menuVos;`
`429`	`433`	`}`
`430`	`434`
`431`		`- [UseCache(Expiration = 30, KeyPrefix = GlobalConstants.CacheKey.LoadMenusByPId)]`
	`435`	`+ [UseCache(Expiration = 30, KeyPrefix = GlobalConstants.CachePrefix.LoadMenusByPId)]`
`432`	`436`	`public async Task<List<MenuDto>> FindByPIdAsync(long pid = 0)`
`433`	`437`	`{`
`434`	`438`	`List<MenuDto> menuDtos = ApeContext.Mapper.Map<List<MenuDto>>(await TableWhere(x => x.ParentId == pid,`
Original file line number	Diff line number	Diff line change
`@@ -239,7 +239,9 @@ public async Task<bool> UpdateRolesMenusAsync(CreateUpdateRoleDto createUpdateRo`
`239`	`239`	`//删除用户缓存`
`240`	`240`	`foreach (var user in role.Users)`
`241`	`241`	`{`
`242`		`- await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.UserPermissionRoles +`
	`242`	`+ await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.UserPermissionRoles +`
	`243`	`+ user.Id.ToString().ToMd5String16());`
	`244`	`+ await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.UserMenuById +`
`243`	`245`	`user.Id.ToString().ToMd5String16());`
`244`	`246`	`}`
`245`	`247`
`@@ -270,7 +272,9 @@ public async Task<bool> UpdateRolesApisAsync(CreateUpdateRoleDto createUpdateRol`
`270`	`272`	`//删除用户缓存`
`271`	`273`	`foreach (var user in role.Users)`
`272`	`274`	`{`
`273`		`- await ApeContext.Cache.RemoveAsync(GlobalConstants.CacheKey.UserPermissionUrls +`
	`275`	`+ await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.UserPermissionUrls +`
	`276`	`+ user.Id.ToString().ToMd5String16());`
	`277`	`+ await ApeContext.Cache.RemoveAsync(GlobalConstants.CachePrefix.UserMenuById +`
`274`	`278`	`user.Id.ToString().ToMd5String16());`
`275`	`279`	`}`
`276`	`280`	`}`