From b3e5568216944a09cbce9a621195af7072a2a4a0 Mon Sep 17 00:00:00 2001
From: chenh <852066789@qq.com>
Date: Thu, 15 Jan 2026 16:52:26 +0800
Subject: [PATCH] =?UTF-8?q?feat(sip)=EF=BC=9A=E6=8F=90=E4=BE=9B=E7=BB=99NE?=
 =?UTF-8?q?X=E7=9A=84=E6=8E=A5=E5=8F=A3=E8=B0=83=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/common/utils/ShiroUtils.java    | 31 +++++--------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ShiroUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ShiroUtils.java
index 1e205b75..80a348a5 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ShiroUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ShiroUtils.java
@@ -37,21 +37,6 @@ public class ShiroUtils {
 
         // 检查是否是API Key认证
         Object principal = subject.getPrincipal();
-        if (principal instanceof SysUser) {
-            // 正常登录用户
-            return (SysUser) principal;
-        } else if (principal == null) {
-            // 检查是否是API Key请求
-            HttpServletRequest request = ServletUtils.getRequest();
-            String apiKey = request.getHeader("X-API-Key");
-            if (StringUtils.isNotEmpty(apiKey) && NEX_API_KEY.equals(apiKey)) {
-                Long userId = validateApiKey(apiKey); // 验证API Key并获取用户ID
-                if (userId != null) {
-                    SysUser user = loadUserById(userId);
-                    return user;
-                }
-            }
-        }
 
         // 传统方式获取用户
         SysUser user = null;
@@ -63,11 +48,8 @@ public class ShiroUtils {
         // 检查是否是API Key请求
         HttpServletRequest request = ServletUtils.getRequest();
         String apiKey = request.getHeader("X-API-Key");
-        if (StringUtils.isNotEmpty(apiKey)) {
-            Long userId = validateApiKey(apiKey); // 验证API Key并获取用户ID
-            user = loadUserById(userId);
-            setSysUser(user);
-            return user;
+        if (StringUtils.isNotEmpty(apiKey)&& NEX_API_KEY.equals(apiKey)) {
+            return loadUserById();
         }
         return user;
     }
@@ -79,18 +61,19 @@ public class ShiroUtils {
         // 查询数据库验证API Key，并返回对应的用户ID
         // 这里应该查询API Key表，获取关联的用户ID
         // 例如: select user_id from sys_api_key where api_key = ? and status = 'A'
-        return 1L;
+        return 101L;
     }
 
     /**
      * 根据用户ID加载用户信息
      */
-    private static SysUser loadUserById(Long userId) {
+    private static SysUser loadUserById() {
         // 从数据库加载用户信息
         // 例如: select * from sys_user where user_id = ?
         SysUser user = new SysUser();
-        user.setUserId(1L);
-        user.setUserName("admin");
+        user.setUserId(101L);
+        user.setUserName("乐喽ch");
+        user.setLoginName("leoloch");
         return user;
     }