refactor all

src/main/java/com/imyeyu/api/annotation/CaptchaValidInterceptor.java

@@ -1,20 +1,13 @@
 package com.imyeyu.api.annotation;
 
-import lombok.extern.slf4j.Slf4j;
-import com.imyeyu.api.bean.CaptchaFrom;
 import com.imyeyu.api.util.CaptchaManager;
-import com.imyeyu.spring.bean.CaptchaData;
-import org.aspectj.lang.JoinPoint;
+import com.imyeyu.spring.annotation.CaptchaValidAbstractInterceptor;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Before;
-import org.aspectj.lang.annotation.Pointcut;
-import org.aspectj.lang.reflect.MethodSignature;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import java.lang.reflect.Method;
-
 /**
  * 图形验证码校验注解处理器
  *
@@ -24,47 +17,19 @@ import java.lang.reflect.Method;
 @Slf4j
 @Aspect
 @Component
-public class CaptchaValidInterceptor {
+@RequiredArgsConstructor
+public class CaptchaValidInterceptor extends CaptchaValidAbstractInterceptor {
 
 	@Value("${spring.profiles.active}")
 	private String env;
 
-	@Autowired
-	private CaptchaManager captchaManager;
+	private final CaptchaManager captchaManager;
 
-	/** 注入注解 */
-	@Pointcut("@annotation(com.imyeyu.api.annotation.CaptchaValid)")
-	public void captchaPointCut() {
-	}
-
-	/**
-	 * 执行前
-	 *
-	 * @param joinPoint 切入点
-	 */
-	@Before("captchaPointCut()")
-	public void doBefore(JoinPoint joinPoint) {
-		try {
-			if (env.startsWith("dev")) {
-				// 开发环境不校验
-				return;
-			}
-			if (joinPoint.getSignature() instanceof MethodSignature ms) {
-				Method method = joinPoint.getTarget().getClass().getMethod(ms.getName(), ms.getParameterTypes());
-				CaptchaValid annotation = method.getAnnotation(CaptchaValid.class);
-				CaptchaFrom from = annotation.value();
-
-				Object[] args = joinPoint.getArgs();
-				for (int i = 0; i < args.length; i++) {
-					if (args[i] instanceof CaptchaData<?> captchaData) {
-						// 校验请求参数的验证码
-						captchaManager.test(captchaData.getCaptcha(), from.toString());
-						break;
-					}
-				}
-			}
-		} catch (NoSuchMethodException e) {
-			throw new RuntimeException("TODO CaptchaValidInterceptor error");
+	@Override
+	protected void verify(String captchaId, String captcha) {
+		if (!env.equals("prod")) {
+			return;
 		}
+		captchaManager.verify(captchaId, captcha);
 	}
 }