From c994d375b3ab9e322bd6ebe99ddcd4a74b751714 Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Fri, 14 Mar 2025 22:37:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=A4=B4=E9=83=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/aspect/AuthorizeAspect.java  | 23 ++++++++++++++++++-
 .../mybatis/mapper/basic/UdiRelevanceDao.xml  |  2 +-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java b/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java
index dfddd8c9..5d855c6a 100644
--- a/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java
+++ b/src/main/java/com/glxp/api/aspect/AuthorizeAspect.java
@@ -52,14 +52,35 @@ public class AuthorizeAspect {
         }
         HttpServletRequest request = attributes.getRequest();
 
+        // 尝试获取下划线格式的请求头信息
         String id = request.getHeader("ADMIN_ID");
         String token = request.getHeader("ADMIN_TOKEN");
+
+        // 如果没有获取到，尝试获取驼峰格式的请求头信息
+        if (StrUtil.isBlank(id)) {
+            id = request.getHeader("adminId");
+        }
+        if (StrUtil.isBlank(token)) {
+            token = request.getHeader("adminToken");
+        }
+
+        // 如果 id 或 token 仍然为空
         if (StrUtil.isBlank(id) || StrUtil.isBlank(token)) {
+            // 尝试获取下划线格式的 api_key 和 secret_key
             String apiKey = request.getHeader("api_key");
             String secretKey = request.getHeader("secret_key");
+
+            // 如果没有获取到，尝试获取驼峰格式的 apiKey 和 secretKey
+            if (StrUtil.isBlank(apiKey)) {
+                apiKey = request.getHeader("apiKey");
+            }
+            if (StrUtil.isBlank(secretKey)) {
+                secretKey = request.getHeader("secretKey");
+            }
+
             AuthLicense authLicense = authLicenseDao.get(apiKey);
             if (authLicense != null && authLicense.getSecretKey().equals(secretKey)) {
-
+                // 这里可以添加验证通过后的逻辑
             } else {
                 throw new JsonException(ResultEnum.LOGIN_VERIFY_FALL);
             }
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
index 0ef44037..3192d589 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
@@ -581,7 +581,7 @@
             <if test="notCodeType != '' and notCodeType != null">
                 AND basic_udirel.notCodeType = #{notCodeType}
             </if>
-            <if test="manuReview != '' and thirdId != null">
+            <if test="manuReview != '' and manuReview != null">
                 AND manuReview = #{manuReview}
             </if>
             <if test="thirdId != '' and thirdId != null">