From 6c57a5f917c5ca4021bb8eeafad0ae904c28dc01 Mon Sep 17 00:00:00 2001
From: none <none>
Date: Thu, 23 Mar 2023 17:03:59 +0800
Subject: [PATCH] =?UTF-8?q?fixed:=20=E5=90=8E=E5=8F=B0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/xyz/playedu/api/BCtx.java                    | 7 +++++++
 src/main/java/xyz/playedu/api/bus/BackendBus.java          | 3 +++
 .../playedu/api/controller/frontend/UserController.java    | 2 ++
 .../java/xyz/playedu/api/middleware/FrontMiddleware.java   | 3 +--
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/xyz/playedu/api/BCtx.java b/src/main/java/xyz/playedu/api/BCtx.java
index 38c37f5..ee5c52f 100644
--- a/src/main/java/xyz/playedu/api/BCtx.java
+++ b/src/main/java/xyz/playedu/api/BCtx.java
@@ -28,9 +28,16 @@ public class BCtx {
     }
 
     private static Object get(String key) {
+        if (THREAD_LOCAL.get() == null) {
+            return null;
+        }
         return THREAD_LOCAL.get().getOrDefault(key, null);
     }
 
+    public static boolean isNull() {
+        return THREAD_LOCAL.get() == null;
+    }
+
     public static void remove() {
         THREAD_LOCAL.remove();
     }
diff --git a/src/main/java/xyz/playedu/api/bus/BackendBus.java b/src/main/java/xyz/playedu/api/bus/BackendBus.java
index ab12f31..ad77d84 100644
--- a/src/main/java/xyz/playedu/api/bus/BackendBus.java
+++ b/src/main/java/xyz/playedu/api/bus/BackendBus.java
@@ -54,6 +54,9 @@ public class BackendBus {
     }
 
     public static String valueHidden(String permissionSlug, String type, String value) {
+        if (BCtx.isNull()) {//非后管环境返回原值
+            return value;
+        }
         HashMap<String, Boolean> permissions = BCtx.getAdminPer();
         if (permissions.get(permissionSlug) != null) {
             return value;
diff --git a/src/main/java/xyz/playedu/api/controller/frontend/UserController.java b/src/main/java/xyz/playedu/api/controller/frontend/UserController.java
index e022c4a..6d2e625 100644
--- a/src/main/java/xyz/playedu/api/controller/frontend/UserController.java
+++ b/src/main/java/xyz/playedu/api/controller/frontend/UserController.java
@@ -1,5 +1,6 @@
 package xyz.playedu.api.controller.frontend;
 
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -26,6 +27,7 @@ import java.util.stream.Collectors;
  */
 @RestController
 @RequestMapping("/api/v1/user")
+@Slf4j
 public class UserController {
 
     @Autowired
diff --git a/src/main/java/xyz/playedu/api/middleware/FrontMiddleware.java b/src/main/java/xyz/playedu/api/middleware/FrontMiddleware.java
index ff55349..22918dd 100644
--- a/src/main/java/xyz/playedu/api/middleware/FrontMiddleware.java
+++ b/src/main/java/xyz/playedu/api/middleware/FrontMiddleware.java
@@ -59,9 +59,8 @@ public class FrontMiddleware implements HandlerInterceptor {
                 return responseTransform(response, 403, "当前学员已锁定无法登录");
             }
 
-            FCtx.setUserId(user.getId());
             FCtx.setUser(user);
-            FCtx.setJWtJti(token);
+            FCtx.setUserId(user.getId());
             FCtx.setJWtJti(payload.getJti());
 
             return HandlerInterceptor.super.preHandle(request, response, handler);