Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

 Conflicts:

	ruoyi-common/src/main/java/com/ruoyi/common/annotation/Excel.java

	ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java

	ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java

	ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/RepeatSubmitInterceptor.java

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

ruoyi-common/src/main/java/com/ruoyi/common/annotation/RepeatSubmit.java

@@ -20,10 +20,15 @@ import java.util.concurrent.TimeUnit;
 public @interface RepeatSubmit {
 
 	/**
-	 * 默认使用全局配置
+	 * 间隔时间(ms)，小于此时间视为重复提交
 	 */
-	int intervalTime() default 0;
+	int interval() default 5000;
 
 	TimeUnit timeUnit() default TimeUnit.MILLISECONDS;
 
+    /**
+     * 提示消息
+     */
+    String message() default "不允许重复提交，请稍后再试";
+
 }

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelHandlerAdapter.java

@@ -0,0 +1,19 @@
+package com.ruoyi.common.utils.poi;
+
+/**
+ * Excel数据格式处理适配器
+ * 
+ * @author ruoyi
+ */
+public interface ExcelHandlerAdapter
+{
+    /**
+     * 格式化
+     * 
+     * @param value 单元格数据值
+     * @param args excel注解args参数组
+     *
+     * @return 处理后的值
+     */
+    Object format(Object value, String[] args);
+}

ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java

@@ -146,7 +146,11 @@ public class LogAspect {
         if (paramsArray != null && paramsArray.length > 0) {
             for (Object o : paramsArray) {
                 if (StringUtils.isNotNull(o) && !isFilterObject(o)) {
-                    params.append(JsonUtils.toJsonString(o)).append(" ");
+                    try {
+                        params.append(JsonUtils.toJsonString(o)).append(" ");
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
                 }
             }
         }

ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java

@@ -62,5 +62,4 @@ public class RateLimiterAspect {
         stringBuffer.append(targetClass.getName()).append("-").append(method.getName());
         return stringBuffer.toString();
     }
-
 }