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 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);