From d0f01f571918ae942349068776fa7fb70f3ab5cd Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期三, 28 八月 2024 16:20:18 +0800
Subject: [PATCH] 更新设备信息表从表导入问题

---
 WIDESEAWCS_Server/WIDESEAWCS_Core/Authorization/JwtHelper.cs |   27 +++++++++++++++------------
 1 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/WIDESEAWCS_Server/WIDESEAWCS_Core/Authorization/JwtHelper.cs b/WIDESEAWCS_Server/WIDESEAWCS_Core/Authorization/JwtHelper.cs
index ee34f6d..947fa4e 100644
--- a/WIDESEAWCS_Server/WIDESEAWCS_Core/Authorization/JwtHelper.cs
+++ b/WIDESEAWCS_Server/WIDESEAWCS_Core/Authorization/JwtHelper.cs
@@ -23,22 +23,23 @@
         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>
+            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);
@@ -112,7 +113,9 @@
         /// <summary>
         /// 鑱岃兘
         /// </summary>
-        public string Work { get; set; }
+        public string UserName { get; set; }
+
+        public long TenantId { get; set; }
 
     }
 }

--
Gitblit v1.9.3