From b47eaa5dc40477f5888c321d579f4f2e6722f271 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Fri, 8 Dec 2023 17:09:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=88=B7=E6=96=B0token?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml          |  9 +++++++++
 src/WMS.Web.Domain/IService/Public/ILoginService.cs | 11 +++++++++++
 src/WMS.Web.Domain/Services/Public/LoginService.cs  |  2 +-
 .../AuthorizationTokenSecurityPolicy.cs             | 13 ++++++++-----
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
index 5e98deb1..9b48cb3b 100644
--- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
+++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
@@ -2912,6 +2912,15 @@
             登录服务接口
             </summary>
         </member>
+        <member name="M:WMS.Web.Domain.IService.Public.ILoginService.CreateToken(WMS.Web.Core.Dto.Login.UserInfoDto,WMS.Web.Core.Dto.Login.Temp.LoginTempDto,System.String)">
+            <summary>
+            创建token
+            </summary>
+            <param name="data"></param>
+            <param name="tempDto"></param>
+            <param name="NewToken"></param>
+            <returns></returns>
+        </member>
         <member name="M:WMS.Web.Domain.IService.Public.ILoginService.GetUserInfoAsync(System.String)">
             <summary>
             得到单点用户信息
diff --git a/src/WMS.Web.Domain/IService/Public/ILoginService.cs b/src/WMS.Web.Domain/IService/Public/ILoginService.cs
index 50d508df..739ed416 100644
--- a/src/WMS.Web.Domain/IService/Public/ILoginService.cs
+++ b/src/WMS.Web.Domain/IService/Public/ILoginService.cs
@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using WMS.Web.Core.Dto.Login;
+using WMS.Web.Core.Dto.Login.Temp;
 using WMS.Web.Core.Internal.Results;
 
 namespace WMS.Web.Domain.IService.Public
@@ -12,6 +13,16 @@ namespace WMS.Web.Domain.IService.Public
     /// </summary>
     public interface ILoginService
     {
+
+        /// <summary>
+        /// 创建token
+        /// </summary>
+        /// <param name="data"></param>
+        /// <param name="tempDto"></param>
+        /// <param name="NewToken"></param>
+        /// <returns></returns>
+        Task<AccessTokenDto> CreateToken(UserInfoDto data, LoginTempDto tempDto, string NewToken);
+
         /// <summary>
         /// 得到单点用户信息
         /// </summary>
diff --git a/src/WMS.Web.Domain/Services/Public/LoginService.cs b/src/WMS.Web.Domain/Services/Public/LoginService.cs
index c50c7334..b8e4c0f0 100644
--- a/src/WMS.Web.Domain/Services/Public/LoginService.cs
+++ b/src/WMS.Web.Domain/Services/Public/LoginService.cs
@@ -52,7 +52,7 @@ namespace WMS.Web.Domain.Services.Public
         /// <param name="tempDto"></param>
         /// <param name="NewToken"></param>
         /// <returns></returns>
-        private async Task<AccessTokenDto> CreateToken(UserInfoDto data, LoginTempDto tempDto, string NewToken)
+        public async Task<AccessTokenDto> CreateToken(UserInfoDto data, LoginTempDto tempDto, string NewToken)
         {
             return await Task.Run(() =>
             {
diff --git a/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs b/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs
index 9ce3b5e2..6af76e02 100644
--- a/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs
+++ b/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs
@@ -100,11 +100,13 @@ namespace WMS.Web.Repositories.DependencyInjection
                     {
                         _logger.LogInformation("RefreshToken:我在刷新登录--2");
                         var refreshtokeninfo = RefreshToken(logininfo.TokenInfo.Token, logininfo.TokenInfo.RefreshToken, loginService);
-
-                        if (!refreshtokeninfo)
-                        {
-                            RemoveRedisLoginInfo(token);
-                        }
+                        var info = _redisClientService.GetStringKey<LoginInDto>($"wms_login_{token}");
+                        _logger.LogInformation("RefreshToken:我在刷新登录--完成：" + info.UserInfo.Nickname);
+                        //刷新token后不能删除_redis用户缓存
+                        //if (!refreshtokeninfo)
+                        //{
+                        //    RemoveRedisLoginInfo(token);
+                        //}
                     }
                     //3.验证检查是否有黑名单的token缓存
                     string blacktoken = _redisClientService.GetStringKey($"wms_black_token_{logininfo.UserInfo.UcId}");
@@ -156,6 +158,7 @@ namespace WMS.Web.Repositories.DependencyInjection
             }
         }
 
+
         /// <summary>
         /// 刷新token
         /// </summary>