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

# Conflicts: # IP-learning-graph/src/main/resources/clickhouse.properties
2020-08-06 16:51:47 +08:00
parent c391fbffba f44beda912
commit 10c742e9c2
22 changed files with 1455 additions and 10 deletions
--- a/IP-learning-graph/src/main/java/cn/ac/iie/service/ingestion/ReadClickhouseData.java
+++ b/IP-learning-graph/src/main/java/cn/ac/iie/service/ingestion/ReadClickhouseData.java
@@ -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();
        }