Skip to content

Commit eed7801

Browse files
Chat2DB-ProChat2DB-Pro
committed
Driver configuration is configured through json,
Support driver attribute configuration.
1 parent 12c1c46 commit eed7801

75 files changed

Lines changed: 859 additions & 467 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎chat2db-server/chat2db-plugins/chat2db-clickhouse/pom.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,18 @@
1717
</dependency>
1818
</dependencies>
1919
<artifactId>chat2db-clickhouse</artifactId>
20+
<build>
21+
<resources>
22+
<resource>
23+
<directory>src/main/java</directory>
24+
<includes>
25+
<!--properties的配置文件会和编译后的class文件放在一起-->
26+
<include>**/*.json</include>
27+
</includes>
28+
</resource>
29+
<resource>
30+
<directory>src/main/resources</directory>
31+
</resource>
32+
</resources>
33+
</build>
2034
</project>

‎chat2db-server/chat2db-plugins/chat2db-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/ClickHousePlugin.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
package ai.chat2db.plugin.clickhouse;
22

33

4-
import ai.chat2db.plugin.clickhouse.builder.DBConfigBuilder;
54
import ai.chat2db.spi.DBManage;
65
import ai.chat2db.spi.MetaData;
76
import ai.chat2db.spi.Plugin;
87
import ai.chat2db.spi.config.DBConfig;
8+
import ai.chat2db.spi.util.FileUtils;
99

1010
public class ClickHousePlugin implements Plugin {
1111
@Override
1212
public DBConfig getDBConfig() {
13-
return DBConfigBuilder.buildDBConfig();
13+
return FileUtils.readJsonValue(this.getClass(),"clickhouse.json", DBConfig.class);
1414
}
1515

1616
@Override

‎chat2db-server/chat2db-plugins/chat2db-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/builder/DBConfigBuilder.java‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎chat2db-server/chat2db-plugins/chat2db-clickhouse/src/main/java/ai/chat2db/plugin/clickhouse/clickhouse.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"dbType": "CLICKHOUSE",
3+
"driverConfigList": [
4+
{
5+
"url": "jdbc:clickhouse://localhost:8123/",
6+
"defaultDriver": true,
7+
"custom": false,
8+
"downloadJdbcDriverUrls": [
9+
"https://oss.sqlgpt.cn/lib/clickhouse-jdbc-0.3.2-patch8-http.jar"
10+
],
11+
"jdbcDriver": "clickhouse-jdbc-0.3.2-patch8-http.jar",
12+
"jdbcDriverClass": "com.clickhouse.jdbc.ClickHouseDriver"
13+
}
14+
],
15+
"name": "ClickHouse"
16+
}

‎chat2db-server/chat2db-plugins/chat2db-db2/pom.xml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,18 @@
1717
</dependency>
1818
</dependencies>
1919
<artifactId>chat2db-db2</artifactId>
20-
20+
<build>
21+
<resources>
22+
<resource>
23+
<directory>src/main/java</directory>
24+
<includes>
25+
<!--properties的配置文件会和编译后的class文件放在一起-->
26+
<include>**/*.json</include>
27+
</includes>
28+
</resource>
29+
<resource>
30+
<directory>src/main/resources</directory>
31+
</resource>
32+
</resources>
33+
</build>
2134
</project>

‎chat2db-server/chat2db-plugins/chat2db-db2/src/main/java/ai/chat2db/plugin/db2/DB2Plugin.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package ai.chat2db.plugin.db2;
22

3-
import ai.chat2db.plugin.db2.builder.DBConfigBuilder;
43
import ai.chat2db.spi.DBManage;
54
import ai.chat2db.spi.MetaData;
65
import ai.chat2db.spi.Plugin;
76
import ai.chat2db.spi.config.DBConfig;
7+
import ai.chat2db.spi.util.FileUtils;
88

99
public class DB2Plugin implements Plugin {
1010
@Override
1111
public DBConfig getDBConfig() {
12-
return DBConfigBuilder.buildDBConfig();
12+
return FileUtils.readJsonValue(this.getClass(),"db2.json", DBConfig.class);
13+
1314
}
1415

1516
@Override

‎chat2db-server/chat2db-plugins/chat2db-db2/src/main/java/ai/chat2db/plugin/db2/builder/DBConfigBuilder.java‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎chat2db-server/chat2db-plugins/chat2db-db2/src/main/java/ai/chat2db/plugin/db2/db2.json‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"dbType": "DB2",
3+
"driverConfigList": [
4+
{
5+
"url": "jdbc:db2://localhost:50000/",
6+
"defaultDriver": true,
7+
"custom": false,
8+
"downloadJdbcDriverUrls": [
9+
"https://oss.sqlgpt.cn/lib/db2jcc4_4.26.14.jar"
10+
],
11+
"jdbcDriver": "db2jcc4_4.26.14.jar",
12+
"jdbcDriverClass": "com.ibm.db2.jcc.DB2Driver"
13+
}
14+
],
15+
"name": "DB2"
16+
}

‎chat2db-server/chat2db-plugins/chat2db-dm/pom.xml‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,18 @@
1818
</dependencies>
1919

2020
<artifactId>chat2db-dm</artifactId>
21-
21+
<build>
22+
<resources>
23+
<resource>
24+
<directory>src/main/java</directory>
25+
<includes>
26+
<!--properties的配置文件会和编译后的class文件放在一起-->
27+
<include>**/*.json</include>
28+
</includes>
29+
</resource>
30+
<resource>
31+
<directory>src/main/resources</directory>
32+
</resource>
33+
</resources>
34+
</build>
2235
</project>

‎chat2db-server/chat2db-plugins/chat2db-dm/src/main/java/ai/chat2db/plugin/dm/DMPlugin.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package ai.chat2db.plugin.dm;
22

3-
import ai.chat2db.plugin.dm.builder.DBConfigBuilder;
43
import ai.chat2db.spi.DBManage;
54
import ai.chat2db.spi.MetaData;
65
import ai.chat2db.spi.Plugin;
76
import ai.chat2db.spi.config.DBConfig;
7+
import ai.chat2db.spi.util.FileUtils;
88

99
public class DMPlugin implements Plugin {
1010
@Override
1111
public DBConfig getDBConfig() {
12-
return DBConfigBuilder.buildDBConfig();
12+
return FileUtils.readJsonValue(this.getClass(),"dm.json", DBConfig.class);
13+
1314
}
1415

1516
@Override

0 commit comments

Comments
 (0)