From 8b191330b846f517eafdb57883aa2f7ece9b3f32 Mon Sep 17 00:00:00 2001
From: ccnetcore <cc2016cc>
Date: Thu, 11 Dec 2025 23:31:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"fix:=20=E4=BB=85=E4=BB=8E=20Query?=
 =?UTF-8?q?=20=E8=8E=B7=E5=8F=96=20access=5Ftoken/refresh=5Ftoken=EF=BC=8C?=
 =?UTF-8?q?=E7=AE=80=E5=8C=96=20OnMessageReceived=20=E9=80=BB=E8=BE=91"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 0d2f2cb82678a8496bd93cd906a44d0cda6f7742.
---
 Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs | 30 +++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
index 57e3db0d..af4af4dc 100644
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
@@ -280,14 +280,22 @@ namespace Yi.Abp.Web
                     };
                     options.Events = new JwtBearerEvents
                     {
-                        OnMessageReceived = messageContext =>
+                        OnMessageReceived = context =>
                         {
-                            //优先Query中获取
-                            var accessToken = messageContext.Request.Query["access_token"];
+                            //优先Query中获取，再去cookies中获取
+                            var accessToken = context.Request.Query["access_token"];
                             if (!string.IsNullOrEmpty(accessToken))
                             {
-                                messageContext.Token = accessToken;
+                                context.Token = accessToken;
                             }
+                            else
+                            {
+                                if (context.Request.Cookies.TryGetValue("Token", out var cookiesToken))
+                                {
+                                    context.Token = cookiesToken;
+                                }
+                            }
+
                             return Task.CompletedTask;
                         }
                     };
@@ -305,13 +313,21 @@ namespace Yi.Abp.Web
                     };
                     options.Events = new JwtBearerEvents
                     {
-                        OnMessageReceived = messageContext =>
+                        OnMessageReceived = context =>
                         {
-                            var refreshToken = messageContext.Request.Query["refresh_token"];
+                            var refresh_token = context.Request.Headers["refresh_token"];
+                            if (!string.IsNullOrEmpty(refresh_token))
+                            {
+                                context.Token = refresh_token;
+                                return Task.CompletedTask;
+                            }
+
+                            var refreshToken = context.Request.Query["refresh_token"];
                             if (!string.IsNullOrEmpty(refreshToken))
                             {
-                                messageContext.Token = refreshToken;
+                                context.Token = refreshToken;
                             }
+
                             return Task.CompletedTask;
                         }
                     };

From 8a6e5abf4843ca03306f6ea83a1f9bb3813e226a Mon Sep 17 00:00:00 2001
From: ccnetcore <cc2016cc>
Date: Thu, 11 Dec 2025 23:32:57 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dtoken=E9=89=B4?=
 =?UTF-8?q?=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs | 24 ++++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
index af4af4dc..752cac3f 100644
--- a/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
+++ b/Yi.Abp.Net8/src/Yi.Abp.Web/YiAbpWebModule.cs
@@ -280,19 +280,19 @@ namespace Yi.Abp.Web
                     };
                     options.Events = new JwtBearerEvents
                     {
-                        OnMessageReceived = context =>
+                        OnMessageReceived = messageContext =>
                         {
                             //优先Query中获取，再去cookies中获取
-                            var accessToken = context.Request.Query["access_token"];
+                            var accessToken = messageContext.Request.Query["access_token"];
                             if (!string.IsNullOrEmpty(accessToken))
                             {
-                                context.Token = accessToken;
+                                messageContext.Token = accessToken;
                             }
                             else
                             {
-                                if (context.Request.Cookies.TryGetValue("Token", out var cookiesToken))
+                                if (messageContext.Request.Cookies.TryGetValue("Token", out var cookiesToken))
                                 {
-                                    context.Token = cookiesToken;
+                                    messageContext.Token = cookiesToken;
                                 }
                             }
 
@@ -313,19 +313,19 @@ namespace Yi.Abp.Web
                     };
                     options.Events = new JwtBearerEvents
                     {
-                        OnMessageReceived = context =>
+                        OnMessageReceived = messageContext =>
                         {
-                            var refresh_token = context.Request.Headers["refresh_token"];
-                            if (!string.IsNullOrEmpty(refresh_token))
+                            var headerRefreshToken = messageContext.Request.Headers["refresh_token"];
+                            if (!string.IsNullOrEmpty(headerRefreshToken))
                             {
-                                context.Token = refresh_token;
+                                messageContext.Token = headerRefreshToken;
                                 return Task.CompletedTask;
                             }
 
-                            var refreshToken = context.Request.Query["refresh_token"];
-                            if (!string.IsNullOrEmpty(refreshToken))
+                            var queryRefreshToken = messageContext.Request.Query["refresh_token"];
+                            if (!string.IsNullOrEmpty(queryRefreshToken))
                             {
-                                context.Token = refreshToken;
+                                messageContext.Token = queryRefreshToken;
                             }
 
                             return Task.CompletedTask;