From 5fd51c437819f1c9d027a936db4ba2ee7cd2e053 Mon Sep 17 00:00:00 2001
From: ustcyc <yincun@163.com>
Date: 星期二, 07 一月 2025 15:02:58 +0800
Subject: [PATCH] 升级架构
---
zhitan-framework/src/main/java/com/zhitan/framework/web/service/PermissionService.java | 41 ++++++++++++++++++++---------------------
1 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/zhitan-framework/src/main/java/com/zhitan/framework/web/service/PermissionService.java b/zhitan-framework/src/main/java/com/zhitan/framework/web/service/PermissionService.java
index 520d562..68171fc 100644
--- a/zhitan-framework/src/main/java/com/zhitan/framework/web/service/PermissionService.java
+++ b/zhitan-framework/src/main/java/com/zhitan/framework/web/service/PermissionService.java
@@ -1,19 +1,19 @@
package com.zhitan.framework.web.service;
+import java.util.Set;
+
+import com.zhitan.framework.security.context.PermissionContextHolder;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
import com.zhitan.common.constant.Constants;
import com.zhitan.common.core.domain.entity.SysRole;
import com.zhitan.common.core.domain.model.LoginUser;
import com.zhitan.common.utils.SecurityUtils;
import com.zhitan.common.utils.StringUtils;
-import com.zhitan.framework.security.context.PermissionContextHolder;
-import org.springframework.stereotype.Service;
-import org.springframework.util.CollectionUtils;
-
-import java.util.Set;
/**
* 棣栧垱 鑷畾涔夋潈闄愬疄鐜帮紝ss鍙栬嚜SpringSecurity棣栧瓧姣�
- *
+ *
* @author zhitan
*/
@Service("ss")
@@ -21,24 +21,23 @@
{
/**
* 楠岃瘉鐢ㄦ埛鏄惁鍏峰鏌愭潈闄�
- *
+ *
* @param permission 鏉冮檺瀛楃涓�
* @return 鐢ㄦ埛鏄惁鍏峰鏌愭潈闄�
*/
public boolean hasPermi(String permission)
{
- return true;
-// if (StringUtils.isEmpty(permission))
-// {
-// return false;
-// }
-// LoginUser loginUser = SecurityUtils.getLoginUser();
-// if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
-// {
-// return false;
-// }
-// PermissionContextHolder.setContext(permission);
-// return hasPermissions(loginUser.getPermissions(), permission);
+ if (StringUtils.isEmpty(permission))
+ {
+ return false;
+ }
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
+ {
+ return false;
+ }
+ PermissionContextHolder.setContext(permission);
+ return hasPermissions(loginUser.getPermissions(), permission);
}
/**
@@ -83,7 +82,7 @@
/**
* 鍒ゆ柇鐢ㄦ埛鏄惁鎷ユ湁鏌愪釜瑙掕壊
- *
+ *
* @param role 瑙掕壊瀛楃涓�
* @return 鐢ㄦ埛鏄惁鍏峰鏌愯鑹�
*/
@@ -149,7 +148,7 @@
/**
* 鍒ゆ柇鏄惁鍖呭惈鏉冮檺
- *
+ *
* @param permissions 鏉冮檺鍒楄〃
* @param permission 鏉冮檺瀛楃涓�
* @return 鐢ㄦ埛鏄惁鍏峰鏌愭潈闄�
--
Gitblit v1.9.3