Просмотр исходного кода

升级druid到最新版本1.2.14

RuoYi лет назад: 3
Родитель
Сommit
6e5d7a6dab

+ 1 - 1
pom.xml

@@ -27,7 +27,7 @@
27
         <tobato.version>1.27.2</tobato.version>
27
         <tobato.version>1.27.2</tobato.version>
28
         <kaptcha.version>2.3.2</kaptcha.version>
28
         <kaptcha.version>2.3.2</kaptcha.version>
29
         <pagehelper.boot.version>1.4.5</pagehelper.boot.version>
29
         <pagehelper.boot.version>1.4.5</pagehelper.boot.version>
30
-        <druid.version>1.2.12</druid.version>
30
+        <druid.version>1.2.14</druid.version>
31
         <dynamic-ds.version>3.5.2</dynamic-ds.version>
31
         <dynamic-ds.version>3.5.2</dynamic-ds.version>
32
         <commons.io.version>2.11.0</commons.io.version>
32
         <commons.io.version>2.11.0</commons.io.version>
33
         <commons.fileupload.version>1.4</commons.fileupload.version>
33
         <commons.fileupload.version>1.4</commons.fileupload.version>

+ 2 - 1
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/domain/BaseEntity.java

@@ -6,6 +6,7 @@ import java.util.HashMap;
6
 import java.util.Map;
6
 import java.util.Map;
7
 import com.fasterxml.jackson.annotation.JsonFormat;
7
 import com.fasterxml.jackson.annotation.JsonFormat;
8
 import com.fasterxml.jackson.annotation.JsonIgnore;
8
 import com.fasterxml.jackson.annotation.JsonIgnore;
9
+import com.fasterxml.jackson.annotation.JsonInclude;
9
 
10
 
10
 /**
11
 /**
11
  * Entity基类
12
  * Entity基类
@@ -38,7 +39,7 @@ public class BaseEntity implements Serializable
38
     private String remark;
39
     private String remark;
39
 
40
 
40
     /** 请求参数 */
41
     /** 请求参数 */
41
-    @JsonIgnore
42
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
42
     private Map<String, Object> params;
43
     private Map<String, Object> params;
43
 
44
 
44
     public String getSearchValue()
45
     public String getSearchValue()