From d8fc291bde1a2ea25aa56e3371e36c94d7f319b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Sun, 27 Mar 2022 14:06:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96jwt=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/Controllers/CommonController.cs |  2 +-
 ZR.Admin.WebApi/Framework/JwtUtil.cs            | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ZR.Admin.WebApi/Controllers/CommonController.cs b/ZR.Admin.WebApi/Controllers/CommonController.cs
index 1b504b5..18e2433 100644
--- a/ZR.Admin.WebApi/Controllers/CommonController.cs
+++ b/ZR.Admin.WebApi/Controllers/CommonController.cs
@@ -145,7 +145,7 @@ namespace ZR.Admin.WebApi.Controllers
         }
 
         /// <summary>
-        /// 存储文件到阿里云
+        /// 存储文件到阿里云(已弃用)
         /// </summary>
         /// <param name="formFile"></param>
         /// <param name="fileName">自定义文件名</param>
diff --git a/ZR.Admin.WebApi/Framework/JwtUtil.cs b/ZR.Admin.WebApi/Framework/JwtUtil.cs
index eb37c83..3a52795 100644
--- a/ZR.Admin.WebApi/Framework/JwtUtil.cs
+++ b/ZR.Admin.WebApi/Framework/JwtUtil.cs
@@ -131,9 +131,13 @@ namespace ZR.Admin.WebApi.Framework
             {
                 var userData = jwtToken.FirstOrDefault(x => x.Type == ClaimTypes.UserData).Value;
                 var loginUser = JsonConvert.DeserializeObject<LoginUser>(userData);
-                var permissions = CacheHelper.GetCache(GlobalConstant.UserPermKEY + loginUser?.UserId);
+                var permissions = (List<string>)CacheHelper.GetCache(GlobalConstant.UserPermKEY + loginUser?.UserId);
+                if (loginUser?.UserName == "admin")
+                {
+                    permissions = new List<string>() { GlobalConstant.AdminPerm };
+                }
                 if (permissions == null) return null;
-                loginUser.Permissions = (List<string>)permissions;
+                loginUser.Permissions = permissions;
                 return loginUser;
             }
             catch (Exception ex)
@@ -150,8 +154,10 @@ namespace ZR.Admin.WebApi.Framework
         /// <returns></returns>
         public static List<Claim> AddClaims(LoginUser user)
         {
-            user.Permissions = new List<string>();
-            //1、创建Cookie保存用户信息，使用claim
+            if (user?.Permissions.Count > 50)
+            {
+                user.Permissions = new List<string>();
+            }
             var claims = new List<Claim>()
                 {
                     new Claim(ClaimTypes.PrimarySid, user.UserId.ToString()),
@@ -159,8 +165,6 @@ namespace ZR.Admin.WebApi.Framework
                     new Claim(ClaimTypes.UserData, JsonConvert.SerializeObject(user))
                 };
 
-            //写入Cookie
-            //WhiteCookie(context, claims);
             return claims;
         }