From 9785e2c8dd4712a8cd96c6d33f4fb2a7cffc58a2 Mon Sep 17 00:00:00 2001
From: xuyuxiang <xuyuxiang29@foxmail.com>
Date: Wed, 22 May 2024 15:43:24 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7id=E7=9A=84?=
 =?UTF-8?q?=E5=86=99=E6=B3=95=EF=BC=8C=E5=85=BC=E5=AE=B9B=E3=80=81C?=
 =?UTF-8?q?=E7=AB=AF=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95=E5=92=8C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/vip/xiaonuo/dev/core/aop/DevLogAop.java     | 10 ++++++----
 .../vip/xiaonuo/core/config/GlobalConfigure.java     | 12 ++++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/core/aop/DevLogAop.java b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/core/aop/DevLogAop.java
index 976a9048..e173a7bd 100644
--- a/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/core/aop/DevLogAop.java
+++ b/snowy-plugin/snowy-plugin-dev/src/main/java/vip/xiaonuo/dev/core/aop/DevLogAop.java
@@ -90,10 +90,12 @@ public class DevLogAop {
         CommonLog commonLog = method.getAnnotation(CommonLog.class);
         String userName = "未知";
         try {
-            SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
-            if(ObjectUtil.isNotNull(loginUser)) {
-                userName = loginUser.getName();
-            } else {
+            try {
+                SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
+                if(ObjectUtil.isNotNull(loginUser)) {
+                    userName = loginUser.getName();
+                }
+            } catch (Exception e) {
                 SaBaseClientLoginUser clientLoginUser = StpClientLoginUserUtil.getClientLoginUser();
                 if(ObjectUtil.isNotNull(clientLoginUser)) {
                     userName = clientLoginUser.getName();
diff --git a/snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java b/snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java
index 24cc481e..c8a39450 100644
--- a/snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java
+++ b/snowy-web-app/src/main/java/vip/xiaonuo/core/config/GlobalConfigure.java
@@ -603,10 +603,14 @@ public class GlobalConfigure implements WebMvcConfigurer {
          */
         private String getUserId() {
             try {
-                String loginId = StpUtil.getLoginIdAsString();
-                if (ObjectUtil.isNotEmpty(loginId)) {
-                    return loginId;
-                } else {
+                try {
+                    String loginId = StpUtil.getLoginIdAsString();
+                    if (ObjectUtil.isNotEmpty(loginId)) {
+                        return loginId;
+                    } else {
+                        return "-1";
+                    }
+                } catch (Exception e) {
                     String clientLoginId = StpClientUtil.getLoginIdAsString();
                     if (ObjectUtil.isNotEmpty(clientLoginId)) {
                         return clientLoginId;