From 4902276921c1df0485ee4f6f970bb977acc04541 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?= <15040126243@163.com> Date: Fri, 22 Apr 2022 12:07:32 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=A7=BB=E9=99=A4=20=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E6=8F=90=E4=BA=A4=20=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=85=A8=E5=B1=80=E9=85=8D=E7=BD=AE=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E6=B3=A8=E8=A7=A3=E9=BB=98=E8=AE=A4=E5=80=BC=E6=9B=BF?= =?UTF-8?q?=E4=BB=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 5 ----- .../framework/aspectj/RepeatSubmitAspect.java | 5 +---- .../properties/RepeatSubmitProperties.java | 22 ------------------- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RepeatSubmitProperties.java diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 3d84371fe..db983f2b8 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -149,11 +149,6 @@ security: - /actuator - /actuator/** -# 重复提交 -repeat-submit: - # 全局间隔时间(毫秒) - interval: 5000 - # MyBatisPlus配置 # https://baomidou.com/config/ mybatis-plus: diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java index d0422e9d7..aedc4431c 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java @@ -12,7 +12,6 @@ import com.ruoyi.common.utils.MessageUtils; import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.redis.RedisUtils; -import com.ruoyi.framework.config.properties.RepeatSubmitProperties; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; @@ -43,12 +42,10 @@ public class RepeatSubmitAspect { private static final ThreadLocal KEY_CACHE = new ThreadLocal<>(); - private final RepeatSubmitProperties repeatSubmitProperties; - @Before("@annotation(repeatSubmit)") public void doBefore(JoinPoint point, RepeatSubmit repeatSubmit) throws Throwable { // 如果注解不为0 则使用注解数值 - long interval = repeatSubmitProperties.getInterval(); + long interval = 0; if (repeatSubmit.interval() > 0) { interval = repeatSubmit.timeUnit().toMillis(repeatSubmit.interval()); } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RepeatSubmitProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RepeatSubmitProperties.java deleted file mode 100644 index fa65b28c3..000000000 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/RepeatSubmitProperties.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.ruoyi.framework.config.properties; - -import lombok.Data; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * 重复提交 配置属性 - * - * @author Lion Li - */ -@Data -@Component -@ConfigurationProperties(prefix = "repeat-submit") -public class RepeatSubmitProperties { - - /** - * 间隔时间(毫秒) - */ - private int interval; - -}