Merge remote-tracking branch 'origin/dev'

疯狂的狮子li

2021-06-23 c12dc71ecea33d5c23e2ceb32bfc3db68e4198e3

 ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/impl/SameUrlDataInterceptor.java

@@ -1,17 +1,19 @@
package com.ruoyi.framework.interceptor.impl;



import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Validator;

import com.alibaba.fastjson.JSONObject;

import com.ruoyi.common.constant.Constants;

import com.ruoyi.common.core.redis.RedisCache;

import com.ruoyi.common.filter.RepeatedlyRequestWrapper;

import com.ruoyi.common.utils.http.HttpHelper;

import com.ruoyi.common.utils.JsonUtils;
import com.ruoyi.framework.interceptor.RepeatSubmitInterceptor;

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;

import java.io.IOException;
import java.util.HashMap;

import java.util.Map;

import java.util.concurrent.TimeUnit;

@@ -22,6 +24,7 @@
 * 

 * @author ruoyi

 */

@Slf4j
@Component

public class SameUrlDataInterceptor extends RepeatSubmitInterceptor

{

@@ -56,13 +59,17 @@
        if (request instanceof RepeatedlyRequestWrapper)

        {

            RepeatedlyRequestWrapper repeatedlyRequest = (RepeatedlyRequestWrapper) request;

            nowParams = HttpHelper.getBodyString(repeatedlyRequest);

         try {
            nowParams = IoUtil.readUtf8(repeatedlyRequest.getInputStream());
         } catch (IOException e) {
            log.warn("读取流出现问题！");
         }
        }



        // body参数为空，获取Parameter的数据

        if (Validator.isEmpty(nowParams))

        {

            nowParams = JSONObject.toJSONString(request.getParameterMap());

            nowParams = JsonUtils.toJsonString(request.getParameterMap());
        }

        Map<String, Object> nowDataMap = new HashMap<String, Object>();

        nowDataMap.put(REPEAT_PARAMS, nowParams);