diff --git a/backend/pom.xml b/backend/pom.xml
index 160cf502c7..e637cc3138 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -6,7 +6,7 @@
dataease-server
io.dataease
- 1.15.0
+ 1.16.0
4.0.0
@@ -205,7 +205,7 @@
io.dataease
dataease-plugin-interface
- 1.15.0
+ 1.16.0
guava
@@ -216,12 +216,12 @@
io.dataease
dataease-plugin-view
- 1.15.0
+ 1.16.0
io.dataease
dataease-plugin-datasource
- 1.15.0
+ 1.16.0
diff --git a/backend/src/main/java/io/dataease/dto/datasource/MysqlConfiguration.java b/backend/src/main/java/io/dataease/dto/datasource/MysqlConfiguration.java
index 7c0378ace3..6a22b778f0 100644
--- a/backend/src/main/java/io/dataease/dto/datasource/MysqlConfiguration.java
+++ b/backend/src/main/java/io/dataease/dto/datasource/MysqlConfiguration.java
@@ -5,20 +5,30 @@ import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
+import java.util.Arrays;
+import java.util.List;
+
@Getter
@Setter
public class MysqlConfiguration extends JdbcConfiguration {
private String driver = "com.mysql.jdbc.Driver";
private String extraParams = "characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true&zeroDateTimeBehavior=convertToNull";
+ private List illegalParameters = Arrays.asList("autoDeserialize", "queryInterceptors", "statementInterceptors", "detectCustomCollations");
public String getJdbc() {
- if(StringUtils.isEmpty(extraParams.trim())){
+ if (StringUtils.isEmpty(extraParams.trim())) {
return "jdbc:mysql://HOSTNAME:PORT/DATABASE"
.replace("HOSTNAME", getHost().trim())
.replace("PORT", getPort().toString().trim())
.replace("DATABASE", getDataBase().trim());
- }else {
+ } else {
+ for (String illegalParameter : illegalParameters) {
+ if (getExtraParams().contains(illegalParameter)) {
+ throw new RuntimeException("Illegal parameter: " + illegalParameter);
+ }
+ }
+
return "jdbc:mysql://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS"
.replace("HOSTNAME", getHost().trim())
.replace("PORT", getPort().toString().trim())
diff --git a/frontend/package.json b/frontend/package.json
index a383baf274..e028ed0a97 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
{
"name": "dataease",
- "version": "1.15.0",
+ "version": "1.16.0",
"description": "dataease front",
"private": true,
"scripts": {
diff --git a/frontend/pom.xml b/frontend/pom.xml
index 633db6097d..b4c0df5188 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -6,7 +6,7 @@
dataease-server
io.dataease
- 1.15.0
+ 1.16.0
4.0.0
diff --git a/mobile/package.json b/mobile/package.json
index dbf3645e3a..7dfb130271 100644
--- a/mobile/package.json
+++ b/mobile/package.json
@@ -1,6 +1,6 @@
{
"name": "dataease-mobile",
- "version": "1.15.0",
+ "version": "1.16.0",
"private": true,
"scripts": {
"serve": "npm run dev:h5",
diff --git a/mobile/pom.xml b/mobile/pom.xml
index c7bc8f1d80..d171907ce1 100644
--- a/mobile/pom.xml
+++ b/mobile/pom.xml
@@ -6,7 +6,7 @@
dataease-server
io.dataease
- 1.15.0
+ 1.16.0
4.0.0
diff --git a/pom.xml b/pom.xml
index 7797515123..2f824748d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
4.0.0
io.dataease
dataease-server
- 1.15.0
+ 1.16.0
pom