From 0375fd319c9f3b08d255c814cb0f8521d8ec641b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 18 八月 2021 11:11:24 +0800
Subject: [PATCH] !78 同步dev分支 Merge pull request !78 from 疯狂的狮子Li/dev
---
ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java | 164 ++++++++++++++++++++++++------------------------------
1 files changed, 73 insertions(+), 91 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
index bc09231..d9b3464 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java
@@ -1,15 +1,19 @@
package com.ruoyi.framework.interceptor.impl;
+import cn.hutool.core.convert.Convert;
import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.lang.Validator;
+import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.filter.RepeatedlyRequestWrapper;
import com.ruoyi.common.utils.JsonUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.framework.config.properties.RepeatSubmitProperties;
+import com.ruoyi.framework.config.properties.TokenProperties;
import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import javax.servlet.http.HttpServletRequest;
@@ -20,45 +24,34 @@
/**
* 鍒ゆ柇璇锋眰url鍜屾暟鎹槸鍚﹀拰涓婁竴娆＄浉鍚岋紝
- * 濡傛灉鍜屼笂娆＄浉鍚岋紝鍒欐槸閲嶅鎻愪氦琛ㄥ崟銆� 鏈夋晥鏃堕棿涓�10绉掑唴銆�
+ * 濡傛灉鍜屼笂娆＄浉鍚岋紝鍒欐槸閲嶅鎻愪氦琛ㄥ崟銆�
*
- * @author ruoyi
+ * @author Lion Li
*/
@Slf4j
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
@Component
-public class SameUrlDataInterceptor extends RepeatSubmitInterceptor
-{
- public final String REPEAT_PARAMS = "repeatParams";
+public class SameUrlDataInterceptor extends RepeatSubmitInterceptor {
+ public final String REPEAT_PARAMS = "repeatParams";
- public final String REPEAT_TIME = "repeatTime";
+ public final String REPEAT_TIME = "repeatTime";
- // 浠ょ墝鑷畾涔夋爣璇�
- @Value("${token.header}")
- private String header;
+ private final TokenProperties tokenProperties;
+ private final RepeatSubmitProperties repeatSubmitProperties;
+ private final RedisCache redisCache;
- @Autowired
- private RedisCache redisCache;
- /**
- * 闂撮殧鏃堕棿锛屽崟浣�:绉� 榛樿10绉�
- *
- * 涓ゆ鐩稿悓鍙傛暟鐨勮姹傦紝濡傛灉闂撮殧鏃堕棿澶т簬璇ュ弬鏁帮紝绯荤粺涓嶄細璁ゅ畾涓洪噸澶嶆彁浜ょ殑鏁版嵁
- */
- private int intervalTime = 10;
-
- public void setIntervalTime(int intervalTime)
- {
- this.intervalTime = intervalTime;
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public boolean isRepeatSubmit(HttpServletRequest request)
- {
- String nowParams = "";
- if (request instanceof RepeatedlyRequestWrapper)
- {
- RepeatedlyRequestWrapper repeatedlyRequest = (RepeatedlyRequestWrapper) request;
+ @SuppressWarnings("unchecked")
+ @Override
+ public boolean isRepeatSubmit(RepeatSubmit repeatSubmit, HttpServletRequest request) {
+ // 濡傛灉娉ㄨВ涓嶄负0 鍒欎娇鐢ㄦ敞瑙ｆ暟鍊�
+ long intervalTime = repeatSubmitProperties.getIntervalTime();
+ if (repeatSubmit.intervalTime() > 0) {
+ intervalTime = repeatSubmit.timeUnit().toMillis(repeatSubmit.intervalTime());
+ }
+ String nowParams = "";
+ if (request instanceof RepeatedlyRequestWrapper) {
+ RepeatedlyRequestWrapper repeatedlyRequest = (RepeatedlyRequestWrapper) request;
try {
nowParams = IoUtil.readUtf8(repeatedlyRequest.getInputStream());
} catch (IOException e) {
@@ -66,68 +59,57 @@
}
}
- // body鍙傛暟涓虹┖锛岃幏鍙朠arameter鐨勬暟鎹�
- if (Validator.isEmpty(nowParams))
- {
- nowParams = JsonUtils.toJsonString(request.getParameterMap());
- }
- Map<String, Object> nowDataMap = new HashMap<String, Object>();
- nowDataMap.put(REPEAT_PARAMS, nowParams);
- nowDataMap.put(REPEAT_TIME, System.currentTimeMillis());
+ // body鍙傛暟涓虹┖锛岃幏鍙朠arameter鐨勬暟鎹�
+ if (StringUtils.isEmpty(nowParams)) {
+ nowParams = JsonUtils.toJsonString(request.getParameterMap());
+ }
+ Map<String, Object> nowDataMap = new HashMap<String, Object>();
+ nowDataMap.put(REPEAT_PARAMS, nowParams);
+ nowDataMap.put(REPEAT_TIME, System.currentTimeMillis());
- // 璇锋眰鍦板潃锛堜綔涓哄瓨鏀綾ache鐨刱ey鍊硷級
- String url = request.getRequestURI();
+ // 璇锋眰鍦板潃锛堜綔涓哄瓨鏀綾ache鐨刱ey鍊硷級
+ String url = request.getRequestURI();
- // 鍞竴鍊硷紙娌℃湁娑堟伅澶村垯浣跨敤璇锋眰鍦板潃锛�
- String submitKey = request.getHeader(header);
- if (Validator.isEmpty(submitKey))
- {
- submitKey = url;
- }
+ // 鍞竴鍊硷紙娌℃湁娑堟伅澶村垯浣跨敤璇锋眰鍦板潃锛�
+ String submitKey = request.getHeader(tokenProperties.getHeader());
+ if (StringUtils.isEmpty(submitKey)) {
+ submitKey = url;
+ }
- // 鍞竴鏍囪瘑锛堟寚瀹歬ey + 娑堟伅澶达級
- String cacheRepeatKey = Constants.REPEAT_SUBMIT_KEY + submitKey;
+ // 鍞竴鏍囪瘑锛堟寚瀹歬ey + 娑堟伅澶达級
+ String cacheRepeatKey = Constants.REPEAT_SUBMIT_KEY + submitKey;
- Object sessionObj = redisCache.getCacheObject(cacheRepeatKey);
- if (sessionObj != null)
- {
- Map<String, Object> sessionMap = (Map<String, Object>) sessionObj;
- if (sessionMap.containsKey(url))
- {
- Map<String, Object> preDataMap = (Map<String, Object>) sessionMap.get(url);
- if (compareParams(nowDataMap, preDataMap) && compareTime(nowDataMap, preDataMap))
- {
- return true;
- }
- }
- }
- Map<String, Object> cacheMap = new HashMap<String, Object>();
- cacheMap.put(url, nowDataMap);
- redisCache.setCacheObject(cacheRepeatKey, cacheMap, intervalTime, TimeUnit.SECONDS);
- return false;
- }
+ Object sessionObj = redisCache.getCacheObject(cacheRepeatKey);
+ if (sessionObj != null) {
+ Map<String, Object> sessionMap = (Map<String, Object>) sessionObj;
+ if (sessionMap.containsKey(url)) {
+ Map<String, Object> preDataMap = (Map<String, Object>) sessionMap.get(url);
+ if (compareParams(nowDataMap, preDataMap) && compareTime(nowDataMap, preDataMap, intervalTime)) {
+ return true;
+ }
+ }
+ }
+ Map<String, Object> cacheMap = new HashMap<String, Object>();
+ cacheMap.put(url, nowDataMap);
+ redisCache.setCacheObject(cacheRepeatKey, cacheMap, Convert.toInt(intervalTime), TimeUnit.MILLISECONDS);
+ return false;
+ }
- /**
- * 鍒ゆ柇鍙傛暟鏄惁鐩稿悓
- */
- private boolean compareParams(Map<String, Object> nowMap, Map<String, Object> preMap)
- {
- String nowParams = (String) nowMap.get(REPEAT_PARAMS);
- String preParams = (String) preMap.get(REPEAT_PARAMS);
- return nowParams.equals(preParams);
- }
+ /**
+ * 鍒ゆ柇鍙傛暟鏄惁鐩稿悓
+ */
+ private boolean compareParams(Map<String, Object> nowMap, Map<String, Object> preMap) {
+ String nowParams = (String) nowMap.get(REPEAT_PARAMS);
+ String preParams = (String) preMap.get(REPEAT_PARAMS);
+ return nowParams.equals(preParams);
+ }
- /**
- * 鍒ゆ柇涓ゆ闂撮殧鏃堕棿
- */
- private boolean compareTime(Map<String, Object> nowMap, Map<String, Object> preMap)
- {
- long time1 = (Long) nowMap.get(REPEAT_TIME);
- long time2 = (Long) preMap.get(REPEAT_TIME);
- if ((time1 - time2) < (this.intervalTime * 1000))
- {
- return true;
- }
- return false;
- }
+ /**
+ * 鍒ゆ柇涓ゆ闂撮殧鏃堕棿
+ */
+ private boolean compareTime(Map<String, Object> nowMap, Map<String, Object> preMap, long intervalTime) {
+ long time1 = (Long) nowMap.get(REPEAT_TIME);
+ long time2 = (Long) preMap.get(REPEAT_TIME);
+ return (time1 - time2) < intervalTime;
+ }
}
--
Gitblit v1.9.3