From 5e3fa361990b97bdc0f4d41b112ca1b713fab7ad Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 26 三月 2025 16:59:46 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/xiaochen991015/xizang

---
 ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java |   30 ++++++++++++++++++++++++++++++
 1 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
index a6f3d53..89c8853 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
@@ -1,5 +1,7 @@
 package com.ruoyi.common.utils;
 
+import com.ruoyi.common.core.domain.model.LoginUserApplet;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -12,6 +14,7 @@
  * 
  * @author ruoyi
  */
+@Slf4j
 public class SecurityUtils
 {
     /**
@@ -55,6 +58,22 @@
         }
         catch (Exception e)
         {
+            log.error("获取用户信息发生异常",e);
+//            throw new ServiceException("获取用户账户异常", HttpStatus.UNAUTHORIZED);
+        }
+        return "";
+    }
+    /**
+     * 获取用户账户小程序
+     **/
+    public static String getUsernameApplet()
+    {
+        try
+        {
+            return getLoginUserApplet().getUsername();
+        }
+        catch (Exception e)
+        {
             throw new ServiceException("获取用户账户异常", HttpStatus.UNAUTHORIZED);
         }
     }
@@ -73,6 +92,17 @@
             throw new ServiceException("获取用户信息异常", HttpStatus.UNAUTHORIZED);
         }
     }
+    public static LoginUserApplet getLoginUserApplet()
+    {
+        try
+        {
+            return (LoginUserApplet) getAuthentication().getPrincipal();
+        }
+        catch (Exception e)
+        {
+            throw new ServiceException("获取用户信息异常", HttpStatus.UNAUTHORIZED);
+        }
+    }
 
     /**
      * 获取Authentication

--
Gitblit v1.7.1