From 195df24b4bc660b249aca092f0554bdcf2d7c1a2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 16 Jun 2021 10:05:53 +0800
Subject: [PATCH] 升级commons.io到最新版本v2.10.0
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java | 94 +++++++++++++++++++++++++++++++----------------
1 files changed, 62 insertions(+), 32 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
index f38039c..20e20e3 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
@@ -11,12 +11,17 @@
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.springframework.util.PatternMatchUtils;
-import org.springframework.util.StringUtils;
import com.ruoyi.common.core.exception.PreAuthorizeException;
+import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.security.annotation.PreAuthorize;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.system.api.model.LoginUser;
+/**
+ * 自定义权限实现
+ *
+ * @author ruoyi
+ */
@Aspect
@Component
public class PreAuthorizeAspect
@@ -30,6 +35,9 @@
/** 管理员角色权限标识 */
private static final String SUPER_ADMIN = "admin";
+ /** 数组为0时 */
+ private static final Integer ARRAY_EMPTY = 0;
+
@Around("@annotation(com.ruoyi.common.security.annotation.PreAuthorize)")
public Object around(ProceedingJoinPoint point) throws Throwable
{
@@ -42,34 +50,56 @@
return point.proceed();
}
- if (StringUtils.isEmpty(annotation.hasPermi()) && hasPermi(annotation.hasPermi()))
+ if (StringUtils.isNotEmpty(annotation.hasPermi()))
{
- return point.proceed();
- }
- else if (StringUtils.isEmpty(annotation.lacksPermi()) && hasPermi(annotation.lacksPermi()))
- {
- return point.proceed();
- }
- else if (StringUtils.isEmpty(annotation.hasAnyPermi()) && hasAnyPermi(annotation.hasAnyPermi()))
- {
- return point.proceed();
- }
- else if (StringUtils.isEmpty(annotation.hasRole()) && hasRole(annotation.hasRole()))
- {
- return point.proceed();
- }
- else if (StringUtils.isEmpty(annotation.lacksRole()) && lacksRole(annotation.lacksRole()))
- {
- return point.proceed();
- }
- else if (StringUtils.isEmpty(annotation.hasAnyRoles()) && hasAnyRoles(annotation.hasAnyRoles()))
- {
- return point.proceed();
- }
- else
- {
+ if (hasPermi(annotation.hasPermi()))
+ {
+ return point.proceed();
+ }
throw new PreAuthorizeException();
}
+ else if (StringUtils.isNotEmpty(annotation.lacksPermi()))
+ {
+ if (lacksPermi(annotation.lacksPermi()))
+ {
+ return point.proceed();
+ }
+ throw new PreAuthorizeException();
+ }
+ else if (ARRAY_EMPTY < annotation.hasAnyPermi().length)
+ {
+ if (hasAnyPermi(annotation.hasAnyPermi()))
+ {
+ return point.proceed();
+ }
+ throw new PreAuthorizeException();
+ }
+ else if (StringUtils.isNotEmpty(annotation.hasRole()))
+ {
+ if (hasRole(annotation.hasRole()))
+ {
+ return point.proceed();
+ }
+ throw new PreAuthorizeException();
+ }
+ else if (StringUtils.isNotEmpty(annotation.lacksRole()))
+ {
+ if (lacksRole(annotation.lacksRole()))
+ {
+ return point.proceed();
+ }
+ throw new PreAuthorizeException();
+ }
+ else if (ARRAY_EMPTY < annotation.hasAnyRoles().length)
+ {
+ if (hasAnyRoles(annotation.hasAnyRoles()))
+ {
+ return point.proceed();
+ }
+ throw new PreAuthorizeException();
+ }
+
+ return point.proceed();
}
/**
@@ -81,7 +111,7 @@
public boolean hasPermi(String permission)
{
LoginUser userInfo = tokenService.getLoginUser();
- if (StringUtils.isEmpty(userInfo) || CollectionUtils.isEmpty(userInfo.getPermissions()))
+ if (StringUtils.isNull(userInfo) || CollectionUtils.isEmpty(userInfo.getPermissions()))
{
return false;
}
@@ -108,7 +138,7 @@
public boolean hasAnyPermi(String[] permissions)
{
LoginUser userInfo = tokenService.getLoginUser();
- if (StringUtils.isEmpty(userInfo) || CollectionUtils.isEmpty(userInfo.getPermissions()))
+ if (StringUtils.isNull(userInfo) || CollectionUtils.isEmpty(userInfo.getPermissions()))
{
return false;
}
@@ -132,13 +162,13 @@
public boolean hasRole(String role)
{
LoginUser userInfo = tokenService.getLoginUser();
- if (StringUtils.isEmpty(userInfo) || CollectionUtils.isEmpty(userInfo.getRoles()))
+ if (StringUtils.isNull(userInfo) || CollectionUtils.isEmpty(userInfo.getRoles()))
{
return false;
}
for (String roleKey : userInfo.getRoles())
{
- if (SUPER_ADMIN.contains(roleKey) || roleKey.contains(role))
+ if (SUPER_ADMIN.equals(roleKey) || roleKey.equals(role))
{
return true;
}
@@ -166,7 +196,7 @@
public boolean hasAnyRoles(String[] roles)
{
LoginUser userInfo = tokenService.getLoginUser();
- if (StringUtils.isEmpty(userInfo) || CollectionUtils.isEmpty(userInfo.getRoles()))
+ if (StringUtils.isNull(userInfo) || CollectionUtils.isEmpty(userInfo.getRoles()))
{
return false;
}
@@ -190,6 +220,6 @@
private boolean hasPermissions(Collection<String> authorities, String permission)
{
return authorities.stream().filter(StringUtils::hasText)
- .anyMatch(x -> ALL_PERMISSION.contains(x) || PatternMatchUtils.simpleMatch(permission, x));
+ .anyMatch(x -> ALL_PERMISSION.contains(x) || PatternMatchUtils.simpleMatch(x, permission));
}
}
--
Gitblit v1.9.3