pig-common/pig-common-security/src/main/java/com/pig4cloud/pig/common/security/component/PigSecurityInnerAspect.java

@@ -16,15 +16,14 @@
 
 package com.pig4cloud.pig.common.security.component;
 
-import cn.hutool.core.util.StrUtil;
 import com.pig4cloud.pig.common.core.constant.SecurityConstants;
 import com.pig4cloud.pig.common.security.annotation.Inner;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
-import org.aspectj.lang.ProceedingJoinPoint;
-import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.security.access.AccessDeniedException;
@@ -34,7 +33,7 @@ import javax.servlet.http.HttpServletRequest;
 /**
  * @author lengleng
  * @date 2022-06-04
- *
+ * <p>
  * 服务间接口不鉴权处理逻辑
  */
 @Slf4j
@@ -45,20 +44,18 @@ public class PigSecurityInnerAspect implements Ordered {
 	private final HttpServletRequest request;
 
 	@SneakyThrows
-	@Around("@within(inner) || @annotation(inner)")
-	public Object around(ProceedingJoinPoint point, Inner inner) {
+	@Before("@within(inner) || @annotation(inner)")
+	public void around(JoinPoint point, Inner inner) {
 		// 实际注入的inner实体由表达式后一个注解决定，即是方法上的@Inner注解实体，若方法上无@Inner注解，则获取类上的
-		// 这段代码没有意义，拦截的就是@Inner注解，怎么会为null呢
-		// if (inner == null) {
-		// Class<?> clazz = point.getTarget().getClass();
-		// inner = AnnotationUtils.findAnnotation(clazz, Inner.class);
-		// }
+		if (inner == null) {
+			Class<?> clazz = point.getTarget().getClass();
+			inner = AnnotationUtils.findAnnotation(clazz, Inner.class);
+		}
 		String header = request.getHeader(SecurityConstants.FROM);
 		if (inner.value() && !SecurityConstants.FROM_IN.equals(header)) {
 			log.warn("访问接口 {} 没有权限", point.getSignature().getName());
 			throw new AccessDeniedException("Access is denied");
 		}
-		return point.proceed();
 	}
 
 	@Override