From 867467ca597df48ccb115bf5836fd60d6bac4ca7 Mon Sep 17 00:00:00 2001 From: ljc Date: Fri, 27 Oct 2023 11:37:43 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dclickhouse?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=80=89=E4=B8=AD=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/clickhouse/ClickHouseDBManage.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/chat2db-server/chat2db-plugins/chat2db-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/ClickHouseDBManage.java b/chat2db-server/chat2db-plugins/chat2db-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/ClickHouseDBManage.java index 57bdcff9..94209052 100644 --- a/chat2db-server/chat2db-plugins/chat2db-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/ClickHouseDBManage.java +++ b/chat2db-server/chat2db-plugins/chat2db-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/ClickHouseDBManage.java @@ -4,10 +4,39 @@ import java.sql.Connection; import ai.chat2db.spi.DBManage; import ai.chat2db.spi.jdbc.DefaultDBManage; +import ai.chat2db.spi.sql.ConnectInfo; import ai.chat2db.spi.sql.SQLExecutor; +import org.apache.commons.lang3.StringUtils; + +import javax.net.ssl.HostnameVerifier; public class ClickHouseDBManage extends DefaultDBManage implements DBManage { + @Override + public Connection getConnection(ConnectInfo connectInfo) { + String url = setDatabaseInJdbcUrl(connectInfo); + connectInfo.setUrl(url); + + return super.getConnection(connectInfo); + } + + private String setDatabaseInJdbcUrl(ConnectInfo connectInfo) { + String databaseName; + String url = connectInfo.getUrl(); + if (StringUtils.isBlank((databaseName = connectInfo.getDatabaseName())) && StringUtils.isBlank((databaseName = connectInfo.getSchemaName()))) { + return url; + } + + String connectAddress = connectInfo.getHost() + ":" + connectInfo.getPort(); + String[] addressSplit = url.split(connectAddress); + String connectParams = addressSplit[1]; + if (connectParams.startsWith("/")) { + // 删除连接参数中的 / + connectParams = connectParams.substring(1); + } + // 添加数据库名 + return addressSplit[0] + connectAddress + "/" + databaseName + connectParams; + } @Override public void dropTable(Connection connection, String databaseName, String schemaName, String tableName) { From b89a4052e1a5b0f6a3b7fd72fe2806f42245e214 Mon Sep 17 00:00:00 2001 From: ljc Date: Sat, 28 Oct 2023 09:46:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E8=BF=9E=E6=8E=A5=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/api/param/datasource/DataSourceUpdateParam.java | 5 ++++- .../data/source/request/DataSourceUpdateRequest.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/datasource/DataSourceUpdateParam.java b/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/datasource/DataSourceUpdateParam.java index f565df8d..41558288 100644 --- a/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/datasource/DataSourceUpdateParam.java +++ b/chat2db-server/chat2db-server-domain/chat2db-server-domain-api/src/main/java/ai/chat2db/server/domain/api/param/datasource/DataSourceUpdateParam.java @@ -53,7 +53,10 @@ public class DataSourceUpdateParam { */ private String envType; - + /** + * 环境id + */ + private Integer environmentId; /** * host diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceUpdateRequest.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceUpdateRequest.java index dbc567ad..57a7e425 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceUpdateRequest.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/data/source/request/DataSourceUpdateRequest.java @@ -56,7 +56,10 @@ public class DataSourceUpdateRequest { */ private String envType; - + /** + * 环境id + */ + private Integer environmentId; /** * host