Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into

develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	关键字日志转http url配置功能完成

src/main/java/com/nis/domain/configuration/BaseCfg.java

@@ -83,7 +83,7 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	/**
 	 * 是否审核
 	 */
-	@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=100)
+	@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=25)
 	protected Integer isAudit;
 	/**
 	 * 创建人员

src/main/java/com/nis/domain/configuration/BaseIpCfg.java

@@ -45,11 +45,11 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	@SerializedName("ipType")
 	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=3)
 	protected Integer ipType;
-	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=4)
+	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=6)
 	protected Integer ipPattern; 
 	@ExcelField(title="client_ip",sort=5)
 	protected String srcIpAddress; 
-	@ExcelField(title="server_ip",sort=6)
+	@ExcelField(title="server_ip",sort=4)
 	protected String destIpAddress;
 	@ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=7)
 	protected Integer portPattern;
@@ -65,6 +65,14 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	
 	private List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList;
 	private NtcSubscribeIdCfg ntcSubscribeIdCfg;
+	private Integer asnIpGroup;//asn组号，仅用于copy属性使用
+	
+	public Integer getAsnIpGroup() {
+		return asnIpGroup;
+	}
+	public void setAsnIpGroup(Integer asnIpGroup) {
+		this.asnIpGroup = asnIpGroup;
+	}
 	/**
 	 * irType
 	 * @return  irType

src/main/java/com/nis/domain/configuration/BaseStringCfg.java

@@ -82,6 +82,9 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
 	private NtcSubscribeIdCfg ntcSubscribeIdCfg;
 	private IpPortCfg ipPort;
 	
+	//http url来源于http关键字的标识
+	private Integer sourceCompileId;
+	
 	
 	public IpPortCfg getIpPort() {
 		return ipPort;
@@ -190,7 +193,12 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
 	public void setIsCaseInsenstive(Integer isCaseInsenstive) {
 		this.isCaseInsenstive =isCaseInsenstive;
 	}
-	
+	public Integer getSourceCompileId() {
+		return sourceCompileId;
+	}
+	public void setSourceCompileId(Integer sourceCompileId) {
+		this.sourceCompileId = sourceCompileId;
+	}
 	public static List<BaseStringCfg> replaceBaseKeyList(List<BaseStringCfg> list){
 		for (int i = 0; i < list.size(); i++) {
 			BaseStringCfg  base=(BaseStringCfg)list.get(i);

src/main/java/com/nis/domain/configuration/CfgIndexInfo.java

@@ -71,6 +71,14 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	private List<P2pHashCfg> p2pHashList;
 	private List<P2pKeywordCfg> p2pKeywordList;
 	
+	private Integer sourceCompileId;
+	public Integer getSourceCompileId() {
+		return sourceCompileId;
+	}
+	public void setSourceCompileId(Integer sourceCompileId) {
+		this.sourceCompileId = sourceCompileId;
+	}
+	
 	public AvContUrlCfg getAvContUrlCfg() {
 		return avContUrlCfg;
 	}

src/main/java/com/nis/domain/configuration/DdosIpCfg.java

@@ -23,11 +23,11 @@ public class DdosIpCfg extends BaseIpCfg {
 	 */
 	private static final long serialVersionUID = -5446903784736960824L;
 	private String indexTable="ddos_ip_cfg";
-	@ExcelField(title="antiddos_protocol",sort=41)
+	@ExcelField(title="antiddos_protocol",sort=22)
 	private String antiddosProtocol;//目前支持TCP_SYN, DNS, NTP，
-	@ExcelField(title="bps_threadshold",sort=42)
+	@ExcelField(title="bps_threadshold",sort=23)
 	private Long bpsThreadshold;// 即DDoS攻击保护动作触发阈值，每秒Bit数和每秒包数
-	@ExcelField(title="pps_threadshold",sort=43)
+	@ExcelField(title="pps_threadshold",sort=24)
 	private Long ppsThreadshold;
 
 	public String getAntiddosProtocol() {

src/main/java/com/nis/domain/configuration/template/AsnIpTemplate.java

@@ -14,7 +14,7 @@ public class AsnIpTemplate {
 	 */
 	
 	private String cfgDesc;
-	private String asnNo;
+	private String userRegion1;
 	private String destIpAddress; 
 	
 	@ExcelField(title="config_describe",align=2,sort=1)
@@ -25,16 +25,17 @@ public class AsnIpTemplate {
 		this.cfgDesc = cfgDesc;
 	}
 	@ExcelField(title="asn_no",align=2,sort=11)
-	public String getAsnNo() {
-		return asnNo;
+	public String getUserRegion1() {
+		return userRegion1;
 	}
-	public void setAsnNo(String asnNo) {
-		this.asnNo = asnNo;
+	public void setUserRegion1(String userRegion1) {
+		this.userRegion1 = userRegion1;
 	}
 	@ExcelField(title="server_ip",align=2,sort=12)
 	public String getDestIpAddress() {
 		return destIpAddress;
 	}
+	
 	public void setDestIpAddress(String destIpAddress) {
 		this.destIpAddress = destIpAddress;
 	}