1.修改app payload特征，拆分L3_header为L3_header_IP,L3_header_ICMP,支持偏移量表达式；

2.域名统计界面的域名查询条件，去除id=0(Other)的域名查询；
3.通联关系日志的下拉列表查询条件，增select为空的条件，否则reset时，全部定位在了Other。

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

@@ -55,6 +55,11 @@ public class AppComplexFeatureCfg extends BaseCfg<AppComplexFeatureCfg> {
 	private String icmpCode;
 	private String icmpIdentifier;
 	private String headerType;
+	//以下参数为APP payload payload的特殊属性（偏移量表达式时处理）
+	private Integer payloadOffset;
+	private Integer payloadSize;//下发综合服务接口时，为单独的域配置
+	private String payloadPacketDirection;//下发综合服务接口时，为单独的域配置
+	
 	
 	public String getCfgRegionCode1() {
 		return cfgRegionCode1;
@@ -299,5 +304,28 @@ public class AppComplexFeatureCfg extends BaseCfg<AppComplexFeatureCfg> {
 		this.headerType = headerType;
 	}
 
+	public Integer getPayloadOffset() {
+		return payloadOffset;
+	}
+
+	public void setPayloadOffset(Integer payloadOffset) {
+		this.payloadOffset = payloadOffset;
+	}
+
+	public Integer getPayloadSize() {
+		return payloadSize;
+	}
+
+	public void setPayloadSize(Integer payloadSize) {
+		this.payloadSize = payloadSize;
+	}
+
+	public String getPayloadPacketDirection() {
+		return payloadPacketDirection;
+	}
+
+	public void setPayloadPacketDirection(String payloadPacketDirection) {
+		this.payloadPacketDirection = payloadPacketDirection;
+	}
 	
 }

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

@@ -46,6 +46,12 @@ public class AppFeatureIndex extends BaseCfg<AppFeatureIndex> {
 	private String cfgRegionType;
 	private String cfgRegionValue;
 	private String cfgRegionCode1;
+	private Integer isDrop;//
+	private Integer isLoop;
+	private Integer dropTime;//drop持续时间，默认180s，0-1800s
+	private Integer loopTime;//loop持续时间，默认180s，0-1800s
+	private Integer isRelation;
+	private Integer relationTime;//关联持续时间，默认10s，0-180s
 	public static String getTablename() {
 		return tableName;
 	}
@@ -133,5 +139,59 @@ public class AppFeatureIndex extends BaseCfg<AppFeatureIndex> {
 	public void setNumCfgList(List<AppTcpCfg> numCfgList) {
 		this.numCfgList = numCfgList;
 	}
+	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;
+	}
+	public Integer getIsDrop() {
+		return isDrop;
+	}
+	public void setIsDrop(Integer isDrop) {
+		this.isDrop = isDrop;
+	}
+	public Integer getIsLoop() {
+		return isLoop;
+	}
+	public void setIsLoop(Integer isLoop) {
+		this.isLoop = isLoop;
+	}
+	public Integer getDropTime() {
+		return dropTime;
+	}
+	public void setDropTime(Integer dropTime) {
+		this.dropTime = dropTime;
+	}
+	public Integer getLoopTime() {
+		return loopTime;
+	}
+	public void setLoopTime(Integer loopTime) {
+		this.loopTime = loopTime;
+	}
+	public Integer getIsRelation() {
+		return isRelation;
+	}
+	public void setIsRelation(Integer isRelation) {
+		this.isRelation = isRelation;
+	}
+	public Integer getRelationTime() {
+		return relationTime;
+	}
+	public void setRelationTime(Integer relationTime) {
+		this.relationTime = relationTime;
+	}
 
 }