From 568c600c90fcda91dc7f10de0ae87a978d2554c4 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Wed, 31 Mar 2021 15:20:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=8F=90=E4=BA=A4=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8@Before=E6=B3=A8=E8=A7=A3->=E8=BF=98=E9=9C=80=E8=A6=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20=E6=9C=AC=E5=9C=B0=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8D=E4=BA=86=20=E5=88=86=E5=B8=83?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/tools/aop/NoRepeatSubmitAop.java  | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java
index f887dd1aab..7dfbd88a75 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/aop/NoRepeatSubmitAop.java
@@ -6,9 +6,10 @@ import com.epmet.commons.tools.exception.RenException;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 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.aspectj.lang.annotation.Pointcut;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
@@ -32,13 +33,18 @@ public class NoRepeatSubmitAop {
 	 */
 	private static final Cache<String, Integer> CACHES = CacheBuilder.newBuilder()
 			// 最大缓存 100 个
-			.maximumSize(1000)
+			.maximumSize(100)
 			// 设置写缓存后 5 秒钟过期
 			.expireAfterWrite(5, TimeUnit.SECONDS)
 			.build();
 
-	@Around("execution(public * com.epmet..*Controller.*(..)) && @annotation(com.epmet.commons.tools.aop.NoRepeatSubmit)")
-	public Object around(ProceedingJoinPoint pjp) {
+	@Pointcut("@annotation(com.epmet.commons.tools.aop.NoRepeatSubmit)")
+	public void doAspect() {
+
+	}
+
+	@Before("doAspect()")
+	public void around(JoinPoint pjp) {
 		try {
 			ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
 			assert attributes != null;
@@ -46,9 +52,7 @@ public class NoRepeatSubmitAop {
 			String key = getKey(request.getRequestURI(), pjp.getArgs());
 			// 如果缓存中有这个url视为重复提交
 			if (CACHES.getIfPresent(key) == null) {
-				Object o = pjp.proceed();
 				CACHES.put(key, NumConstant.ZERO);
-				return o;
 			} else {
 				log.error("重复提交");
 				throw new RenException(EpmetErrorCode.REPEATED_SUBMIT_ERROR.getCode());
@@ -59,7 +63,6 @@ public class NoRepeatSubmitAop {
 			log.error("验证重复提交时出现未知异常!");
 			throw  new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
 		}
-
 	}
 
 	private String getKey(String keyExpress, Object[] args) {