优化用户权限查询

zhontai · zhontai · commit 6aeb77911ace · 2020-03-30T21:48:23.000+08:00
diff --git a/Admin.Core.Model/Admin/RolePermissionEntity.cs b/Admin.Core.Model/Admin/RolePermissionEntity.cs
@@ -19,31 +19,15 @@ public class RolePermissionEntity: EntityAdd
         /// </summary>
 		public long PermissionId { get; set; }
 
-        #region 外键 => 导航属性，ManyToMany
         /// <summary>
         /// 角色
         /// </summary>
-        [Navigate("RoleId")]
         public RoleEntity Role { get; set; }
 
         /// <summary>
         /// 权限
         /// </summary>
-        [Navigate("PermissionId")]
         public PermissionEntity Permission { get; set; }
-
-        /// <summary>
-        /// 角色名称
-        /// </summary>
-        [Column(IsIgnore = true)]
-        public string RoleName { get; set; }
-
-        /// <summary>
-        /// 路由
-        /// </summary>
-        [Column(IsIgnore = true)]
-        public string ApiPath { get; set; }
-        #endregion
     }
 
 }
diff --git a/Admin.Core.Services/Admin/Auth/AuthService.cs b/Admin.Core.Services/Admin/Auth/AuthService.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using System.Security.Claims;
 using Admin.Core.Model.Admin;
 using Admin.Core.Model.Output;
 using Admin.Core.Repository.Admin;
@@ -19,24 +18,24 @@ public class AuthService : IAuthService
         private readonly IUser _user;
         private readonly ICache _cache;
         private readonly IMapper _mapper;
-        private readonly IUserToken _userToken;
         private readonly IUserRepository _userRepository;
+        private readonly IPermissionRepository _permissionRepository;
         private readonly IRolePermissionRepository _rolePermissionRepository;
 
         public AuthService(
             IUser user,
             ICache cache,
             IMapper mapper,
-            IUserToken userToken,
             IUserRepository userRepository,
+            IPermissionRepository permissionRepository,
             IRolePermissionRepository rolePermissionRepository
         )
         {
             _user = user;
             _cache = cache;
             _mapper = mapper;
-            _userToken = userToken;
             _userRepository = userRepository;
+            _permissionRepository = permissionRepository;
             _rolePermissionRepository = rolePermissionRepository;
         }
 
@@ -50,11 +49,11 @@ public async Task<IResponseOutput> LoginAsync(AuthLoginInput input)
                 var verifyCode = await _cache.GetAsync(verifyCodeKey);
                 if (string.IsNullOrEmpty(verifyCode))
                 {
-                    return ResponseOutput.NotOk("验证码已过期！",1);
+                    return ResponseOutput.NotOk("验证码已过期！", 1);
                 }
                 if (verifyCode.ToLower() != input.VerifyCode.ToLower())
                 {
-                    return ResponseOutput.NotOk("验证码输入有误！",2);
+                    return ResponseOutput.NotOk("验证码输入有误！", 2);
                 }
                 await _cache.DelAsync(verifyCodeKey);
             }
@@ -80,22 +79,22 @@ public async Task<IResponseOutput> LoginAsync(AuthLoginInput input)
                     var secretKey = await _cache.GetAsync(passwordEncryptKey);
                     if (passwordEncryptKey.IsNull())
                     {
-                        return ResponseOutput.NotOk("解密失败！",1);
+                        return ResponseOutput.NotOk("解密失败！", 1);
                     }
                     input.Password = DesEncrypt.Decrypt(input.Password, secretKey);
                     await _cache.DelAsync(passwordEncryptKey);
                 }
                 else
                 {
-                    return ResponseOutput.NotOk("解密失败！",1);
+                    return ResponseOutput.NotOk("解密失败！", 1);
                 }
             }
             #endregion
 
             var password = MD5Encrypt.Encrypt32(input.Password);
             if (user.Password != password)
             {
-                return ResponseOutput.NotOk("密码输入有误！",4);
+                return ResponseOutput.NotOk("密码输入有误！", 4);
             }
 
             var authLoginOutput = _mapper.Map<AuthLoginOutput>(user);
@@ -111,34 +110,36 @@ public async Task<IResponseOutput> GetUserInfoAsync()
             }
 
             var user = await _userRepository.Select.WhereDynamic(_user.Id)
-                .ToOneAsync(m=>new { 
+                .ToOneAsync(m => new {
                     m.NickName,
                     m.Name,
                     m.Avatar
                 });
 
             //获取菜单
-            var menus = await _rolePermissionRepository.Select
-                .InnerJoin<UserRoleEntity>((a, b) => a.RoleId == b.RoleId && b.UserId == _user.Id)
-                .Include(a => a.Permission.View)
-                .Where(a => new[] { PermissionType.Group,PermissionType.Menu }.Contains(a.Permission.Type))
-                //.Distinct()
-                .OrderBy(a => a.Permission.ParentId)
-                .OrderBy(a => a.Permission.Sort)
+            var menus = await _permissionRepository.Select
+                .Where(a => new[] { PermissionType.Group, PermissionType.Menu }.Contains(a.Type))
+                .Where(a =>
+                    _rolePermissionRepository.Select
+                    .InnerJoin<UserRoleEntity>((b, c) => b.RoleId == c.RoleId && b.PermissionId == a.Id && c.UserId == _user.Id)
+                    .Any()
+                )
+                .OrderBy(a => a.ParentId)
+                .OrderBy(a => a.Sort)
                 .ToListAsync(a => new
                 {
-                    a.Permission.Id,
-                    a.Permission.ParentId,
-                    a.Permission.Path,
-                    ViewPath = a.Permission.View.Path,
-                    a.Permission.Label,
-
-                    a.Permission.Icon,
-                    a.Permission.Opened,
-                    a.Permission.Closable,
-                    a.Permission.Hidden,
-                    a.Permission.NewWindow,
-                    a.Permission.External
+                    a.Id,
+                    a.ParentId,
+                    a.Path,
+                    ViewPath = a.View.Path,
+                    a.Label,
+
+                    a.Icon,
+                    a.Opened,
+                    a.Closable,
+                    a.Hidden,
+                    a.NewWindow,
+                    a.External
                 });
 
             return ResponseOutput.Ok(new { user, menus });
diff --git a/Admin.Core/Admin.Core.Model.xml b/Admin.Core/Admin.Core.Model.xml
