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

test-

Browse Source
This commit is contained in:
tongfei
2023-12-09 10:01:18 +08:00
parent b47eaa5dc4
commit c3a79f626d
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -373,7 +373,7 @@ namespace WMS.Web.Domain.Services.Public
/// <returns></returns> /// <returns></returns>
public async Task<Result<LoginInDto>> RefreshToken(string Token, string RefreshToken) public async Task<Result<LoginInDto>> RefreshToken(string Token, string RefreshToken)
{ {
_logger.LogInformation("RefreshToken:我在刷新登录" + RefreshToken);
//1.根据旧token 找到登录对象 //1.根据旧token 找到登录对象
var loginInfo = _redisClientService.GetStringKey<LoginInDto>($"wms_login_{Token}"); var loginInfo = _redisClientService.GetStringKey<LoginInDto>($"wms_login_{Token}");
//2.请求PHP单点登出接口 //2.请求PHP单点登出接口
@@ -397,9 +397,10 @@ namespace WMS.Web.Domain.Services.Public
var token = await CreateToken(loginInfo.UserInfo, _loginDto, Token); var token = await CreateToken(loginInfo.UserInfo, _loginDto, Token);
r.TokenInfo = token; r.TokenInfo = token;
loginInfo.TokenInfo = token; loginInfo.TokenInfo = token;
_logger.LogInformation("RefreshToken:我在刷新登录：刷新后的过期时间-1>" + token.Expired.ToString());
var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式 var ops_login_time = token.Expired.AddDays(1) - 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("RefreshToken:我在刷新登录：刷新后的过期时间-小时->" + ops_login_time.Hours);
return Result<LoginInDto>.ReSuccess(r); return Result<LoginInDto>.ReSuccess(r);
} }
//else if (jObject["code"] == 0) //else if (jObject["code"] == 0)

5
src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs
View File

@@ -94,11 +94,10 @@ namespace WMS.Web.Repositories.DependencyInjection
} }
else else
{ {
_logger.LogInformation("RefreshToken:我在刷新登录--1"+ logininfo.TokenInfo.Expired.ToString()); _logger.LogInformation("RefreshToken:我在刷新登录--过期时间："+ logininfo.TokenInfo.Expired.ToString());
//2.判断缓存的token 过期时间 //2.判断缓存的token 过期时间
if (!string.IsNullOrEmpty(logininfo.TokenInfo.Token) && logininfo.TokenInfo.Expired.AddMinutes(-10) <= DateTime.Now) 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 refreshtokeninfo = RefreshToken(logininfo.TokenInfo.Token, logininfo.TokenInfo.RefreshToken, loginService);
var info = _redisClientService.GetStringKey<LoginInDto>($"wms_login_{token}"); var info = _redisClientService.GetStringKey<LoginInDto>($"wms_login_{token}");
_logger.LogInformation("RefreshToken:我在刷新登录--完成：" + info.UserInfo.Nickname); _logger.LogInformation("RefreshToken:我在刷新登录--完成：" + info.UserInfo.Nickname);
@@ -166,9 +165,7 @@ namespace WMS.Web.Repositories.DependencyInjection
/// <returns></returns> /// <returns></returns>
private bool RefreshToken(string OldToken, string RefreshToken, ILoginService _loginService) private bool RefreshToken(string OldToken, string RefreshToken, ILoginService _loginService)
{ {
_logger.LogInformation("RefreshToken:我在刷新登录--3");
var res = _loginService.RefreshToken(OldToken, RefreshToken); var res = _loginService.RefreshToken(OldToken, RefreshToken);
if (!res.Result.Success) if (!res.Result.Success)
return false; return false;
else else