From b63101272c43c01e6bf828b59d7d9c7e9d163983 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 14 十月 2025 11:57:22 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/QYTDriving
---
management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckFactory.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckFactory.java b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckFactory.java
index 89f602f..e58368f 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckFactory.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/core/shiro/check/PermissionCheckFactory.java
@@ -15,12 +15,14 @@
*/
package com.stylefeng.guns.core.shiro.check;
+import com.stylefeng.guns.core.beetl.ShiroExtUtil;
import com.stylefeng.guns.core.listener.ConfigListener;
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.shiro.ShiroUser;
import com.stylefeng.guns.core.support.CollectionKit;
import com.stylefeng.guns.core.support.HttpKit;
import com.stylefeng.guns.core.util.SpringContextHolder;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.DependsOn;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -35,13 +37,16 @@
@Transactional(readOnly = true)
public class PermissionCheckFactory implements ICheck {
+ @Autowired
+ private ShiroExtUtil shiroExtUtil;
+
public static ICheck me() {
return SpringContextHolder.getBean(ICheck.class);
}
@Override
public boolean check(Object[] permissions) {
- ShiroUser user = ShiroKit.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
if (null == user) {
return false;
}
@@ -55,7 +60,7 @@
@Override
public boolean checkAll() {
HttpServletRequest request = HttpKit.getRequest();
- ShiroUser user = ShiroKit.getUser();
+ ShiroUser user = shiroExtUtil.getUser();
if (null == user) {
return false;
}
--
Gitblit v1.7.1