From c3a79f626d114c4e3ba2571da1e49a79822d8b17 Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Sat, 9 Dec 2023 10:01:18 +0800 Subject: [PATCH] test- --- src/WMS.Web.Domain/Services/Public/LoginService.cs | 5 +++-- .../DependencyInjection/AuthorizationTokenSecurityPolicy.cs | 5 +---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/WMS.Web.Domain/Services/Public/LoginService.cs b/src/WMS.Web.Domain/Services/Public/LoginService.cs index b8e4c0f0..d4b8a585 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 /// public async Task> RefreshToken(string Token, string RefreshToken) { - _logger.LogInformation("RefreshToken:我在刷新登录" + RefreshToken); + //1.根据旧token 找到登录对象 var loginInfo = _redisClientService.GetStringKey($"wms_login_{Token}"); //2.请求PHP单点登出接口 @@ -397,9 +397,10 @@ namespace WMS.Web.Domain.Services.Public var token = await CreateToken(loginInfo.UserInfo, _loginDto, Token); r.TokenInfo = token; loginInfo.TokenInfo = token; - + _logger.LogInformation("RefreshToken:我在刷新登录:刷新后的过期时间-1>" + token.Expired.ToString()); var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式 _redisClientService.SetStringKey($"wms_login_{token.Token}", loginInfo, ops_login_time); + _logger.LogInformation("RefreshToken:我在刷新登录:刷新后的过期时间-小时->" + ops_login_time.Hours); return Result.ReSuccess(r); } //else if (jObject["code"] == 0) diff --git a/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs b/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs index 6af76e02..b61aefc5 100644 --- a/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs +++ b/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs @@ -94,11 +94,10 @@ namespace WMS.Web.Repositories.DependencyInjection } else { - _logger.LogInformation("RefreshToken:我在刷新登录--1"+ logininfo.TokenInfo.Expired.ToString()); + _logger.LogInformation("RefreshToken:我在刷新登录--过期时间:"+ 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); var info = _redisClientService.GetStringKey($"wms_login_{token}"); _logger.LogInformation("RefreshToken:我在刷新登录--完成:" + info.UserInfo.Nickname); @@ -166,9 +165,7 @@ namespace WMS.Web.Repositories.DependencyInjection /// 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