From 26b1dbb7cf04c8dcc5d6258f26703bb87ec2016c Mon Sep 17 00:00:00 2001 From: "chen.ma" Date: Wed, 5 Jan 2022 00:11:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=8A=E4=B8=8B=E6=96=87?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E4=B8=BA=E7=A9=BA=E6=97=B6=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=A9=BA=E5=AD=97=E7=AC=A6=E4=B8=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/hippo4j/common/toolkit/UserContext.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java index 89fde6bb..f4f2bd01 100644 --- a/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java +++ b/hippo4j-common/src/main/java/cn/hippo4j/common/toolkit/UserContext.java @@ -4,6 +4,8 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Optional; + /** * User context (Transition scheme). * @@ -19,11 +21,11 @@ public class UserContext { } public static String getUserName() { - return USER_THREAD_LOCAL.get().username; + return Optional.ofNullable(USER_THREAD_LOCAL.get()).map(User::getUsername).orElse(""); } public static String getUserRole() { - return USER_THREAD_LOCAL.get().userRole; + return Optional.ofNullable(USER_THREAD_LOCAL.get()).map(User::getUserRole).orElse(""); } public static void clear() {