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 @@ 登录服务接口 + + + 创建token + + + + + + 得到单点用户信息 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 /// public interface ILoginService { + + /// + /// 创建token + /// + /// + /// + /// + /// + Task CreateToken(UserInfoDto data, LoginTempDto tempDto, string NewToken); + /// /// 得到单点用户信息 /// 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 /// /// /// - private async Task CreateToken(UserInfoDto data, LoginTempDto tempDto, string NewToken) + public async Task 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($"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 } } + /// /// 刷新token ///