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 @@
AND basic_udirel.notCodeType = #{notCodeType}
-
+
AND manuReview = #{manuReview}