diff --git a/src/WMS.Web.Api/Controllers/LoginController.cs b/src/WMS.Web.Api/Controllers/LoginController.cs index 2d396afb..6ba7956e 100644 --- a/src/WMS.Web.Api/Controllers/LoginController.cs +++ b/src/WMS.Web.Api/Controllers/LoginController.cs @@ -58,23 +58,30 @@ namespace WMS.Web.Api.Controllers public async Task LoginOut() { string authorization = this.HttpContext.Request.Headers["Authorization"]; - if (string.IsNullOrEmpty(authorization)) + //if (string.IsNullOrEmpty(authorization)) + //{ + // return Result.ReFailure(BaseResultCodes.UnAuthorized); + //} + + //if (logininfo == null || logininfo.UserInfo == null) + // return Result.ReFailure(BaseResultCodes.UnAuthorized); + if (!string.IsNullOrEmpty(authorization)) { - return Result.ReFailure(BaseResultCodes.UnAuthorized); + var logininfo = _loginService.GetLoginInfo(authorization); + if (logininfo != null && logininfo.UserInfo != null) + { + var dto = new LoginOutDto() + { + UcId = logininfo.UserInfo.UcId.ToString(), + SessionId = logininfo.UserInfo.SeesionId, + Token = logininfo.TokenInfo.Token, + AccessToken = logininfo.TokenInfo.PhpToken, + ExpiresIn = logininfo.TokenInfo.Expired + }; + var res = await _loginService.LoginOutAsync(dto); + } } - var logininfo = _loginService.GetLoginInfo(authorization); - if (logininfo == null || logininfo.UserInfo == null) - return Result.ReFailure(BaseResultCodes.UnAuthorized); - var dto = new LoginOutDto() - { - UcId = logininfo.UserInfo.UcId.ToString(), - SessionId = logininfo.UserInfo.SeesionId, - Token = logininfo.TokenInfo.Token, - AccessToken = logininfo.TokenInfo.PhpToken, - ExpiresIn = logininfo.TokenInfo.Expired - }; - var res = await _loginService.LoginOutAsync(dto); - return res; + return Result.ReSuccess(); } /// /// PHP单点退出使用