From df34d7cb2834bf11ad45313d0edb32e3c5574ecc Mon Sep 17 00:00:00 2001
From: heshunme <heshunme@outlook.com>
Date: Wed, 3 Jul 2024 14:40:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99@JwtVerify=E6=B7=BB=E5=8A=A0=E4=BA=86?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=AD=97=E7=AC=A6=E4=B8=B2=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=9A=84=E7=94=A8=E6=B3=95=EF=BC=8C=E7=8E=B0=E5=9C=A8=E5=8F=AA?=
 =?UTF-8?q?=E8=A6=81=E6=9C=89=E4=BB=BB=E6=84=8F=E4=B8=80=E4=B8=AA=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E5=8F=82=E6=95=B0=E7=9A=84=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E6=98=AFJWT=E5=B0=B1=E4=B9=9F=E8=83=BD=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E4=BA=86=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/cmh/backend/Utils/JwtVerifyAspect.java  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/cmh/backend/Utils/JwtVerifyAspect.java b/src/main/java/org/cmh/backend/Utils/JwtVerifyAspect.java
index 5104981..1e341ea 100644
--- a/src/main/java/org/cmh/backend/Utils/JwtVerifyAspect.java
+++ b/src/main/java/org/cmh/backend/Utils/JwtVerifyAspect.java
@@ -15,11 +15,19 @@ public class JwtVerifyAspect {
             if (arg instanceof JwtRequest jwtRequest) {
                 String token = jwtRequest.getToken();
                 if (!JwtUtil.isTokenValid(token)) {
-                    throw new JwtValidationException("JWT token is invalid");
+                    throw new JwtValidationException("请求未正确携带身份令牌");
+                }
+                return;  // 只接受第一个 JwtRequest 对象，收到后不再校验其他参数
+            }
+            // JWTRequest对象优先，否则再检查其他字符串参数
+            if (arg instanceof String token){
+                if (JwtUtil.isTokenValid(token)){
+                    // 验证成功就直接退出。
+                    return;
                 }
-                break;
             }
         }
+        throw new JwtValidationException("请求未正确携带身份令牌");
     }
 }