From 1348cef17f08b06fb1c7615ed16edca67a538b33 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Fri, 8 Dec 2023 16:23:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Domain/Services/Public/LoginService.cs       | 2 +-
 .../AuthorizationTokenSecurityPolicy.cs                  | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/WMS.Web.Domain/Services/Public/LoginService.cs b/src/WMS.Web.Domain/Services/Public/LoginService.cs
index f308c014..c50c7334 100644
--- a/src/WMS.Web.Domain/Services/Public/LoginService.cs
+++ b/src/WMS.Web.Domain/Services/Public/LoginService.cs
@@ -373,7 +373,7 @@ namespace WMS.Web.Domain.Services.Public
         /// <returns></returns>
         public async Task<Result<LoginInDto>> RefreshToken(string Token, string RefreshToken)
         {
-            _logger.LogInformation("RefreshToken:" + RefreshToken);
+            _logger.LogInformation("RefreshToken:我在刷新登录" + RefreshToken);
             //1.根据旧token 找到登录对象
             var loginInfo = _redisClientService.GetStringKey<LoginInDto>($"wms_login_{Token}");
             //2.请求PHP单点登出接口  
diff --git a/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs b/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs
index 94f0c80e..9ce3b5e2 100644
--- a/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs
+++ b/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
@@ -19,6 +20,7 @@ namespace WMS.Web.Repositories.DependencyInjection
     {
         private readonly RequestDelegate _next;
         private readonly IMemoryCache _cache;
+        private ILogger<AuthorizationTokenSecurityPolicy> _logger;
         private DateTime _refreshTime = DateTime.Now.AddYears(-5);
         private readonly RedisClientService _redisClientService;
 
@@ -27,10 +29,11 @@ namespace WMS.Web.Repositories.DependencyInjection
         /// </summary>
         /// <param name="next"></param>
         /// <param name="cache"></param>
-        public AuthorizationTokenSecurityPolicy(RequestDelegate next, IMemoryCache cache, RedisClientService redisClientService)
+        public AuthorizationTokenSecurityPolicy(RequestDelegate next, ILogger<AuthorizationTokenSecurityPolicy> logger, IMemoryCache cache, RedisClientService redisClientService)
         {
             _next = next;
             _cache = cache;
+            this._logger = logger;
             _redisClientService = redisClientService;
         }
 
@@ -91,9 +94,11 @@ namespace WMS.Web.Repositories.DependencyInjection
                 }
                 else
                 {
+                    _logger.LogInformation("RefreshToken:我在刷新登录--1"+ logininfo.TokenInfo.Expired.ToString());
                     //2.判断缓存的token 过期时间  
                     if (!string.IsNullOrEmpty(logininfo.TokenInfo.Token) && logininfo.TokenInfo.Expired.AddMinutes(-10) <= DateTime.Now)
                     {
+                        _logger.LogInformation("RefreshToken:我在刷新登录--2");
                         var refreshtokeninfo = RefreshToken(logininfo.TokenInfo.Token, logininfo.TokenInfo.RefreshToken, loginService);
 
                         if (!refreshtokeninfo)
@@ -158,7 +163,9 @@ namespace WMS.Web.Repositories.DependencyInjection
         /// <returns></returns>
         private bool RefreshToken(string OldToken, string RefreshToken, ILoginService _loginService)
         {
+            _logger.LogInformation("RefreshToken:我在刷新登录--3");
             var res = _loginService.RefreshToken(OldToken, RefreshToken);
+
             if (!res.Result.Success)
                 return false;
             else