From 1abea043b46856531661e489d2ece9b935f53f6d Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 9 Jun 2025 14:47:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=BC=8F=E6=B4=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/datasource/type/Pg.java | 10 +++++----- .../java/io/dataease/datasource/type/Redshift.java | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) 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 6b16a25cef..5ac3ff9978 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 @@ -15,10 +15,10 @@ import java.util.List; public class Pg extends DatasourceConfiguration { private String driver = "org.postgresql.Driver"; private String extraParams = ""; - private List illegalParameters = Arrays.asList("socketFactory", "socketFactoryArg"); + private List illegalParameters = Arrays.asList("socketFactory", "socketFactoryArg", "sslfactory", "sslhostnameverifier", "sslpasswordcallback", "authenticationPluginClassName"); public String getJdbc() { - if(StringUtils.isNoneEmpty(getUrlType()) && !getUrlType().equalsIgnoreCase("hostName")){ + if (StringUtils.isNoneEmpty(getUrlType()) && !getUrlType().equalsIgnoreCase("hostName")) { for (String illegalParameter : illegalParameters) { if (URLDecoder.decode(getJdbcUrl()).contains(illegalParameter)) { DEException.throwException("Illegal parameter: " + illegalParameter); @@ -27,9 +27,9 @@ public class Pg extends DatasourceConfiguration { return getJdbcUrl(); } String jdbcUrl = ""; - if(StringUtils.isEmpty(extraParams.trim())){ + if (StringUtils.isEmpty(extraParams.trim())) { if (StringUtils.isEmpty(getSchema())) { - jdbcUrl = "jdbc:postgresql://HOSTNAME:PORT/DATABASE" + jdbcUrl = "jdbc:postgresql://HOSTNAME:PORT/DATABASE" .replace("HOSTNAME", getLHost().trim()) .replace("PORT", getLPort().toString().trim()) .replace("DATABASE", getDataBase().trim()); @@ -40,7 +40,7 @@ public class Pg extends DatasourceConfiguration { .replace("DATABASE", getDataBase().trim()) .replace("SCHEMA", getSchema().trim()); } - }else { + } else { jdbcUrl = "jdbc:postgresql://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS" .replace("HOSTNAME", getLHost().trim()) .replace("PORT", getLPort().toString().trim()) 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 75779a662c..ab6e2b4cc5 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 @@ -15,10 +15,10 @@ import java.util.List; public class Redshift extends DatasourceConfiguration { private String driver = "com.amazon.redshift.jdbc42.Driver"; private String extraParams = ""; - private List illegalParameters = Arrays.asList("socketFactory", "socketFactoryArg"); + private List illegalParameters = Arrays.asList("socketFactory", "socketFactoryArg", "sslfactory", "sslhostnameverifier", "sslpasswordcallback", "authenticationPluginClassName"); public String getJdbc() { - if(StringUtils.isNoneEmpty(getUrlType()) && !getUrlType().equalsIgnoreCase("hostName")){ + if (StringUtils.isNoneEmpty(getUrlType()) && !getUrlType().equalsIgnoreCase("hostName")) { for (String illegalParameter : illegalParameters) { if (URLDecoder.decode(getJdbcUrl()).contains(illegalParameter)) { DEException.throwException("Illegal parameter: " + illegalParameter); @@ -26,7 +26,7 @@ public class Redshift extends DatasourceConfiguration { } return getJdbcUrl(); } - String jdbcUrl = "jdbc:redshift://HOSTNAME:PORT/DATABASE" + String jdbcUrl = "jdbc:redshift://HOSTNAME:PORT/DATABASE" .replace("HOSTNAME", getLHost().trim()) .replace("PORT", getLPort().toString().trim()) .replace("DATABASE", getDataBase().trim());