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

修改recv_time为end_time

Browse Source
This commit is contained in:
wanglihui
2020-08-27 10:04:09 +08:00
parent 6136635b7b
commit a563591051
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,7 +13,7 @@ spark.read.clickhouse.user=default
spark.read.clickhouse.password=111111
spark.read.clickhouse.numPartitions=144
spark.read.clickhouse.fetchsize=10000
spark.read.clickhouse.partitionColumn=common_recv_time
spark.read.clickhouse.partitionColumn=common_end_time
clickhouse.socket.timeout=300000
#arangoDB配置
arangoDB.host=192.168.40.182

12
ip-learning-spark/src/main/scala/cn/ac/iie/dao/BaseClickhouseData.scala
View File

@@ -31,11 +31,11 @@ object BaseClickhouseData {
}
def loadConnectionDataFromCk(): Unit ={
val where = "common_recv_time >= " + timeLimit._2 + " AND common_recv_time < " + timeLimit._1 + " and common_schema_type != 'BASE'"
val where = "common_end_time >= " + timeLimit._2 + " AND common_end_time < " + timeLimit._1 + " and common_schema_type != 'BASE'"
val sql =
s"""
|(SELECT
| ssl_sni,http_host,common_client_ip,common_server_ip,common_recv_time,common_c2s_byte_num,common_s2c_byte_num,common_schema_type
| ssl_sni,http_host,common_client_ip,common_server_ip,common_end_time,common_c2s_byte_num,common_s2c_byte_num,common_schema_type
|FROM
| connection_record_log
|WHERE $where) as dbtable
@@ -153,8 +153,8 @@ object BaseClickhouseData {
|SELECT
| ssl_sni AS FQDN,
| common_server_ip,
| MAX(common_recv_time) AS LAST_FOUND_TIME,
| MIN(common_recv_time) AS FIRST_FOUND_TIME,
| MAX(common_end_time) AS LAST_FOUND_TIME,
| MIN(common_end_time) AS FIRST_FOUND_TIME,
| COUNT(*) AS COUNT_TOTAL,
| 'TLS' AS schema_type
|FROM
@@ -170,8 +170,8 @@ object BaseClickhouseData {
|SELECT
| http_host AS FQDN,
| common_server_ip,
| MAX(common_recv_time) AS LAST_FOUND_TIME,
| MIN(common_recv_time) AS FIRST_FOUND_TIME,
| MAX(common_end_time) AS LAST_FOUND_TIME,
| MIN(common_end_time) AS FIRST_FOUND_TIME,
| COUNT(*) AS COUNT_TOTAL,
| 'HTTP' AS schema_type
|FROM