Browse Source

update properties

RuoYi 5 days ago
parent
commit
baeba9a3bd

+ 1 - 1
pom.xml

@@ -26,7 +26,7 @@
         <swagger.version>3.0.0</swagger.version>
         <pagehelper.boot.version>1.4.7</pagehelper.boot.version>
         <fastjson.version>1.2.83</fastjson.version>
-        <oshi.version>6.6.5</oshi.version>
+        <oshi.version>6.8.1</oshi.version>
         <commons.io.version>2.16.1</commons.io.version>
         <poi.version>4.1.2</poi.version>
         <velocity.version>2.3</velocity.version>

+ 1 - 1
ruoyi-admin/src/main/resources/application.yml

@@ -139,7 +139,7 @@ xss:
 # 防止csrf攻击
 csrf:
   # 过滤开关
-  enabled: true
+  enabled: false
   # 白名单(多个用逗号分隔)
   whites: /druid
 

+ 1 - 1
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";
 

+ 5 - 0
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);