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 } /// - /// 存储文件到阿里云 + /// 存储文件到阿里云(已弃用) /// /// /// 自定义文件名 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(userData); - var permissions = CacheHelper.GetCache(GlobalConstant.UserPermKEY + loginUser?.UserId); + var permissions = (List)CacheHelper.GetCache(GlobalConstant.UserPermKEY + loginUser?.UserId); + if (loginUser?.UserName == "admin") + { + permissions = new List() { GlobalConstant.AdminPerm }; + } if (permissions == null) return null; - loginUser.Permissions = (List)permissions; + loginUser.Permissions = permissions; return loginUser; } catch (Exception ex) @@ -150,8 +154,10 @@ namespace ZR.Admin.WebApi.Framework /// public static List AddClaims(LoginUser user) { - user.Permissions = new List(); - //1、创建Cookie保存用户信息,使用claim + if (user?.Permissions.Count > 50) + { + user.Permissions = new List(); + } var claims = new List() { 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; }