From da84e4e72c9d9cc7e2bd40dc4bb7b3222ca3519a Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 28 四月 2026 17:07:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Utility/JWTHelper.cs |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/WebAPI/Utility/JWTHelper.cs b/WebAPI/Utility/JWTHelper.cs
index e0a2400..d7bd23d 100644
--- a/WebAPI/Utility/JWTHelper.cs
+++ b/WebAPI/Utility/JWTHelper.cs
@@ -26,8 +26,8 @@
         {
             var claims = new[]
             {
-            new Claim(ClaimTypes.NameIdentifier, userId),
-            new Claim(ClaimTypes.Name, userName),
+            new Claim(ClaimTypes.NameIdentifier, userId), // 缂栫爜
+            new Claim(ClaimTypes.Name, userName), // 鐢ㄦ埛id
             new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString())
         };
 
@@ -37,7 +37,7 @@
                 issuer: "zjzyms",
                 audience: HCampanyName,
                 claims: claims,
-                expires: DateTime.UtcNow.AddHours(2), // 涓ゅ皬鏃惰繃鏈熸椂闂�
+                expires: DateTime.UtcNow.AddMinutes(120), // 涓ゅ皬鏃惰繃鏈熸椂闂�
                 signingCredentials: credentials
             );
 
@@ -81,9 +81,9 @@
         {
             var jwt = new JwtSecurityTokenHandler().ReadJwtToken(token);
             var czybm = jwt.Claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier)?.Value;
-            var zymm = jwt.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name)?.Value;
+            var czymc = jwt.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name)?.Value;
             // 閫氳繃涓婁竴涓猼oken鐨勫�煎埛鏂皌oken
-            return GenerateToken(czybm, zymm);
+            return GenerateToken(czybm, czymc);
         }
 
         // 鍒ゆ柇Token 鏄惁鍗冲皢杩囨湡
@@ -92,11 +92,18 @@
             var jwt = new JwtSecurityTokenHandler().ReadJwtToken(token);
             var validTo = jwt.ValidTo;
 
-            if(validTo.Subtract(DateTime.UtcNow).TotalMinutes < 5)
+            if(validTo.Subtract(DateTime.UtcNow).TotalMinutes < 30)
             {
                 return true;
             }
             return false;
         }
+
+        public static String getUserName(string token)
+        {
+            var jwt = new JwtSecurityTokenHandler().ReadJwtToken(token);
+            var userName = jwt.Claims.FirstOrDefault(c => c.Type == ClaimTypes.Name)?.Value;
+            return userName;
+        }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.1