diff --git a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 index f9c8efca..6c4dd832 100644 Binary files a/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 and b/.vs/WMS.Web/DesignTimeBuild/.dtbcache.v2 differ diff --git a/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs b/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs index b61aefc5..9062735b 100644 --- a/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs +++ b/src/WMS.Web.Repositories/DependencyInjection/AuthorizationTokenSecurityPolicy.cs @@ -47,7 +47,7 @@ namespace WMS.Web.Repositories.DependencyInjection string authorization = context.Request.Headers["Authorization"]; string path = context.Request.Path.Value.ToLower(); string[] pathlist = path.Split('/'); - bool isLogin = pathlist.Where(x => x == "login" || x.ToLower() == "heart" || x.ToLower() == "test").Any(); + bool isLogin = pathlist.Where(x => x == "login" || x.ToLower() == "heart" || x.ToLower() == "test" || x.ToLower() == "serialnumber/get").Any(); if (isLogin) { context.Response.StatusCode = 200; @@ -94,10 +94,11 @@ namespace WMS.Web.Repositories.DependencyInjection } else { - _logger.LogInformation("RefreshToken:我在刷新登录--过期时间:"+ logininfo.TokenInfo.Expired.ToString()); + _logger.LogInformation("RefreshToken:我在刷新登录--1" + logininfo.TokenInfo.Expired.ToString()); //2.判断缓存的token 过期时间 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 info = _redisClientService.GetStringKey($"wms_login_{token}"); _logger.LogInformation("RefreshToken:我在刷新登录--完成:" + info.UserInfo.Nickname); @@ -165,7 +166,9 @@ namespace WMS.Web.Repositories.DependencyInjection /// private bool RefreshToken(string OldToken, string RefreshToken, ILoginService _loginService) { + _logger.LogInformation("RefreshToken:我在刷新登录--3"); var res = _loginService.RefreshToken(OldToken, RefreshToken); + if (!res.Result.Success) return false; else