优化登录权限从缓存中读取不存入jwt中

ZR.Admin.WebApi/Controllers/System/SysLoginController.cs

@@ -86,8 +86,8 @@ namespace ZR.Admin.WebApi.Controllers.System
             List<string> permissions = permissionService.GetMenuPermission(user);
 
             LoginUser loginUser = new(user, roles, permissions);
-            CacheHelper.SetCache(GlobalConstant.UserPermKEY + user.UserId, loginUser);
+            CacheHelper.SetCache(GlobalConstant.UserPermKEY + user.UserId, permissions);
-            return SUCCESS(JwtUtil.GenerateJwtToken(HttpContext.AddClaims(loginUser), jwtSettings.JwtSettings));
+            return SUCCESS(JwtUtil.GenerateJwtToken(JwtUtil.AddClaims(loginUser), jwtSettings.JwtSettings));
         }
 
         /// <summary>
@@ -103,11 +103,11 @@ namespace ZR.Admin.WebApi.Controllers.System
             //    //注销登录的用户，相当于ASP.NET中的FormsAuthentication.SignOut  
             //    await HttpContext.SignOutAsync();
             //}).Wait();
-            var id = HttpContext.GetUId();
+            var userid = HttpContext.GetUId();
             var name = HttpContext.GetName();
             
-            CacheHelper.Remove(GlobalConstant.UserPermKEY + id);
+            CacheHelper.Remove(GlobalConstant.UserPermKEY + userid);
-            return SUCCESS(new { name , id});
+            return SUCCESS(new { name , id = userid });
         }
 
         /// <summary>

ZR.Admin.WebApi/Controllers/System/SysUserController.cs

@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using ZR.Admin.WebApi.Extensions;
 using ZR.Admin.WebApi.Filters;
 using ZR.Common;
 using ZR.Model;
@@ -94,7 +95,7 @@ namespace ZR.Admin.WebApi.Controllers.System
                 return ToResponse(ApiResult.Error($"新增用户 '{user.UserName}'失败，登录账号已存在"));
             }
 
-            user.Create_by = User.Identity.Name;
+            user.Create_by = HttpContext.GetName();
             user.Password = NETCore.Encrypt.EncryptProvider.Md5(user.Password);
 
             return ToResponse(UserService.InsertUser(user));
@@ -112,7 +113,7 @@ namespace ZR.Admin.WebApi.Controllers.System
         {
             if (user == null || user.UserId <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); }
 
-            user.Update_by = User.Identity.Name;
+            user.Update_by = HttpContext.GetName();
             int upResult = UserService.UpdateUser(user);
 
             return ToResponse(upResult);

ZR.Admin.WebApi/Extensions/HttpContextExtension.cs

@@ -130,27 +130,6 @@ namespace ZR.Admin.WebApi.Extensions
             return context != null ? context.Request.Path.Value : "";
         }
 
-        /// <summary>
-        ///组装Claims
-        /// </summary>
-        /// <param name="context"></param>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        public static List<Claim> AddClaims(this HttpContext context, LoginUser user)
-        {
-            //1、创建Cookie保存用户信息，使用claim
-            var claims = new List<Claim>()
-                {
-                    new Claim(ClaimTypes.PrimarySid, user.UserId.ToString()),
-                    new Claim(ClaimTypes.Name, user.UserName),
-                    new Claim(ClaimTypes.UserData, JsonConvert.SerializeObject(user))
-                };
-
-            //写入Cookie
-            //WhiteCookie(context, claims);
-            return claims;
-        }
-
         private static void WhiteCookie(HttpContext context, List<Claim> claims)
         {
             //2.创建声明主题 指定认证方式 这里使用cookie

ZR.Admin.WebApi/Framework/JwtUtil.cs

@@ -10,6 +10,7 @@ using System.Linq;
 using System.Security.Claims;
 using System.Text;
 using ZR.Admin.WebApi.Extensions;
+using ZR.Common;
 using ZR.Model.System;
 
 namespace ZR.Admin.WebApi.Framework
@@ -129,8 +130,9 @@ namespace ZR.Admin.WebApi.Framework
             try
             {
                 var userData = jwtToken.FirstOrDefault(x => x.Type == ClaimTypes.UserData).Value;
-
+                var loginUser = JsonConvert.DeserializeObject<LoginUser>(userData);
-                LoginUser loginUser = JsonConvert.DeserializeObject<LoginUser>(userData);
+                var permissions = CacheHelper.GetCache(GlobalConstant.UserPermKEY + loginUser?.UserId);
+                loginUser.Permissions = (List<string>)permissions;
                 return loginUser;
             }
             catch (Exception ex)
@@ -139,5 +141,27 @@ namespace ZR.Admin.WebApi.Framework
                 return null;
             }
         }
+
+        /// <summary>
+        ///组装Claims
+        /// </summary>
+        /// <param name="user"></param>
+        /// <returns></returns>
+        public static List<Claim> AddClaims(LoginUser user)
+        {
+            user.Permissions = new List<string>();
+            //1、创建Cookie保存用户信息，使用claim
+            var claims = new List<Claim>()
+                {
+                    new Claim(ClaimTypes.PrimarySid, user.UserId.ToString()),
+                    new Claim(ClaimTypes.Name, user.UserName),
+                    new Claim(ClaimTypes.UserData, JsonConvert.SerializeObject(user))
+                };
+
+            //写入Cookie
+            //WhiteCookie(context, claims);
+            return claims;
+        }
+
     }
 }

ZR.Model/System/LoginUser.cs

@@ -24,7 +24,7 @@ namespace ZR.Model.System
         /// <summary>
         /// 权限集合
         /// </summary>
-        public List<string> Permissions { get; set; }
+        public List<string> Permissions { get; set; } = new List<string>();
         public LoginUser()
         {
         }