From fe98fba5b51ae4f1ef62cbdbd9b6a8ec20e8e623 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期二, 12 七月 2022 18:01:56 +0800
Subject: [PATCH] !527 调增数组格式声明，random随机转换修正 Merge pull request !527 from 靖少毅/jsy20220705
---
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
index bce2f3f..05fff7b 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java
@@ -5,19 +5,19 @@
import javax.servlet.http.HttpServletResponse;
import org.springframework.stereotype.Component;
import org.springframework.web.method.HandlerMethod;
-import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
-import com.alibaba.fastjson.JSONObject;
+import org.springframework.web.servlet.HandlerInterceptor;
+import com.alibaba.fastjson2.JSON;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.ServletUtils;
/**
* 防止重复提交拦截器
- *
+ *
* @author ruoyi
*/
@Component
-public abstract class RepeatSubmitInterceptor extends HandlerInterceptorAdapter
+public abstract class RepeatSubmitInterceptor implements HandlerInterceptor
{
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception
@@ -29,10 +29,10 @@
RepeatSubmit annotation = method.getAnnotation(RepeatSubmit.class);
if (annotation != null)
{
- if (this.isRepeatSubmit(request))
+ if (this.isRepeatSubmit(request, annotation))
{
- AjaxResult ajaxResult = AjaxResult.error("不允许重复提交，请稍后再试");
- ServletUtils.renderString(response, JSONObject.toJSONString(ajaxResult));
+ AjaxResult ajaxResult = AjaxResult.error(annotation.message());
+ ServletUtils.renderString(response, JSON.toJSONString(ajaxResult));
return false;
}
}
@@ -40,16 +40,16 @@
}
else
{
- return super.preHandle(request, response, handler);
+ return true;
}
}
/**
* 验证是否重复提交由子类实现具体的防重复提交的规则
- *
- * @param httpServletRequest
+ *
+ * @param request
* @return
* @throws Exception
*/
- public abstract boolean isRepeatSubmit(HttpServletRequest request);
+ public abstract boolean isRepeatSubmit(HttpServletRequest request, RepeatSubmit annotation);
}
--
Gitblit v1.9.2