From 46c9563f33c79d63b8bfdc3baa30d7c3c2ed3bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Tue, 29 Aug 2023 07:40:56 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=E5=88=B7=E6=96=B0jwttoken?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ZR.Admin.WebApi/Filters/VerifyAttribute.cs | 19 +++++++++++++++++--
 ZR.Admin.WebApi/Framework/JwtUtil.cs       | 22 +---------------------
 ZR.Admin.WebApi/ZR.Admin.WebApi.csproj     |  2 +-
 ZR.Admin.WebApi/appsettings.json           |  3 ++-
 4 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/ZR.Admin.WebApi/Filters/VerifyAttribute.cs b/ZR.Admin.WebApi/Filters/VerifyAttribute.cs
index 5e54c93..7ea4078 100644
--- a/ZR.Admin.WebApi/Filters/VerifyAttribute.cs
+++ b/ZR.Admin.WebApi/Filters/VerifyAttribute.cs
@@ -36,9 +36,24 @@ namespace ZR.Admin.WebApi.Filters
             var isAuthed = context.HttpContext.User.Identity.IsAuthenticated;
 
             //使用jwt token校验2020-11-21
-            LoginUser info = JwtUtil.GetLoginUser(context.HttpContext);
+            LoginUser loginUser = JwtUtil.GetLoginUser(context.HttpContext);
+            if (loginUser != null)
+            {
+                var nowTime = DateTime.UtcNow;
+                TimeSpan ts = loginUser.ExpireTime - nowTime;
 
-            if (info == null || !isAuthed)
+                //Console.WriteLine($"jwt到期剩余：{ts.TotalMinutes}分,{ts.TotalSeconds}秒");
+
+                var CK = "token_" + loginUser.UserId;
+                if (!CacheHelper.Exists(CK) && ts.TotalMinutes < 5)
+                {
+                    var newToken = JwtUtil.GenerateJwtToken(JwtUtil.AddClaims(loginUser));
+
+                    CacheHelper.SetCache(CK, CK, 1);
+                    context.HttpContext.Response.Headers.Add("X-Refresh-Token", newToken);
+                }
+            }
+            if (loginUser == null || !isAuthed)
             {
                 string msg = $"请求访问[{url}]失败，无法访问系统资源";
                 logger.Info($"{msg}");
diff --git a/ZR.Admin.WebApi/Framework/JwtUtil.cs b/ZR.Admin.WebApi/Framework/JwtUtil.cs
index ad004f2..88423b8 100644
--- a/ZR.Admin.WebApi/Framework/JwtUtil.cs
+++ b/ZR.Admin.WebApi/Framework/JwtUtil.cs
@@ -1,13 +1,8 @@
-using JinianNet.JNTemplate;
-using JinianNet.JNTemplate.Nodes;
-using Microsoft.AspNetCore.SignalR;
-using Microsoft.Extensions.Caching.Memory;
-using Microsoft.IdentityModel.Tokens;
+using Microsoft.IdentityModel.Tokens;
 using Newtonsoft.Json;
 using System.IdentityModel.Tokens.Jwt;
 using System.Security.Claims;
 using System.Text;
-using ZR.Admin.WebApi.Hubs;
 using ZR.Model.System.Dto;
 
 namespace ZR.Admin.WebApi.Framework
@@ -137,21 +132,6 @@ namespace ZR.Admin.WebApi.Framework
                     loginUser = JsonConvert.DeserializeObject<LoginUser>(userData);
                     loginUser.ExpireTime = jwtSecurityToken.ValidTo;
                 }
-                //var nowTime = DateTime.UtcNow;
-                //TimeSpan ts = loginUser.ExpireTime - nowTime;
-
-                //Console.WriteLine("jwt到期时间：" + loginUser.ExpireTime);
-                //Console.WriteLine("nowTime" + nowTime + ",相隔" + ts.TotalSeconds);
-
-                //if (loginUser != null && ts.TotalSeconds <= 30)
-                //{
-                //    var newToken = GenerateJwtToken(AddClaims(loginUser));
-                //    var CK = "token_" + loginUser.UserId;
-                //    if (!CacheHelper.Exists(CK))
-                //    {
-                //        CacheHelper.SetCache(CK, newToken);
-                //    }
-                //}
                 return loginUser;
             }
             catch (Exception ex)
diff --git a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
index fc07c89..870be2a 100644
--- a/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
+++ b/ZR.Admin.WebApi/ZR.Admin.WebApi.csproj
@@ -6,7 +6,7 @@
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-		<NoWarn>1701;1702;1591,8603,8602,8604,8600</NoWarn>
+		<NoWarn>1701;1702;1591,8603,8602,8604,8600,8618</NoWarn>
 	</PropertyGroup>
 
 	<ItemGroup>
diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json
index 2e10095..17baa36 100644
--- a/ZR.Admin.WebApi/appsettings.json
+++ b/ZR.Admin.WebApi/appsettings.json
@@ -29,7 +29,8 @@
     "Issuer": "ZRAdmin.NET", //即token的签发者。
     "Audience": "ZRAdmin.NET", //指该token是服务于哪个群体的（群体范围）
     "SecretKey": "SecretKey-ZRADMIN.NET-20210101",
-    "Expire": 1440 //jwt登录过期时间（分）
+    "Expire": 1440, //jwt登录过期时间（分）
+    "refreshTokenTime": 5
   },
   "InjectClass": [ "ZR.Repository", "ZR.Service", "ZR.Tasks" ], //自动注入类
   "ShowDbLog": true, //是否打印db日志