gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1、APP监测添加service与action的对应关系以及入库序号配置；

Browse Source 
2、将配置入库序号分为两版(合并前、合并后)，升级部署时注意切换；
3、原始日志查询添加字段:P2P(P2P_PROTO、P2P_FILE_ID、P2P_KEYWORD
)、APP(LABEL_PROTO_ID、LABEL_PROTO_SOURCE
LABEL_BEHAV_ID、LABEL_BEHAV_SOURCE、LABEL_APP_ID、LABEL_APP_SOURCE
)；
This commit is contained in:
zhangdongxu
2018-09-13 15:32:52 +08:00
parent dd83863a3d
commit 02eaf285fe
4 changed files with 153 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/main/java/com/nis/domain/restful/NtcAppLog.java
View File

@@ -1,6 +1,7 @@
package com.nis.domain.restful;
import com.nis.domain.LogEntity;
import com.wordnik.swagger.annotations.ApiModelProperty;
/**
* @ClassName:NtcAppLog
@@ -10,6 +11,64 @@ import com.nis.domain.LogEntity;
* @version V1.0
*/
public class NtcAppLog extends LogEntity<NtcAppLog> {
private static final long serialVersionUID = -1186780816038898916L;
@ApiModelProperty(value = "协议类型ID", required = true)
private Integer labelProtoId;
@ApiModelProperty(value = "协议类型来源", required = true)
private Integer labelProtoSource;
@ApiModelProperty(value = "行为ID", required = true)
private Integer labelBehavId;
@ApiModelProperty(value = "行为来源", required = true)
private Integer labelBehavSource;
@ApiModelProperty(value = "应用ID", required = true)
private Integer labelAppId;
@ApiModelProperty(value = "应用来源", required = true)
private Integer labelAppSource;
public Integer getLabelProtoId() {
return labelProtoId;
}
public void setLabelProtoId(Integer labelProtoId) {
this.labelProtoId = labelProtoId;
}
public Integer getLabelProtoSource() {
return labelProtoSource;
}
public void setLabelProtoSource(Integer labelProtoSource) {
this.labelProtoSource = labelProtoSource;
}
public Integer getLabelBehavId() {
return labelBehavId;
}
public void setLabelBehavId(Integer labelBehavId) {
this.labelBehavId = labelBehavId;
}
public Integer getLabelBehavSource() {
return labelBehavSource;
}
public void setLabelBehavSource(Integer labelBehavSource) {
this.labelBehavSource = labelBehavSource;
}
public Integer getLabelAppId() {
return labelAppId;
}
public void setLabelAppId(Integer labelAppId) {
this.labelAppId = labelAppId;
}
public Integer getLabelAppSource() {
return labelAppSource;
}
public void setLabelAppSource(Integer labelAppSource) {
this.labelAppSource = labelAppSource;
}
}

44
src/main/java/com/nis/domain/restful/NtcP2pLog.java
View File

@@ -1,6 +1,7 @@
package com.nis.domain.restful;
import com.nis.domain.LogEntity;
import com.wordnik.swagger.annotations.ApiModelProperty;
/**
*
@@ -14,4 +15,47 @@ public class NtcP2pLog extends LogEntity<NtcP2pLog> {
private static final long serialVersionUID = -8085222950278735219L;
@ApiModelProperty(value = "P2P协议", required = true)
private String p2pProto;
@ApiModelProperty(value = "文件标识", required = true)
private String p2pFileId;
@ApiModelProperty(value = "Emule搜索关键词", required = true)
private String p2pKeyword;
/**
* @return the p2pProto
*/
public String getP2pProto() {
return p2pProto;
}
/**
* @param p2pProto the p2pProto to set
*/
public void setP2pProto(String p2pProto) {
this.p2pProto = p2pProto;
}
/**
* @return the p2pFileId
*/
public String getP2pFileId() {
return p2pFileId;
}
/**
* @param p2pFileId the p2pFileId to set
*/
public void setP2pFileId(String p2pFileId) {
this.p2pFileId = p2pFileId;
}
/**
* @return the p2pKeyword
*/
public String getP2pKeyword() {
return p2pKeyword;
}
/**
* @param p2pKeyword the p2pKeyword to set
*/
public void setP2pKeyword(String p2pKeyword) {
this.p2pKeyword = p2pKeyword;
}
}

11
src/main/java/com/nis/web/dao/DfLogSearchDao.xml
View File

@@ -414,6 +414,13 @@
<result column="s_subscribe_id" jdbcType="VARCHAR" property="sSubscribeId" />
<result column="d_subscribe_id" jdbcType="VARCHAR" property="dSubscribeId" />
<result column="scene_file" jdbcType="VARCHAR" property="sceneFile" />
<result column="label_proto_id" jdbcType="INTEGER" property="labelProtoId" />
<result column="label_proto_source" jdbcType="INTEGER" property="labelProtoSource" />
<result column="label_behav_id" jdbcType="INTEGER" property="labelBehavId" />
<result column="label_behav_source" jdbcType="INTEGER" property="labelBehavSource" />
<result column="label_app_id" jdbcType="INTEGER" property="labelAppId" />
<result column="label_app_source" jdbcType="INTEGER" property="labelAppSource" />
</resultMap>
<resultMap id="NtcDdosLogMap" type="com.nis.domain.restful.NtcDdosLog">
@@ -985,6 +992,10 @@
<result column="s_subscribe_id" jdbcType="VARCHAR" property="sSubscribeId" />
<result column="d_subscribe_id" jdbcType="VARCHAR" property="dSubscribeId" />
<result column="scene_file" jdbcType="VARCHAR" property="sceneFile" />
<result column="p2p_proto" jdbcType="VARCHAR" property="p2pProto" />
<result column="p2p_file_id" jdbcType="VARCHAR" property="p2pFileId" />
<result column="p2p_keyword" jdbcType="VARCHAR" property="p2pKeyword" />
</resultMap>
<resultMap id="NtcBgpLogMap" type="com.nis.domain.restful.NtcBgpLog">
<result column="cfg_id" jdbcType="BIGINT" property="cfgId" />