From d39b65f584df0d7b735d04e78c09785599919e5a Mon Sep 17 00:00:00 2001 From: tongfei <244188119@qq.com> Date: Fri, 22 Mar 2024 17:29:31 +0800 Subject: [PATCH] =?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.Core.xml | 5 +++++ src/WMS.Web.Core/Dto/Login/AccessTokenDto.cs | 5 +++++ src/WMS.Web.Domain/Services/Public/LoginService.cs | 10 ++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml index 0ffb0d2e..1ae71d24 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml @@ -3648,6 +3648,11 @@ wms箱ID + + + 客户端名称 + + 授权token -- 给前端用的验证token diff --git a/src/WMS.Web.Core/Dto/Login/AccessTokenDto.cs b/src/WMS.Web.Core/Dto/Login/AccessTokenDto.cs index 2fb905d4..e43eb84b 100644 --- a/src/WMS.Web.Core/Dto/Login/AccessTokenDto.cs +++ b/src/WMS.Web.Core/Dto/Login/AccessTokenDto.cs @@ -6,6 +6,11 @@ namespace WMS.Web.Core.Dto.Login { public class AccessTokenDto { + /// + /// 客户端名称 + /// + public string ClientName { get; set; } + /// /// 授权token -- 给前端用的验证token /// diff --git a/src/WMS.Web.Domain/Services/Public/LoginService.cs b/src/WMS.Web.Domain/Services/Public/LoginService.cs index 830e1875..d9f2eddf 100644 --- a/src/WMS.Web.Domain/Services/Public/LoginService.cs +++ b/src/WMS.Web.Domain/Services/Public/LoginService.cs @@ -171,6 +171,7 @@ namespace WMS.Web.Domain.Services.Public var loginInfo = new LoginInDto(); loginInfo.UserInfo = r.UserInfo; loginInfo.TokenInfo = token; + loginInfo.TokenInfo.ClientName = "PC"; //var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式 var ops_login_time = token.Expired - DateTime.Now;//用于正式 @@ -287,6 +288,7 @@ namespace WMS.Web.Domain.Services.Public var loginInfo = new LoginInDto(); loginInfo.UserInfo = r.UserInfo; loginInfo.TokenInfo = token; + loginInfo.TokenInfo.ClientName = "PDA"; //var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式 var ops_login_time = token.Expired - DateTime.Now;//用于正式 @@ -373,6 +375,8 @@ namespace WMS.Web.Domain.Services.Public reqData.GrantType = "refresh_token"; reqData.RefreshToken = RefreshToken; reqData.Scope = "credentials"; + + var clientName = loginInfo?.TokenInfo?.ClientName; var oldExpired = loginInfo?.TokenInfo?.Expired.ToString("yyyy-MM-dd HH:mm:ss"); try { @@ -394,8 +398,10 @@ namespace WMS.Web.Domain.Services.Public var token = await CreateToken(loginInfo.UserInfo, _loginDto, oldToken); r.TokenInfo = token; loginInfo.TokenInfo = token; - //_logger.LogInformation("RefreshToken:我在刷新登录：刷新后的过期时间-1>" + token.Expired.ToString()); - var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式 + loginInfo.TokenInfo.ClientName = clientName; + //_logger.LogInformation("RefreshToken:我在刷新登录：刷新后的过期时间-1>" + token.Expired.ToString()); + //var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式 + var ops_login_time = token.Expired - DateTime.Now;//用于正式 _redisClientService.SetStringKey($"wms_login_{token.Token}", loginInfo, ops_login_time); _logger.LogInformation($"刷新Token：老时间->" + $"{oldExpired}"+"，新时间->"+ $"wms_login_{token.Expired.ToString("yyyy-MM-dd HH:mm:ss")}"); //移除老的redis缓存