Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
This commit is contained in:
fangshunjian
2018-08-20 22:17:34 +08:00
161 changed files with 10070 additions and 1890 deletions

View File

@@ -16,6 +16,60 @@ public class FunctionRegionDict extends BaseCfg<FunctionRegionDict> {
private String configDesc;
private Integer isMaat;
private Integer regionType;
private String configMultiKeywords;
private String configHex;
private String configExprType;
private String configMatchMethod;
private String configServiceType;
private String configIpPortShow;
private String configIpType;
private String configIpPattern;
private String configPortPattern;
private String configDirection;
private String configProtocol;
public String getConfigIpPortShow() {
return configIpPortShow;
}
public void setConfigIpPortShow(String configIpPortShow) {
this.configIpPortShow = configIpPortShow;
}
public String getConfigIpType() {
return configIpType;
}
public void setConfigIpType(String configIpType) {
this.configIpType = configIpType;
}
public String getConfigIpPattern() {
return configIpPattern;
}
public void setConfigIpPattern(String configIpPattern) {
this.configIpPattern = configIpPattern;
}
public String getConfigPortPattern() {
return configPortPattern;
}
public void setConfigPortPattern(String configPortPattern) {
this.configPortPattern = configPortPattern;
}
public String getConfigDirection() {
return configDirection;
}
public void setConfigDirection(String configDirection) {
this.configDirection = configDirection;
}
public String getConfigProtocol() {
return configProtocol;
}
public void setConfigProtocol(String configProtocol) {
this.configProtocol = configProtocol;
}
public String getConfigServiceType() {
return configServiceType;
}
public void setConfigServiceType(String configServiceType) {
this.configServiceType = configServiceType;
}
public Integer getDictId() {
return dictId;
}
@@ -64,5 +118,30 @@ public class FunctionRegionDict extends BaseCfg<FunctionRegionDict> {
public void setRegionType(Integer regionType) {
this.regionType = regionType;
}
public String getConfigMultiKeywords() {
return configMultiKeywords;
}
public void setConfigMultiKeywords(String configMultiKeywords) {
this.configMultiKeywords = configMultiKeywords;
}
public String getConfigHex() {
return configHex;
}
public void setConfigHex(String configHex) {
this.configHex = configHex;
}
public String getConfigExprType() {
return configExprType;
}
public void setConfigExprType(String configExprType) {
this.configExprType = configExprType;
}
public String getConfigMatchMethod() {
return configMatchMethod;
}
public void setConfigMatchMethod(String configMatchMethod) {
this.configMatchMethod = configMatchMethod;
}
}

View File

@@ -16,6 +16,14 @@ public class FunctionServiceDict extends BaseCfg<FunctionServiceDict> {
private String serviceName;
private String serviceDesc;
private String actionCode;
private Integer regionCode;
public Integer getRegionCode() {
return regionCode;
}
public void setRegionCode(Integer regionCode) {
this.regionCode = regionCode;
}
public Integer getDictId() {
return dictId;
}

View File

@@ -0,0 +1,147 @@
/**
*@Title: BaseStringConfig.java
*@Package com.nis.domain.restful
*@Description TODO
*@author dell
*@date 2018年2月5日 下午5:26:02
*@version 版本号
*/
package com.nis.domain.configuration;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.nis.util.excel.ExcelField;
/**
* APP SSL证书特征配置
* @author dell
*
*/
public class AppSslCertCfg extends BaseCfg<AppSslCertCfg> {
/**
*
*/
private static final long serialVersionUID = -4366457794248757698L;
private static final String tableName="app_ssl_cert_cfg";
@Expose
private Integer compileId;
@Expose
private Integer ratelimit;
private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
private Integer specServiceId;
private String district;
private String cfgKeywords;
private String appName;
@Expose
@ExcelField(title="expression_type")
@SerializedName("exprType")
protected Integer exprType ;
@Expose
@ExcelField(title="match_method")
@SerializedName("matchMethod")
protected Integer matchMethod ;
@Expose
@ExcelField(title="whether_hexbinary")
@SerializedName("isHexbin")
protected Integer isHexbin;
public Integer getExprType() {
return exprType;
}
public void setExprType(Integer exprType) {
this.exprType = exprType;
}
public Integer getMatchMethod() {
return matchMethod;
}
public void setMatchMethod(Integer matchMethod) {
this.matchMethod = matchMethod;
}
public Integer getIsHexbin() {
return isHexbin;
}
public void setIsHexbin(Integer isHexbin) {
this.isHexbin = isHexbin;
}
@Override
public void initDefaultValue() {
// TODO Auto-generated method stub
super.initDefaultValue();
this.isHexbin = 0;
}
public Integer getCompileId() {
return compileId;
}
public void setCompileId(Integer compileId) {
this.compileId = compileId;
}
public static String getTablename() {
return tableName;
}
public Integer getRatelimit() {
return ratelimit;
}
public void setRatelimit(Integer ratelimit) {
this.ratelimit = ratelimit;
}
public Integer getAppCode() {
return appCode;
}
public void setAppCode(Integer appCode) {
this.appCode = appCode;
}
public Integer getSpecServiceId() {
return specServiceId;
}
public void setSpecServiceId(Integer specServiceId) {
this.specServiceId = specServiceId;
}
public String getDistrict() {
return district;
}
public void setDistrict(String district) {
this.district = district;
}
public String getCfgKeywords() {
return cfgKeywords;
}
public void setCfgKeywords(String cfgKeywords) {
this.cfgKeywords = cfgKeywords;
}
public String getAppName() {
return appName;
}
public void setAppName(String appName) {
this.appName = appName;
}
public Integer getBehavCode() {
return behavCode;
}
public void setBehavCode(Integer behavCode) {
this.behavCode = behavCode;
}
}

View File

@@ -8,12 +8,14 @@ package com.nis.domain.configuration;
* @version V1.0
*/
public class AvVoipIpCfg extends BaseIpCfg {
private static final String tableName="av_voip_ip_cfg";
/**
*
*/
private static final long serialVersionUID = -942354218504312548L;
public static String getTablename() {
return tableName;
}
}

View File

@@ -15,6 +15,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import com.google.gson.annotations.Expose;
import com.google.gson.annotations.SerializedName;
import com.nis.domain.BaseEntity;
import com.nis.util.Constants;
import com.nis.util.excel.ExcelField;
/**
@@ -196,6 +197,18 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
*/
protected Integer functionId;
/**
* do_log属性在界面do_log:0不需要1记录所有日志2只记录结构化日志。默认是2
*/
protected Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT;
public Integer getDoLog() {
return doLog;
}
public void setDoLog(Integer doLog) {
this.doLog = doLog;
}
/**
* cfgRegionCode
* @return cfgRegionCode

View File

@@ -51,10 +51,30 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
private List<ComplexkeywordCfg> complexList;
private List<BaseStringCfg> stringList;
private List<FileDigestCfg> digestList;
private List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList;//新增SUBSCRIBE_ID
private NtcSubscribeIdCfg ntcSubscribeIdCfg;
private Long dnsStrategyId;
private String dnsStrategyName;
private P2pHashCfg p2pHash;
private P2pKeywordCfg p2pKeyword;
private List<P2pHashCfg> p2pHashList;
private List<P2pKeywordCfg> p2pKeywordList;
public List<NtcSubscribeIdCfg> getNtcSubscribeIdCfgList() {
return ntcSubscribeIdCfgList;
}
public void setNtcSubscribeIdCfgList(List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList) {
this.ntcSubscribeIdCfgList = ntcSubscribeIdCfgList;
}
public NtcSubscribeIdCfg getNtcSubscribeIdCfg() {
return ntcSubscribeIdCfg;
}
public void setNtcSubscribeIdCfg(NtcSubscribeIdCfg ntcSubscribeIdCfg) {
this.ntcSubscribeIdCfg = ntcSubscribeIdCfg;
}
public Long getDnsStrategyId() {
return dnsStrategyId;
}
@@ -200,6 +220,30 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
public void setDigestList(List<FileDigestCfg> digestList) {
this.digestList = digestList;
}
public P2pHashCfg getP2pHash() {
return p2pHash;
}
public void setP2pHash(P2pHashCfg p2pHash) {
this.p2pHash = p2pHash;
}
public P2pKeywordCfg getP2pKeyword() {
return p2pKeyword;
}
public void setP2pKeyword(P2pKeywordCfg p2pKeyword) {
this.p2pKeyword = p2pKeyword;
}
public List<P2pHashCfg> getP2pHashList() {
return p2pHashList;
}
public void setP2pHashList(List<P2pHashCfg> p2pHashList) {
this.p2pHashList = p2pHashList;
}
public List<P2pKeywordCfg> getP2pKeywordList() {
return p2pKeywordList;
}
public void setP2pKeywordList(List<P2pKeywordCfg> p2pKeywordList) {
this.p2pKeywordList = p2pKeywordList;
}
public static String getTablename() {
return tableName;
}

View File

@@ -0,0 +1,23 @@
package com.nis.domain.configuration;
public class NtcSubscribeIdCfg extends BaseStringCfg<NtcSubscribeIdCfg> {
private static final String tableName="ntc_subscribe_id_cfg";
/**
*
*/
private static final long serialVersionUID = 9137401459733286997L;
/**
* 配置关键字
*/
@Override
public void initDefaultValue() {
super.initDefaultValue();
this.exprType=0;
this.matchMethod=0;
}
public static String getTablename() {
return tableName;
}
}

View File

@@ -0,0 +1,24 @@
package com.nis.domain.configuration;
public class P2pHashCfg extends BaseStringCfg<P2pHashCfg>{
/**
*
*/
private static final long serialVersionUID = -7072353181349049294L;
private static final String tableName="p2p_hash_cfg";
@Override
public void initDefaultValue() {
// TODO Auto-generated method stub
super.initDefaultValue();
this.exprType=0;
this.matchMethod=0;
}
public static String getTablename() {
return tableName;
}
}

View File

@@ -0,0 +1,23 @@
package com.nis.domain.configuration;
public class P2pKeywordCfg extends BaseStringCfg<P2pKeywordCfg>{
/**
*
*/
private static final long serialVersionUID = 1308668362397070497L;
private static final String tableName="p2p_keyword_cfg";
@Override
public void initDefaultValue() {
// TODO Auto-generated method stub
super.initDefaultValue();
this.exprType=0;
this.matchMethod=0;
this.isHexbin=0;
}
public static String getTablename() {
return tableName;
}
}

View File

@@ -25,6 +25,11 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
protected String serverLocate;// 服务端地址定位信息
protected String clientLocate;// 客户端地址定位信息
protected String userRegion; //用户自定义
protected String sAsn;//客户端ASN
protected String dAsn;//服务端ASN
protected String sSubscribeId;//客户端用户名
protected String dSubscribeId;//服务端用户名
protected String sceneFile;//现场日志文件地址
protected Integer functionId;
protected Integer action;
@@ -178,15 +183,58 @@ public class BaseLogEntity<T> extends BaseEntity<T> {
public void setClientLocate(String clientLocate) {
this.clientLocate = clientLocate;
}
public String getsAsn() {
return sAsn;
}
public void setsAsn(String sAsn) {
this.sAsn = sAsn;
}
public String getdAsn() {
return dAsn;
}
public void setdAsn(String dAsn) {
this.dAsn = dAsn;
}
public String getsSubscribeId() {
return sSubscribeId;
}
public void setsSubscribeId(String sSubscribeId) {
this.sSubscribeId = sSubscribeId;
}
public String getdSubscribeId() {
return dSubscribeId;
}
public void setdSubscribeId(String dSubscribeId) {
this.dSubscribeId = dSubscribeId;
}
public String getSceneFile() {
return sceneFile;
}
public void setSceneFile(String sceneFile) {
this.sceneFile = sceneFile;
}
@Override
public String toString() {
return "BaseLogEntity [cfgId=" + cfgId + ", foundTime=" + foundTime + ", recvTime=" + recvTime + ", transProto="
+ transProto + ", addrType=" + addrType + ", dIp=" + dIp + ", sIp=" + sIp + ", dPort=" + dPort
+ ", sPort=" + sPort + ", service=" + service + ", entranceId=" + entranceId + ", deviceId=" + deviceId
+ ", direction=" + direction + ", streamDir=" + streamDir + ", capIp=" + capIp + ", addrList="
+ addrList + ", serverLocate=" + serverLocate + ", clientLocate=" + clientLocate + ", userRegion="
+ userRegion + ", functionId=" + functionId + ", action=" + action + ", seltype=" + seltype
+ ", searchFoundStartTime=" + searchFoundStartTime + ", searchFoundEndTime=" + searchFoundEndTime + "]";
return "{\"cfgId\"=\"" + cfgId + "\", \"foundTime\"=\"" + foundTime
+ "\", \"recvTime\"=\"" + recvTime + "\", \"transProto\"=\""
+ transProto + "\", \"addrType\"=\"" + addrType
+ "\", \"dIp\"=\"" + dIp + "\", \"sIp\"=\"" + sIp
+ "\", \"dPort\"=\"" + dPort + "\", \"sPort\"=\"" + sPort
+ "\", \"service\"=\"" + service + "\", \"entranceId\"=\""
+ entranceId + "\", \"deviceId\"=\"" + deviceId
+ "\", \"direction\"=\"" + direction + "\", \"streamDir\"=\""
+ streamDir + "\", \"capIp\"=\"" + capIp
+ "\", \"addrList\"=\"" + addrList + "\", \"serverLocate\"=\""
+ serverLocate + "\", \"clientLocate\"=\"" + clientLocate
+ "\", \"userRegion\"=\"" + userRegion + "\", \"sAsn\"=\""
+ sAsn + "\", \"dAsn\"=\"" + dAsn + "\", \"sSubscribeId\"=\""
+ sSubscribeId + "\", \"dSubscribeId\"=\"" + dSubscribeId
+ "\", \"sceneFile\"=\"" + sceneFile + "\", \"functionId\"=\""
+ functionId + "\", \"action\"=\"" + action
+ "\", \"seltype\"=\"" + seltype
+ "\", \"searchFoundStartTime\"=\"" + searchFoundStartTime
+ "\", \"searchFoundEndTime\"=\"" + searchFoundEndTime + "}";
}
}

View File

@@ -4,7 +4,6 @@ import com.wordnik.swagger.annotations.ApiModelProperty;
/**
* @ClassName:MmAvIpLog
* @Description:TODO(这里用一句话描述这个类的作用)
* @author (zdx)
* @date 2018年7月16日 下午2:54:23
* @version V1.0
@@ -19,7 +18,7 @@ public class MmAvIpLog extends BaseLogEntity<MmAvIpLog> {
@ApiModelProperty(value="封堵现场片段路径", required=true)
protected String logUri;
@ApiModelProperty(value="入口页面", required=true)
protected String refer;
protected String referer;
@ApiModelProperty(value="有害级别", required=true)
protected Integer level;
@ApiModelProperty(value="封堵类型", required=true)
@@ -44,11 +43,11 @@ public class MmAvIpLog extends BaseLogEntity<MmAvIpLog> {
public void setLogUri(String logUri) {
this.logUri = logUri;
}
public String getRefer() {
return refer;
public String getReferer() {
return referer;
}
public void setRefer(String refer) {
this.refer = refer;
public void setReferer(String referer) {
this.referer = referer;
}
public Integer getLevel() {
return level;

View File

@@ -19,7 +19,7 @@ public class MmAvUrlLog extends BaseLogEntity<MmAvUrlLog> {
@ApiModelProperty(value="封堵现场片段路径", required=true)
protected String logUri;
@ApiModelProperty(value="入口页面", required=true)
protected String refer;
protected String referer;
@ApiModelProperty(value="有害级别", required=true)
protected Integer level;
@ApiModelProperty(value="封堵类型", required=true)
@@ -44,11 +44,11 @@ public class MmAvUrlLog extends BaseLogEntity<MmAvUrlLog> {
public void setLogUri(String logUri) {
this.logUri = logUri;
}
public String getRefer() {
return refer;
public String getReferer() {
return referer;
}
public void setRefer(String refer) {
this.refer = refer;
public void setReferer(String referer) {
this.referer = referer;
}
public Integer getLevel() {
return level;

View File

@@ -7,7 +7,7 @@ public class MmPicIpLog extends BaseLogEntity<MmPicIpLog> {
private String pid;// 节目ID
private String url;// 节目访问地址
private String logUri;// fd现场片段路径
private String refer;// 入口页面
private String referer;// 入口页面
private Integer level;// 有害级别
private Integer fdType;// fd类型
private String protocol;// 传输协议
@@ -30,11 +30,11 @@ public class MmPicIpLog extends BaseLogEntity<MmPicIpLog> {
public void setLogUri(String logUri) {
this.logUri = logUri;
}
public String getRefer() {
return refer;
public String getReferer() {
return referer;
}
public void setRefer(String refer) {
this.refer = refer;
public void setReferer(String referer) {
this.referer = referer;
}
public Integer getLevel() {
return level;

View File

@@ -7,7 +7,7 @@ public class MmPicUrlLog extends BaseLogEntity<MmPicUrlLog>{
private String pid;// 节目ID
private String url;// 节目访问地址
private String logUri;// fd现场片段路径
private String refer;// 入口页面
private String referer;// 入口页面
private Integer level;// 有害级别
private Integer fdType;// fd类型
private String protocol;// 传输协议
@@ -30,11 +30,11 @@ public class MmPicUrlLog extends BaseLogEntity<MmPicUrlLog>{
public void setLogUri(String logUri) {
this.logUri = logUri;
}
public String getRefer() {
return refer;
public String getReferer() {
return referer;
}
public void setRefer(String refer) {
this.refer = refer;
public void setReferer(String referer) {
this.referer = referer;
}
public Integer getLevel() {
return level;

View File

@@ -7,7 +7,7 @@ public class MmSampleAudioLog extends BaseLogEntity<MmSampleAudioLog>{
private String pid;// 节目ID
private String url;// 节目访问地址
private String logUri;// fd现场片段路径
private String refer;// 入口页面
private String referer;// 入口页面
private Integer level;// 有害级别
private Integer fdType;// fd类型
private String protocol;// 传输协议
@@ -30,11 +30,11 @@ public class MmSampleAudioLog extends BaseLogEntity<MmSampleAudioLog>{
public void setLogUri(String logUri) {
this.logUri = logUri;
}
public String getRefer() {
return refer;
public String getReferer() {
return referer;
}
public void setRefer(String refer) {
this.refer = refer;
public void setReferer(String referer) {
this.referer = referer;
}
public Integer getLevel() {
return level;
@@ -56,7 +56,7 @@ public class MmSampleAudioLog extends BaseLogEntity<MmSampleAudioLog>{
}
@Override
public String toString() {
return "MmSampleAudioLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", refer=" + refer + ", level="
return "MmSampleAudioLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", referer=" + referer + ", level="
+ level + ", fdType=" + fdType + ", protocol=" + protocol + "]";
}
}

View File

@@ -7,7 +7,7 @@ public class MmSamplePicLog extends BaseLogEntity<MmSamplePicLog>{
private String pid;// 节目ID
private String url;// 节目访问地址
private String logUri;// fd现场片段路径
private String refer;// 入口页面
private String referer;// 入口页面
private Integer level;// 有害级别
private Integer fdType;// fd类型
private String protocol;// 传输协议
@@ -29,11 +29,11 @@ public class MmSamplePicLog extends BaseLogEntity<MmSamplePicLog>{
public void setLogUri(String logUri) {
this.logUri = logUri;
}
public String getRefer() {
return refer;
public String getReferer() {
return referer;
}
public void setRefer(String refer) {
this.refer = refer;
public void setReferer(String referer) {
this.referer = referer;
}
public Integer getLevel() {
return level;
@@ -55,7 +55,7 @@ public class MmSamplePicLog extends BaseLogEntity<MmSamplePicLog>{
}
@Override
public String toString() {
return "MmSamplePicLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", refer=" + refer + ", level="
return "MmSamplePicLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", referer=" + referer + ", level="
+ level + ", fdType=" + fdType + ", protocol=" + protocol + "]";
}

View File

@@ -7,7 +7,7 @@ public class MmSampleVideoLog extends BaseLogEntity<MmSampleVideoLog>{
private String pid;// 节目ID
private String url;// 节目访问地址
private String logUri;// fd现场片段路径
private String refer;// 入口页面
private String referer;// 入口页面
private Integer level;// 有害级别
private Integer fdType;// fd类型
private String protocol;// 传输协议
@@ -29,11 +29,11 @@ public class MmSampleVideoLog extends BaseLogEntity<MmSampleVideoLog>{
public void setLogUri(String logUri) {
this.logUri = logUri;
}
public String getRefer() {
return refer;
public String getReferer() {
return referer;
}
public void setRefer(String refer) {
this.refer = refer;
public void setReferer(String referer) {
this.referer = referer;
}
public Integer getLevel() {
return level;
@@ -55,7 +55,7 @@ public class MmSampleVideoLog extends BaseLogEntity<MmSampleVideoLog>{
}
@Override
public String toString() {
return "MmSampleVideoLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", refer=" + refer + ", level="
return "MmSampleVideoLog [pid=" + pid + ", url=" + url + ", logUri=" + logUri + ", referer=" + referer + ", level="
+ level + ", fdType=" + fdType + ", protocol=" + protocol + "]";
}

View File

@@ -0,0 +1,7 @@
package com.nis.domain.log;
public class NtBgpLog extends BaseLogEntity<NtBgpLog> {
private static final long serialVersionUID = 1000090441108515598L;
}

View File

@@ -5,10 +5,16 @@ public class NtcHttpLog extends BaseLogEntity<NtcHttpLog> {
private static final long serialVersionUID = -7697668215327123848L;
private String url;
private String reqHdrKey;//请求头转储文件key
private String reqHdrFile;
private String reqBodyKey;//请求体转储文件key
private String reqBodyFile;
private String resHdrKey;//应答头转储文件key
private String resHdrFile;
private String resBodyKey;//应答体转储文件key
private String resBodyFile;
private String website;//域名
/*以下字段无需反馈到界面*/
private Integer c2sIsn;
@@ -134,4 +140,34 @@ public class NtcHttpLog extends BaseLogEntity<NtcHttpLog> {
public void setResLine(String resLine) {
this.resLine = resLine;
}
public String getReqHdrKey() {
return reqHdrKey;
}
public void setReqHdrKey(String reqHdrKey) {
this.reqHdrKey = reqHdrKey;
}
public String getReqBodyKey() {
return reqBodyKey;
}
public void setReqBodyKey(String reqBodyKey) {
this.reqBodyKey = reqBodyKey;
}
public String getResHdrKey() {
return resHdrKey;
}
public void setResHdrKey(String resHdrKey) {
this.resHdrKey = resHdrKey;
}
public String getResBodyKey() {
return resBodyKey;
}
public void setResBodyKey(String resBodyKey) {
this.resBodyKey = resBodyKey;
}
public String getWebsite() {
return website;
}
public void setWebsite(String website) {
this.website = website;
}
}