From 9eeca6aa905cffea1c95d965b4790fbd20ce2275 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期五, 25 十月 2024 16:19:16 +0800
Subject: [PATCH] 更新字典数据获取
---
WIDESEAWCS_Server/WIDESEAWCS_Core/Authorization/JwtHelper.cs | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/WIDESEAWCS_Server/WIDESEAWCS_Core/Authorization/JwtHelper.cs b/WIDESEAWCS_Server/WIDESEAWCS_Core/Authorization/JwtHelper.cs
index ee34f6d..fc6da1b 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_Core/Authorization/JwtHelper.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_Core/Authorization/JwtHelper.cs
@@ -22,23 +22,24 @@
/// <returns></returns>
public static string IssueJwt(TokenModelJwt tokenModel)
{
- string exp = $"{new DateTimeOffset(DateTime.Now.AddMinutes(/*tokenModel.UserId == 1 ? 43200 : */AppSettings.app("ExpMinutes").ObjToInt())).ToUnixTimeSeconds()}";
- var claims = new List<Claim>
+ string exp = $"{new DateTimeOffset(DateTime.Now.AddMinutes(/*tokenModel.UserId == 1 ? 43200 : */AppSettings.Get("ExpMinutes").ObjToInt())).ToUnixTimeSeconds()}";
+ List<Claim> claims = new List<Claim>
{
- new Claim(JwtRegisteredClaimNames.Jti,tokenModel.UserId.ToString()),
- new Claim(JwtRegisteredClaimNames.Iat, $"{new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds()}"),
- new Claim(JwtRegisteredClaimNames.Nbf,$"{new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds()}") ,
- //JWT杩囨湡鏃堕棿
- //榛樿璁剧疆jwt杩囨湡鏃堕棿120鍒嗛挓
- new Claim (JwtRegisteredClaimNames.Exp,exp),
- new Claim(JwtRegisteredClaimNames.Iss,AppSecret.Issuer),
- new Claim(JwtRegisteredClaimNames.Aud,AppSecret.Audience),
- new Claim(ClaimTypes.Role, tokenModel.RoleId.ToString())
+ new Claim(JwtRegisteredClaimNames.Jti, tokenModel.UserId.ToString()),
+ new Claim(JwtRegisteredClaimNames.Iat, $"{new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds()}"),
+ new Claim(JwtRegisteredClaimNames.Nbf, $"{new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds()}") ,
+ //JWT杩囨湡鏃堕棿
+ //榛樿璁剧疆jwt杩囨湡鏃堕棿120鍒嗛挓
+ new Claim (JwtRegisteredClaimNames.Exp, exp),
+ new Claim(JwtRegisteredClaimNames.Iss, AppSecret.Issuer),
+ new Claim(JwtRegisteredClaimNames.Aud, AppSecret.Audience),
+ new Claim(ClaimTypes.Role, tokenModel.RoleId.ToString()),
+ new Claim(ClaimTypes.Name, tokenModel.UserName),
+ new Claim(nameof(TokenModelJwt.TenantId), tokenModel.TenantId.ToString())
};
// 鍙互灏嗕竴涓敤鎴风殑澶氫釜瑙掕壊鍏ㄩ儴璧嬩簣锛�
// 浣滆�咃細DX 鎻愪緵鎶�鏈敮鎸侊紱
-
//绉橀挜16浣�
var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(AppSecret.JWT));
var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
@@ -60,6 +61,8 @@
{
UserId = Convert.ToInt32(jwtToken.Id),
RoleId = (jwtToken.Payload[ClaimTypes.Role] ?? 0).ObjToInt(),
+ UserName = (jwtToken.Payload[ClaimTypes.Name] ?? "")?.ToString() ?? "",
+ TenantId = (jwtToken.Payload[nameof(TokenModelJwt.TenantId)] ?? 0).ObjToInt(),
};
return userInfo;
}
@@ -112,7 +115,9 @@
/// <summary>
/// 鑱岃兘
/// </summary>
- public string Work { get; set; }
+ public string UserName { get; set; }
+
+ public long TenantId { get; set; }
}
}
--
Gitblit v1.9.3