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

修改读取client IP空指针异常bug

Browse Source
This commit is contained in:
wanglihui
2020-08-26 10:51:24 +08:00
parent 9c2831013e
commit e5f30f5bfd
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ip-learning-spark/src/main/java/cn/ac/iie/service/read/ReadHistoryArangoData.java
View File

@@ -107,6 +107,12 @@ public class ReadHistoryArangoData<T extends BaseDocument> extends Thread {
private void deleteDistinctClientIpByTime(T doc) { private void deleteDistinctClientIpByTime(T doc) {
ArrayList<String> distCip = (ArrayList<String>) doc.getAttribute("DIST_CIP"); ArrayList<String> distCip = (ArrayList<String>) doc.getAttribute("DIST_CIP");
ArrayList<Long> distCipTs = (ArrayList<Long>) doc.getAttribute("DIST_CIP_TS"); ArrayList<Long> distCipTs = (ArrayList<Long>) doc.getAttribute("DIST_CIP_TS");
if (distCip == null || distCip.isEmpty()){
doc.updateAttribute("DIST_CIP", new String[0]);
doc.updateAttribute("DIST_CIP_TS", new long[0]);
return;
}
distCipTs.add(currentHour - RECENT_COUNT_HOUR * 3600); distCipTs.add(currentHour - RECENT_COUNT_HOUR * 3600);
Collections.sort(distCipTs); Collections.sort(distCipTs);
int index = distCipTs.indexOf(currentHour - RECENT_COUNT_HOUR * 3600); int index = distCipTs.indexOf(currentHour - RECENT_COUNT_HOUR * 3600);

10
ip-learning-spark/src/main/resources/application.properties
View File

@@ -27,14 +27,14 @@ arangoDB.ttl=3600
thread.pool.number=5 thread.pool.number=5
#读取clickhouse时间范围方式，0：读取过去一小时；1：指定时间范围 #读取clickhouse时间范围方式，0：读取过去一小时；1：指定时间范围
clickhouse.time.limit.type=0 clickhouse.time.limit.type=1
read.clickhouse.max.time=1571245220 read.clickhouse.max.time=1598246519
read.clickhouse.min.time=1571245210 read.clickhouse.min.time=1597161600
#读取arangoDB时间范围方式，0：正常读；1：指定时间范围 #读取arangoDB时间范围方式，0：正常读；1：指定时间范围
arango.time.limit.type=0 arango.time.limit.type=0
read.arango.max.time=1571245320 read.arango.max.time=1598246519
read.arango.min.time=1571245200 read.arango.min.time=1597161600
arangoDB.read.limit= arangoDB.read.limit=
update.arango.batch=10000 update.arango.batch=10000