diff --git a/IP-learning-graph/src/main/java/cn/ac/iie/dao/UpdateGraphData.java b/IP-learning-graph/src/main/java/cn/ac/iie/dao/UpdateGraphData.java index 56d65d1..b0e6e7a 100644 --- a/IP-learning-graph/src/main/java/cn/ac/iie/dao/UpdateGraphData.java +++ b/IP-learning-graph/src/main/java/cn/ac/iie/dao/UpdateGraphData.java @@ -54,9 +54,9 @@ public class UpdateGraphData { LocateFqdn2Ip.class,BaseEdgeDocument.class, ReadClickhouseData::getRelationshipFqdnAddressIpSql, ReadClickhouseData::getRelationFqdnAddressIpDocument); - updateDocument(newRelationIpVisitFqdnMap,historyRelationIpVisitFqdnMap,"R_VISIT_IP2FQDN", - VisitIp2Fqdn.class,BaseEdgeDocument.class, - ReadClickhouseData::getRelationshipIpVisitFqdnSql, ReadClickhouseData::getRelationIpVisitFqdnDocument); +// updateDocument(newRelationIpVisitFqdnMap,historyRelationIpVisitFqdnMap,"R_VISIT_IP2FQDN", +// VisitIp2Fqdn.class,BaseEdgeDocument.class, +// ReadClickhouseData::getRelationshipIpVisitFqdnSql, ReadClickhouseData::getRelationIpVisitFqdnDocument); updateDocument(newRelationFqdnSameFqdnMap,historyRelationFqdnSameFqdnMap,"R_SAME_ORIGIN_FQDN2FQDN", SameFqdn2Fqdn.class,BaseEdgeDocument.class, diff --git a/IP-learning-graph/src/main/resources/application.properties b/IP-learning-graph/src/main/resources/application.properties index 92a4143..0265978 100644 --- a/IP-learning-graph/src/main/resources/application.properties +++ b/IP-learning-graph/src/main/resources/application.properties @@ -1,10 +1,10 @@ #arangoDB参数配置 arangoDB.host=192.168.40.182 arangoDB.port=8529 -arangoDB.user=root -arangoDB.password=111111 -#arangoDB.DB.name=ip-learning-test -arangoDB.DB.name=insert_iplearn_index +arangoDB.user=upsert +arangoDB.password=ceiec2018 +arangoDB.DB.name=ip-learning-test-0 +#arangoDB.DB.name=insert_iplearn_index arangoDB.batch=100000 arangoDB.ttl=3600 @@ -17,8 +17,8 @@ thread.await.termination.time=10 #读取clickhouse时间范围方式,0:读取过去一小时,1:指定时间范围 clickhouse.time.limit.type=1 -read.clickhouse.max.time=1571245220 -read.clickhouse.min.time=1571245210 +read.clickhouse.max.time=1571245230 +read.clickhouse.min.time=1571245220 #读取arangoDB时间范围方式,0:正常读,1:指定时间范围 arango.time.limit.type=1 diff --git a/IP-learning-graph/src/main/resources/clickhouse.properties b/IP-learning-graph/src/main/resources/clickhouse.properties index 01689b5..997d3ea 100644 --- a/IP-learning-graph/src/main/resources/clickhouse.properties +++ b/IP-learning-graph/src/main/resources/clickhouse.properties @@ -1,5 +1,5 @@ drivers=ru.yandex.clickhouse.ClickHouseDriver -db.id=192.168.40.193:8123/av_miner?socket_timeout=300000 +db.id=192.168.40.193:8123/tsg_galaxy_zx?socket_timeout=3600000 #db.id=192.168.40.186:8123/tsg_galaxy_v3?socket_timeout=300000 mdb.user=default mdb.password=111111