From 9283fa6e32145ff0ae237c40d2008fc35e81ef7c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 09 六月 2025 10:29:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java | 46 ++++++++++++++++++----------------------------
1 files changed, 18 insertions(+), 28 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 bc75873..c6730c6 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,31 +1,30 @@
package com.ruoyi.common.security.aspect;
-import java.lang.reflect.Method;
+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;
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;
+
+import java.lang.reflect.Method;
/**
* 基于 Spring Aop 的注解鉴权
- *
+ *
* @author kong
*/
@Aspect
@Component
-public class PreAuthorizeAspect
-{
+public class PreAuthorizeAspect {
/**
* 构建
*/
- public PreAuthorizeAspect()
- {
+ public PreAuthorizeAspect() {
}
/**
@@ -39,31 +38,26 @@
* 声明AOP签名
*/
@Pointcut(POINTCUT_SIGN)
- public void pointcut()
- {
+ public void pointcut() {
}
/**
* 环绕切入
- *
+ *
* @param joinPoint 切面对象
* @return 底层方法执行后的返回值
* @throws Throwable 底层方法抛出的异常
*/
@Around("pointcut()")
- public Object around(ProceedingJoinPoint joinPoint) throws Throwable
- {
+ public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
// 注解鉴权
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
checkMethodAnnotation(signature.getMethod());
- try
- {
+ try {
// 执行原有逻辑
Object obj = joinPoint.proceed();
return obj;
- }
- catch (Throwable e)
- {
+ } catch (Throwable e) {
throw e;
}
}
@@ -71,26 +65,22 @@
/**
* 对一个Method对象进行注解检查
*/
- public void checkMethodAnnotation(Method method)
- {
+ public void checkMethodAnnotation(Method method) {
// 校验 @RequiresLogin 注解
RequiresLogin requiresLogin = method.getAnnotation(RequiresLogin.class);
- if (requiresLogin != null)
- {
+ if (requiresLogin != null) {
AuthUtil.checkLogin();
}
// 校验 @RequiresRoles 注解
RequiresRoles requiresRoles = method.getAnnotation(RequiresRoles.class);
- if (requiresRoles != null)
- {
+ if (requiresRoles != null) {
AuthUtil.checkRole(requiresRoles);
}
// 校验 @RequiresPermissions 注解
RequiresPermissions requiresPermissions = method.getAnnotation(RequiresPermissions.class);
- if (requiresPermissions != null)
- {
+ if (requiresPermissions != null) {
AuthUtil.checkPermi(requiresPermissions);
}
}
--
Gitblit v1.7.1