From 6502f2107229bd0e19a0ce5dd748b9e6e5e11367 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 26 十一月 2021 13:57:28 +0800
Subject: [PATCH] update 修改不规范命名
---
ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java | 87 ++++++++++++++++++++-----------------------
1 files changed, 40 insertions(+), 47 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
index fe735b0..e413333 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/PermissionService.java
@@ -1,9 +1,12 @@
package com.ruoyi.system.service;
import com.ruoyi.common.core.domain.entity.SysRole;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
+import com.ruoyi.common.core.service.UserService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -15,12 +18,15 @@
* @author ruoyi
*/
@Service("ss")
-public class PermissionService
-{
- /** 鎵�鏈夋潈闄愭爣璇� */
+public class PermissionService {
+ /**
+ * 鎵�鏈夋潈闄愭爣璇�
+ */
private static final String ALL_PERMISSION = "*:*:*";
- /** 绠＄悊鍛樿鑹叉潈闄愭爣璇� */
+ /**
+ * 绠＄悊鍛樿鑹叉潈闄愭爣璇�
+ */
private static final String SUPER_ADMIN = "admin";
private static final String ROLE_DELIMETER = ",";
@@ -33,15 +39,12 @@
* @param permission 鏉冮檺瀛楃涓�
* @return 鐢ㄦ埛鏄惁鍏峰鏌愭潈闄�
*/
- public boolean hasPermi(String permission)
- {
- if (StringUtils.isEmpty(permission))
- {
+ public boolean hasPermi(String permission) {
+ if (StringUtils.isEmpty(permission)) {
return false;
}
LoginUser loginUser = SecurityUtils.getLoginUser();
- if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
- {
+ if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) {
return false;
}
return hasPermissions(loginUser.getPermissions(), permission);
@@ -53,8 +56,7 @@
* @param permission 鏉冮檺瀛楃涓�
* @return 鐢ㄦ埛鏄惁涓嶅叿澶囨煇鏉冮檺
*/
- public boolean lacksPermi(String permission)
- {
+ public boolean lacksPermi(String permission) {
return hasPermi(permission) != true;
}
@@ -64,22 +66,17 @@
* @param permissions 浠� PERMISSION_NAMES_DELIMETER 涓哄垎闅旂鐨勬潈闄愬垪琛�
* @return 鐢ㄦ埛鏄惁鍏锋湁浠ヤ笅浠绘剰涓�涓潈闄�
*/
- public boolean hasAnyPermi(String permissions)
- {
- if (StringUtils.isEmpty(permissions))
- {
+ public boolean hasAnyPermi(String permissions) {
+ if (StringUtils.isEmpty(permissions)) {
return false;
}
LoginUser loginUser = SecurityUtils.getLoginUser();
- if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions()))
- {
+ if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getPermissions())) {
return false;
}
Set<String> authorities = loginUser.getPermissions();
- for (String permission : permissions.split(PERMISSION_DELIMETER))
- {
- if (permission != null && hasPermissions(authorities, permission))
- {
+ for (String permission : permissions.split(PERMISSION_DELIMETER)) {
+ if (permission != null && hasPermissions(authorities, permission)) {
return true;
}
}
@@ -92,22 +89,21 @@
* @param role 瑙掕壊瀛楃涓�
* @return 鐢ㄦ埛鏄惁鍏峰鏌愯鑹�
*/
- public boolean hasRole(String role)
- {
- if (StringUtils.isEmpty(role))
- {
+ public boolean hasRole(String role) {
+ if (StringUtils.isEmpty(role)) {
return false;
}
LoginUser loginUser = SecurityUtils.getLoginUser();
- if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
- {
+ if (StringUtils.isNull(loginUser)) {
return false;
}
- for (SysRole sysRole : loginUser.getUser().getRoles())
- {
+ SysUser sysUser = SpringUtils.getBean(UserService.class).selectUserById(loginUser.getUserId());
+ if (CollectionUtils.isEmpty(sysUser.getRoles())) {
+ return false;
+ }
+ for (SysRole sysRole : sysUser.getRoles()) {
String roleKey = sysRole.getRoleKey();
- if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role)))
- {
+ if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role))) {
return true;
}
}
@@ -120,8 +116,7 @@
* @param role 瑙掕壊鍚嶇О
* @return 鐢ㄦ埛鏄惁涓嶅叿澶囨煇瑙掕壊
*/
- public boolean lacksRole(String role)
- {
+ public boolean lacksRole(String role) {
return hasRole(role) != true;
}
@@ -131,21 +126,20 @@
* @param roles 浠� ROLE_NAMES_DELIMETER 涓哄垎闅旂鐨勮鑹插垪琛�
* @return 鐢ㄦ埛鏄惁鍏锋湁浠ヤ笅浠绘剰涓�涓鑹�
*/
- public boolean hasAnyRoles(String roles)
- {
- if (StringUtils.isEmpty(roles))
- {
+ public boolean hasAnyRoles(String roles) {
+ if (StringUtils.isEmpty(roles)) {
return false;
}
LoginUser loginUser = SecurityUtils.getLoginUser();
- if (StringUtils.isNull(loginUser) || CollectionUtils.isEmpty(loginUser.getUser().getRoles()))
- {
+ if (StringUtils.isNull(loginUser)) {
return false;
}
- for (String role : roles.split(ROLE_DELIMETER))
- {
- if (hasRole(role))
- {
+ SysUser sysUser = SpringUtils.getBean(UserService.class).selectUserById(loginUser.getUserId());
+ if (CollectionUtils.isEmpty(sysUser.getRoles())) {
+ return false;
+ }
+ for (String role : roles.split(ROLE_DELIMETER)) {
+ if (hasRole(role)) {
return true;
}
}
@@ -156,11 +150,10 @@
* 鍒ゆ柇鏄惁鍖呭惈鏉冮檺
*
* @param permissions 鏉冮檺鍒楄〃
- * @param permission 鏉冮檺瀛楃涓�
+ * @param permission 鏉冮檺瀛楃涓�
* @return 鐢ㄦ埛鏄惁鍏峰鏌愭潈闄�
*/
- private boolean hasPermissions(Set<String> permissions, String permission)
- {
+ private boolean hasPermissions(Set<String> permissions, String permission) {
return permissions.contains(ALL_PERMISSION) || permissions.contains(StringUtils.trim(permission));
}
}
--
Gitblit v1.9.3