diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/CK.java b/core/core-backend/src/main/java/io/dataease/datasource/type/CK.java index e02ffb1cac..9c2f255ec3 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/CK.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/CK.java @@ -1,5 +1,6 @@ package io.dataease.datasource.type; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.dataease.exception.DEException; import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; @@ -31,6 +32,7 @@ public class CK extends DatasourceConfiguration { private String sslCert; private String sslKey; + @JsonIgnore private List ILLEGAL_PARAMETERS = Arrays.asList("jndi:", "rmi:", "ldap:", "ldaps:", "dns:", "nis:", "corba:", "java.naming.factory.initial", "java.naming.provider.url"); diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Db2.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Db2.java index bbb13e4657..cd5a09a5ab 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Db2.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Db2.java @@ -1,5 +1,6 @@ package io.dataease.datasource.type; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.dataease.exception.DEException; import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; @@ -14,6 +15,7 @@ import java.util.List; public class Db2 extends DatasourceConfiguration { private String driver = "com.ibm.db2.jcc.DB2Driver"; private String extraParams = ""; + @JsonIgnore private List illegalParameters = Arrays.asList( // 原有参数(如RMI相关) "java.naming.factory.initial", "java.naming.provider.url", "rmi", diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/H2.java b/core/core-backend/src/main/java/io/dataease/datasource/type/H2.java index ae91feb9e4..fdc5bf2e4d 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/H2.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/H2.java @@ -1,5 +1,6 @@ package io.dataease.datasource.type; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.dataease.exception.DEException; import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; @@ -29,6 +30,7 @@ public class H2 extends DatasourceConfiguration { return jdbc; } + @JsonIgnore private List getH2IllegalParameters() { return Arrays.asList("INIT", "RUNSCRIPT"); } diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Impala.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Impala.java index 3f2cb7ee76..d63078de96 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Impala.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Impala.java @@ -1,5 +1,6 @@ package io.dataease.datasource.type; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.dataease.exception.DEException; import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; @@ -16,6 +17,7 @@ import java.util.regex.Pattern; public class Impala extends DatasourceConfiguration { private String driver = "com.cloudera.impala.jdbc.Driver"; private String extraParams = ""; + @JsonIgnore private List illegalParameters = Arrays.asList( // 原有非法参数 "autoDeserialize", "queryInterceptors", "statementInterceptors", "detectCustomCollations", diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Mongo.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Mongo.java index c77dfaf747..f8445841fe 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Mongo.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Mongo.java @@ -1,5 +1,6 @@ package io.dataease.datasource.type; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.dataease.exception.DEException; import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; @@ -14,6 +15,7 @@ import java.util.List; public class Mongo extends DatasourceConfiguration { private String driver = "com.mysql.cj.jdbc.Driver"; private String extraParams = "characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true&zeroDateTimeBehavior=convertToNull"; + @JsonIgnore private List illegalParameters = Arrays.asList("autoDeserialize", "queryInterceptors", "statementInterceptors", "detectCustomCollations"); private List showTableSqls = Arrays.asList("show tables"); diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java index 4c50c30f8d..12bd0fbbcc 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Mysql.java @@ -1,5 +1,6 @@ package io.dataease.datasource.type; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.dataease.exception.DEException; import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; @@ -15,6 +16,7 @@ import java.util.List; public class Mysql extends DatasourceConfiguration { private String driver = "com.mysql.cj.jdbc.Driver"; private String extraParams = "characterEncoding=UTF-8&connectTimeout=5000&useSSL=false&allowPublicKeyRetrieval=true&zeroDateTimeBehavior=convertToNull"; + @JsonIgnore private List illegalParameters = Arrays.asList("maxAllowedPacket", "autoDeserialize", "queryInterceptors", "statementInterceptors", "detectCustomCollations", "allowloadlocalinfile", "allowUrlInLocalInfile", "allowLoadLocalInfileInPath", "allowMultiQueries"); private List showTableSqls = Arrays.asList("show tables"); diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Pg.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Pg.java index 7fceb12cb3..94220d124b 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Pg.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Pg.java @@ -1,5 +1,6 @@ package io.dataease.datasource.type; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.dataease.exception.DEException; import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; @@ -16,6 +17,7 @@ import java.util.regex.Pattern; public class Pg extends DatasourceConfiguration { private String driver = "org.postgresql.Driver"; private String extraParams = ""; + @JsonIgnore private List illegalParameters = Arrays.asList("socketFactory", "socketFactoryArg", "sslfactory", "sslhostnameverifier", "sslpasswordcallback", "authenticationPluginClassName"); public String getJdbc() { diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Redshift.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Redshift.java index 243bdb97fc..dc7770c23c 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Redshift.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Redshift.java @@ -1,5 +1,6 @@ package io.dataease.datasource.type; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.dataease.exception.DEException; import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; @@ -19,6 +20,7 @@ import static java.awt.SystemColor.info; public class Redshift extends DatasourceConfiguration { private String driver = "com.amazon.redshift.jdbc42.Driver"; private String extraParams = ""; + @JsonIgnore private List illegalParameters = Arrays.asList("socketFactory", "socketFactoryArg", "sslfactory", "sslhostnameverifier", "sslpasswordcallback", "authenticationPluginClassName", "IniFile"); public String getJdbc() { diff --git a/core/core-backend/src/main/java/io/dataease/datasource/type/Sqlserver.java b/core/core-backend/src/main/java/io/dataease/datasource/type/Sqlserver.java index 778b1168a0..a940c6f580 100644 --- a/core/core-backend/src/main/java/io/dataease/datasource/type/Sqlserver.java +++ b/core/core-backend/src/main/java/io/dataease/datasource/type/Sqlserver.java @@ -1,5 +1,6 @@ package io.dataease.datasource.type; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.dataease.exception.DEException; import io.dataease.extensions.datasource.vo.DatasourceConfiguration; import lombok.Data; @@ -16,6 +17,7 @@ import java.util.regex.Pattern; public class Sqlserver extends DatasourceConfiguration { private String driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; private String extraParams = ""; + @JsonIgnore private List illegalParameters = Arrays.asList("autoDeserialize", "queryInterceptors", "statementInterceptors", "detectCustomCollations", "jndi:", "rmi:", "ldap:", "ldaps:", "java.naming.factory.initial"); private List showTableSqls = Arrays.asList("show tables");