gfwleak/galaxy-tsg-olap-storm-log-stream-completion
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

替换某些字段类型为Integer类型，防止int类型为0影响本身语义

Browse Source
This commit is contained in:
qidaijie
2019-12-06 18:50:31 +08:00
parent 7aac9e03d5
commit fb22d60bfe
10 changed files with 114 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/cn/ac/iie/bean/PublicSessionRecordLog.java
View File

@@ -63,13 +63,6 @@ public class PublicSessionRecordLog {
this.common_service = common_service;
}
public int getCommon_direction() {
return common_direction;
}
public void setCommon_direction(int common_direction) {
this.common_direction = common_direction;
}
public long getCommon_recv_time() {
return common_recv_time;
@@ -127,13 +120,6 @@ public class PublicSessionRecordLog {
this.common_link_id = common_link_id;
}
public int getCommon_encapsulation() {
return common_encapsulation;
}
public void setCommon_encapsulation(int common_encapsulation) {
this.common_encapsulation = common_encapsulation;
}
public int getCommon_server_port() {
return common_server_port;
@@ -223,6 +209,22 @@ public class PublicSessionRecordLog {
this.common_stream_dir = common_stream_dir;
}
public int getCommon_direction() {
return common_direction;
}
public void setCommon_direction(int common_direction) {
this.common_direction = common_direction;
}
public int getCommon_encapsulation() {
return common_encapsulation;
}
public void setCommon_encapsulation(int common_encapsulation) {
this.common_encapsulation = common_encapsulation;
}
public int getCommon_has_dup_traffic() {
return common_has_dup_traffic;
}

66
src/main/java/cn/ac/iie/bean/connection/ConnectionRecordLog.java
View File

@@ -49,8 +49,8 @@ public class ConnectionRecordLog extends PublicSessionRecordLog {
//TODO 3DNS协议属性 18
private int dns_message_id;
private int dns_qr;
private int dns_opcode;
private Integer dns_qr;
private Integer dns_opcode;
private int dns_aa;
private int dns_tc;
private int dns_rd;
@@ -70,11 +70,11 @@ public class ConnectionRecordLog extends PublicSessionRecordLog {
//TODO SSL协议属性 13
private int ssl_pinningst;
private int ssl_intercept_state;
private Integer ssl_pinningst;
private Integer ssl_intercept_state;
private int ssl_server_side_latency;
private int ssl_client_side_latency;
private int ssl_cert_verify;
private Integer ssl_cert_verify;
private int ssl_con_latency_ms;
private String ssl_version;
private String ssl_sni;
@@ -161,6 +161,23 @@ public class ConnectionRecordLog extends PublicSessionRecordLog {
this.http_response_header = http_response_header;
}
public Integer getSsl_pinningst() {
return ssl_pinningst;
}
public void setSsl_pinningst(Integer ssl_pinningst) {
this.ssl_pinningst = ssl_pinningst;
}
public Integer getSsl_intercept_state() {
return ssl_intercept_state;
}
public void setSsl_intercept_state(Integer ssl_intercept_state) {
this.ssl_intercept_state = ssl_intercept_state;
}
public String getHttp_request_body() {
return http_request_body;
}
@@ -185,6 +202,14 @@ public class ConnectionRecordLog extends PublicSessionRecordLog {
this.http_request_body_key = http_request_body_key;
}
public Integer getSsl_cert_verify() {
return ssl_cert_verify;
}
public void setSsl_cert_verify(Integer ssl_cert_verify) {
this.ssl_cert_verify = ssl_cert_verify;
}
public String getHttp_response_body_key() {
return http_response_body_key;
}
@@ -353,19 +378,19 @@ public class ConnectionRecordLog extends PublicSessionRecordLog {
this.dns_message_id = dns_message_id;
}
public int getDns_qr() {
public Integer getDns_qr() {
return dns_qr;
}
public void setDns_qr(int dns_qr) {
public void setDns_qr(Integer dns_qr) {
this.dns_qr = dns_qr;
}
public int getDns_opcode() {
public Integer getDns_opcode() {
return dns_opcode;
}
public void setDns_opcode(int dns_opcode) {
public void setDns_opcode(Integer dns_opcode) {
this.dns_opcode = dns_opcode;
}
@@ -489,21 +514,6 @@ public class ConnectionRecordLog extends PublicSessionRecordLog {
this.dns_rr = dns_rr;
}
public int getSsl_pinningst() {
return ssl_pinningst;
}
public void setSsl_pinningst(int ssl_pinningst) {
this.ssl_pinningst = ssl_pinningst;
}
public int getSsl_intercept_state() {
return ssl_intercept_state;
}
public void setSsl_intercept_state(int ssl_intercept_state) {
this.ssl_intercept_state = ssl_intercept_state;
}
public int getSsl_server_side_latency() {
return ssl_server_side_latency;
@@ -521,14 +531,6 @@ public class ConnectionRecordLog extends PublicSessionRecordLog {
this.ssl_client_side_latency = ssl_client_side_latency;
}
public int getSsl_cert_verify() {
return ssl_cert_verify;
}
public void setSsl_cert_verify(int ssl_cert_verify) {
this.ssl_cert_verify = ssl_cert_verify;
}
public int getSsl_con_latency_ms() {
return ssl_con_latency_ms;
}

32
src/main/java/cn/ac/iie/bean/security/SecurityPolicyLog.java
View File

@@ -49,8 +49,8 @@ public class SecurityPolicyLog extends PublicSessionRecordLog {
//TODO 3DNS协议属性 18
private int dns_message_id;
private int dns_qr;
private int dns_opcode;
private Integer dns_qr;
private Integer dns_opcode;
private int dns_aa;
private int dns_tc;
private int dns_rd;
@@ -70,11 +70,11 @@ public class SecurityPolicyLog extends PublicSessionRecordLog {
//TODO SSL协议属性 13
private int ssl_pinningst;
private int ssl_intercept_state;
private Integer ssl_pinningst;
private Integer ssl_intercept_state;
private int ssl_server_side_latency;
private int ssl_client_side_latency;
private int ssl_cert_verify;
private Integer ssl_cert_verify;
private int ssl_con_latency_ms;
private String ssl_version;
private String ssl_sni;
@@ -104,7 +104,6 @@ public class SecurityPolicyLog extends PublicSessionRecordLog {
private String streaming_media_url;
private String streaming_media_protocol;
public String getHttp_url() {
return http_url;
}
@@ -353,19 +352,19 @@ public class SecurityPolicyLog extends PublicSessionRecordLog {
this.dns_message_id = dns_message_id;
}
public int getDns_qr() {
public Integer getDns_qr() {
return dns_qr;
}
public void setDns_qr(int dns_qr) {
public void setDns_qr(Integer dns_qr) {
this.dns_qr = dns_qr;
}
public int getDns_opcode() {
public Integer getDns_opcode() {
return dns_opcode;
}
public void setDns_opcode(int dns_opcode) {
public void setDns_opcode(Integer dns_opcode) {
this.dns_opcode = dns_opcode;
}
@@ -489,19 +488,19 @@ public class SecurityPolicyLog extends PublicSessionRecordLog {
this.dns_rr = dns_rr;
}
public int getSsl_pinningst() {
public Integer getSsl_pinningst() {
return ssl_pinningst;
}
public void setSsl_pinningst(int ssl_pinningst) {
public void setSsl_pinningst(Integer ssl_pinningst) {
this.ssl_pinningst = ssl_pinningst;
}
public int getSsl_intercept_state() {
public Integer getSsl_intercept_state() {
return ssl_intercept_state;
}
public void setSsl_intercept_state(int ssl_intercept_state) {
public void setSsl_intercept_state(Integer ssl_intercept_state) {
this.ssl_intercept_state = ssl_intercept_state;
}
@@ -521,11 +520,11 @@ public class SecurityPolicyLog extends PublicSessionRecordLog {
this.ssl_client_side_latency = ssl_client_side_latency;
}
public int getSsl_cert_verify() {
public Integer getSsl_cert_verify() {
return ssl_cert_verify;
}
public void setSsl_cert_verify(int ssl_cert_verify) {
public void setSsl_cert_verify(Integer ssl_cert_verify) {
this.ssl_cert_verify = ssl_cert_verify;
}
@@ -665,7 +664,6 @@ public class SecurityPolicyLog extends PublicSessionRecordLog {
this.voip_called_number = voip_called_number;
}
public String getStreaming_media_url() {
return streaming_media_url;
}

3
src/main/java/cn/ac/iie/topology/LogFlowWriteTopology.java
View File

@@ -68,17 +68,14 @@ public class LogFlowWriteTopology {
builder.setBolt("ProxyCompletionBolt", new ProxyCompletionBolt(), FlowWriteConfig.DATACENTER_BOLT_PARALLELISM).localOrShuffleGrouping("LogFlowWriteSpout");
builder.setBolt("NtcLogSendBolt", new NtcLogSendBolt(), FlowWriteConfig.KAFKA_BOLT_PARALLELISM).localOrShuffleGrouping("ProxyCompletionBolt");
break;
case "RADIUS-RECORD-LOG":
builder.setBolt("RadiusCompletionBolt", new RadiusCompletionBolt(), FlowWriteConfig.DATACENTER_BOLT_PARALLELISM).localOrShuffleGrouping("LogFlowWriteSpout");
builder.setBolt("NtcLogSendBolt", new NtcLogSendBolt(), FlowWriteConfig.KAFKA_BOLT_PARALLELISM).localOrShuffleGrouping("RadiusCompletionBolt");
break;
case "CONNECTION-RECORD-LOG":
builder.setBolt("CollectCompletedBolt", new CollectCompletedBolt(), FlowWriteConfig.DATACENTER_BOLT_PARALLELISM).localOrShuffleGrouping("LogFlowWriteSpout");
builder.setBolt("NtcLogSendBolt", new NtcLogSendBolt(), FlowWriteConfig.KAFKA_BOLT_PARALLELISM).localOrShuffleGrouping("CollectCompletedBolt");
break;
case "SECURITY-EVENT-LOG":
builder.setBolt("SecurityCompletionBolt", new SecurityCompletionBolt(), FlowWriteConfig.DATACENTER_BOLT_PARALLELISM).localOrShuffleGrouping("LogFlowWriteSpout");
builder.setBolt("NtcLogSendBolt", new NtcLogSendBolt(), FlowWriteConfig.KAFKA_BOLT_PARALLELISM).localOrShuffleGrouping("SecurityCompletionBolt");

5
src/main/java/cn/ac/iie/utils/hbase/HBaseUtils.java
View File

@@ -15,7 +15,7 @@ import org.apache.log4j.Logger;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentSkipListMap;
/**
* HBase 工具类
@@ -25,7 +25,8 @@ import java.util.concurrent.ConcurrentHashMap;
public class HBaseUtils {
private final static Logger logger = Logger.getLogger(HBaseUtils.class);
private static Map<String, String> subIdMap = new ConcurrentHashMap<>(333334);
private static Map<String, String> subIdMap = new HashMap<>(333334);
// private static Map<String, String> subIdMap = new ConcurrentSkipListMap<>();
private static Connection connection;
private static Long time;