Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into net6.0

Browse Source
This commit is contained in:
不做码农
2022-03-27 14:18:34 +08:00
parent 156f21226e d8fc291bde
commit 030db5b971
20 changed files with 216 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ZR.Admin.WebApi/Framework/JwtUtil.cs
View File

@@ -6,6 +6,7 @@ using System.IdentityModel.Tokens.Jwt;
using System.Security.Claims;
using System.Text;
using ZR.Admin.WebApi.Extensions;
using ZR.Common;
using ZR.Model.System;
namespace ZR.Admin.WebApi.Framework
@@ -124,9 +125,15 @@ namespace ZR.Admin.WebApi.Framework
{
try
{
var userData = jwtToken.FirstOrDefault(x => x.Type == ClaimTypes.UserData);
LoginUser loginUser = JsonConvert.DeserializeObject<LoginUser>(value: userData?.Value);
var userData = jwtToken.FirstOrDefault(x => x.Type == ClaimTypes.UserData).Value;
var loginUser = JsonConvert.DeserializeObject<LoginUser>(userData);
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 = permissions;
return loginUser;
}
catch (Exception ex)
@@ -135,5 +142,27 @@ namespace ZR.Admin.WebApi.Framework
return null;
}
}
/// <summary>
///组装Claims
/// </summary>
/// <param name="user"></param>
/// <returns></returns>
public static List<Claim> AddClaims(LoginUser user)
{
if (user?.Permissions.Count > 50)
{
user.Permissions = new List<string>();
}
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))
};
return claims;
}
}
}