feature: clickhouse add config

5 files changed, 17 insertions, 3 deletions

diff --git a/platform-base/src/main/java/com/zdjizhi/base/common/CommonConfig.java b/platform-base/src/main/java/com/zdjizhi/base/common/CommonConfig.java
index 6cd3557..323488a 100644
--- a/platform-base/src/main/java/com/zdjizhi/base/common/CommonConfig.java
+++ b/platform-base/src/main/java/com/zdjizhi/base/common/CommonConfig.java
@@ -257,6 +257,14 @@ public class CommonConfig {
             .durationType()
             .defaultValue(Duration.ofSeconds(30));
 
+    public static final ConfigOption<Integer> CLICKHOUSE_CONNECT_TIMEOUT = ConfigOptions.key("clickhouse.connect.timeout")
+            .intType()
+            .defaultValue(30);
+
+    public static final ConfigOption<Integer> CLICKHOUSE_QUERY_TIMEOUT = ConfigOptions.key("clickhouse.query.timeout")
+            .intType()
+            .defaultValue(300);
+
     public static final ConfigOption<String> CLICKHOUSE_USERNAME = ConfigOptions.key("clickhouse.user")
             .stringType()
             .defaultValue("default");
diff --git a/platform-base/src/main/java/com/zdjizhi/base/sink/clickhouse/ClickHouseTableFactory.java b/platform-base/src/main/java/com/zdjizhi/base/sink/clickhouse/ClickHouseTableFactory.java
index f226b61..c37fbc4 100644
--- a/platform-base/src/main/java/com/zdjizhi/base/sink/clickhouse/ClickHouseTableFactory.java
+++ b/platform-base/src/main/java/com/zdjizhi/base/sink/clickhouse/ClickHouseTableFactory.java
@@ -14,6 +14,8 @@ import java.util.Properties;
  */
 public class ClickHouseTableFactory {
 
+    private static final String CLICKHOUSE_CONFIG_PREFIX = "clickhouse.config.";
+
     public static RichSinkFunction<String> getSinkFunction(String table) {
         String address = Configs.get(CommonConfig.CLICKHOUSE_ADDRESS);
         int batchSize = Configs.get(CommonConfig.CLICKHOUSE_BATCH_SIZE);
@@ -23,6 +25,10 @@ public class ClickHouseTableFactory {
         encryptor.setPassword("galaxy");
         connInfo.put("user", encryptor.decrypt(Configs.get(CommonConfig.CLICKHOUSE_USERNAME)));
         connInfo.put("password", encryptor.decrypt(Configs.get(CommonConfig.CLICKHOUSE_PASSWORD)));
+        connInfo.put("connect_timeout", Configs.get(CommonConfig.CLICKHOUSE_CONNECT_TIMEOUT));
+        connInfo.put("query_timeout", Configs.get(CommonConfig.CLICKHOUSE_QUERY_TIMEOUT));
+        Properties properties = Configs.subProperties(CLICKHOUSE_CONFIG_PREFIX);
+        connInfo.putAll(properties);
         return new ClickhouseSink(
                 batchSize,
                 batchIntervalMs,
diff --git a/platform-base/src/main/java/com/zdjizhi/base/sink/clickhouse/ClickhouseSink.java b/platform-base/src/main/java/com/zdjizhi/base/sink/clickhouse/ClickhouseSink.java
index fb44c39..ba22dca 100644
--- a/platform-base/src/main/java/com/zdjizhi/base/sink/clickhouse/ClickhouseSink.java
+++ b/platform-base/src/main/java/com/zdjizhi/base/sink/clickhouse/ClickhouseSink.java
@@ -21,7 +21,7 @@ public class ClickhouseSink extends RichSinkFunction<String> {
     private EventBatchIntervalClickHouseSink eventBatchIntervalClickHouseSink;
 
     public ClickhouseSink(int batchSize, long batchIntervalMs, String host, String table, Properties properties) {
-        this.eventBatchIntervalClickHouseSink = new EventBatchIntervalClickHouseSink(batchSize, batchIntervalMs, host, table, properties);
+        this.eventBatchIntervalClickHouseSink = new EventBatchIntervalClickHouseSink(null, batchSize, batchIntervalMs, host, table, properties);
     }
 
     @Override
diff --git a/platform-schedule/pom.xml b/platform-schedule/pom.xml
index b5c0b09..eead291 100644
--- a/platform-schedule/pom.xml
+++ b/platform-schedule/pom.xml
@@ -116,7 +116,7 @@
                                 <filter>
                                     <artifact>com.geedgenetworks:groot-core</artifact>
                                     <includes>
-                                        <include>com/geedgenetworks/core/metrics/**</include>
+                                        <include>com/geedgenetworks/core/**</include>
                                     </includes>
                                 </filter>
                             </filters>
diff --git a/pom.xml b/pom.xml
index 924d44a..453ed36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
         <mockito.version>4.0.0</mockito.version>
         <jooq.version>0.9.15</jooq.version>
 
-        <groot.version>1.1.0</groot.version>
+        <groot.version>1.2.2</groot.version>
     </properties>
 
     <repositories>