diff --git a/src/WMS.Web.Domain/Services/Public/LoginService.cs b/src/WMS.Web.Domain/Services/Public/LoginService.cs index d6c62a0b..5edc633c 100644 --- a/src/WMS.Web.Domain/Services/Public/LoginService.cs +++ b/src/WMS.Web.Domain/Services/Public/LoginService.cs @@ -152,14 +152,14 @@ namespace WMS.Web.Domain.Services.Public loginInfo.TokenInfo = token; var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式 - _redisClientService.SetStringKey($"ops_login_{token.Token}", loginInfo, ops_login_time); + _redisClientService.SetStringKey($"wms_login_{token.Token}", loginInfo, ops_login_time); //登录成功移出对应的用户token黑名单:应为新的token产生,移除登录的信息 - string blacktoken = _redisClientService.GetStringKey($"ops_black_token_{r.UserInfo.UcId}"); + string blacktoken = _redisClientService.GetStringKey($"wms_black_token_{r.UserInfo.UcId}"); if (!string.IsNullOrEmpty(blacktoken)) { this.RemoveLoginInfo(blacktoken); - _redisClientService.RemoveStringKey($"ops_black_token_{r.UserInfo.UcId}"); + _redisClientService.RemoveStringKey($"wms_black_token_{r.UserInfo.UcId}"); } if (r == null || r.UserInfo == null || r.TokenInfo == null) return Result.ReFailure("授权失败,请重新登录", 401); @@ -225,7 +225,7 @@ namespace WMS.Web.Domain.Services.Public { _logger.LogInformation("RefreshToken:" + RefreshToken); //1.根据旧token 找到登录对象 - var loginInfo = _redisClientService.GetStringKey($"ops_login_{Token}"); + var loginInfo = _redisClientService.GetStringKey($"wms_login_{Token}"); //2.请求PHP单点登出接口 JsonObject reqData = new JsonObject(); reqData.Add("app_id", _soaOptions.AppId); @@ -249,14 +249,14 @@ namespace WMS.Web.Domain.Services.Public loginInfo.TokenInfo = token; var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式 - _redisClientService.SetStringKey($"ops_login_{token.Token}", loginInfo, ops_login_time); + _redisClientService.SetStringKey($"wms_login_{token.Token}", loginInfo, ops_login_time); return Result.ReSuccess(r); } else { //失败了1:就把登录的token清除 2: ucid添加到黑名单 var time = new TimeSpan(r.TokenInfo.Expired.Day, r.TokenInfo.Expired.Hour, r.TokenInfo.Expired.Minute, r.TokenInfo.Expired.Second, r.TokenInfo.Expired.Millisecond); - _redisClientService.SetStringKey($"ops_black_token_{r.UserInfo.UcId}", r.TokenInfo.Token, time); + _redisClientService.SetStringKey($"wms_black_token_{r.UserInfo.UcId}", r.TokenInfo.Token, time); this.RemoveLoginInfo(r.TokenInfo.Token); r.SignedIn = false; return Result.ReFailure(jObject["errmsg"], jObject["errno"]); @@ -274,12 +274,12 @@ namespace WMS.Web.Domain.Services.Public { await Task.Run(() => { - var cache_token = _redisClientService.GetStringKey($"ops_black_token_{ucid}"); + var cache_token = _redisClientService.GetStringKey($"wms_black_token_{ucid}"); if (string.IsNullOrEmpty(cache_token)) { DateTime expires_time = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1)).AddSeconds(expires_in); var time = new TimeSpan(expires_time.Day, expires_time.Hour, expires_time.Minute, expires_time.Second, expires_time.Millisecond); - _redisClientService.SetStringKey($"ops_black_token_{ucid}", token, time); + _redisClientService.SetStringKey($"wms_black_token_{ucid}", token, time); this.RemoveLoginInfo(token); } }); @@ -292,17 +292,17 @@ namespace WMS.Web.Domain.Services.Public /// public async Task LoginOutSingleAsync(string SeesionId) { - var logininfo = _redisClientService.GetStringKey($"ops_login_{SeesionId}"); + var logininfo = _redisClientService.GetStringKey($"wms_login_{SeesionId}"); await Task.Run(() => { if (logininfo != null) { - var cache_token = _redisClientService.GetStringKey($"ops_black_token_{logininfo.UserInfo.UcId}"); + var cache_token = _redisClientService.GetStringKey($"wms_black_token_{logininfo.UserInfo.UcId}"); if (string.IsNullOrEmpty(cache_token)) { DateTime expires_time = logininfo.TokenInfo.Expired; var time = new TimeSpan(expires_time.Day, expires_time.Hour, expires_time.Minute, expires_time.Second, expires_time.Millisecond); - _redisClientService.SetStringKey($"ops_black_token_{logininfo.UserInfo.UcId}", logininfo.TokenInfo.Token, time); + _redisClientService.SetStringKey($"wms_black_token_{logininfo.UserInfo.UcId}", logininfo.TokenInfo.Token, time); this.RemoveLoginInfo(logininfo.TokenInfo.Token); } } @@ -321,7 +321,7 @@ namespace WMS.Web.Domain.Services.Public if (!string.IsNullOrEmpty(dto.AccessToken)) { var time = new TimeSpan(dto.ExpiresIn.Day, dto.ExpiresIn.Hour, dto.ExpiresIn.Minute, dto.ExpiresIn.Second, dto.ExpiresIn.Millisecond); - _redisClientService.SetStringKey($"ops_black_token_{dto.UcId}", dto.AccessToken, time); + _redisClientService.SetStringKey($"wms_black_token_{dto.UcId}", dto.AccessToken, time); this.RemoveLoginInfo(dto.Token); } @@ -340,7 +340,7 @@ namespace WMS.Web.Domain.Services.Public { token = authorization.Substring("Bearer ".Length).Trim(); } - var logininfo = _redisClientService.GetStringKey($"ops_login_{token}"); + var logininfo = _redisClientService.GetStringKey($"wms_login_{token}"); return logininfo; } @@ -352,10 +352,10 @@ namespace WMS.Web.Domain.Services.Public { if (!string.IsNullOrEmpty(token)) { - var info = _redisClientService.GetStringKey($"ops_login_{token}"); + var info = _redisClientService.GetStringKey($"wms_login_{token}"); if (info != null) { - _redisClientService.RemoveStringKey($"ops_login_{token}"); + _redisClientService.RemoveStringKey($"wms_login_{token}"); } } } diff --git a/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs b/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs index 716f1866..94f0c80e 100644 --- a/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs +++ b/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs @@ -79,7 +79,7 @@ namespace WMS.Web.Repositories.DependencyInjection } //1.验证是否有登录数据缓存 - var logininfo = _redisClientService.GetStringKey($"ops_login_{token}"); + var logininfo = _redisClientService.GetStringKey($"wms_login_{token}"); if (logininfo == null) { context.Response.StatusCode = 401; @@ -102,7 +102,7 @@ namespace WMS.Web.Repositories.DependencyInjection } } //3.验证检查是否有黑名单的token缓存 - string blacktoken = _redisClientService.GetStringKey($"ops_black_token_{logininfo.UserInfo.UcId}"); + string blacktoken = _redisClientService.GetStringKey($"wms_black_token_{logininfo.UserInfo.UcId}"); if (string.IsNullOrEmpty(blacktoken)) { context.Response.StatusCode = 200; @@ -143,10 +143,10 @@ namespace WMS.Web.Repositories.DependencyInjection { if (!string.IsNullOrEmpty(token)) { - var info = _redisClientService.GetStringKey($"ops_login_{token}"); + var info = _redisClientService.GetStringKey($"wms_login_{token}"); if (info != null) { - _redisClientService.RemoveStringKey($"ops_login_{token}"); + _redisClientService.RemoveStringKey($"wms_login_{token}"); } } }