diff --git a/src/WMS.Web.Domain/Services/Public/LoginService.cs b/src/WMS.Web.Domain/Services/Public/LoginService.cs index 0d4fb389..e0d709d5 100644 --- a/src/WMS.Web.Domain/Services/Public/LoginService.cs +++ b/src/WMS.Web.Domain/Services/Public/LoginService.cs @@ -370,37 +370,46 @@ namespace WMS.Web.Domain.Services.Public reqData.GrantType = "refresh_token"; reqData.RefreshToken = RefreshToken; reqData.Scope = "credentials"; - string result = _httpClientHelp.PostHttp(_soaOptions.Url_V3 + "/uc/authorize", reqData); - var jObject = JsonObject.Parse(result); - - LoginInDto r = new LoginInDto(); - r.UserInfo = new UserInfoDto(); - r.TokenInfo = new AccessTokenDto(); - - if (jObject["code"] == 0) + try { - string datajson = jObject["data"].ToString(); - var _loginDto = JsonConvert.DeserializeObject(datajson); + _logger.LogInformation("RefreshTokenNew:" + _soaOptions.Url_V3 + "/uc/authorize" + ":Data:" + JsonConvert.SerializeObject(reqData)); + string result = _httpClientHelp.PostHttp(_soaOptions.Url_V3 + "/uc/authorize", reqData); + var jObject = JsonObject.Parse(result); - r.UserInfo = loginInfo.UserInfo; - r.SignedIn = true; - var token = await CreateToken(loginInfo.UserInfo, _loginDto, Token); - r.TokenInfo = token; - loginInfo.TokenInfo = token; - //_logger.LogInformation("RefreshToken:我在刷新登录:刷新后的过期时间-1>" + token.Expired.ToString()); - var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式 - _redisClientService.SetStringKey($"wms_login_{token.Token}", loginInfo, ops_login_time); - //_logger.LogInformation("RefreshToken:我在刷新登录:刷新后的过期时间-小时->" + ops_login_time.Hours); - return Result.ReSuccess(r); + LoginInDto r = new LoginInDto(); + r.UserInfo = new UserInfoDto(); + r.TokenInfo = new AccessTokenDto(); + + if (jObject["code"] == 0) + { + string datajson = jObject["data"].ToString(); + var _loginDto = JsonConvert.DeserializeObject(datajson); + + r.UserInfo = loginInfo.UserInfo; + r.SignedIn = true; + var token = await CreateToken(loginInfo.UserInfo, _loginDto, Token); + r.TokenInfo = token; + loginInfo.TokenInfo = token; + //_logger.LogInformation("RefreshToken:我在刷新登录:刷新后的过期时间-1>" + token.Expired.ToString()); + var ops_login_time = token.Expired.AddDays(1) - DateTime.Now;//用于正式 + _redisClientService.SetStringKey($"wms_login_{token.Token}", loginInfo, ops_login_time); + //_logger.LogInformation("RefreshToken:我在刷新登录:刷新后的过期时间-小时->" + ops_login_time.Hours); + 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($"wms_black_token_{r.UserInfo.UcId}", r.TokenInfo.Token, time); + this.RemoveLoginInfo(r.TokenInfo.Token); + r.SignedIn = false; + return Result.ReFailure(jObject["message"], jObject["code"]); + } } - else + catch (Exception ex) { - //失败了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($"wms_black_token_{r.UserInfo.UcId}", r.TokenInfo.Token, time); - this.RemoveLoginInfo(r.TokenInfo.Token); - r.SignedIn = false; - return Result.ReFailure(jObject["message"], jObject["code"]); + _logger.LogInformation("RefreshTokenNew:Error" + ex.Message); + return Result.ReFailure(ex.Message, 50001); } }