抽取读取clickhouse公共方法，修改merge函数接口。

IP-learning-graph/src/main/resources/application.properties

@@ -1,10 +1,10 @@
 #arangoDB参数配置
-arangoDB.host=192.168.40.127
+arangoDB.host=192.168.40.182
 arangoDB.port=8529
 arangoDB.user=root
 arangoDB.password=111111
 #arangoDB.DB.name=ip-learning-test
-arangoDB.DB.name=ip-learning-test
+arangoDB.DB.name=ip-learning-test-0
 arangoDB.batch=100000
 arangoDB.ttl=3600
 
@@ -13,5 +13,13 @@ update.arango.batch=10000
 thread.pool.number=10
 thread.await.termination.time=10
 
-read.clickhouse.max.time=1594981808
-read.clickhouse.min.time=1593878400
+
+#读取clickhouse时间范围方式，0：读取过去一小时，1：指定时间范围
+time.limit.type=1
+read.clickhouse.max.time=1595489408
+read.clickhouse.min.time=1593878400
+
+update.interval=3600
+distinct.client.ip.num=10000
+recent.count.hour=24
+