diff --git a/pom.xml b/pom.xml
index 9e7ce6ff5..20cfa39a1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
3.0.0
1.4.7
1.2.83
- 6.6.5
+ 6.8.1
2.16.1
4.1.2
2.3
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index b4bf1e0c8..f04220706 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -139,7 +139,7 @@ xss:
# 防止csrf攻击
csrf:
# 过滤开关
- enabled: true
+ enabled: false
# 白名单(多个用逗号分隔)
whites: /druid
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java
index 5b1a6bfec..4e191908c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/ShiroConstants.java
@@ -33,7 +33,7 @@ public class ShiroConstants
public static final String ERROR = "errorMsg";
/**
- * csrf meta content
+ * csrf session content
*/
public static final String CSRF_TOKEN = "csrf_token";
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
index b19953e06..564615f39 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/reflect/ReflectUtils.java
@@ -6,6 +6,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
+import java.math.BigDecimal;
import java.util.Date;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.Validate;
@@ -208,6 +209,10 @@ public class ReflectUtils
{
args[i] = Convert.toBool(args[i]);
}
+ else if (cs[i] == BigDecimal.class)
+ {
+ args[i] = Convert.toBigDecimal(args[i]);
+ }
}
}
return (E) method.invoke(obj, args);