From 001c7a977480205b77486e4481e00f85bfe3c939 Mon Sep 17 00:00:00 2001
From: tongfei <244188119@qq.com>
Date: Fri, 29 Dec 2023 17:19:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=80=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/LoginController.cs            | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

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<Result> 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();
         }
         /// <summary>
         /// PHP单点退出使用