From a256618d5d5b0fd7a62950722444e6e0790df5dd Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Tue, 11 Mar 2025 12:52:17 +0800
Subject: [PATCH] 优化代码
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java | 284 +++++++++++++++++---------------------------------------
1 files changed, 89 insertions(+), 195 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..bd5ce30 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
@@ -1,195 +1,89 @@
-package com.ruoyi.common.security.aspect;
-
-import java.lang.reflect.Method;
-import java.util.Collection;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.Signature;
-import org.aspectj.lang.annotation.Around;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.beans.factory.annotation.Autowired;
-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.security.annotation.PreAuthorize;
-import com.ruoyi.common.security.service.TokenService;
-import com.ruoyi.system.api.model.LoginUser;
-
-@Aspect
-@Component
-public class PreAuthorizeAspect
-{
- @Autowired
- private TokenService tokenService;
-
- /** 所有权限标识 */
- private static final String ALL_PERMISSION = "*:*:*";
-
- /** 管理员角色权限标识 */
- private static final String SUPER_ADMIN = "admin";
-
- @Around("@annotation(com.ruoyi.common.security.annotation.PreAuthorize)")
- public Object around(ProceedingJoinPoint point) throws Throwable
- {
- Signature signature = point.getSignature();
- MethodSignature methodSignature = (MethodSignature) signature;
- Method method = methodSignature.getMethod();
- PreAuthorize annotation = method.getAnnotation(PreAuthorize.class);
- if (annotation == null)
- {
- return point.proceed();
- }
-
- if (StringUtils.isEmpty(annotation.hasPermi()) && hasPermi(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
- {
- throw new PreAuthorizeException();
- }
- }
-
- /**
- * 验证用户是否具备某权限
- *
- * @param permission 权限字符串
- * @return 用户是否具备某权限
- */
- public boolean hasPermi(String permission)
- {
- LoginUser userInfo = tokenService.getLoginUser();
- if (StringUtils.isEmpty(userInfo) || CollectionUtils.isEmpty(userInfo.getPermissions()))
- {
- return false;
- }
- return hasPermissions(userInfo.getPermissions(), permission);
- }
-
- /**
- * 验证用户是否不具备某权限，与 hasPermi逻辑相反
- *
- * @param permission 权限字符串
- * @return 用户是否不具备某权限
- */
- public boolean lacksPermi(String permission)
- {
- return hasPermi(permission) != true;
- }
-
- /**
- * 验证用户是否具有以下任意一个权限
- *
- * @param permissions 权限列表
- * @return 用户是否具有以下任意一个权限
- */
- public boolean hasAnyPermi(String[] permissions)
- {
- LoginUser userInfo = tokenService.getLoginUser();
- if (StringUtils.isEmpty(userInfo) || CollectionUtils.isEmpty(userInfo.getPermissions()))
- {
- return false;
- }
- Collection<String> authorities = userInfo.getPermissions();
- for (String permission : permissions)
- {
- if (permission != null && hasPermissions(authorities, permission))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * 判断用户是否拥有某个角色
- *
- * @param role 角色字符串
- * @return 用户是否具备某角色
- */
- public boolean hasRole(String role)
- {
- LoginUser userInfo = tokenService.getLoginUser();
- if (StringUtils.isEmpty(userInfo) || CollectionUtils.isEmpty(userInfo.getRoles()))
- {
- return false;
- }
- for (String roleKey : userInfo.getRoles())
- {
- if (SUPER_ADMIN.contains(roleKey) || roleKey.contains(role))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * 验证用户是否不具备某角色，与 isRole逻辑相反。
- *
- * @param role 角色名称
- * @return 用户是否不具备某角色
- */
- public boolean lacksRole(String role)
- {
- return hasRole(role) != true;
- }
-
- /**
- * 验证用户是否具有以下任意一个角色
- *
- * @param roles 角色列表
- * @return 用户是否具有以下任意一个角色
- */
- public boolean hasAnyRoles(String[] roles)
- {
- LoginUser userInfo = tokenService.getLoginUser();
- if (StringUtils.isEmpty(userInfo) || CollectionUtils.isEmpty(userInfo.getRoles()))
- {
- return false;
- }
- for (String role : roles)
- {
- if (hasRole(role))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * 判断是否包含权限
- *
- * @param authorities 权限列表
- * @param permission 权限字符串
- * @return 用户是否具备某权限
- */
- private boolean hasPermissions(Collection<String> authorities, String permission)
- {
- return authorities.stream().filter(StringUtils::hasText)
- .anyMatch(x -> ALL_PERMISSION.contains(x) || PatternMatchUtils.simpleMatch(permission, x));
- }
-}
+package com.ruoyi.common.security.aspect;
+
+import java.lang.reflect.Method;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+import com.ruoyi.common.security.annotation.RequiresLogin;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.annotation.RequiresRoles;
+import com.ruoyi.common.security.auth.AuthUtil;
+
+/**
+ * 基于 Spring Aop 的注解鉴权
+ *
+ * @author kong
+ */
+@Aspect
+@Component
+public class PreAuthorizeAspect
+{
+ /**
+ * 构建
+ */
+ public PreAuthorizeAspect()
+ {
+ }
+
+ /**
+ * 定义AOP签名 (切入所有使用鉴权注解的方法)
+ */
+ public static final String POINTCUT_SIGN = " @annotation(com.ruoyi.common.security.annotation.RequiresLogin) || "
+ + "@annotation(com.ruoyi.common.security.annotation.RequiresPermissions) || "
+ + "@annotation(com.ruoyi.common.security.annotation.RequiresRoles)";
+
+ /**
+ * 声明AOP签名
+ */
+ @Pointcut(POINTCUT_SIGN)
+ public void pointcut()
+ {
+ }
+
+ /**
+ * 环绕切入
+ *
+ * @param joinPoint 切面对象
+ * @return 底层方法执行后的返回值
+ * @throws Throwable 底层方法抛出的异常
+ */
+ @Around("pointcut()")
+ public Object around(ProceedingJoinPoint joinPoint) throws Throwable
+ {
+ // 注解鉴权
+ MethodSignature signature = (MethodSignature) joinPoint.getSignature();
+ checkMethodAnnotation(signature.getMethod());
+ // 执行原有逻辑
+ return joinPoint.proceed();
+ }
+
+ /**
+ * 对一个Method对象进行注解检查
+ */
+ public void checkMethodAnnotation(Method method)
+ {
+ // 校验 @RequiresLogin 注解
+ RequiresLogin requiresLogin = method.getAnnotation(RequiresLogin.class);
+ if (requiresLogin != null)
+ {
+ AuthUtil.checkLogin();
+ }
+
+ // 校验 @RequiresRoles 注解
+ RequiresRoles requiresRoles = method.getAnnotation(RequiresRoles.class);
+ if (requiresRoles != null)
+ {
+ AuthUtil.checkRole(requiresRoles);
+ }
+
+ // 校验 @RequiresPermissions 注解
+ RequiresPermissions requiresPermissions = method.getAnnotation(RequiresPermissions.class);
+ if (requiresPermissions != null)
+ {
+ AuthUtil.checkPermi(requiresPermissions);
+ }
+ }
+}
--
Gitblit v1.9.3