From ef374f3f4ec1935c4e967168887635ec01104a32 Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Thu, 10 Apr 2025 18:07:42 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E8=B0=83=E6=95=B4=E4=B8=93=E5=8C=BA?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=EF=BC=9B=E6=B7=BB=E5=8A=A0401=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E6=97=A5=E5=BF=97=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/hzs/common/core/enums/ESpecialArea.java   | 6 +++---
 .../src/main/java/com/hzs/gateway/filter/AuthFilter.java    | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java
index 1eb3079f..25d40014 100644
--- a/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java
+++ b/hzs-common/hzs-common-core/src/main/java/com/hzs/common/core/enums/ESpecialArea.java
@@ -103,17 +103,17 @@ public enum ESpecialArea {
     /**
      * 特殊注册
      */
-    SPECIAL_REGISTER_AREA(24, "乐学注册", 0, EnumsPrefixConstants.SPECIAL_AREA + 24, 17, EMenuDetail.REGISTER_LXYK.getValue()),
+    SPECIAL_REGISTER_AREA(24, "乐学注册", 0, EnumsPrefixConstants.SPECIAL_AREA + 24, 1, EMenuDetail.REGISTER_LXYK.getValue()),
 
     /**
      * 特殊升级
      */
-    SPECIAL_UPGRADE_AREA(25, "乐学升级", 0, EnumsPrefixConstants.SPECIAL_AREA + 25, 18, EMenuDetail.UPGRADE_LXYK.getValue()),
+    SPECIAL_UPGRADE_AREA(25, "乐学升级", 0, EnumsPrefixConstants.SPECIAL_AREA + 25, 2, EMenuDetail.UPGRADE_LXYK.getValue()),
 
     /**
      * 特殊复购
      */
-    SPECIAL_REPURCHASE_AREA(26, "乐学复购", 0, EnumsPrefixConstants.SPECIAL_AREA + 26, 19, EMenuDetail.REPURCHASE_LXYK.getValue()),
+    SPECIAL_REPURCHASE_AREA(26, "乐学复购", 0, EnumsPrefixConstants.SPECIAL_AREA + 26, 3, EMenuDetail.REPURCHASE_LXYK.getValue()),
 
 //    /**
 //     * 海粉升级
diff --git a/hzs-gateway/src/main/java/com/hzs/gateway/filter/AuthFilter.java b/hzs-gateway/src/main/java/com/hzs/gateway/filter/AuthFilter.java
index 3258b6e6..8128ca2f 100644
--- a/hzs-gateway/src/main/java/com/hzs/gateway/filter/AuthFilter.java
+++ b/hzs-gateway/src/main/java/com/hzs/gateway/filter/AuthFilter.java
@@ -50,6 +50,7 @@ public class AuthFilter implements GlobalFilter, Ordered {
 
         String token = getToken(request);
         if (StringUtils.isEmpty(token)) {
+            log.error("auth1 : 令牌不能为空");
             return unauthorizedResponse(exchange, "令牌不能为空");
         }
 
@@ -58,11 +59,13 @@ public class AuthFilter implements GlobalFilter, Ordered {
 
         Claims claims = JwtUtils.parseToken(token);
         if (claims == null) {
+            log.error("auth2 : 令牌已过期或验证不正确");
             return unauthorizedResponse(exchange, "令牌已过期或验证不正确！");
         }
         String userKey = JwtUtils.getUserKey(claims);
         boolean isLogin = redisService.hasKey(getTokenKey(userKey));
         if (!isLogin) {
+            log.error("auth3 : 登录状态已过期");
             return unauthorizedResponse(exchange, "登录状态已过期");
         }
         String userId = JwtUtils.getUserId(claims);
@@ -70,6 +73,7 @@ public class AuthFilter implements GlobalFilter, Ordered {
         String userType = JwtUtils.getUserType(claims);
         String userCountry = JwtUtils.getUserCountry(claims);
         if (StringUtils.isEmpty(userId) || StringUtils.isEmpty(userName) || StringUtils.isEmpty(userType)) {
+            log.error("auth4 : 令牌验证失败");
             return unauthorizedResponse(exchange, "令牌验证失败");
         }
 
@@ -96,7 +100,7 @@ public class AuthFilter implements GlobalFilter, Ordered {
     }
 
     private Mono<Void> unauthorizedResponse(ServerWebExchange exchange, String msg) {
-        log.error("[鉴权异常处理]请求路径:{}", exchange.getRequest().getPath());
+        log.error("[鉴权异常处理]请求路径:{}, msg: {}", exchange.getRequest().getPath(), msg);
         return ServletUtils.webFluxResponseWriter(exchange.getResponse(), msg, HttpStatus.UNAUTHORIZED);
     }