18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
tongfei
2024-03-22 17:29:31 +08:00
parent d5b28e1bae
commit d39b65f584
3 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/WMS.Web.Api/wwwroot/WMS.Web.Core.xml
View File

@@ -3648,6 +3648,11 @@
wms箱ID wms箱ID
</summary> </summary>
</member> </member>
<member name="P:WMS.Web.Core.Dto.Login.AccessTokenDto.ClientName">
<summary>
客户端名称
</summary>
</member>
<member name="P:WMS.Web.Core.Dto.Login.AccessTokenDto.Token"> <member name="P:WMS.Web.Core.Dto.Login.AccessTokenDto.Token">
<summary> <summary>
授权token -- 给前端用的验证token 授权token -- 给前端用的验证token

5
src/WMS.Web.Core/Dto/Login/AccessTokenDto.cs
View File

@@ -6,6 +6,11 @@ namespace WMS.Web.Core.Dto.Login
{ {
public class AccessTokenDto public class AccessTokenDto
{ {
/// <summary>
/// 客户端名称
/// </summary>
public string ClientName { get; set; }
/// <summary> /// <summary>
/// 授权token -- 给前端用的验证token /// 授权token -- 给前端用的验证token
/// </summary> /// </summary>

10
src/WMS.Web.Domain/Services/Public/LoginService.cs
View File

@@ -171,6 +171,7 @@ namespace WMS.Web.Domain.Services.Public
var loginInfo = new LoginInDto(); var loginInfo = new LoginInDto();
loginInfo.UserInfo = r.UserInfo; loginInfo.UserInfo = r.UserInfo;
loginInfo.TokenInfo = token; loginInfo.TokenInfo = token;
loginInfo.TokenInfo.ClientName = "PC";
//var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式 //var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式
var ops_login_time = token.Expired - DateTime.Now;//用于正式 var ops_login_time = token.Expired - DateTime.Now;//用于正式
@@ -287,6 +288,7 @@ namespace WMS.Web.Domain.Services.Public
var loginInfo = new LoginInDto(); var loginInfo = new LoginInDto();
loginInfo.UserInfo = r.UserInfo; loginInfo.UserInfo = r.UserInfo;
loginInfo.TokenInfo = token; loginInfo.TokenInfo = token;
loginInfo.TokenInfo.ClientName = "PDA";
//var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式 //var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式
var ops_login_time = token.Expired - 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.GrantType = "refresh_token";
reqData.RefreshToken = RefreshToken; reqData.RefreshToken = RefreshToken;
reqData.Scope = "credentials"; reqData.Scope = "credentials";
var clientName = loginInfo?.TokenInfo?.ClientName;
var oldExpired = loginInfo?.TokenInfo?.Expired.ToString("yyyy-MM-dd HH:mm:ss"); var oldExpired = loginInfo?.TokenInfo?.Expired.ToString("yyyy-MM-dd HH:mm:ss");
try try
{ {
@@ -394,8 +398,10 @@ namespace WMS.Web.Domain.Services.Public
var token = await CreateToken(loginInfo.UserInfo, _loginDto, oldToken); var token = await CreateToken(loginInfo.UserInfo, _loginDto, oldToken);
r.TokenInfo = token; r.TokenInfo = token;
loginInfo.TokenInfo = token; loginInfo.TokenInfo = token;
//_logger.LogInformation("RefreshToken:我在刷新登录：刷新后的过期时间-1>" + token.Expired.ToString()); loginInfo.TokenInfo.ClientName = clientName;
var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式 //_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<LoginInDto>($"wms_login_{token.Token}", loginInfo, ops_login_time); _redisClientService.SetStringKey<LoginInDto>($"wms_login_{token.Token}", loginInfo, ops_login_time);
_logger.LogInformation($"刷新Token：老时间->" + $"{oldExpired}"+"，新时间->"+ $"wms_login_{token.Expired.ToString("yyyy-MM-dd HH:mm:ss")}"); _logger.LogInformation($"刷新Token：老时间->" + $"{oldExpired}"+"，新时间->"+ $"wms_login_{token.Expired.ToString("yyyy-MM-dd HH:mm:ss")}");
//移除老的redis缓存 //移除老的redis缓存