gfwleak/wanglihui-ip-learning-graph
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into ip-learning-graph-datacenter

Browse Source 
# Conflicts:
#	IP-learning-graph/src/main/resources/clickhouse.properties
This commit is contained in:
wanglihui
2020-08-06 16:51:47 +08:00
parent c391fbffba f44beda912
commit 10c742e9c2
22 changed files with 1455 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
IP-learning-graph/src/main/java/cn/ac/iie/service/ingestion/ReadClickhouseData.java
View File

@@ -105,6 +105,7 @@ public class ReadClickhouseData {
newDoc.setKey(subscriberId);
newDoc.addAttribute("FIRST_FOUND_TIME", firstFoundTime);
newDoc.addAttribute("LAST_FOUND_TIME", lastFoundTime);
newDoc.addAttribute("SUBSCRIBER_ID",subscriberId);
} catch (Exception e) {
e.printStackTrace();
}

10
IP-learning-graph/src/main/resources/application.properties
View File

@@ -1,6 +1,6 @@
#arangoDB参数配置
#arangoDB.host=192.168.40.182
arangoDB.host=192.168.40.224
arangoDB.host=192.168.40.182
#arangoDB.host=192.168.40.224
arangoDB.port=8529
arangoDB.user=root
arangoDB.password=111111
@@ -17,9 +17,9 @@ thread.await.termination.time=10
#读取clickhouse时间范围方式，0：读取过去一小时，1：指定时间范围
time.limit.type=0
read.clickhouse.max.time=1595833062
read.clickhouse.min.time=1595833060
time.limit.type=1
read.clickhouse.max.time=1596684142
read.clickhouse.min.time=1596425769
update.interval=3600
distinct.client.ip.num=10000

8
IP-learning-graph/src/main/resources/clickhouse.properties
View File

@@ -1,9 +1,9 @@
drivers=ru.yandex.clickhouse.ClickHouseDriver
mdb.user=default
#db.id=192.168.40.186:8123/tsg_galaxy_v3?socket_timeout=3600000
#mdb.password=111111
db.id=192.168.40.224:8123/tsg_galaxy_v3?socket_timeout=3600000
mdb.password=ceiec2019
db.id=192.168.40.186:8123/tsg_galaxy_v3?socket_timeout=300000
mdb.password=111111
#db.id=192.168.40.224:8123/tsg_galaxy_v3?socket_timeout=300000
#mdb.password=ceiec2019
initialsize=1
minidle=1
maxactive=50

10
IP-learning-graph/src/test/java/cn/ac/iie/readHistoryDataTest.java Normal file
View File

@@ -0,0 +1,10 @@
package cn.ac.iie;
import cn.ac.iie.dao.BaseArangoData;
import com.arangodb.entity.BaseEdgeDocument;
public class readHistoryDataTest {
public static void main(String[] args) {
BaseArangoData baseArangoData = new BaseArangoData();
}
}