From f2530067b6cd16a87b76190cf524d2ed75bf9592 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 11 十月 2025 14:26:54 +0800
Subject: [PATCH] 集成中台及正联功能

---
 management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroKit.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroKit.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroKit.java
index eedfe1c..d1cf03b 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroKit.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/ShiroKit.java
@@ -15,15 +15,18 @@
  */
 package com.stylefeng.guns.core.shiro;
 
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
 import com.stylefeng.guns.core.common.constant.Const;
 import com.stylefeng.guns.core.common.constant.factory.ConstantFactory;
 import com.stylefeng.guns.core.util.ToolUtil;
+import com.stylefeng.guns.modular.system.util.SpringContextsUtil;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.crypto.hash.Md5Hash;
 import org.apache.shiro.crypto.hash.SimpleHash;
 import org.apache.shiro.session.Session;
 import org.apache.shiro.subject.Subject;
 import org.apache.shiro.util.ByteSource;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 
@@ -33,6 +36,8 @@
  * @author dafei, Chill Zhuang
  */
 public class ShiroKit {
+
+    private static final ShiroExtUtil shiroExtUtil = SpringContextsUtil.getBean(ShiroExtUtil.class);
 
     private static final String NAMES_DELIMETER = ",";
 
@@ -277,7 +282,7 @@
      * 判断当前用户是否是超级管理员
      */
     public static boolean isAdmin() {
-        List<Integer> roleList = ShiroKit.getUser().getRoleList();
+        List<Integer> roleList = shiroExtUtil.getUser().getRoleList();
         for (Integer integer : roleList) {
             String singleRoleTip = ConstantFactory.me().getSingleRoleTip(integer);
             if (singleRoleTip.equals(Const.ADMIN_NAME)) {

--
Gitblit v1.7.1