From 7eee3b9f02f7bd394e1d88faff41ee840e5d863b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 14 十一月 2022 11:17:04 +0800
Subject: [PATCH] 升级druid到最新版本1.2.14
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java | 3 ++-
pom.xml | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index f543e1c..f7280e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
- <druid.version>1.2.11</druid.version>
+ <druid.version>1.2.14</druid.version>
<bitwalker.version>1.21</bitwalker.version>
<swagger.version>3.0.0</swagger.version>
<kaptcha.version>2.3.2</kaptcha.version>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
index b3dee62..67269ff 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java
@@ -6,6 +6,7 @@
import java.util.Map;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
/**
* Entity基类
@@ -38,7 +39,7 @@
private String remark;
/** 请求参数 */
- @JsonIgnore
+ @JsonInclude(JsonInclude.Include.NON_EMPTY)
private Map<String, Object> params;
public String getSearchValue()
--
Gitblit v1.9.2