From d3f5bb64e277ee0176a3a801c839ffd91bb322ba Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 10 Oct 2023 11:14:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3cookie=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.API/Controllers/ExtraController.cs             | 4 ++--
 IRaCIS.Core.API/Properties/launchSettings.json             | 6 +++---
 .../BusinessFilter/LimitUserRequestAuthorization.cs        | 1 +
 IRaCIS.Core.Domain.Share/AuthUser/UserInfo.cs              | 7 +++++++
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/IRaCIS.Core.API/Controllers/ExtraController.cs b/IRaCIS.Core.API/Controllers/ExtraController.cs
index 921317a8..a1e4c4b5 100644
--- a/IRaCIS.Core.API/Controllers/ExtraController.cs
+++ b/IRaCIS.Core.API/Controllers/ExtraController.cs
@@ -165,8 +165,8 @@ namespace IRaCIS.Api.Controllers
                 {
                     Expires = DateTime.Now.AddMonths(1),
                     HttpOnly = true, // 确保 cookie 只能通过 HTTP 访问
-                    SameSite = Microsoft.AspNetCore.Http.SameSiteMode.None, // 设置 SameSite 属性
-                    Secure = true // 确保 cookie 只能通过 HTTPS 访问
+                    SameSite = Microsoft.AspNetCore.Http.SameSiteMode.Unspecified, // 设置 SameSite 属性
+                    Secure = false // 确保 cookie 只能通过 HTTPS 访问
                 };
 
                 HttpContext.Response.Cookies.Append("access_token", returnModel.Data.JWTStr, option);
diff --git a/IRaCIS.Core.API/Properties/launchSettings.json b/IRaCIS.Core.API/Properties/launchSettings.json
index a5c135eb..7654e41c 100644
--- a/IRaCIS.Core.API/Properties/launchSettings.json
+++ b/IRaCIS.Core.API/Properties/launchSettings.json
@@ -46,13 +46,13 @@
       },
       "applicationUrl": "http://localhost:6300"
     },
-    "IRaCIS.CertificateApply": {
+    "IRaCIS.Test-EIImageViewer": {
       "commandName": "Project",
       "launchBrowser": true,
       "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "CertificateApply"
+        "ASPNETCORE_ENVIRONMENT": "Test-EIImageViewer"
       },
-      "applicationUrl": "http://localhost:6400"
+      "applicationUrl": "http://localhost:6100"
     }
   }
 }
\ No newline at end of file
diff --git a/IRaCIS.Core.Application/BusinessFilter/LimitUserRequestAuthorization.cs b/IRaCIS.Core.Application/BusinessFilter/LimitUserRequestAuthorization.cs
index 953f1abb..6054484d 100644
--- a/IRaCIS.Core.Application/BusinessFilter/LimitUserRequestAuthorization.cs
+++ b/IRaCIS.Core.Application/BusinessFilter/LimitUserRequestAuthorization.cs
@@ -62,6 +62,7 @@ public class LimitUserRequestAuthorization : IAsyncAuthorizationFilter
                 //缓存中没有取到Token
                 if (string.IsNullOrWhiteSpace(cacheUserToken))
                 {
+
                     //设置当前用户最新Token
                     await _provider.SetAsync(_userInfo.Id.ToString(), _userInfo.UserToken, TimeSpan.FromDays(7));
 
diff --git a/IRaCIS.Core.Domain.Share/AuthUser/UserInfo.cs b/IRaCIS.Core.Domain.Share/AuthUser/UserInfo.cs
index 890033cd..522c39f6 100644
--- a/IRaCIS.Core.Domain.Share/AuthUser/UserInfo.cs
+++ b/IRaCIS.Core.Domain.Share/AuthUser/UserInfo.cs
@@ -186,6 +186,13 @@ namespace IRaCIS.Core.Domain.Share
                 {
                     return token;
 
+                }
+
+                var cookieToken = _accessor?.HttpContext?.Request.Cookies["access_token"].ToString();
+                if (!string.IsNullOrWhiteSpace(cookieToken))
+                {
+                    return cookieToken;
+
                 }
                 return string.Empty;