From 0cb75f3eabd3f356f6a90138daac5411c6af4af6 Mon Sep 17 00:00:00 2001
From: wanglihui <949764788@qq.com>
Date: Wed, 19 Aug 2020 13:58:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AEserver=E4=B8=8Eclient=20IP?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=8C=BA=E5=88=86=E9=93=BE=E8=B7=AF=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/ac/iie/dao/UpdateGraphData.java |  6 +++---
 .../src/main/resources/application.properties        | 12 ++++++------
 .../src/main/resources/clickhouse.properties         |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

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