Forráskód Böngészése

去除用户缓存

zhontai 3 éve
szülő
commit
b249b7c1ef

+ 29 - 38
Admin.Core.Service/Admin/Auth/AuthService.cs

@@ -54,41 +54,35 @@ namespace Admin.Core.Service.Admin.Auth
                 return ResponseOutput.NotOk("未登录!");
             }
 
-            var key = string.Format(CacheKey.UserInfo, User.Id);
-            var output = await Cache.GetOrSetAsync(key, async () =>
-            {
-                var authUserInfoOutput = new AuthUserInfoOutput { };
-                //用户信息
-                authUserInfoOutput.User = await _userRepository.GetAsync<AuthUserProfileDto>(User.Id);
-
-                //用户菜单
-                authUserInfoOutput.Menus = await _permissionRepository.Select
-                    .Where(a => new[] { PermissionType.Group, PermissionType.Menu }.Contains(a.Type))
-                    .Where(a =>
-                        _permissionRepository.Orm.Select<RolePermissionEntity>()
-                        .InnerJoin<UserRoleEntity>((b, c) => b.RoleId == c.RoleId && c.UserId == User.Id)
-                        .Where(b => b.PermissionId == a.Id)
-                        .Any()
-                    )
-                    .OrderBy(a => a.ParentId)
-                    .OrderBy(a => a.Sort)
-                    .ToListAsync(a => new AuthUserMenuDto { ViewPath = a.View.Path });
-
-                //用户权限点
-                authUserInfoOutput.Permissions = await _permissionRepository.Select
-                    .Where(a => a.Type == PermissionType.Dot)
-                    .Where(a =>
-                        _permissionRepository.Orm.Select<RolePermissionEntity>()
-                        .InnerJoin<UserRoleEntity>((b, c) => b.RoleId == c.RoleId && c.UserId == User.Id)
-                        .Where(b => b.PermissionId == a.Id)
-                        .Any()
-                    )
-                    .ToListAsync(a => a.Code);
-
-                return authUserInfoOutput;
-            });
-
-            return ResponseOutput.Ok(output);
+            var authUserInfoOutput = new AuthUserInfoOutput { };
+            //用户信息
+            authUserInfoOutput.User = await _userRepository.GetAsync<AuthUserProfileDto>(User.Id);
+
+            //用户菜单
+            authUserInfoOutput.Menus = await _permissionRepository.Select
+                .Where(a => new[] { PermissionType.Group, PermissionType.Menu }.Contains(a.Type))
+                .Where(a =>
+                    _permissionRepository.Orm.Select<RolePermissionEntity>()
+                    .InnerJoin<UserRoleEntity>((b, c) => b.RoleId == c.RoleId && c.UserId == User.Id)
+                    .Where(b => b.PermissionId == a.Id)
+                    .Any()
+                )
+                .OrderBy(a => a.ParentId)
+                .OrderBy(a => a.Sort)
+                .ToListAsync(a => new AuthUserMenuDto { ViewPath = a.View.Path });
+
+            //用户权限点
+            authUserInfoOutput.Permissions = await _permissionRepository.Select
+                .Where(a => a.Type == PermissionType.Dot)
+                .Where(a =>
+                    _permissionRepository.Orm.Select<RolePermissionEntity>()
+                    .InnerJoin<UserRoleEntity>((b, c) => b.RoleId == c.RoleId && c.UserId == User.Id)
+                    .Where(b => b.PermissionId == a.Id)
+                    .Any()
+                )
+                .ToListAsync(a => a.Code);
+
+            return ResponseOutput.Ok(authUserInfoOutput);
         }
 
         public async Task<IResponseOutput> GetVerifyCodeAsync(string lastKey)
@@ -188,9 +182,6 @@ namespace Admin.Core.Service.Admin.Auth
                 authLoginOutput.DataIsolationType = tenant.DataIsolationType;
             }
 
-            //登录清空用户缓存
-            await Cache.DelAsync(string.Format(CacheKey.UserInfo, user.Id));
-
             return ResponseOutput.Ok(authLoginOutput);
         }
     }

+ 1 - 1
Admin.Core/Admin.Core.xml

@@ -851,7 +851,7 @@
         </member>
         <member name="T:Admin.Core.Controllers.Personnel.OrganizationController">
             <summary>
-            组织
+            组织
             </summary>
         </member>
         <member name="M:Admin.Core.Controllers.Personnel.OrganizationController.Get(System.Int64)">

+ 1 - 1
Admin.Core/Controllers/Personnel/OrganizationController.cs

@@ -9,7 +9,7 @@ using System.Threading.Tasks;
 namespace Admin.Core.Controllers.Personnel
 {
     /// <summary>
-    /// 组织
+    /// 组织
     /// </summary>
     public class OrganizationController : AreaController
     {