20190508升级sql内容

Conflicts:
	src/main/resources/messages/message_ru.properties

README.md

@@ -1,3 +1,18 @@
-610功能升级：
-系统需要支持对 生效中的配置 进行修改的功能；
-统计的时间修改为一个月，性能是否可以；
+5.8号升级版本。
+
+1、系统支持单独配置 SubscribeID，即仅使用SubscribeID作为配置条件进行监测或者封堵，无需与其它条件组合；
+
+
+2、系统增加配置30个用户并发进行导入，每次导入不超过2w条 。
+
+
+3、系统增加saveAndAudit角色，拥有该角色的用户新增配置，配置不经过审核流程直接生效。
+
+4、日志页面单次可以下载2万条以内的日志；
+
+
+5、支持监测、统计志查询条件扩展到1个月 （通联日志只能是1天）。
+
+
+6、配置 页面支持按照配置 id进行查询，支持配置 id输入方式为 10-15；10，13，15；
+

src/main/java/com/nis/domain/basics/AsnIpCfg.java

@@ -20,14 +20,12 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
 	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=6)
 	@SerializedName("ipType")
 	private Integer ipType;
-	private Integer srcIpPattern; 
-	@ExcelField(title="dest_ip_pattern",dictType="IP_PATTERN",sort=8)
-	private Integer destIpPattern; 
+	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=8)
+	private Integer ipPattern; 
 	private String srcIpAddress; 
 	@ExcelField(title="ip",sort=7)
 	private String destIpAddress; 
-	private Integer srcPortPattern; 
-	private Integer destPortPattern; 
+	private Integer portPattern; 
 	private String srcPort; 
 	private String destPort; 
 	//@ExcelField(title="group",sort=2)
@@ -119,30 +117,11 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
 	public void setIpType(Integer ipType) {
 		this.ipType = ipType;
 	}
-	
-	public Integer getSrcIpPattern() {
-		return srcIpPattern;
+	public Integer getIpPattern() {
+		return ipPattern;
 	}
-	public void setSrcIpPattern(Integer srcIpPattern) {
-		this.srcIpPattern = srcIpPattern;
-	}
-	public Integer getDestIpPattern() {
-		return destIpPattern;
-	}
-	public void setDestIpPattern(Integer destIpPattern) {
-		this.destIpPattern = destIpPattern;
-	}
-	public Integer getSrcPortPattern() {
-		return srcPortPattern;
-	}
-	public void setSrcPortPattern(Integer srcPortPattern) {
-		this.srcPortPattern = srcPortPattern;
-	}
-	public Integer getDestPortPattern() {
-		return destPortPattern;
-	}
-	public void setDestPortPattern(Integer destPortPattern) {
-		this.destPortPattern = destPortPattern;
+	public void setIpPattern(Integer ipPattern) {
+		this.ipPattern = ipPattern;
 	}
 	public String getSrcIpAddress() {
 		return srcIpAddress;
@@ -156,6 +135,12 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
 	public void setDestIpAddress(String destIpAddress) {
 		this.destIpAddress = destIpAddress;
 	}
+	public Integer getPortPattern() {
+		return portPattern;
+	}
+	public void setPortPattern(Integer portPattern) {
+		this.portPattern = portPattern;
+	}
 	public String getSrcPort() {
 		return srcPort;
 	}
@@ -191,10 +176,9 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
 	}
 	@Override
 	public String toString() {
-		return "AsnIpCfg [regionId=" + regionId + ", ratelimit=" + ratelimit + ", ipType=" + ipType + ", srcIpPattern="
-				+ srcIpPattern + ", destIpPattern="+ destIpPattern+ ", srcIpAddress=" + srcIpAddress + ", destIpAddress=" 
-				+ destIpAddress + ", srcPortPattern="+ srcPortPattern+", destPortPattern="+ destPortPattern + ", srcPort=" 
-				+ srcPort + ", destPort=" + destPort + ", asnIpGroupName=" + asnIpGroupName
+		return "AsnIpCfg [regionId=" + regionId + ", ratelimit=" + ratelimit + ", ipType=" + ipType + ", ipPattern="
+				+ ipPattern + ", srcIpAddress=" + srcIpAddress + ", destIpAddress=" + destIpAddress + ", portPattern="
+				+ portPattern + ", srcPort=" + srcPort + ", destPort=" + destPort + ", asnIpGroupName=" + asnIpGroupName
 				+ ", asnIpGroup=" + asnIpGroup + ", direction=" + direction + ", protocol=" + protocol + ", protocolId="
 				+ protocolId + ", compileId=" + compileId + ", isValid=" + isValid + ", userRegion1=" + userRegion1
 				+ ", userRegion2=" + userRegion2 + ", userRegion3=" + userRegion3 + ", userRegion4=" + userRegion4

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

@@ -1,6 +1,8 @@
 
 package com.nis.domain.configuration;
 
+import org.apache.commons.lang3.builder.ReflectionToStringBuilder;
+
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import com.nis.util.excel.ExcelField;
@@ -32,13 +34,11 @@ public class AppIpCfg extends BaseCfg<AppIpCfg> {
 	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=3)
 	@SerializedName("ipType")
 	protected Integer ipType;
-	protected Integer srcIpPattern; 
-	protected Integer destIpPattern; 
+	protected Integer ipPattern; 
 	protected String srcIpAddress; 
 	@ExcelField(title="server_ip",sort=4)
 	protected String destIpAddress; 
-	protected Integer srcPortPattern; 
-	protected Integer destPortPattern; 
+	protected Integer portPattern; 
 	protected String srcPort; 
 	@ExcelField(title="server_port",sort=5)
 	protected String destPort; 
@@ -121,7 +121,34 @@ public class AppIpCfg extends BaseCfg<AppIpCfg> {
 //		this.protocolId = protocolId;
 //	}
 	
+	/**
+	 * ipPattern
+	 * @return  ipPattern
+	*/
 	
+	public Integer getIpPattern() {
+		return ipPattern;
+	}
+	/**
+	 * @param ipPattern the ipPattern to set
+	 */
+	public void setIpPattern(Integer ipPattern) {
+		this.ipPattern = ipPattern;
+	}
+	/**
+	 * portPattern
+	 * @return  portPattern
+	*/
+	
+	public Integer getPortPattern() {
+		return portPattern;
+	}
+	/**
+	 * @param portPattern the portPattern to set
+	 */
+	public void setPortPattern(Integer portPattern) {
+		this.portPattern = portPattern;
+	}
 	
 	/**
 	 * srcIpAddress
@@ -131,30 +158,6 @@ public class AppIpCfg extends BaseCfg<AppIpCfg> {
 	public String getSrcIpAddress() {
 		return srcIpAddress;
 	}
-	public Integer getSrcIpPattern() {
-		return srcIpPattern;
-	}
-	public void setSrcIpPattern(Integer srcIpPattern) {
-		this.srcIpPattern = srcIpPattern;
-	}
-	public Integer getDestIpPattern() {
-		return destIpPattern;
-	}
-	public void setDestIpPattern(Integer destIpPattern) {
-		this.destIpPattern = destIpPattern;
-	}
-	public Integer getSrcPortPattern() {
-		return srcPortPattern;
-	}
-	public void setSrcPortPattern(Integer srcPortPattern) {
-		this.srcPortPattern = srcPortPattern;
-	}
-	public Integer getDestPortPattern() {
-		return destPortPattern;
-	}
-	public void setDestPortPattern(Integer destPortPattern) {
-		this.destPortPattern = destPortPattern;
-	}
 	/**
 	 * @param srcIpAddress the srcIpAddress to set
 	 */
@@ -254,10 +257,16 @@ public class AppIpCfg extends BaseCfg<AppIpCfg> {
 	public String toString() {
 		return "AppIpCfg [compileId=" + compileId + ", ratelimit=" + ratelimit + ", appCode=" + appCode + ", behavCode="
 				+ behavCode + ", specServiceId=" + specServiceId + ", appName=" + appName + ", ipType=" + ipType
-				+ ", srcIpPattern=" + srcIpPattern + ", destIpPattern=" + destIpPattern + ", srcIpAddress="
-				+ srcIpAddress + ", destIpAddress=" + destIpAddress + ", srcPortPattern=" + srcPortPattern
-				+ ", destPortPattern=" + destPortPattern + ", srcPort=" + srcPort + ", destPort=" + destPort
-				+ ", direction=" + direction + ", protocol=" + protocol + "]";
+				+ ", ipPattern=" + ipPattern + ", srcIpAddress=" + srcIpAddress + ", destIpAddress=" + destIpAddress
+				+ ", portPattern=" + portPattern + ", srcPort=" + srcPort + ", destPort=" + destPort + ", direction="
+				+ direction + ", protocol=" + protocol + ", userRegion1=" + userRegion1 + ", userRegion2=" + userRegion2
+				+ ", userRegion3=" + userRegion3 + ", userRegion4=" + userRegion4 + ", userRegion5=" + userRegion5
+				+ ", cfgId=" + cfgId + ", cfgDesc=" + cfgDesc + ", action=" + action + ", isValid=" + isValid
+				+ ", isAudit=" + isAudit + ", creatorId=" + creatorId + ", createTime=" + createTime + ", editorId="
+				+ editorId + ", editTime=" + editTime + ", auditorId=" + auditorId + ", auditTime=" + auditTime
+				+ ", serviceId=" + serviceId + ", requestId=" + requestId + ", cancelRequestId=" + cancelRequestId
+				+ ", isAreaEffective=" + isAreaEffective + ", classify=" + classify + ", attribute=" + attribute
+				+ ", lable=" + lable + ", areaEffectiveIds=" + areaEffectiveIds + ", cfgRegionCode=" + cfgRegionCode
+				+ ", cfgType=" + cfgType + ", functionId=" + functionId + ", doLog=" + doLog + "]";
 	}
-	
 }

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

@@ -59,8 +59,7 @@ public class AreaIpCfg extends BaseIpCfg {
 		this.cfgType=Constants.AREA_REGION;
 		this.cfgRegionCode=1;
 		this.protocol=0;
-		this.srcPortPattern=1;
-		this.destPortPattern=1;
+		this.portPattern=1;
 		this.srcPort="0";
 		this.destPort="0";
 		this.direction=0;

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

@@ -63,10 +63,6 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	protected String hColumns;//导出隐藏列
 	
 	protected String compileIdNew;// 查询 配置ID 范围
-	
-	//批量操作时，记录isAudit和isValid检索条件
-	protected String batchAuditValue;
-	protected String batchValidValue;
 
 	/**
 	 * 定时任务信息
@@ -1008,17 +1004,6 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	public void setSchedule(ScheduleCfg schedule) {
 		this.schedule = schedule;
 	}
-	public String getBatchAuditValue() {
-		return batchAuditValue;
-	}
-	public String getBatchValidValue() {
-		return batchValidValue;
-	}
-	public void setBatchAuditValue(String batchAuditValue) {
-		this.batchAuditValue = batchAuditValue;
-	}
-	public void setBatchValidValue(String batchValidValue) {
-		this.batchValidValue = batchValidValue;
-	}
+	
 	
 }

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

@@ -45,18 +45,14 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	@SerializedName("ipType")
 	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=50)
 	protected Integer ipType;
-	@ExcelField(title="src_ip_pattern",dictType="IP_PATTERN",sort=51)
-	protected Integer srcIpPattern; 
-	@ExcelField(title="client_ip",sort=52)
+	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=51)
+	protected Integer ipPattern; 
+	@ExcelField(title="client_ip",sort=53)
 	protected String srcIpAddress; 
-	@ExcelField(title="dest_ip_pattern",dictType="IP_PATTERN",sort=53)
-	protected Integer destIpPattern; 
-	@ExcelField(title="server_ip",sort=54)
+	@ExcelField(title="server_ip",sort=52)
 	protected String destIpAddress;
-	@ExcelField(title="src_port_pattern",dictType="PORT_PATTERN",sort=54)
-	protected Integer srcPortPattern;
-	@ExcelField(title="dest_port_pattern",dictType="PORT_PATTERN",sort=54)
-	protected Integer destPortPattern;
+	@ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=54)
+	protected Integer portPattern;
 	@ExcelField(title="client_port",sort=55)
 	protected String srcPort;
 	@ExcelField(title="server_port",sort=56)
@@ -273,31 +269,35 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 		this.protocolId = protocolId;
 	}
 	
+	/**
+	 * ipPattern
+	 * @return  ipPattern
+	*/
 	
-	public Integer getSrcIpPattern() {
-		return srcIpPattern;
+	public Integer getIpPattern() {
+		return ipPattern;
 	}
-	public void setSrcIpPattern(Integer srcIpPattern) {
-		this.srcIpPattern = srcIpPattern;
+	/**
+	 * @param ipPattern the ipPattern to set
+	 */
+	public void setIpPattern(Integer ipPattern) {
+		this.ipPattern = ipPattern;
 	}
-	public Integer getDestIpPattern() {
-		return destIpPattern;
+	/**
+	 * portPattern
+	 * @return  portPattern
+	*/
+	
+	public Integer getPortPattern() {
+		return portPattern;
 	}
-	public void setDestIpPattern(Integer destIpPattern) {
-		this.destIpPattern = destIpPattern;
-	}
-	public Integer getSrcPortPattern() {
-		return srcPortPattern;
-	}
-	public void setSrcPortPattern(Integer srcPortPattern) {
-		this.srcPortPattern = srcPortPattern;
-	}
-	public Integer getDestPortPattern() {
-		return destPortPattern;
-	}
-	public void setDestPortPattern(Integer destPortPattern) {
-		this.destPortPattern = destPortPattern;
+	/**
+	 * @param portPattern the portPattern to set
+	 */
+	public void setPortPattern(Integer portPattern) {
+		this.portPattern = portPattern;
 	}
+	
 	/**
 	 * srcIpAddress
 	 * @return  srcIpAddress

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

@@ -0,0 +1,31 @@
+package com.nis.domain.configuration.template;
+
+/**
+ * wx 将部分字段的标题改变，或者不需要的字段隐藏
+ * 隐藏方法，对于不需要的字段或者方法，Override该字段方法，但是@ExcelField注解不需要加上了
+ * @author dell
+ *
+ */
+@Deprecated
+public class IpAddrTemplate extends IpCfgTemplate {
+	
+
+	@Override
+	public Integer getIrType() {
+		// TODO Auto-generated method stub
+		return super.getIrType();
+	}
+
+	@Override
+	public Integer getDnsStrategyId() {
+		// TODO Auto-generated method stub
+		return super.getDnsStrategyId();
+	}
+
+	@Override
+	public String getRatelimit() {
+		// TODO Auto-generated method stub
+		return super.getRatelimit();
+	}
+	
+}

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

@@ -8,6 +8,7 @@
  */
 package com.nis.domain.configuration.template;
 
+import com.google.gson.JsonObject;
 import com.nis.util.excel.ExcelField;
 
 /**

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

@@ -0,0 +1,310 @@
+/**
+ *@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.template;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * @Description: excel导入IP类配置
+ */
+@Deprecated
+public class IpCfgTemplate {
+
+	/**
+	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
+	 *
+	 * @since 1.0.0
+	 */
+	
+
+	
+	private Long cfgId;
+	private Integer ipType;//1
+	private Integer ipPattern;//2 
+	private String srcIpAddress; //3
+	private String destIpAddress; //4
+	private Integer portPattern; //5
+	private String srcPort; //6
+	private String destPort;//7
+	private Integer protocol;//8
+	protected Integer direction;//9
+	private String cfgDesc;//10
+	private Integer requestId;//11
+	private String requestName;//12
+	private Integer isAreaEffective;//13
+	private String classify;//14
+	private String attribute;//15
+	private String lable;//16
+	private String classifyName;//17
+	private String attributeName;//18
+	private String lableName;//19
+	private String areaEffectiveIds;//20
+	private String ratelimit;//21
+	private Integer dnsStrategyId;//22
+	private Integer irType;//23
+	private String userRegion1;//77
+	private String userRegion2;//78
+	private String userRegion3;//79
+	private String userRegion4;//80
+	private String userRegion5;//81
+	
+	/**
+	 * userRegion1
+	 * @return  userRegion1
+	*/
+//	@ExcelField(title="userregion1",align=2,sort=77)
+	public String getUserRegion1() {
+		return userRegion1;
+	}
+	/**
+	 * @param userRegion1 the userRegion1 to set
+	 */
+	public void setUserRegion1(String userRegion1) {
+		this.userRegion1 = userRegion1;
+	}
+	/**
+	 * userRegion2
+	 * @return  userRegion2
+	*/
+//	@ExcelField(title="userregion2",align=2,sort=78)
+	public String getUserRegion2() {
+		return userRegion2;
+	}
+	/**
+	 * @param userRegion2 the userRegion2 to set
+	 */
+	public void setUserRegion2(String userRegion2) {
+		this.userRegion2 = userRegion2;
+	}
+	/**
+	 * userRegion3
+	 * @return  userRegion3
+	*/
+//	@ExcelField(title="userregion3",align=2,sort=79)
+	public String getUserRegion3() {
+		return userRegion3;
+	}
+	/**
+	 * @param userRegion3 the userRegion3 to set
+	 */
+	public void setUserRegion3(String userRegion3) {
+		this.userRegion3 = userRegion3;
+	}
+	/**
+	 * userRegion4
+	 * @return  userRegion4
+	*/
+//	@ExcelField(title="userregion4",align=2,sort=80)
+	public String getUserRegion4() {
+		return userRegion4;
+	}
+	/**
+	 * @param userRegion4 the userRegion4 to set
+	 */
+	public void setUserRegion4(String userRegion4) {
+		this.userRegion4 = userRegion4;
+	}
+	/**
+	 * userRegion5
+	 * @return  userRegion5
+	*/
+//	@ExcelField(title="userregion5",align=2,sort=81)
+	public String getUserRegion5() {
+		return userRegion5;
+	}
+	/**
+	 * @param userRegion5 the userRegion5 to set
+	 */
+	public void setUserRegion5(String userRegion5) {
+		this.userRegion5 = userRegion5;
+	}
+	/**
+	 * ratelimit
+	 * @return  ratelimit
+	*/
+	@ExcelField(title="ratelimit",align=2,sort=74)
+	public String getRatelimit() {
+		return ratelimit;
+	}
+	/**
+	 * @param ratelimit the ratelimit to set
+	 */
+	public void setRatelimit(String ratelimit) {
+		this.ratelimit = ratelimit;
+	}
+	/**
+	 * irType
+	 * @return  irType
+	*/
+	@ExcelField(title="ir_type",align=2,sort=76)
+	public Integer getIrType() {
+		return irType;
+	}
+	/**
+	 * @param irType the irType to set
+	 */
+	public void setIrType(Integer irType) {
+		this.irType = irType;
+	}
+	/**
+	 * dnsStrategyId
+	 * @return  dnsStrategyId
+	*/
+	@ExcelField(title="dns_strategy_id",align=2,sort=75)
+	public Integer getDnsStrategyId() {
+		return dnsStrategyId;
+	}
+	/**
+	 * @param dnsStrategyId the dnsStrategyId to set
+	 */
+	public void setDnsStrategyId(Integer dnsStrategyId) {
+		this.dnsStrategyId = dnsStrategyId;
+	}
+	@ExcelField(title="ip_type",align=2,sort=1)
+	public Integer getIpType() {
+		return ipType;
+	}
+	public void setIpType(Integer ipType) {
+		this.ipType = ipType;
+	}
+	@ExcelField(title="ip_pattern",align=2,sort=2)
+	public Integer getIpPattern() {
+		return ipPattern;
+	}
+	public void setIpPattern(Integer ipPattern) {
+		this.ipPattern = ipPattern;
+	}
+	@ExcelField(title="client_ip",align=2,sort=3)
+	public String getSrcIpAddress() {
+		return srcIpAddress;
+	}
+	public void setSrcIpAddress(String srcIpAddress) {
+		this.srcIpAddress = srcIpAddress;
+	}
+	@ExcelField(title="server_ip",align=2,sort=4)
+	public String getDestIpAddress() {
+		return destIpAddress;
+	}
+	public void setDestIpAddress(String destIpAddress) {
+		this.destIpAddress = destIpAddress;
+	}
+	@ExcelField(title="port_pattern",align=2,sort=5)
+	public Integer getPortPattern() {
+		return portPattern;
+	}
+	public void setPortPattern(Integer portPattern) {
+		this.portPattern = portPattern;
+	}
+	@ExcelField(title="client_port",align=2,sort=6)
+	public String getSrcPort() {
+		return srcPort;
+	}
+	public void setSrcPort(String srcPort) {
+		this.srcPort = srcPort;
+	}
+	@ExcelField(title="server_port",align=2,sort=7)
+	public String getDestPort() {
+		return destPort;
+	}
+	public void setDestPort(String destPort) {
+		this.destPort = destPort;
+	}
+	public Long getCfgId() {
+		return cfgId;
+	}
+	public void setCfgId(Long cfgId) {
+		this.cfgId = cfgId;
+	}
+	@ExcelField(title="direction",align=2,sort=8)
+	public Integer getDirection() {
+		return direction;
+	}
+	public void setDirection(Integer direction) {
+		this.direction = direction;
+	}
+	@ExcelField(title="config_describe",align=2,sort=11)
+	public String getCfgDesc() {
+		return cfgDesc;
+	}
+	public void setCfgDesc(String cfgDesc) {
+		this.cfgDesc = cfgDesc;
+	}
+	@ExcelField(title="letter",align=2,sort=13)
+	public Integer getRequestId() {
+		return requestId;
+	}
+	public void setRequestId(Integer requestId) {
+		this.requestId = requestId;
+	}
+	public String getRequestName() {
+		return requestName;
+	}
+	public void setRequestName(String requestName) {
+		this.requestName = requestName;
+	}
+	public Integer getIsAreaEffective() {
+		return isAreaEffective;
+	}
+	public void setIsAreaEffective(Integer isAreaEffective) {
+		this.isAreaEffective = isAreaEffective;
+	}
+	@ExcelField(title="classification",align=2,sort=71)
+	public String getClassify() {
+		return classify;
+	}
+	public void setClassify(String classify) {
+		this.classify = classify;
+	}
+	@ExcelField(title="attribute",align=2,sort=72)
+	public String getAttribute() {
+		return attribute;
+	}
+	public void setAttribute(String attribute) {
+		this.attribute = attribute;
+	}
+	@ExcelField(title="label",align=2,sort=73)
+	public String getLable() {
+		return lable;
+	}
+	public void setLable(String lable) {
+		this.lable = lable;
+	}
+	public String getClassifyName() {
+		return classifyName;
+	}
+	public void setClassifyName(String classifyName) {
+		this.classifyName = classifyName;
+	}
+	public String getAttributeName() {
+		return attributeName;
+	}
+	public void setAttributeName(String attributeName) {
+		this.attributeName = attributeName;
+	}
+	public String getLableName() {
+		return lableName;
+	}
+	public void setLableName(String lableName) {
+		this.lableName = lableName;
+	}
+//	@ExcelField(title="area_effective",align=2,sort=70)
+	public String getAreaEffectiveIds() {
+		return areaEffectiveIds;
+	}
+	public void setAreaEffectiveIds(String areaEffectiveIds) {
+		this.areaEffectiveIds = areaEffectiveIds;
+	}
+	@ExcelField(title="protocol",align=2,sort=9)
+	public Integer getProtocol() {
+		return protocol;
+	}
+	public void setProtocol(Integer protocol) {
+		this.protocol = protocol;
+	}
+}

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

@@ -0,0 +1,47 @@
+package com.nis.domain.configuration.template;
+
+import com.nis.util.excel.ExcelField;
+/**
+ * wx 将部分字段的标题改变，或者不需要的字段隐藏
+ * 隐藏方法，对于不需要的字段或者方法，Override该字段方法，但是@ExcelField注解不需要加上了
+ * @author dell
+ *
+ */
+@Deprecated
+public class IpMultiplexPolicyTemplate extends IpCfgTemplate {
+	@Override
+	@ExcelField(title="IP",align=2,sort=3)
+	public String getSrcIpAddress() {
+		return super.getSrcIpAddress();
+	}
+	@ExcelField(title="port",align=2,sort=6)
+	@Override
+	public String getSrcPort() {
+		// TODO Auto-generated method stub
+		return super.getSrcPort();
+	}
+	
+	@Override
+	@ExcelField(title="group_name",align=2,sort=75)
+	public Integer getDnsStrategyId() {
+		// TODO Auto-generated method stub
+		return super.getDnsStrategyId();
+	}
+	
+	@Override
+	public String getRatelimit() {
+		// TODO Auto-generated method stub
+		return super.getRatelimit();
+	}
+	@Override
+	public String getDestPort() {
+		// TODO Auto-generated method stub
+		return super.getDestPort();
+	}
+	@Override
+	public String getDestIpAddress() {
+		// TODO Auto-generated method stub
+		return super.getDestIpAddress();
+	}
+
+}

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

@@ -0,0 +1,31 @@
+package com.nis.domain.configuration.template;
+
+/**
+ * wx 将部分字段的标题改变，或者不需要的字段隐藏
+ * 隐藏方法，对于不需要的字段或者方法，Override该字段方法，但是@ExcelField注解不需要加上了
+ * @author dell
+ *
+ */
+@Deprecated
+public class IpsecTemplate extends IpCfgTemplate {
+	
+
+	@Override
+	public Integer getIrType() {
+		// TODO Auto-generated method stub
+		return super.getIrType();
+	}
+
+	@Override
+	public Integer getDnsStrategyId() {
+		// TODO Auto-generated method stub
+		return super.getDnsStrategyId();
+	}
+
+	@Override
+	public String getRatelimit() {
+		// TODO Auto-generated method stub
+		return super.getRatelimit();
+	}
+	
+}

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

@@ -0,0 +1,37 @@
+package com.nis.domain.configuration.template;
+
+/**
+ * wx 将部分字段的标题改变，或者不需要的字段隐藏
+ * 隐藏方法，对于不需要的字段或者方法，Override该字段方法，但是@ExcelField注解不需要加上了
+ * @author dell
+ *
+ */
+@Deprecated
+public class TunnelIpTemplate extends IpCfgTemplate {
+	
+
+	@Override
+	public Integer getIrType() {
+		// TODO Auto-generated method stub
+		return super.getIrType();
+	}
+
+	@Override
+	public Integer getDnsStrategyId() {
+		// TODO Auto-generated method stub
+		return super.getDnsStrategyId();
+	}
+
+	@Override
+	public String getRatelimit() {
+		// TODO Auto-generated method stub
+		return super.getRatelimit();
+	}
+
+	@Override
+	public Integer getProtocol() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+	
+}

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

@@ -0,0 +1,66 @@
+package com.nis.domain.configuration.template;
+
+/**
+ * wx 将部分字段的标题改变，或者不需要的字段隐藏
+ * 隐藏方法，对于不需要的字段或者方法，Override该字段方法，但是@ExcelField注解不需要加上了
+ * @author dell
+ *
+ */
+@Deprecated
+public class WhiteListIpTemplate extends IpCfgTemplate {
+	
+	@Override
+	public Integer getDirection() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public Integer getProtocol() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	@Override
+	public Integer getIrType() {
+		// TODO Auto-generated method stub
+		return super.getIrType();
+	}
+
+	@Override
+	public Integer getDnsStrategyId() {
+		// TODO Auto-generated method stub
+		return super.getDnsStrategyId();
+	}
+	
+	@Override
+	public Integer getRequestId() {
+		// TODO Auto-generated method stub
+		return super.getRequestId();
+	}
+
+	@Override
+	public String getClassify() {
+		// TODO Auto-generated method stub
+		return super.getClassify();
+	}
+
+	@Override
+	public String getAttribute() {
+		// TODO Auto-generated method stub
+		return super.getAttribute();
+	}
+
+	@Override
+	public String getLable() {
+		// TODO Auto-generated method stub
+		return super.getLable();
+	}
+
+	@Override
+	public String getRatelimit() {
+		// TODO Auto-generated method stub
+		return super.getRatelimit();
+	}
+	
+}

src/main/java/com/nis/domain/specific/SpecificServiceHostCfg.java

@@ -30,15 +30,13 @@ public class SpecificServiceHostCfg extends BaseEntity<SpecificServiceHostCfg>{
 	@Expose
 	private Integer protocol; //protocol	协议	int	N	6表示tcp,17表示udp，0表示任意
 	@Expose
-	private Integer srcIpPattern; //ip格式
-	private Integer destIpPattern; //ip格式
+	private Integer ipPattern; //ip格式
 	@Expose
 	private String srcIpAddress; //源（客户端）IP地址
 	@Expose
 	private String destIpAddress; //目的（服务器）IP地址
 	@Expose
-	private Integer srcPortPattern; //端口格式
-	private Integer destPortPattern; //端口格式
+	private Integer portPattern; //端口格式
 	@Expose
 	private String srcPort; //源（客户端）端口
 	@Expose
@@ -116,33 +114,19 @@ public class SpecificServiceHostCfg extends BaseEntity<SpecificServiceHostCfg>{
 	public void setDestPort(String destPort) {
 		this.destPort = destPort;
 	}
-	@ExcelField(title="src_ip_pattern",align=2,sort=21,fieldType=Integer.class)
-	public Integer getSrcIpPattern() {
-		return srcIpPattern;
+	@ExcelField(title="ip_pattern",align=2,sort=21,fieldType=Integer.class)
+	public Integer getIpPattern() {
+		return ipPattern;
 	}
-	public void setSrcIpPattern(Integer srcIpPattern) {
-		this.srcIpPattern = srcIpPattern;
+	public void setIpPattern(Integer ipPattern) {
+		this.ipPattern = ipPattern;
 	}
-	@ExcelField(title="dest_ip_pattern",align=2,sort=22,fieldType=Integer.class)
-	public Integer getDestIpPattern() {
-		return destIpPattern;
+	@ExcelField(title="port_pattern",align=2,sort=40,fieldType=Integer.class)
+	public Integer getPortPattern() {
+		return portPattern;
 	}
-	public void setDestIpPattern(Integer destIpPattern) {
-		this.destIpPattern = destIpPattern;
-	}
-	@ExcelField(title="src_port_pattern",align=2,sort=40,fieldType=Integer.class)
-	public Integer getSrcPortPattern() {
-		return srcPortPattern;
-	}
-	public void setSrcPortPattern(Integer srcPortPattern) {
-		this.srcPortPattern = srcPortPattern;
-	}
-	@ExcelField(title="dest_port_pattern",align=2,sort=41,fieldType=Integer.class)
-	public Integer getDestPortPattern() {
-		return destPortPattern;
-	}
-	public void setDestPortPattern(Integer destPortPattern) {
-		this.destPortPattern = destPortPattern;
+	public void setPortPattern(Integer portPattern) {
+		this.portPattern = portPattern;
 	}
 	@ExcelField(title="direction",align=2,sort=110)
 	public Integer getDirection() {

src/main/java/com/nis/quartz/ScheduleCfgJob.java

@@ -330,7 +330,7 @@ public class ScheduleCfgJob implements Job {
 			Calendar invalidCal=Calendar.getInstance();
 			invalidCal.setTime(invalidTime);
 			invalidCal.add(Calendar.MINUTE, 2);
-			long invalidTimes=invalidCal.getTime().getTime();
+			long invalidTimes=validStartCal.getTime().getTime();
 			long currentTimes=new Date().getTime();
 			//开始时间设置为今天已过时，则将开始时间加上周期
 			if((currentTimes-validStartTimes) > 0) {

src/main/java/com/nis/util/ConfigConvertUtil.java

@@ -395,45 +395,31 @@ public class ConfigConvertUtil {
 	 */
 	public static List<IpCfg> ipConvert(IpCfg dstIp, BaseIpCfg srcIp) {
 		List<IpCfg> ipConvertList = Lists.newArrayList();
-		List<IpCfg> tempList = Lists.newArrayList();
-		List<IpCfg> tempList1 = Lists.newArrayList();
-		if (srcIp.getIpType().equals(4)) {// IP V4
-			if(srcIp.getSrcIpPattern().equals(2)) {//源IP范围
-					if (srcIp.getSrcIpAddress() != null) {
-						String startIpPart = srcIp.getSrcIpAddress().split("-")[0];
-						String endIpPart = srcIp.getSrcIpAddress().split("-")[1];
-						Integer startNum = Integer.parseInt(startIpPart.split("\\.")[3]);
-						Integer endNum = Integer.parseInt(endIpPart.split("\\.")[3]);
-						for (int i = startNum; i <= endNum; i++) {
-							IpCfg tempIp = new IpCfg();
-							BeanUtils.copyProperties(dstIp, tempIp);
-							tempIp.setSrcIp(startIpPart.substring(0, startIpPart.lastIndexOf(".") + 1) + i);
-							tempIp.setSrcIpMask("255.255.255.255");
-							tempList.add(tempIp);
-						}
-					}else {
-						dstIp.setSrcIp("0.0.0.0");
-						dstIp.setSrcIpMask("255.255.255.255");
-						tempList.add(dstIp);
+		boolean isRange = ((srcIp.getIpPattern() != null && srcIp.getIpPattern() == 2)
+				|| (srcIp.getSrcIpAddress() != null && srcIp.getSrcIpAddress().indexOf("-") > -1)
+				|| (srcIp.getDestIpAddress() != null && srcIp.getDestIpAddress().indexOf("-") > -1));
+		if (isRange) {
+			List<IpCfg> tempList = Lists.newArrayList();
+			List<IpCfg> tempList1 = Lists.newArrayList();
+			if (srcIp.getIpType().intValue() == 4) {
+				if (srcIp.getSrcIpAddress() != null) {
+					String startIpPart = srcIp.getSrcIpAddress().split("-")[0];
+					String endIpPart = srcIp.getSrcIpAddress().split("-")[1];
+					Integer startNum = Integer.parseInt(startIpPart.split("\\.")[3]);
+					Integer endNum = Integer.parseInt(endIpPart.split("\\.")[3]);
+					for (int i = startNum; i <= endNum; i++) {
+						IpCfg tempIp = new IpCfg();
+						BeanUtils.copyProperties(dstIp, tempIp);
+						tempIp.setSrcIp(startIpPart.substring(0, startIpPart.lastIndexOf(".") + 1) + i);
+						tempIp.setSrcIpMask("255.255.255.255");
+						tempList.add(tempIp);
 					}
-			}else if(srcIp.getSrcIpPattern().equals(1)){
-				Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]);
-				if (srcMaskNum == 0) {
-					dstIp.setSrcIpMask("0.0.0.0");
 				} else {
-					dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum));
+					dstIp.setSrcIp("0.0.0.0");
+					dstIp.setSrcIpMask("255.255.255.255");
+					tempList.add(dstIp);
 				}
-				dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
-				tempList.add(dstIp);
-			}else if(srcIp.getSrcIpPattern().equals(3)){
-				dstIp.setSrcIp(srcIp.getSrcIpAddress());
-				dstIp.setSrcIpMask("255.255.255.255");
-				tempList.add(dstIp);
-			}else {
-				throw new RuntimeException("Unsupported IP Pattern " + srcIp.getSrcIpPattern());
-			}
-			if (srcIp.getDestIpAddress() != null) {
-				if(srcIp.getDestIpPattern().equals(2)) {
+				if (srcIp.getDestIpAddress() != null) {
 					String startIpPart = srcIp.getDestIpAddress().split("-")[0];
 					String endIpPart = srcIp.getDestIpAddress().split("-")[1];
 					Integer startNum = Integer.parseInt(startIpPart.split("\\.")[3]);
@@ -453,93 +439,217 @@ public class ConfigConvertUtil {
 						}
 					}
 					tempList.clear();
-				}else if(srcIp.getDestIpPattern().equals(1)) {
-					Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]);
+				} else {
 					for (IpCfg _cfg : tempList) {
-						IpCfg tempIp = new IpCfg();
-						BeanUtils.copyProperties(_cfg, tempIp);
-						if (dstMaskNum == 0) {
-							tempIp.setDstIpMask("0.0.0.0");
-						} else {
-							tempIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));
-						}
-						tempIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
-						if (!tempIp.getSrcIp().equals(tempIp.getDstIp())) {
-							// 处理
-							convertPortValues(tempIp, srcIp);
-							tempList1.add(tempIp);
-						}
+						_cfg.setDstIp("0.0.0.0");
+						_cfg.setSrcIpMask("255.255.255.255");
+						convertPortValues(_cfg, srcIp);
 					}
-					tempList.clear();
-				}else {
-					for (IpCfg _cfg : tempList) {
-						IpCfg tempIp = new IpCfg();
-						BeanUtils.copyProperties(_cfg, tempIp);
-						tempIp.setDstIp(srcIp.getDestIpAddress());
-						if (!tempIp.getSrcIp().equals(tempIp.getDstIp())) {
-							tempIp.setDstIpMask("255.255.255.255");
-							// 处理
-							convertPortValues(tempIp, srcIp);
-							tempList1.add(tempIp);
-						}
-					}
-					tempList.clear();
 				}
-			}else {
-				for (IpCfg _cfg : tempList) {
-					_cfg.setDstIp("0.0.0.0");
-					_cfg.setSrcIpMask("255.255.255.255");
-					convertPortValues(_cfg, srcIp);
+				if (tempList1.size() > 0) {
+					ipConvertList.addAll(tempList1);
+				} else {
+					ipConvertList.addAll(tempList);
 				}
-			}
-			if (tempList1.size() > 0) {
-				ipConvertList.addAll(tempList1);
-			} else {
-				ipConvertList.addAll(tempList);
-			}
-		}else if(srcIp.getIpType().equals(6)){// IP V6
-			if (srcIp.getSrcIpAddress() != null) {
-				if(srcIp.getSrcIpPattern().equals(2)) {
+			} else if (srcIp.getIpType().intValue() == 6) {
+				if (srcIp.getSrcIpAddress() != null) {
 					IPv6Address address1 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[0]);
 					IPv6Address address2 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[1]);
 					IPv6Network network = IPv6Network.fromTwoAddresses(address1, address2);
 					dstIp.setSrcIp(address1.toString());
 					dstIp.setSrcIpMask(network.getNetmask().asAddress().toString());
-				}else if(srcIp.getSrcIpPattern().equals(1)){// IP/掩码
-					IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress());
-					dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
-					dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString());
-				}else {// IP
-					dstIp.setSrcIp(srcIp.getSrcIpAddress());
+				} else {
+					dstIp.setSrcIp("::");
 					dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
 				}
-			} else {
-				dstIp.setSrcIp("::");
-				dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
-			}
-			if (srcIp.getDestIpAddress() != null) {
-				if(srcIp.getDestIpPattern().equals(2)) {
+				if (srcIp.getDestIpAddress() != null) {
 					IPv6Address address1 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[0]);
 					IPv6Address address2 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[1]);
 					IPv6Network network = IPv6Network.fromTwoAddresses(address1, address2);
 					dstIp.setDstIp(address1.toString());
 					dstIp.setDstIpMask(network.getNetmask().asAddress().toString());
-				}else if(srcIp.getDestIpPattern().equals(1)) {// IP/掩码
-					IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress());
-					dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
-					dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString());
-				}else {// IP
-					dstIp.setDstIp(srcIp.getDestIpAddress());
+				} else {
+					dstIp.setDstIp("::");
 					dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
 				}
+
+				ipConvertList.add(dstIp);
 			} else {
-				dstIp.setDstIp("::");
-				dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
+				throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
+			}
+		} else {
+			if (srcIp.getSrcIpAddress() != null) {
+				if (srcIp.getSrcIpAddress().indexOf("/") != -1) {
+					if (srcIp.getIpType() == 4 /* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
+						Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]);
+						if (srcMaskNum == 0) {
+							dstIp.setSrcIpMask("0.0.0.0");
+						} else {
+							dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum));
+						}
+
+						dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
+					} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
+						IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress());
+						dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
+						dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString());
+					} /*
+						 * else { Pattern
+						 * patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); Pattern
+						 * patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); Matcher
+						 * matchernV4Subnet=patternV4Subnet.matcher(srcIp.getSrcIpAddress()); Matcher
+						 * matcherV6Subnet=patternV6Subnet.matcher(srcIp.getSrcIpAddress());
+						 * if(matchernV4Subnet.matches()) { Integer srcMaskNum =
+						 * Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); if(srcMaskNum==0){
+						 * dstIp.setSrcIpMask("0.0.0.0"); }else{
+						 * dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); }
+						 * dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); }else
+						 * if(matcherV6Subnet.matches()){ IPv6Network strangeNetwork =
+						 * IPv6Network.fromString(srcIp.getSrcIpAddress());
+						 * dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
+						 * dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); }else
+						 * { throw new RuntimeException("Invalid IP/subnet mask format"); } }
+						 */
+					else {
+						throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
+					}
+				} else {
+					if (srcIp.getIpType() == 4/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
+						dstIp.setSrcIp(srcIp.getSrcIpAddress());
+						dstIp.setSrcIpMask("255.255.255.255");
+					} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
+						dstIp.setSrcIp(srcIp.getSrcIpAddress());
+						dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
+					} /*
+						 * else {//all Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP);
+						 * Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); Matcher
+						 * matcherV4=patternV4.matcher(srcIp.getSrcIpAddress()); Matcher
+						 * matcherV6=patternV6.matcher(srcIp.getSrcIpAddress()); if(matcherV4.matches())
+						 * { dstIp.setSrcIp(srcIp.getSrcIpAddress());
+						 * dstIp.setSrcIpMask("255.255.255.255"); }else if(matcherV6.matches()) {
+						 * dstIp.setSrcIp(srcIp.getSrcIpAddress());
+						 * dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else { throw
+						 * new RuntimeException("Invalid IP format"); } }
+						 */
+					else {
+						throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
+					}
+				}
+			} else {
+				if (srcIp.getIpType() == 4/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
+					dstIp.setSrcIp(srcIp.getSrcIpAddress());
+					dstIp.setSrcIpMask("255.255.255.255");
+				} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
+					dstIp.setSrcIp(srcIp.getSrcIpAddress());
+					dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
+				} /*
+					 * else {//all dstIp.setSrcIp(srcIp.getSrcIpAddress());
+					 * dstIp.setSrcIpMask("255.255.255.255"); }
+					 */
+				else {
+					throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
+				}
+			}
+			if (srcIp.getDestIpAddress() != null) {
+				if (srcIp.getDestIpAddress().indexOf("/") != -1) {
+					if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
+						Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]);
+						if (dstMaskNum == 0) {
+							dstIp.setDstIpMask("0.0.0.0");
+						} else {
+							dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));
+							;
+						}
+						dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
+					} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
+						IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress());
+						dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
+						dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString());
+					} /*
+						 * else { Pattern
+						 * patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); Pattern
+						 * patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); Matcher
+						 * matchernV4Subnet=patternV4Subnet.matcher(srcIp.getDestIpAddress()); Matcher
+						 * matcherV6Subnet=patternV6Subnet.matcher(srcIp.getDestIpAddress());
+						 * if(matchernV4Subnet.matches()) { Integer dstMaskNum =
+						 * Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); if(dstMaskNum==0){
+						 * dstIp.setDstIpMask("0.0.0.0"); }else{
+						 * dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));; }
+						 * dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); }else
+						 * if(matcherV6Subnet.matches()){ IPv6Network strangeNetwork =
+						 * IPv6Network.fromString(srcIp.getDestIpAddress());
+						 * dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
+						 * dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); }else
+						 * { throw new RuntimeException("Invalid IP/subnet mask format"); } }
+						 */
+					else {
+						throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
+					}
+
+				} else {
+					if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
+						dstIp.setDstIp(srcIp.getDestIpAddress());
+						dstIp.setDstIpMask("255.255.255.255");
+					} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
+						dstIp.setDstIp(srcIp.getDestIpAddress());
+						dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
+					} /*
+						 * else {//all Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP);
+						 * Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); Matcher
+						 * matcherV4=patternV4.matcher(srcIp.getDestIpAddress()); Matcher
+						 * matcherV6=patternV6.matcher(srcIp.getDestIpAddress());
+						 * if(matcherV4.matches()) { dstIp.setDstIp(srcIp.getDestIpAddress());
+						 * dstIp.setDstIpMask("255.255.255.255"); }else if(matcherV6.matches()) {
+						 * dstIp.setDstIp(srcIp.getDestIpAddress());
+						 * dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else { throw
+						 * new RuntimeException("invalid ip format"); } }
+						 */
+					else {
+						throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
+					}
+				}
+			} else {
+				if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
+					dstIp.setDstIp(srcIp.getDestIpAddress());
+					dstIp.setDstIpMask("255.255.255.255");
+				} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
+					dstIp.setDstIp(srcIp.getDestIpAddress());
+					dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
+				} /*
+					 * else {//all dstIp.setDstIp(srcIp.getDestIpAddress());
+					 * dstIp.setDstIpMask("255.255.255.255"); }
+					 */
+				else {
+					throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
+				}
+			}
+			if (srcIp.getSrcPort() != null) {
+				if (srcIp.getSrcPort().indexOf("/") != -1) {
+					String srcMaskNum = srcIp.getSrcPort().split("/")[1];
+					dstIp.setSrcPortMask(srcMaskNum);
+					dstIp.setSrcPort(srcIp.getSrcPort().split("/")[0]);
+				} else {
+					dstIp.setSrcPort(srcIp.getSrcPort());
+					dstIp.setSrcPortMask("65535");
+				}
+			} else {
+				dstIp.setSrcPort("0");
+				dstIp.setSrcPortMask("65535");
+			}
+			if (srcIp.getDestPort() != null) {
+				if (srcIp.getDestPort().indexOf("/") != -1) {
+					String dstMaskNum = srcIp.getDestPort().split("/")[1];
+					dstIp.setDstPortMask(dstMaskNum);
+					dstIp.setDstPort(srcIp.getDestPort().split("/")[0]);
+				} else {
+					dstIp.setDstPort(srcIp.getDestPort());
+					dstIp.setDstPortMask("65535");
+				}
+			} else {
+				dstIp.setDstPort("0");
+				dstIp.setDstPortMask("65535");
 			}
-			convertPortValues(dstIp, srcIp);
 			ipConvertList.add(dstIp);
-		}else {
-			throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
 		}
 		return ipConvertList;
 	}

src/main/java/com/nis/util/ConfigServiceUtil.java

@@ -133,7 +133,6 @@ public class ConfigServiceUtil {
 					result=response.readEntity(String.class);
 				}
 			} catch (Exception e) {
-				logger.error("request_service_failed",e);
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
 			}  
 			if(response != null && response.getStatus() == 200){
@@ -190,7 +189,6 @@ public class ConfigServiceUtil {
 					result=response.readEntity(String.class);
 				}
 			} catch (Exception e) {
-				e.printStackTrace();
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
 			}  
 			if(response != null && response.getStatus() == 200){
@@ -236,7 +234,6 @@ public class ConfigServiceUtil {
 					result=response.readEntity(String.class);
 				}
 			} catch (Exception e) {
-				e.printStackTrace();
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
 			}  
 			if(response != null && response.getStatus() == 200){
@@ -246,7 +243,6 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
 			logger.error("postCallbackCfg()",e);
 			throw e;
 		}finally {
@@ -282,7 +278,6 @@ public class ConfigServiceUtil {
 					result=response.readEntity(String.class);
 				}
 			} catch (Exception e) {
-				e.printStackTrace();
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
 			}  
 			if(response != null && response.getStatus() == 200){
@@ -330,7 +325,6 @@ public class ConfigServiceUtil {
 					result=response.readEntity(String.class);
 				}
 			} catch (Exception e) {
-				e.printStackTrace();
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
 			} 
 			if(response != null &&  response.getStatus() == 200){
@@ -380,7 +374,6 @@ public class ConfigServiceUtil {
 					result=response.readEntity(String.class);
 				}
 			} catch (Exception e) {
-				e.printStackTrace();
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
 			} 
 			if(response !=null && response.getStatus() == 200){
@@ -424,7 +417,6 @@ public class ConfigServiceUtil {
 //				bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class);
 				//获取响应结果
 			} catch (Exception e) {
-				e.printStackTrace();
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			} 
 		} catch (Exception e) {
@@ -459,7 +451,6 @@ public class ConfigServiceUtil {
 					result=response.readEntity(String.class);
 				}
 			} catch (Exception e) {
-				e.printStackTrace();
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
 			} 
 			if(response !=null && response.getStatus() == 200){

src/main/java/com/nis/util/Constants.java

@@ -322,18 +322,56 @@ public final class Constants {
 	// public static final boolean IS_USE_HIVE_DB =
 	// Configurations.getBooleanProperty("isUseHiveDb", true);
 
+	/**
+	 * 是否获取数据中心查询记录的总条数
+	 */
+
+	public static final boolean IS_GET_HIVECOUNT = Configurations.getBooleanProperty("isGetHiveCount", true);
+	/**
+	 * 是否获取数据中心[神通]查询记录的总条数
+	 */
+	
+	public static final boolean IS_SELECT_CLUSTER = Configurations.getBooleanProperty("isSelectCluster", false);
+	
+	/**
+	 * 神通数据库A的数据最早时间
+	 */
+	public static final Long CLUSTER_A_START_TIME =  Configurations.getLongProperty("clusterAStartTime", new Date().getTime());
+
+	/**
+	 * 神通数据库B的数据最早时间
+	 */
+	public static final Long CLUSTER_B_START_TIME = Configurations.getLongProperty("clusterBStartTime", new Date().getTime());
+	
 	/**
 	 * 每次获取数据中心多少条数据,咱们在对获取的数据进行分页处理
 	 */
 	public static final Long EVERY_GETHIVEDATANUM = Configurations.getLongProperty("everyGetHiveDataNum", 10000);
 
+	/**
+	 * 是否开启基础校验
+	 */
+	public static final boolean BASE_VALIDATE = Configurations.getBooleanProperty("baseValidate", true);
 
 	public static final Long DATACENTER_TIME = Configurations.getLongProperty("dataCenterTime", 48);
 
+	/**
+	 * 是否开启业务校验
+	 */
+	public static final boolean SERVICE_VALIDATE = Configurations.getBooleanProperty("serviceValidate", true);
+	/**
+	 * 日志本地存储时间
+	 */
+	public static final Long LOG_LOCAL_TIME = Configurations.getLongProperty("logLocalTime", 48);
+	/**
+	 * 实时统计默认时间
+	 */
+	public static final Long REPORT_LOCAL_TIME = Configurations.getLongProperty("reportLocalTime", 1);
 
 	/**
 	 * 日志是否从hive中查询
 	 */
+	public static final boolean SEL_FROM_HIVE = Configurations.getBooleanProperty("selFromHive", true);
 	public static final boolean ONLY_SEL_FROM_HIVE = Configurations.getBooleanProperty("onlySelFromHive", true);
 
 	/**
@@ -347,6 +385,12 @@ public final class Constants {
 	 */
 	public static final String SEARCH_DATEFORMAT = Configurations.getStringProperty("search.dateformat",
 			"yyyy-MM-dd HH:mm:ss");
+	public static final String SEARCH_ES_HOSTANDPORT_A = Configurations.getStringProperty("search.eshostandport_A",
+			null);
+	public static final String SEARCH_ES_HOSTANDPORT_B = Configurations.getStringProperty("search.eshostandport_B",
+			null);
+	public static final String SEARCH_ES_HOSTANDPORT_C = Configurations.getStringProperty("search.eshostandport_C",
+			null);
 	/**
 	 * 数据中心A版数据库名称,程序中每次查询时使用的数据库名称 use HIVEADBNAME
 	 */
@@ -363,7 +407,6 @@ public final class Constants {
 	public static final String FILE_UPLOAD_CFG = Configurations.getStringProperty("fileUploadCfg","fileUploadSources"); 
 	public static final String FILE_DIGEST_CFG=Configurations.getStringProperty("fileDigestCfg","fileDigestSources");
 	public static final String CONFIG_ID_SOURCES=Configurations.getStringProperty("configIdSources","configPzIdSources");
-	public static final String DEL_ALL_CFG=Configurations.getStringProperty("delAllCfg","delAllConfig");
 	//日志查询接口URL
 	public static final String LOG_BASE_URL = Configurations.getStringProperty("logBaseUrl","");
 	public static final String NTC_SERVICE_REPORT=Configurations.getStringProperty("ntcServiceReport","ntcServiceReport");

src/main/java/com/nis/util/excel/ExcelCsv.java

@@ -306,13 +306,6 @@ public class ExcelCsv {
 									dict="block_drop";
 									val = msgProp.getProperty(dict,dict);
 								}
-								if ("action".equals(ef.title()) && dict.equals("action_reject")
-										&& (Reflections.invokeGetter(e, "service").toString().equals("35")
-										|| Reflections.invokeGetter(e, "service").toString().equals("33")
-										|| Reflections.invokeGetter(e, "service").toString().equals("36"))) {
-									dict="block_drop";
-									val = msgProp.getProperty(dict,dict);
-								}
 								//ip spoofing redirect动作修改为Spoofing
 								if(ef.title().equals("block_type") 
 										&& (Reflections.invokeGetter(e, "serviceId").toString().equals("518"))) {

src/main/java/com/nis/util/excel/ExportExcel.java

@@ -39,7 +39,6 @@ import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
 import org.apache.poi.xssf.usermodel.XSSFRichTextString;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.util.Assert;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -266,9 +265,6 @@ public class ExportExcel {
 			commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n";
 			index++;
 			//1、非空
-			commentStr=commentStr+"▶"+msgProp.getProperty("https_url_format_tip")+"\n";
-			index++;
-			//1、非空
 			commentStr=commentStr+"▶"+msgProp.getProperty("required")+"\n";
 			index++;
 		}
@@ -601,28 +597,25 @@ public class ExportExcel {
 					commentStr="";
 				}
 			}else{
-					String[] ipPatterns=region.getConfigIpPattern().split(";");
 					if("client_ip".equals(headerStr)){
-						Assert.isTrue(ipPatterns.length==2);
-						String srcIpPattern=ipPatterns[0];
 						if(((","+region.getConfigIpPortShow()+",").indexOf(",1,") > -1) ){
 							commentStr="";
 							if((","+region.getConfigIpType()+",").indexOf(",4,") > -1){
-								if((","+srcIpPattern+",").indexOf(",3,") > -1){
+								if((","+region.getConfigIpPattern()+",").indexOf(",3,") > -1){
 									commentStr=commentStr+Constants.IPV4_DEFAULT_IP_VALUE+"（IPv4）"+"\n";
 									if(StringUtil.isEmpty(defaultValue)){
 										defaultValue=Constants.IPV4_DEFAULT_IP_VALUE;
 									}
 									index++;
 								}
-								if((","+srcIpPattern+",").indexOf(",2,") > -1){
+								if((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1){
 									commentStr=commentStr+Constants.IPV4_DEFAULT_IP_RANGE_VALUE+"（"+msgProp.getProperty("ipv4_range_tip")+"）"+"\n";
 									if(StringUtil.isEmpty(defaultValue)){
 										defaultValue=Constants.IPV4_DEFAULT_IP_RANGE_VALUE;
 									}
 									index++;
 								}
-								if((","+srcIpPattern+",").indexOf(",1,") > -1){
+								if((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1){
 									commentStr=commentStr+Constants.IPV4_DEFAULT_IP_SUBNET_VALUE+"（"+msgProp.getProperty("ipv4_subnet_tip")+"）"+"\n";
 									if(StringUtil.isEmpty(defaultValue)){
 										defaultValue=Constants.IPV4_DEFAULT_IP_SUBNET_VALUE;
@@ -631,21 +624,21 @@ public class ExportExcel {
 								}
 							}
 							if((","+region.getConfigIpType()+",").indexOf(",6,") > -1){
-								if((","+srcIpPattern+",").indexOf(",3,") > -1){
+								if((","+region.getConfigIpPattern()+",").indexOf(",3,") > -1){
 									commentStr=commentStr+Constants.IPV6_DEFAULT_IP_VALUE+"（IPv6）"+"\n";
 									if(StringUtil.isEmpty(defaultValue)){
 										defaultValue=Constants.IPV6_DEFAULT_IP_VALUE;
 									}
 									index++;
 								}
-								if((","+srcIpPattern+",").indexOf(",2,") > -1){
+								if((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1){
 									commentStr=commentStr+Constants.IPV6_DEFAULT_IP_RANGE_VALUE+"（"+msgProp.getProperty("ipv6_range_tip")+"）"+"\n";
 									if(StringUtil.isEmpty(defaultValue)){
 										defaultValue=Constants.IPV6_DEFAULT_IP_RANGE_VALUE;
 									}
 									index++;
 								}
-								if((","+srcIpPattern+",").indexOf(",1,") > -1){
+								if((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1){
 									commentStr=commentStr+Constants.IPV6_DEFAULT_IP_SUBNET_VALUE+"（"+msgProp.getProperty("ipv6_subnet_tip")+"）"+"\n\n";
 									if(StringUtil.isEmpty(defaultValue)){
 										defaultValue=Constants.IPV6_DEFAULT_IP_SUBNET_VALUE;
@@ -694,12 +687,12 @@ public class ExportExcel {
 										,msgProp.getProperty("serverip"))+"\n";
 								index++;
 								index++;
-								commentStr=commentStr+"▶"+String.format(msgProp.getProperty("the_same_ip_type"))+"\n";
+								commentStr=commentStr+"▶"+String.format(msgProp.getProperty("the_same_ip_type_pattern"))+"\n";
 								index++;
 								index++;
 							}
 							//4、IP Range 开始IP和结束IP必须在同一网段
-							if(((","+srcIpPattern+",").indexOf(",2,") > -1)){
+							if(((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1)){
 								commentStr=commentStr+"▶"+msgProp.getProperty("ip_range")+","+msgProp.getProperty("ip_range_bit_field")+"\n";
 								index++;
 								index++;
@@ -710,7 +703,7 @@ public class ExportExcel {
 							}
 							
 							//6、IPv4 Mask 掩码范围16-32
-							if(((","+srcIpPattern+",").indexOf(",1,") > -1)){
+							if(((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1)){
 								if(((","+region.getConfigIpType()+",").indexOf(",4,") > -1)){
 									commentStr=commentStr+"▶"+msgProp.getProperty("ipv4_subnet_tip")+","+msgProp.getProperty("ipv4_mask_range_tip")+"\n";
 									index++;
@@ -726,25 +719,24 @@ public class ExportExcel {
 						
 				}
 				if("server_ip".equals(headerStr)){
-					String destIpPattern=ipPatterns[1];
 					if((","+region.getConfigIpPortShow()+",").indexOf(",3,") > -1){
 						commentStr="";
 						if((","+region.getConfigIpType()+",").indexOf(",4,") > -1){
-							if((","+destIpPattern+",").indexOf(",3,") > -1){
+							if((","+region.getConfigIpPattern()+",").indexOf(",3,") > -1){
 								commentStr=commentStr+Constants.IPV4_DEFAULT_IP_VALUE+"（IPv4）"+"\n";
 								if(StringUtil.isEmpty(defaultValue)){
 									defaultValue=Constants.IPV4_DEFAULT_IP_VALUE;
 								}
 								index++;
 							}
-							if((","+destIpPattern+",").indexOf(",2,") > -1){
+							if((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1){
 								commentStr=commentStr+Constants.IPV4_DEFAULT_IP_RANGE_VALUE+"（"+msgProp.getProperty("ipv4_range_tip")+"）"+"\n";
 								if(StringUtil.isEmpty(defaultValue)){
 									defaultValue=Constants.IPV4_DEFAULT_IP_RANGE_VALUE;
 								}
 								index++;
 							}
-							if((","+destIpPattern+",").indexOf(",1,") > -1){
+							if((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1){
 								commentStr=commentStr+Constants.IPV4_DEFAULT_IP_SUBNET_VALUE+"（"+msgProp.getProperty("ipv4_subnet_tip")+"）"+"\n";
 								if(StringUtil.isEmpty(defaultValue)){
 									defaultValue=Constants.IPV4_DEFAULT_IP_SUBNET_VALUE;
@@ -753,21 +745,21 @@ public class ExportExcel {
 							}
 						}
 						if((","+region.getConfigIpType()+",").indexOf(",6,") > -1){
-							if((","+destIpPattern+",").indexOf(",3,") > -1){
+							if((","+region.getConfigIpPattern()+",").indexOf(",3,") > -1){
 								commentStr=commentStr+Constants.IPV6_DEFAULT_IP_VALUE+"（IPv6）"+"\n";
 								if(StringUtil.isEmpty(defaultValue)){
 									defaultValue=Constants.IPV6_DEFAULT_IP_VALUE;
 								}
 								index++;
 							}
-							if((","+destIpPattern+",").indexOf(",2,") > -1){
+							if((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1){
 								commentStr=commentStr+Constants.IPV6_DEFAULT_IP_RANGE_VALUE+"（"+msgProp.getProperty("ipv6_range_tip")+"）"+"\n";
 								if(StringUtil.isEmpty(defaultValue)){
 									defaultValue=Constants.IPV6_DEFAULT_IP_RANGE_VALUE;
 								}
 								index++;
 							}
-							if((","+destIpPattern+",").indexOf(",1,") > -1){
+							if((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1){
 								commentStr=commentStr+Constants.IPV6_DEFAULT_IP_SUBNET_VALUE+"（"+msgProp.getProperty("ipv6_subnet_tip")+"）"+"\n\n";
 								if(StringUtil.isEmpty(defaultValue)){
 									defaultValue=Constants.IPV6_DEFAULT_IP_SUBNET_VALUE;
@@ -800,12 +792,12 @@ public class ExportExcel {
 									,msgProp.getProperty("serverip"))+"\n";
 							index++;
 							index++;
-							commentStr=commentStr+"▶"+String.format(msgProp.getProperty("the_same_ip_type"))+"\n";
+							commentStr=commentStr+"▶"+String.format(msgProp.getProperty("the_same_ip_type_pattern"))+"\n";
 							index++;
 							index++;
 						}
 						//4、IP Range 开始IP和结束IP必须在同一网段
-						if(((","+destIpPattern+",").indexOf(",2,") > -1)){
+						if(((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1)){
 							commentStr=commentStr+"▶"+msgProp.getProperty("ip_range")+","+msgProp.getProperty("ip_range_bit_field")+"\n";
 							index++;
 							index++;
@@ -816,7 +808,7 @@ public class ExportExcel {
 						}
 						
 						//6、IPv4 Mask 掩码范围16-32
-						if(((","+destIpPattern+",").indexOf(",1,") > -1)){
+						if(((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1)){
 							if(((","+region.getConfigIpType()+",").indexOf(",4,") > -1)){
 								commentStr=commentStr+"▶"+msgProp.getProperty("ipv4_subnet_tip")+","+msgProp.getProperty("ipv4_mask_range_tip")+"\n";
 								index++;
@@ -842,20 +834,17 @@ public class ExportExcel {
 				}else{
 					protocol=region.getConfigProtocol();
 				}
-				String[] portPatterns=region.getConfigPortPattern().split(";");
-				Assert.isTrue(portPatterns.length==2);
 				if("client_port".equals(headerStr)){
-					String srcPortPattern=portPatterns[0];
 					if(((","+region.getConfigIpPortShow()+",").indexOf(",2,") > -1)){
 						commentStr="";
-						if((","+srcPortPattern+",").indexOf(",1,") > -1){
+						if((","+region.getConfigPortPattern()+",").indexOf(",1,") > -1){
 							commentStr=commentStr+Constants.PORT_DEFAULT+"（Port）"+"\n";
 							if(StringUtil.isEmpty(defaultValue)){
 								defaultValue=Constants.PORT_DEFAULT;
 							}
 							index++;
 						}
-						if((","+srcPortPattern+",").indexOf(",2,") > -1){
+						if((","+region.getConfigPortPattern()+",").indexOf(",2,") > -1){
 							commentStr=commentStr+Constants.PORT_MASK_DEFAULT+"（Port/"+msgProp.getProperty("port_mask")+"）"+"\n\n";
 							if(StringUtil.isEmpty(defaultValue)){
 								defaultValue=Constants.PORT_MASK_DEFAULT;
@@ -881,11 +870,11 @@ public class ExportExcel {
 							index++;
 						}
 						//2、源端口、目的端口格式必须一致
-//						if(((","+region.getConfigIpPortShow()+",").indexOf(",2,") > -1) && ((","+region.getConfigIpPortShow()+",").indexOf(",4,") > -1)){
-//							commentStr=commentStr+"▶"+msgProp.getProperty("the_same_port_pattern")+"\n";
-//							index++;
-//							index++;
-//						}
+						if(((","+region.getConfigIpPortShow()+",").indexOf(",2,") > -1) && ((","+region.getConfigIpPortShow()+",").indexOf(",4,") > -1)){
+							commentStr=commentStr+"▶"+msgProp.getProperty("the_same_port_pattern")+"\n";
+							index++;
+							index++;
+						}
 						//3、端口和端口掩码范围0-65535
 						commentStr=commentStr+"▶"+msgProp.getProperty("port_mask_comment_tip")+"\n";
 						index++;
@@ -920,17 +909,16 @@ public class ExportExcel {
 					}
 				}
 				if("server_port".equals(headerStr)){
-					String destPortPattern=portPatterns[1];
 					if((","+region.getConfigIpPortShow()+",").indexOf(",4,") > -1){
 						commentStr="";
-						if((","+destPortPattern+",").indexOf(",1,") > -1){
+						if((","+region.getConfigPortPattern()+",").indexOf(",1,") > -1){
 							commentStr=commentStr+Constants.PORT_DEFAULT+"（Port）"+"\n";
 							if(StringUtil.isEmpty(defaultValue)){
 								defaultValue=Constants.PORT_DEFAULT;
 							}
 							index++;
 						}
-						if((","+destPortPattern+",").indexOf(",2,") > -1){
+						if((","+region.getConfigPortPattern()+",").indexOf(",2,") > -1){
 							commentStr=commentStr+Constants.PORT_MASK_DEFAULT+"（Port/"+msgProp.getProperty("port_mask")+"）"+"\n\n";
 							if(StringUtil.isEmpty(defaultValue)){
 								defaultValue=Constants.PORT_MASK_DEFAULT;
@@ -956,11 +944,11 @@ public class ExportExcel {
 							index++;
 						}
 						//2、源端口、目的端口格式必须一致
-//						if(((","+region.getConfigIpPortShow()+",").indexOf(",2,") > -1) && ((","+region.getConfigIpPortShow()+",").indexOf(",4,") > -1)){
-//							commentStr=commentStr+"▶"+msgProp.getProperty("the_same_port_pattern")+"\n";
-//							index++;
-//							index++;
-//						}
+						if(((","+region.getConfigIpPortShow()+",").indexOf(",2,") > -1) && ((","+region.getConfigIpPortShow()+",").indexOf(",4,") > -1)){
+							commentStr=commentStr+"▶"+msgProp.getProperty("the_same_port_pattern")+"\n";
+							index++;
+							index++;
+						}
 						//3、端口和端口掩码范围0-65535
 						commentStr=commentStr+"▶"+msgProp.getProperty("port_mask_comment_tip")+"\n";
 						index++;
@@ -2311,13 +2299,6 @@ public class ExportExcel {
 									dict="block_drop";
 									val = msgProp.getProperty(dict,dict);
 								}
-								if ("action".equals(ef.title()) && dict.equals("action_reject")
-										&& (Reflections.invokeGetter(e, "service").toString().equals("35")
-										|| Reflections.invokeGetter(e, "service").toString().equals("33")
-										|| Reflections.invokeGetter(e, "service").toString().equals("36"))) {
-									dict="block_drop";
-									val = msgProp.getProperty(dict,dict);
-								}
 								//ip spoofing redirect动作修改为Spoofing
 								if(ef.title().equals("block_type") 
 										&& (Reflections.invokeGetter(e, "serviceId").toString().equals("518"))) {
@@ -2377,7 +2358,7 @@ public class ExportExcel {
 			}
 		}
 		end=System.currentTimeMillis();
-		System.err.println("setDataList cost:"+(end-start));
+		log.info("setDataList cost:"+(end-start));
 		return this;
 	}
 	/**

src/main/java/com/nis/util/excel/ImportBigExcel.java

@@ -488,11 +488,11 @@ public class ImportBigExcel extends XLSXCovertCSVReader{
 						if (valType == String.class){
 							String s = String.valueOf(val.toString().trim());
 							//0.0.0.0表示任意IP的含义
-//							if(StringUtils.endsWith(s, ".0") && !s.endsWith("0.0.0.0")){
-//								val = StringUtils.substringBefore(s, ".0");
-//							}else{
-							val=val == null ? "" : StringEscapeUtils.escapeHtml4(val.toString().trim());
-//							}
+							if(StringUtils.endsWith(s, ".0") && !s.endsWith("0.0.0.0")){
+								val = StringUtils.substringBefore(s, ".0");
+							}else{
+								val=val == null ? "" : StringEscapeUtils.escapeHtml4(val.toString().trim());
+							}
 						}else if (valType == Integer.class){
 							val = Double.valueOf(val.toString().trim()).intValue();
 						}else if (valType == Long.class){

src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java

@@ -13,7 +13,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.jets3t.service.ServiceException;
 import org.springframework.beans.BeanUtils;
-import org.springframework.util.Assert;
 
 import com.beust.jcommander.internal.Lists;
 import com.nis.domain.FunctionRegionDict;
@@ -28,7 +27,6 @@ import com.nis.domain.configuration.template.IpRateLimitTemplate;
 //import com.nis.util.AsnCacheUtils;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
-import com.nis.util.IPUtil;
 import com.nis.util.StringUtil;
 
 public class CheckIpFormatThread implements Callable<String>{
@@ -94,20 +92,14 @@ public class CheckIpFormatThread implements Callable<String>{
 		}
 		boolean canIPv4 = ipType.indexOf("4") > -1;
 		boolean canIPv6 = ipType.indexOf("6") > -1;
-		String[] ipPattern = regionDict.getConfigIpPattern().split(";");
-		Assert.isTrue(ipPattern!=null&&ipPattern.length==2);
-		String srcIpPattern = ipPattern[0];
-		String destIpPattern = ipPattern[1];
-		if (StringUtils.isBlank(srcIpPattern)||StringUtils.isBlank(destIpPattern)) {
+		String ipPattern = regionDict.getConfigIpPattern();
+		if (StringUtils.isBlank(ipPattern)) {
 			throw new RuntimeException("Found IP region,but ipPattern is Empty");
 		}
 		boolean canIPFormat = ipType.indexOf("3") > -1;
 		boolean canIPSubnetFormat = ipType.indexOf("1") > -1;
 		boolean canIPRangeFormat = ipType.indexOf("2") > -1;
-		String[] portPattern = regionDict.getConfigPortPattern().split(";");
-		Assert.isTrue(ipPattern!=null&&ipPattern.length==2);
-		String srcPortPattern=portPattern[0];
-		String destPortPattern=portPattern[1];
+		String portPattern = regionDict.getConfigPortPattern();
 		String protocol = regionDict.getConfigProtocol();
 		String direction = regionDict.getConfigDirection();
 		StringBuffer errTip = new StringBuffer();
@@ -138,7 +130,6 @@ public class CheckIpFormatThread implements Callable<String>{
 			// doLog属性检验
 			this.validDoLog(baseIpCfg,errInfo);
 			
-			
 			// 特殊字段验证
 			// packet ip ratelimit
 			if (serviceDict!=null && serviceDict.getAction().intValue() == 64 && (serviceDict.getFunctionId().intValue() == 5 
@@ -595,23 +586,6 @@ public class CheckIpFormatThread implements Callable<String>{
 						String subfix=baseIpCfg.getSrcIpAddress().split("-")[1];
 						baseIpCfg.setSrcIpAddress(prefix+"-"+prefix.substring(0, prefix.lastIndexOf(".")+1)+subfix);
 					}
-					//Tip:判断业务是否只展示源IP列,如果是,判断源IP是否是默认值,如果是默认值,提示源IP不能是默认值
-					if (configIpPortShow.indexOf("1") > -1 && configIpPortShow.indexOf("3") == -1) {// 源IP必填
-						String srcIpAddress = baseIpCfg.getSrcIpAddress();
-						Pattern ip4 = Constants.IPV4_IP_PATTERN;
-						Pattern ip6 = Constants.IPV6_IP_PATTERN;
-						Matcher ip4Matcher = ip4.matcher(srcIpAddress);
-						Matcher ip6Matcher = ip6.matcher(srcIpAddress);
-						if (ip4Matcher.matches() && srcIpAddress.startsWith("0.0.0.0")) {
-							errInfo.append(prop.getProperty("client_ip")+" "
-									+ String.format(prop.getProperty("can_not_be"), Constants.IPV4_DEFAULT_IP_VALUE)
-									+ ";");
-						} else if (ip6Matcher.matches() && srcIpAddress.startsWith("::")) {
-							errInfo.append(prop.getProperty("client_ip")+" "
-									+ String.format(prop.getProperty("can_not_be"), Constants.IPV6_DEFAULT_IP_VALUE)
-									+ ";");
-						}
-					}
 				}
 				if (StringUtils.isBlank(baseIpCfg.getDestIpAddress())) {
 					destIpEmpty = true;
@@ -623,23 +597,6 @@ public class CheckIpFormatThread implements Callable<String>{
 						String subfix=baseIpCfg.getDestIpAddress().split("-")[1];
 						baseIpCfg.setDestIpAddress(prefix+"-"+prefix.substring(0, prefix.lastIndexOf(".")+1)+subfix);
 					}
-					//Tip:判断业务是否只展示目的IP列,如果是,判断目的IP是否是默认值,如果是默认值,提示目的IP不能是默认值
-					if (configIpPortShow.indexOf("3") > -1 && configIpPortShow.indexOf("1") == -1) {// 目的IP必填
-						String destIpAddress = baseIpCfg.getDestIpAddress();
-						Pattern ip4 = Constants.IPV4_IP_PATTERN;
-						Pattern ip6 = Constants.IPV6_IP_PATTERN;
-						Matcher ip4Matcher = ip4.matcher(destIpAddress);
-						Matcher ip6Matcher = ip6.matcher(destIpAddress);
-						if (ip4Matcher.matches() && destIpAddress.startsWith("0.0.0.0")) {
-							errInfo.append(prop.getProperty("server_ip")+" "
-									+ String.format(prop.getProperty("can_not_be"), Constants.IPV4_DEFAULT_IP_VALUE)
-									+ ";");
-						} else if (ip6Matcher.matches() && destIpAddress.startsWith("::")) {
-							errInfo.append(prop.getProperty("server_ip")+" "
-									+ String.format(prop.getProperty("can_not_be"), Constants.IPV6_DEFAULT_IP_VALUE)
-									+ ";");
-						}
-					}
 				}
 				if (StringUtils.isBlank(baseIpCfg.getSrcPort())) {
 					srcPortEmpty = true;
@@ -664,49 +621,77 @@ public class CheckIpFormatThread implements Callable<String>{
 								prop.getProperty("server_ip", "Server IP")) + ";");
 					} else if (configIpPortShow.indexOf("1") > -1) {
 						String matchType = this.validIPAddress("client_ip", errInfo, baseIpCfg.getSrcIpAddress(),
-								ipType, srcIpPattern);
-						//设置源IP pattern
-						if (matchType.endsWith("RANGE")) {
-							baseIpCfg.setSrcIpPattern(2);
-						} else if (matchType.endsWith("SUBNET")) {
-							baseIpCfg.setSrcIpPattern(1);
-						}else {
-							baseIpCfg.setSrcIpPattern(3);
-						}
+								ipType, ipPattern);
 						if (matchType.startsWith("IPV6")) {
-							//设置dest ip值
-							if(destIpPattern.indexOf("3")>-1) {//优先设置IP类型，因为拆分的IP较少
-								baseIpCfg.setDestIpAddress(Constants.IPV6_DEFAULT_IP_VALUE);
-								baseIpCfg.setDestIpPattern(3);
-							}else if(destIpPattern.indexOf("1")>-1) {
-								baseIpCfg.setDestIpAddress(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE);
-								baseIpCfg.setDestIpPattern(1);
-							}else {
+							if (matchType.endsWith("RANGE")) {
+								// baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress());
 								baseIpCfg.setDestIpAddress(Constants.IPV6_DEFAULT_IP_RANGE_VALUE);
-								baseIpCfg.setDestIpPattern(2);
+								baseIpCfg.setIpPattern(2);
+								if (baseIpCfg.getSrcIpAddress()
+										.startsWith(Constants.IPV6_DEFAULT_IP_RANGE_VALUE.split("-")[0])) {
+									errInfo.append(prop.getProperty("client_ip")+" "
+											+ String.format(prop.getProperty("can_not_be"),
+													Constants.IPV6_DEFAULT_IP_RANGE_VALUE.split("-")[0])
+											+ ";");
+								}
+							} else if (matchType.endsWith("SUBNET")) {
+								// baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress());
+								baseIpCfg.setDestIpAddress(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE);
+								baseIpCfg.setIpPattern(1);
+								if (baseIpCfg.getSrcIpAddress()
+										.startsWith(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE.split("/")[0])) {
+									errInfo.append(
+											prop.getProperty("client_ip")+" "
+													+ String.format(prop.getProperty("can_not_be"),
+															Constants.IPV6_DEFAULT_IP_SUBNET_VALUE.split("/")[0])
+													+ ";");
+								}
+							} else {
+								// baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress());
+								baseIpCfg.setDestIpAddress(Constants.IPV6_DEFAULT_IP_VALUE);
+								baseIpCfg.setIpPattern(3);
+								if (baseIpCfg.getSrcIpAddress().equals(Constants.IPV6_DEFAULT_IP_VALUE)) {
+									errInfo.append(prop.getProperty("client_ip")+" " + String.format(
+											prop.getProperty("can_not_be"), Constants.IPV6_DEFAULT_IP_VALUE) + ";");
+								}
 							}
-							//设置IP类型
 							baseIpCfg.setIpType(6);
 						} else {
-							//设置dest ip值
-							if(destIpPattern.indexOf("3")>-1) {//优先设置IP类型，因为拆分的IP较少
-								baseIpCfg.setDestIpAddress(Constants.IPV4_DEFAULT_IP_VALUE);
-								baseIpCfg.setDestIpPattern(3);
-							}else if(destIpPattern.indexOf("1")>-1) {
-								baseIpCfg.setDestIpAddress(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE);
-								baseIpCfg.setDestIpPattern(1);
-							}else {
+							if (matchType.endsWith("RANGE")) {
+								this.validIPv4Range("client_ip", errInfo, baseIpCfg.getSrcIpAddress());
+								// baseIpCfg.setSrcIpAddress("0.0.0.0-"+baseIpCfg.getSrcIpAddress().split("-")[0].substring(0,baseIpCfg.getSrcIpAddress().indexOf("-")+1)+baseIpCfg.getSrcIpAddress().split("-")[1]);
 								baseIpCfg.setDestIpAddress(Constants.IPV4_DEFAULT_IP_RANGE_VALUE);
-								baseIpCfg.setDestIpPattern(2);
+								baseIpCfg.setIpPattern(2);
+								if (baseIpCfg.getSrcIpAddress()
+										.startsWith(Constants.IPV4_DEFAULT_IP_RANGE_VALUE.split("-")[0])) {
+									errInfo.append(prop.getProperty("client_ip")+" "
+											+ String.format(prop.getProperty("can_not_be"),
+													Constants.IPV4_DEFAULT_IP_RANGE_VALUE.split("-")[0])
+											+ ";");
+								}
+							} else if (matchType.endsWith("SUBNET")) {
+								// baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress());
+								baseIpCfg.setDestIpAddress(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE);
+								baseIpCfg.setIpPattern(1);
+								if (baseIpCfg.getSrcIpAddress()
+										.startsWith(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE.split("/")[0])) {
+									errInfo.append(
+											prop.getProperty("client_ip")+" "
+													+ String.format(prop.getProperty("can_not_be"),
+															Constants.IPV4_DEFAULT_IP_SUBNET_VALUE.split("/")[0])
+													+ ";");
+								}
+							} else {
+								baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress());
+								baseIpCfg.setDestIpAddress(Constants.IPV4_DEFAULT_IP_VALUE);
+								baseIpCfg.setIpPattern(3);
+								if (baseIpCfg.getSrcIpAddress().equals(Constants.IPV4_DEFAULT_IP_VALUE)) {
+									errInfo.append(prop.getProperty("client_ip")+" " + String.format(
+											prop.getProperty("can_not_be"), Constants.IPV4_DEFAULT_IP_VALUE) + ";");
+								}
 							}
 							baseIpCfg.setIpType(4);
 						}
-						//Tip:增加源IP和目的IP是否相等,如果相等,提示目的IP不能为空
-						if ((configIpPortShow.indexOf("3") > -1 && configIpPortShow.indexOf("1") > -1)
-								&& (baseIpCfg.getDestIpAddress().equals(baseIpCfg.getSrcIpAddress()))) {
-							errInfo.append(String.format(prop.getProperty("can_not_null"),
-									prop.getProperty("server_ip", "Server IP")) + ";");
-						}
 					}
 
 				} else if (srcIpEmpty) {// 源IP为空
@@ -715,175 +700,166 @@ public class CheckIpFormatThread implements Callable<String>{
 								prop.getProperty("client_ip", "Client IP")) + ";");
 					} else if (configIpPortShow.indexOf("3") > -1) {
 						String matchType = this.validIPAddress("server_ip", errInfo, baseIpCfg.getDestIpAddress(),
-								ipType, destIpPattern);
-						if (matchType.endsWith("RANGE")) {
-							baseIpCfg.setDestIpPattern(2);
-						} else if (matchType.endsWith("SUBNET")) {
-							baseIpCfg.setDestIpPattern(1);
-						}else {
-							baseIpCfg.setDestIpPattern(3);
-						}
+								ipType, ipPattern);
 						if (matchType.startsWith("IPV6")) {
-							if(srcIpPattern.indexOf("3")>-1) {
-								baseIpCfg.setSrcIpAddress(Constants.IPV6_DEFAULT_IP_VALUE);
-								baseIpCfg.setSrcIpPattern(3);
-							}else if(srcIpPattern.indexOf("1")>-1) {
-								baseIpCfg.setSrcIpAddress(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE);
-								baseIpCfg.setSrcIpPattern(1);
-							}else {
+							if (matchType.endsWith("RANGE")) {
+								// baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress());
 								baseIpCfg.setSrcIpAddress(Constants.IPV6_DEFAULT_IP_RANGE_VALUE);
-								baseIpCfg.setSrcIpPattern(2);
+								baseIpCfg.setIpPattern(2);
+								if (baseIpCfg.getDestIpAddress()
+										.startsWith(Constants.IPV6_DEFAULT_IP_RANGE_VALUE.split("-")[0])) {
+									errInfo.append(prop.getProperty("server_ip")+" "
+											+ String.format(prop.getProperty("can_not_be"),
+													Constants.IPV6_DEFAULT_IP_RANGE_VALUE.split("-")[0])
+											+ ";");
+								}
+							} else if (matchType.endsWith("SUBNET")) {
+								// baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress());
+								baseIpCfg.setSrcIpAddress(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE);
+								baseIpCfg.setIpPattern(1);
+								if (baseIpCfg.getDestIpAddress()
+										.startsWith(Constants.IPV6_DEFAULT_IP_SUBNET_VALUE.split("/")[0])) {
+									errInfo.append(
+											prop.getProperty("server_ip")+" "
+													+ String.format(prop.getProperty("can_not_be"),
+															Constants.IPV6_DEFAULT_IP_SUBNET_VALUE.split("/")[0])
+													+ ";");
+								}
+							} else {
+								// baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress());
+								baseIpCfg.setSrcIpAddress(Constants.IPV6_DEFAULT_IP_VALUE);
+								baseIpCfg.setIpPattern(3);
+								if (baseIpCfg.getDestIpAddress().equals(Constants.IPV6_DEFAULT_IP_VALUE)) {
+									errInfo.append(prop.getProperty("server_ip")+" " + String.format(
+											prop.getProperty("can_not_be"), Constants.IPV6_DEFAULT_IP_VALUE) + ";");
+								}
 							}
 							baseIpCfg.setIpType(6);
 						} else {
-							if(srcIpPattern.indexOf("3")>-1) {
-								baseIpCfg.setSrcIpAddress(Constants.IPV4_DEFAULT_IP_VALUE);
-								baseIpCfg.setSrcIpPattern(3);
-							}else if(srcIpPattern.indexOf("1")>-1) {
-								baseIpCfg.setSrcIpAddress(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE);
-								baseIpCfg.setSrcIpPattern(1);
-							}else {
+							if (matchType.endsWith("RANGE")) {
+								this.validIPv4Range("server_ip", errInfo, baseIpCfg.getDestIpAddress());
+								// baseIpCfg.setDestIpAddress("0.0.0.0-"+baseIpCfg.getDestIpAddress().split("-")[0]
+								// .substring(0,baseIpCfg.getDestIpAddress().indexOf("-")+1)
+								// +baseIpCfg.getDestIpAddress().split("-")[1]);
 								baseIpCfg.setSrcIpAddress(Constants.IPV4_DEFAULT_IP_RANGE_VALUE);
-								baseIpCfg.setSrcIpPattern(2);
+								baseIpCfg.setIpPattern(2);
+								if (baseIpCfg.getDestIpAddress()
+										.startsWith(Constants.IPV4_DEFAULT_IP_RANGE_VALUE.split("-")[0])) {
+									errInfo.append(prop.getProperty("server_ip")+" "
+											+ String.format(prop.getProperty("can_not_be"),
+													Constants.IPV4_DEFAULT_IP_RANGE_VALUE.split("-")[0])
+											+ ";");
+								}
+							} else if (matchType.endsWith("SUBNET")) {
+								// baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress());
+								baseIpCfg.setSrcIpAddress(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE);
+								baseIpCfg.setIpPattern(1);
+								if (baseIpCfg.getDestIpAddress()
+										.startsWith(Constants.IPV4_DEFAULT_IP_SUBNET_VALUE.split("/")[0])) {
+									errInfo.append(
+											prop.getProperty("server_ip")+" "
+													+ String.format(prop.getProperty("can_not_be"),
+															Constants.IPV4_DEFAULT_IP_SUBNET_VALUE.split("/")[0])
+													+ ";");
+								}
+							} else {
+								// baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress());
+								baseIpCfg.setSrcIpAddress(Constants.IPV4_DEFAULT_IP_VALUE);
+								baseIpCfg.setIpPattern(3);
+								if (baseIpCfg.getDestIpAddress().equals(Constants.IPV4_DEFAULT_IP_VALUE)) {
+									errInfo.append(prop.getProperty("server_ip")+" " + String.format(
+											prop.getProperty("can_not_be"), Constants.IPV4_DEFAULT_IP_VALUE) + ";");
+								}
 							}
 							baseIpCfg.setIpType(4);
 						}
-						//Tip:增加源IP和目的IP是否相等,如果相等,提示源的IP不能为空
-						if ((configIpPortShow.indexOf("3") > -1 && configIpPortShow.indexOf("1") > -1)
-								&& (baseIpCfg.getSrcIpAddress().equals(baseIpCfg.getDestIpAddress()))) {
-							errInfo.append(String.format(prop.getProperty("can_not_null"),
-									prop.getProperty("client_ip", "Client IP")) + ";");
-						}
 					}
 				} else {// 全不为空
-					String srcMatchType = this.validIPAddress("client_ip", errInfo, baseIpCfg.getSrcIpAddress(), ipType,
-							srcIpPattern);
-					String destMatchType = this.validIPAddress("server_ip", errInfo, baseIpCfg.getDestIpAddress(), ipType,
-							destIpPattern);
-					if (StringUtils.isNotBlank(srcMatchType) && StringUtils.isNotBlank(destMatchType)
-							&& ((srcMatchType.startsWith("IPV6")&&destMatchType.startsWith("IPV4"))
-									||(srcMatchType.startsWith("IPV4")&&destMatchType.startsWith("IPV6")))) {
-						errInfo.append(prop.get("the_same_ip_type") + ";");
+					String matchType = this.validIPAddress("client_ip", errInfo, baseIpCfg.getSrcIpAddress(), ipType,
+							ipPattern);
+					String matchType1 = this.validIPAddress("server_ip", errInfo, baseIpCfg.getDestIpAddress(), ipType,
+							ipPattern);
+					if (StringUtils.isNotBlank(matchType) && StringUtils.isNotBlank(matchType1)
+							&& !matchType.equals(matchType1)) {
+						errInfo.append(prop.get("the_same_ip_type_pattern") + ";");
 					}
 					// baseIpCfg.setSrcIpAddress(baseIpCfg.getSrcIpAddress());
 					// baseIpCfg.setDestIpAddress(baseIpCfg.getDestIpAddress());
-					if (srcMatchType.startsWith("IPV6")) {
+					if (matchType.startsWith("IPV6")) {
 						baseIpCfg.setIpType(6);
 					} else {
 						baseIpCfg.setIpType(4);
 					}
-					if (srcMatchType.endsWith("RANGE")) {
-						baseIpCfg.setSrcIpPattern(2);
-					}else if(srcMatchType.endsWith("SUBNET")) {
-						baseIpCfg.setSrcIpPattern(1);
-					}else {
-						baseIpCfg.setSrcIpPattern(3);
-					}
-					if (destMatchType.endsWith("RANGE")) {
-						baseIpCfg.setDestIpPattern(2);
-					}else if(destMatchType.endsWith("SUBNET")) {
-						baseIpCfg.setDestIpPattern(1);
-					}else {
-						baseIpCfg.setDestIpPattern(3);
-					}
-					if(baseIpCfg.getIpType().equals(4)) {
-						if (srcMatchType.endsWith("RANGE")) {
+					if (matchType.endsWith("RANGE")) {
+						if (matchType.startsWith("IPV4")) {
 							this.validIPv4Range("client_ip", errInfo, baseIpCfg.getSrcIpAddress());
-						}
-						if (destMatchType.endsWith("RANGE")) {
 							this.validIPv4Range("server_ip", errInfo, baseIpCfg.getDestIpAddress());
 						}
-						//验证Ip范围
-						if(StringUtils.isEmpty(errInfo)&&(srcMatchType.endsWith("RANGE")||destMatchType.endsWith("RANGE"))) {
-							this.ValidateRangeCross(baseIpCfg.getSrcIpAddress(),baseIpCfg.getDestIpAddress(), errInfo);
+
+						if (baseIpCfg.getSrcIpAddress().split("-")[0]
+								.equals(baseIpCfg.getDestIpAddress().split("-")[0])) {
+							errInfo.append(String.format(prop.getProperty("are_the_same"),
+									baseIpCfg.getSrcIpAddress().split("-")[0],
+									baseIpCfg.getDestIpAddress().split("-")[0]) + ";");
 						}
-					}
-					boolean same=false;
-					if(baseIpCfg.getSrcIpAddress().indexOf("-")>-1) {
-						if(baseIpCfg.getDestIpAddress().indexOf("-")>-1) {
-							if(baseIpCfg.getSrcIpAddress().split("-")[0].equals(baseIpCfg.getDestIpAddress().split("-")[0])) {
-								same=true;
-							}
-						}else if(baseIpCfg.getDestIpAddress().indexOf("/")>-1) {
-							if(baseIpCfg.getSrcIpAddress().split("-")[0].equals(baseIpCfg.getDestIpAddress().split("/")[0])) {
-								same=true;
-							}
-						}else {
-							if(baseIpCfg.getSrcIpAddress().split("-")[0].equals(baseIpCfg.getDestIpAddress())) {
-								same=true;
-							}
+						baseIpCfg.setIpPattern(2);
+					} else if (matchType.endsWith("SUBNET")) {
+						if (baseIpCfg.getSrcIpAddress().split("/")[0]
+								.equals(baseIpCfg.getDestIpAddress().split("/")[0])) {
+							errInfo.append(String.format(prop.getProperty("are_the_same"),
+									baseIpCfg.getSrcIpAddress().split("/")[0],
+									baseIpCfg.getDestIpAddress().split("/")[0]) + ";");
 						}
-					}else if(baseIpCfg.getSrcIpAddress().indexOf("/")>-1){
-						if(baseIpCfg.getDestIpAddress().indexOf("-")>-1) {
-							if(baseIpCfg.getSrcIpAddress().split("/")[0].equals(baseIpCfg.getDestIpAddress().split("-")[0])) {
-								same=true;
-							}
-						}else if(baseIpCfg.getDestIpAddress().indexOf("/")>-1) {
-							if(baseIpCfg.getSrcIpAddress().split("/")[0].equals(baseIpCfg.getDestIpAddress().split("/")[0])) {
-								same=true;
-							}
-						}else {
-							if(baseIpCfg.getSrcIpAddress().split("/")[0].equals(baseIpCfg.getDestIpAddress())) {
-								same=true;
-							}
+						baseIpCfg.setIpPattern(1);
+					} else {
+						if (baseIpCfg.getSrcIpAddress().equals(baseIpCfg.getDestIpAddress())) {
+							errInfo.append(String.format(prop.getProperty("are_the_same"),
+									prop.getProperty("client_ip"), prop.getProperty("server_ip")) + ";");
 						}
-					}else {
-						if(baseIpCfg.getDestIpAddress().indexOf("-")>-1) {
-							if(baseIpCfg.getSrcIpAddress().equals(baseIpCfg.getDestIpAddress().split("-")[0])) {
-								same=true;
-							}
-						}else if(baseIpCfg.getDestIpAddress().indexOf("/")>-1) {
-							if(baseIpCfg.getSrcIpAddress().equals(baseIpCfg.getDestIpAddress().split("/")[0])) {
-								same=true;
-							}
-						}else {
-							if(baseIpCfg.getSrcIpAddress().equals(baseIpCfg.getDestIpAddress())) {
-								same=true;
-							}
-						}
-					}
-					if(same) {
-						errInfo.append(String.format(prop.getProperty("are_the_same"),
-								baseIpCfg.getSrcIpAddress().split("-")[0],
-								baseIpCfg.getDestIpAddress().split("-")[0]) + ";");
+						baseIpCfg.setIpPattern(3);
 					}
 				}
 
 				// TODO 判断源IP和目的IP的值
 				// TODO 判断源IP和目的IP格式
-				if (srcPortEmpty) {
-					if(srcPortPattern.indexOf("1")>-1) {
-						baseIpCfg.setSrcPort("0");
-						baseIpCfg.setSrcPortPattern(1);
-					}else {
-						baseIpCfg.setSrcPort("0/0");
-						baseIpCfg.setSrcPortPattern(2);
-					}
-				}else if(baseIpCfg.getSrcPort().indexOf("/")>-1) {
-					baseIpCfg.setSrcPortPattern(2);
-				}else {
-					baseIpCfg.setSrcPortPattern(1);
-				}
-				baseIpCfg.setSrcPort(baseIpCfg.getSrcPort().trim());
-				boolean validSrcPort = this.validPort(errInfo, baseIpCfg.getSrcPort(),
-						srcPortPattern,"client_port");
 				if (destPortEmpty) {
-					if(destPortPattern.indexOf("1")>-1) {
+					if (srcPortEmpty) {
+						baseIpCfg.setSrcPort("0");
 						baseIpCfg.setDestPort("0");
-						baseIpCfg.setDestPortPattern(1);
-					}else {
-						baseIpCfg.setDestPort("0/0");
-						baseIpCfg.setDestPortPattern(2);
+						baseIpCfg.setPortPattern(1);
+					} else {
+						if (baseIpCfg.getSrcPort().indexOf("/") > -1) {
+							baseIpCfg.setDestPort("0/0");
+							baseIpCfg.setPortPattern(2);
+						} else {
+							baseIpCfg.setDestPort("0");
+							baseIpCfg.setPortPattern(1);
+						}
+						baseIpCfg.setSrcPort(baseIpCfg.getSrcPort().trim());
 					}
-				}else if(baseIpCfg.getDestPort().indexOf("/")>-1) {
-					baseIpCfg.setDestPortPattern(2);
-				}else {
-					baseIpCfg.setDestPortPattern(1);
+				} else {
+					if (srcPortEmpty) {
+						if (baseIpCfg.getDestPort().indexOf("/") > -1) {
+							baseIpCfg.setSrcPort("0/0");
+							baseIpCfg.setPortPattern(2);
+						} else {
+							baseIpCfg.setSrcPort("0");
+							baseIpCfg.setPortPattern(1);
+						}
+					} else {
+						if (baseIpCfg.getSrcPort().indexOf("/") > -1) {
+							baseIpCfg.setPortPattern(2);
+						} else {
+							baseIpCfg.setPortPattern(1);
+						}
+						baseIpCfg.setSrcPort(baseIpCfg.getSrcPort().trim());
+					}
+					baseIpCfg.setDestPort(baseIpCfg.getDestPort().trim());
 				}
-				baseIpCfg.setDestPort(baseIpCfg.getDestPort().trim());
-				boolean validDestPort = this.validPort(errInfo, baseIpCfg.getDestPort(),
-						srcPortPattern,"server_port");
-				
+				// TODO 判断源端口和目的端口格式
+				// TODO 判断源和目的端口的值
+				boolean validPort = this.validPort(errInfo, baseIpCfg.getSrcPort(), baseIpCfg.getDestPort(),
+						portPattern);
 				if (baseIpCfg.getProtocol()==null) {
 					//packet ip reject
 					if(regionDict.getFunctionId().equals(5)&&serviceDict!=null&&serviceDict.getServiceId().equals(16)) {
@@ -925,7 +901,7 @@ public class CheckIpFormatThread implements Callable<String>{
 				}
 				boolean validProtocol = this.validProtocol(errInfo, baseIpCfg.getProtocol(), protocol);
 				// 验证protocol与port是否符合逻辑
-				if (validProtocol && validSrcPort&&validDestPort) {
+				if (validProtocol && validPort) {
 					validProtocolAndPort(errInfo, baseIpCfg.getProtocol(), baseIpCfg.getSrcPort(),
 							baseIpCfg.getDestPort());
 				}
@@ -948,10 +924,6 @@ public class CheckIpFormatThread implements Callable<String>{
 				// TODO 判断Direction的值
 				this.validDirection(errInfo, baseIpCfg.getDirection(), direction);
 			}
-			
-			//IP校验
-//			this.validSrcAndDescIp(baseIpCfg.getSrcIpAddress(), baseIpCfg.getDestIpAddress(), configIpPortShow,errInfo);
-			
 			if (errInfo.toString().length() > 0) {//
 				errTip.append(String.format(prop.getProperty("line"), baseIpCfg.getIndex()) + ",");
 				errTip.append(errInfo);
@@ -1058,85 +1030,153 @@ public class CheckIpFormatThread implements Callable<String>{
 	 * @param portPattern
 	 * @throws ServiceException
 	 */
-	public boolean validPort(StringBuffer errInfo, String portStr, String portPattern,String portName)
+	public boolean validPort(StringBuffer errInfo, String srcPortStr, String destPortStr, String portPattern)
 			throws ServiceException {
 		boolean valid = true;
 		if (portPattern.equals("1")) {
 			try {
-				Integer srcPort = Integer.parseInt(portStr);
+				Integer srcPort = Integer.parseInt(srcPortStr);
 				if (srcPort < 0 || srcPort > 65535) {
-					errInfo.append(prop.getProperty(portName)
+					errInfo.append(prop.getProperty("client_port")
 							+ String.format(prop.getProperty("must_between"), 0, 65535) + ";");
 					valid = false;
 				}
 			} catch (Exception e) {
 				// TODO: handle exception
-				errInfo.append(String.format(prop.getProperty("not_number"), prop.getProperty(portName)) + ";");
+				errInfo.append(String.format(prop.getProperty("not_number"), prop.getProperty("client_port")) + ";");
+				valid = false;
+			}
+			try {
+				Integer destPort = Integer.parseInt(destPortStr);
+				if (destPort < 0 || destPort > 65535) {
+					errInfo.append(prop.getProperty("server_port")
+							+ String.format(prop.getProperty("must_between"), 0, 65535) + ";");
+					valid = false;
+				}
+			} catch (Exception e) {
+				// TODO: handle exception
+				errInfo.append(String.format(prop.getProperty("not_number"), prop.getProperty("server_port")) + ";");
 				valid = false;
 			}
-			
 		} else if (portPattern.equals("2")) {
 			Pattern p = Constants.PORT_MASK_PATTERN;
-			Matcher m = p.matcher(portStr);
+			Matcher m = p.matcher(srcPortStr);
 			if (!m.matches()) {
 				errInfo.append(
-						String.format(prop.getProperty("is_in_wrong_format"), prop.getProperty(portName)) + ";");
+						String.format(prop.getProperty("is_in_wrong_format"), prop.getProperty("client_port")) + ";");
 				valid = false;
 			}
-			
-			Integer port = Integer.parseInt(portStr.split("/")[0]);
-			Integer portMask = Integer.parseInt(portStr.split("/")[1]);
-			
-			if (port < 0 || port > 65535) {
-				errInfo.append(prop.getProperty(portName)
+			m = p.matcher(destPortStr);
+			if (!m.matches()) {
+				errInfo.append(
+						String.format(prop.getProperty("is_in_wrong_format"), prop.getProperty("server_port")) + ";");
+				valid = false;
+			}
+			Integer srcPort = Integer.parseInt(srcPortStr.split("/")[0]);
+			Integer srcPortMask = Integer.parseInt(srcPortStr.split("/")[1]);
+			Integer destPort = Integer.parseInt(destPortStr.split("/")[0]);
+			Integer destPortMask = Integer.parseInt(destPortStr.split("/")[1]);
+			if (srcPort < 0 || srcPort > 65535) {
+				errInfo.append(prop.getProperty("client_port")
 						+ String.format(prop.getProperty("must_between"), 0, 65535) + ";");
 				valid = false;
 			}
-			if (portMask < 0 || portMask > 65535) {
-				errInfo.append(prop.getProperty(portName+"_mask")
+			if (srcPortMask < 0 || srcPortMask > 65535) {
+				errInfo.append(prop.getProperty("client_port_mask")
+						+ String.format(prop.getProperty("must_between"), 0, 65535) + ";");
+				valid = false;
+			}
+			if (destPort < 0 || destPort > 65535) {
+				errInfo.append(prop.getProperty("server_port")
+						+ String.format(prop.getProperty("must_between"), 0, 65535) + ";");
+				valid = false;
+			}
+			if (destPortMask < 0 || destPortMask > 65535) {
+				errInfo.append(prop.getProperty("server_port_mask")
 						+ String.format(prop.getProperty("must_between"), 0, 65535) + ";");
 				valid = false;
 			}
-			
 		} else if (portPattern.indexOf("1") > -1 && portPattern.indexOf("2") > -1) {
 			Pattern p = Constants.PORT_MASK_PATTERN;
 			Pattern p1 = Constants.PORT_PATTERN;
-			Matcher m = p.matcher(portStr);// 源端口是端口掩码格式
-			Matcher m2 = p1.matcher(portStr);// 源端口是端口格式
+			Matcher m = p.matcher(srcPortStr);// 源端口是端口掩码格式
+			Matcher m1 = p.matcher(destPortStr);// 目的端口是端口掩码格式
+			Matcher m2 = p1.matcher(srcPortStr);// 源端口是端口格式
+			Matcher m3 = p1.matcher(destPortStr);// 目的端口是端口格式
 			if (m.matches()) {
-				Integer srcPort = Integer.parseInt(portStr.split("/")[0]);
-				Integer srcPortMask = Integer.parseInt(portStr.split("/")[1]);
+				Integer srcPort = Integer.parseInt(srcPortStr.split("/")[0]);
+				Integer srcPortMask = Integer.parseInt(srcPortStr.split("/")[1]);
 				if (srcPort < 0 || srcPort > 65535) {
-					errInfo.append(prop.getProperty(portName)
+					errInfo.append(prop.getProperty("client_port")
 							+ String.format(prop.getProperty("must_between"), 0, 65535) + ";");
 					valid = false;
 				}
 				if (srcPortMask < 0 || srcPortMask > 65535) {
-					errInfo.append(prop.getProperty(portName+"_mask")
+					errInfo.append(prop.getProperty("client_port_mask")
+							+ String.format(prop.getProperty("must_between"), 0, 65535) + ";");
+					valid = false;
+				}
+			}
+			if (m1.matches()) {
+				Integer destPort = Integer.parseInt(destPortStr.split("/")[0]);
+				Integer destPortMask = Integer.parseInt(destPortStr.split("/")[1]);
+
+				if (destPort < 0 || destPort > 65535) {
+					errInfo.append(prop.getProperty("server_port")
+							+ String.format(prop.getProperty("must_between"), 0, 65535) + ";");
+					valid = false;
+				}
+				if (destPortMask < 0 || destPortMask > 65535) {
+					errInfo.append(prop.getProperty("server_port_mask")
 							+ String.format(prop.getProperty("must_between"), 0, 65535) + ";");
 					valid = false;
 				}
 			}
 			if (m2.matches()) {
 				try {
-					Integer srcPort = Integer.parseInt(portStr);
+					Integer srcPort = Integer.parseInt(srcPortStr);
 					if (srcPort < 0 || srcPort > 65535) {
-						errInfo.append(prop.getProperty(portName)
+						errInfo.append(prop.getProperty("client_port")
 								+ String.format(prop.getProperty("must_between"), 0, 65535) + ";");
 						valid = false;
 					}
 				} catch (Exception e) {
 					// TODO: handle exception
 					errInfo.append(
-							String.format(prop.getProperty("not_number"), prop.getProperty(portName)) + ";");
+							String.format(prop.getProperty("not_number"), prop.getProperty("client_port")) + ";");
 					valid = false;
 				}
 			}
-			if (!m.matches() && !m2.matches()) {
-				errInfo.append(
-						String.format(prop.getProperty("is_in_wrong_format"), prop.getProperty(portName)) + ";");
+			if (m3.matches()) {
+				try {
+					Integer destPort = Integer.parseInt(destPortStr);
+					if (destPort < 0 || destPort > 65535) {
+						errInfo.append(prop.getProperty("server_port")
+								+ String.format(prop.getProperty("must_between"), 0, 65535) + ";");
+						valid = false;
+					}
+				} catch (Exception e) {
+					// TODO: handle exception
+					errInfo.append(
+							String.format(prop.getProperty("not_number"), prop.getProperty("server_port")) + ";");
+					valid = false;
+				}
+			}
+			if ((m.matches() && m3.matches()) || (m2.matches() && m1.matches())) {
+				errInfo.append(prop.getProperty("the_same_port_pattern") + ";");
 				valid = false;
 			}
+			if (!m.matches() && !m2.matches()) {
+				errInfo.append(
+						String.format(prop.getProperty("is_in_wrong_format"), prop.getProperty("client_port")) + ";");
+				valid = false;
+			}
+			if (!m1.matches() && !m3.matches()) {
+				errInfo.append(
+						String.format(prop.getProperty("is_in_wrong_format"), prop.getProperty("server_port")) + ";");
+				valid = false;
+			}
+
 		}
 		return valid;
 	}
@@ -1329,44 +1369,7 @@ public class CheckIpFormatThread implements Callable<String>{
 		}
 		return matchType;
 	}
-	public void ValidateRangeCross(String srcIp,String destIp,StringBuffer errInfo) {
-		long srcStart=0l,srcEnd=0,srcNum=0l,destStart=0l,destEnd=0l,destNum=0l;
-		if(srcIp.indexOf("-")>-1) {
-			String[] srcArr=srcIp.split("\\-");
-			srcStart=IPUtil.getIpHostDesimal(srcArr[0]);
-			srcEnd=IPUtil.getIpHostDesimal(srcArr[1]);
-		}else if(srcIp.indexOf("/")>-1) {
-			srcNum=IPUtil.getIpHostDesimal(srcIp.split("/")[0]);
-		}else {
-			srcNum=IPUtil.getIpHostDesimal(srcIp);
-		}
-		if(destIp.indexOf("-")>-1) {
-			String[] destArr=destIp.split("\\-");
-			destStart=IPUtil.getIpHostDesimal(destArr[0]);
-			destEnd=IPUtil.getIpHostDesimal(destArr[1]);
-		}else if(destIp.indexOf("/")>-1) {
-			destNum=IPUtil.getIpHostDesimal(destIp.split("/")[0]);
-		}else {
-			destNum=IPUtil.getIpHostDesimal(destIp);
-		}
-		if(srcNum==0l) {
-			if(destNum==0l) {
-				if(!(destEnd<srcStart||srcEnd<destStart)) {
-					errInfo.append(prop.getProperty("range_cross")+";");
-				}
-			}else {
-				if(destNum>=srcStart&&destNum<=srcEnd) {
-					errInfo.append(prop.getProperty("range_cross")+";");
-				}
-			}
-		}else {
-			if(destNum==0l) {
-				if(srcNum>=destStart&&srcNum<=destEnd) {
-					errInfo.append(prop.getProperty("range_cross")+";");
-				}
-			}
-		}
-	}
+	
 	public List<Map<Long, AsnGroupInfo>> getAsnNoMaps() {
 		return asnNoMaps;
 	}
@@ -1379,4 +1382,5 @@ public class CheckIpFormatThread implements Callable<String>{
 	public void setAsnGroupInfos(Map<Long, AsnGroupInfo> asnGroupInfos) {
 		this.asnGroupInfos = asnGroupInfos;
 	}
+	
 }

src/main/java/com/nis/web/controller/BaseController.java

@@ -64,6 +64,7 @@ import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.configuration.ComplexStringCfgTemplate;
 import com.nis.domain.configuration.ComplexkeywordCfg;
 import com.nis.domain.configuration.DdosIpCfg;
 import com.nis.domain.configuration.DnsIpCfg;
@@ -74,6 +75,7 @@ import com.nis.domain.configuration.PxyObjKeyring;
 import com.nis.domain.configuration.PxyObjTrustedCaCert;
 import com.nis.domain.configuration.PxyObjTrustedCaCrl;
 import com.nis.domain.configuration.RequestInfo;
+import com.nis.domain.configuration.StringCfgTemplate;
 import com.nis.domain.configuration.template.AppDomainTemplate;
 import com.nis.domain.configuration.template.AppPayloadTemplate;
 import com.nis.domain.configuration.template.AsnIpTemplate;
@@ -98,6 +100,7 @@ import com.nis.domain.configuration.template.HttpsReplaceIpTemplate;
 import com.nis.domain.configuration.template.HttpsReplaceTemplate;
 import com.nis.domain.configuration.template.IpAllNotDoLogTemplate;
 import com.nis.domain.configuration.template.IpAllTemplate;
+import com.nis.domain.configuration.template.IpCfgTemplate;
 import com.nis.domain.configuration.template.IpPayloadTemplate;
 import com.nis.domain.configuration.template.IpRateLimitTemplate;
 import com.nis.domain.configuration.template.IpSpoofingTemplate;
@@ -768,6 +771,75 @@ public class BaseController {
 		}
 		return msgProp;
 	}
+	@Deprecated
+	public void importCfgTemplate(HttpServletRequest request, HttpServletResponse response,
+			RedirectAttributes redirectAttributes, Integer functionId, Integer cfgRegionCode) {
+		Properties msgProp = getMsgProp();
+		try {
+			List<FunctionRegionDict> dictList = DictUtils.getFunctionRegionDictList(functionId);
+			for (FunctionRegionDict dict : dictList) {
+				if (dict.getConfigRegionCode() == cfgRegionCode) {
+					String fileName = dict.getConfigRegionValue() + ".xlsx";
+					if (dict.getRegionType() == 1) {
+						List<IpCfgTemplate> list = Lists.newArrayList();
+						list.add(new IpCfgTemplate());
+						new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null,
+								IpCfgTemplate.class, 2).setDataList(msgProp, list, null)
+										.write(request, response, fileName).dispose();
+					} else if (dict.getRegionType() == 2) {
+						List<StringCfgTemplate> list = Lists.newArrayList();
+						list.add(new StringCfgTemplate());
+						new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null,
+								StringCfgTemplate.class, 2).setDataList(msgProp, list, null)
+										.write(request, response, fileName).dispose();
+					} else if (dict.getRegionType() == 3) {
+						List<ComplexStringCfgTemplate> list = Lists.newArrayList();
+						list.add(new ComplexStringCfgTemplate());
+						new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null,
+								ComplexStringCfgTemplate.class, 2).setDataList(msgProp, list, null)
+										.write(request, response, fileName).dispose();
+					}
+				}
+			}
+
+		} catch (Exception e) {
+			msgProp = null;
+			e.printStackTrace();
+		}
+	}
+	@Deprecated
+	public void importCfgTemplate(HttpServletRequest request, HttpServletResponse response,
+			RedirectAttributes redirectAttributes, Integer functionId, Integer cfgRegionCode, Class clazz) {
+		Properties msgProp = getMsgProp();
+		try {
+			List<FunctionRegionDict> dictList = DictUtils.getFunctionRegionDictList(functionId);
+			for (FunctionRegionDict dict : dictList) {
+				if (dict.getConfigRegionCode() == cfgRegionCode) {
+					String fileName = dict.getConfigRegionValue() + ".xlsx";
+					if (dict.getRegionType() == 1) {
+						List<IpCfgTemplate> list = Lists.newArrayList();
+						list.add((IpCfgTemplate) clazz.newInstance());
+						new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null, clazz, 2)
+								.setDataList(msgProp, list, null).write(request, response, fileName).dispose();
+					} else if (dict.getRegionType() == 2) {
+						List<StringCfgTemplate> list = Lists.newArrayList();
+						list.add(new StringCfgTemplate());
+						new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null, clazz, 2)
+								.setDataList(msgProp, list, null).write(request, response, fileName).dispose();
+					} else if (dict.getRegionType() == 3) {
+						List<ComplexStringCfgTemplate> list = Lists.newArrayList();
+						list.add(new ComplexStringCfgTemplate());
+						new ExportExcel(new FunctionServiceDict(), new FunctionRegionDict(), msgProp, null, clazz, 2)
+								.setDataList(msgProp, list, null).write(request, response, fileName).dispose();
+					}
+				}
+			}
+
+		} catch (Exception e) {
+			msgProp = null;
+			e.printStackTrace();
+		}
+	}
 
 	public void setLogAction(BaseLogEntity log, List<FunctionServiceDict> serviceList) {
 		if (!StringUtil.isEmpty(serviceList)) {
@@ -2749,6 +2821,45 @@ public class BaseController {
 		
 		//全部审核通过，只查询当前条件下的所有未审核的配置 -批量审核通过/不通过
 		if(auditType.equals(1) || auditType.equals(2)) {
+			searchCfg.setIsValid(0);
+			searchCfg.setIsAudit(0);
+			searchAppCfg.setIsValid(0);
+			searchAppCfg.setIsAudit(0);
+			searchDigestCfg.setIsValid(0);
+			searchDigestCfg.setIsAudit(0);
+			searchFileSampleCfg.setIsValid(0);
+			searchFileSampleCfg.setIsAudit(0);
+			searchObjKeyringCfg.setIsValid(0);
+			searchObjKeyringCfg.setIsAudit(0);
+			searchTrustedCaCertCfg.setIsValid(0);
+			searchTrustedCaCertCfg.setIsAudit(0);
+			searchTrustedCaCrlCfg.setIsValid(0);
+			searchTrustedCaCrlCfg.setIsAudit(0);
+			searchDnsResStrategy.setIsValid(0);
+			searchDnsResStrategy.setIsAudit(0);
+			searchDnsIpCfg.setIsValid(0);
+			searchDnsIpCfg.setIsAudit(0);
+			searchIpPortCfg.setIsValid(0);
+			searchIpPortCfg.setIsAudit(0);
+			searchSignSampleCfg.setIsValid(0);
+			searchSignSampleCfg.setIsAudit(0);
+			searchDdosIpCfg.setIsValid(0);
+			searchDdosIpCfg.setIsAudit(0);
+			searchAppIpCfg.setIsValid(0);
+			searchAppIpCfg.setIsAudit(0);
+			searchAppHttpCfg.setIsValid(0);
+			searchAppHttpCfg.setIsAudit(0);
+			searchAppDomainCfg.setIsValid(0);
+			searchAppDomainCfg.setIsAudit(0);
+			searchAppTopicCfg.setIsValid(0);
+			searchAppTopicCfg.setIsAudit(0);
+			searchAppFeatureIndex.setIsValid(0);
+			searchAppFeatureIndex.setIsAudit(0);
+			searchAppSslCertCfg.setIsValid(0);
+			searchAppSslCertCfg.setIsAudit(0);
+			searchAsnIpCfg.setIsValid(0);
+			searchAsnIpCfg.setIsAudit(0);
+			
 			if(auditType.equals(1)) {
 				auditBatchCfg.setIsAudit(1);
 				auditBatchCfg.setIsValid(1);
@@ -2759,6 +2870,45 @@ public class BaseController {
 			auditBatchCfg.setAuditTime(new Date());
 			auditBatchCfg.setAuditorId(UserUtils.getUser().getId());
 		}else {
+		//全部取消通过，只查询当前条件下的所有审核通过的配置
+			searchCfg.setIsValid(1);
+			searchCfg.setIsAudit(1);
+			searchAppCfg.setIsValid(1);
+			searchAppCfg.setIsAudit(1);
+			searchDigestCfg.setIsValid(1);
+			searchDigestCfg.setIsAudit(1);
+			searchFileSampleCfg.setIsValid(1);
+			searchFileSampleCfg.setIsAudit(1);
+			searchObjKeyringCfg.setIsValid(1);
+			searchObjKeyringCfg.setIsAudit(1);
+			searchTrustedCaCertCfg.setIsValid(1);
+			searchTrustedCaCertCfg.setIsAudit(1);
+			searchTrustedCaCrlCfg.setIsValid(1);
+			searchTrustedCaCrlCfg.setIsAudit(1);
+			searchDnsResStrategy.setIsValid(1);
+			searchDnsResStrategy.setIsAudit(1);
+			searchDnsIpCfg.setIsValid(1);
+			searchDnsIpCfg.setIsAudit(1);
+			searchIpPortCfg.setIsValid(1);
+			searchIpPortCfg.setIsAudit(1);
+			searchSignSampleCfg.setIsValid(1);
+			searchSignSampleCfg.setIsAudit(1);
+			searchDdosIpCfg.setIsValid(1);
+			searchDdosIpCfg.setIsAudit(1);
+			searchAppIpCfg.setIsValid(1);
+			searchAppIpCfg.setIsAudit(1);
+			searchAppHttpCfg.setIsValid(1);
+			searchAppHttpCfg.setIsAudit(1);
+			searchAppDomainCfg.setIsValid(1);
+			searchAppDomainCfg.setIsAudit(1);
+			searchAppTopicCfg.setIsValid(1);
+			searchAppTopicCfg.setIsAudit(1);
+			searchAppFeatureIndex.setIsValid(1);
+			searchAppFeatureIndex.setIsAudit(1);
+			searchAppSslCertCfg.setIsValid(1);
+			searchAppSslCertCfg.setIsAudit(1);
+			searchAsnIpCfg.setIsValid(1);
+			searchAsnIpCfg.setIsAudit(1);
 			
 			auditBatchCfg.setIsAudit(3);
 			auditBatchCfg.setIsValid(0);
@@ -3218,42 +3368,11 @@ public class BaseController {
  		//批量审核通过时，如果没有携带isValid检索条件，返回界面需要将isValid置为null
 		if(!StringUtil.isEmpty(entity)) {
 			BaseCfg base=(BaseCfg)entity ;
-			base.setBatchAuditValue("");
-			base.setBatchValidValue("");
-			//配置目标状态：1 1 生效,isAudit条件置为1，有selType条件,且不是isValid不改，没有sel改为isValid并且为1
-			if(base.getIsAudit()==1 && base.getIsValid()==1){
-				base.setIsAudit(1);
-				if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
-					base.setIsValid(null);
-				}else{
-					base.setIsValid(1);
-					base.setSeltype("isValid");
-				}
+			if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
+				base.setIsValid(null);
+				BeanUtils.copyProperties(base, entity);
 			}
-			//配置目标状态：2 0 不通过,isAudit条件置为2，有selType条件,且不是isValid不改，没有sel改为isValid并且为0
-			if(base.getIsAudit()==2 && base.getIsValid()==0){
-				base.setIsAudit(2);
-				if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
-					base.setIsValid(null);
-				}else{
-					base.setIsValid(0);
-					base.setSeltype("isValid");
-				}
-			}
-			//配置目标状态：3 0 取消
-			if(base.getIsAudit()==3 && base.getIsValid()==0){
-				base.setIsAudit(3);
-				if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
-					base.setIsValid(null);
-				}else{
-					base.setIsValid(0);
-					base.setSeltype("isValid");
-				}
-			}
-			
-			BeanUtils.copyProperties(base, entity);
 		}
-		
 		long end=System.currentTimeMillis();
 		logger.warn("配置批量生效/失效耗时："+(end-start));
 	}
@@ -3272,6 +3391,7 @@ public class BaseController {
 		page.setPageNo(1);
 		page.setLastPage(false);
 		
+		// 只有未审核的配置可删除
 		CfgIndexInfo searchCfg = new CfgIndexInfo();
 		AppPolicyCfg searchAppCfg=new AppPolicyCfg();
 		FileDigestCfg searchDigestCfg=new FileDigestCfg();
@@ -3294,70 +3414,104 @@ public class BaseController {
 		// 传递检索条件
 		if(entity != null  && (entity instanceof CfgIndexInfo)) {
 			BeanUtils.copyProperties(entity, searchCfg);
+			searchCfg.setIsValid(0);
+			searchCfg.setIsAudit(0);
 			searchCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppPolicyCfg)) {
 			BeanUtils.copyProperties(entity, searchAppCfg);
+			searchAppCfg.setIsValid(0);
+			searchAppCfg.setIsAudit(0);
 			searchAppCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof FileDigestCfg)) {
 			BeanUtils.copyProperties(entity, searchDigestCfg);
+			searchDigestCfg.setIsValid(0);
+			searchDigestCfg.setIsAudit(0);
 			searchDigestCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AvFileSampleCfg)) {
 			BeanUtils.copyProperties(entity, searchFileSampleCfg);
+			searchFileSampleCfg.setIsValid(0);
+			searchFileSampleCfg.setIsAudit(0);
 			searchFileSampleCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof DdosIpCfg)) {
 			BeanUtils.copyProperties(entity, searchDdosIpCfg);
+			searchDdosIpCfg.setIsValid(0);
+			searchDdosIpCfg.setIsAudit(0);
 			searchDdosIpCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppHttpCfg)) {
 			BeanUtils.copyProperties(entity, searchAppHttpCfg);
+			searchAppHttpCfg.setIsValid(0);
+			searchAppHttpCfg.setIsAudit(0);
 			searchAppHttpCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppHttpCfg)) {
 			BeanUtils.copyProperties(entity, searchAppHttpCfg);
+			searchAppHttpCfg.setIsValid(0);
+			searchAppHttpCfg.setIsAudit(0);
 			searchAppHttpCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppDomainCfg)) {
 			BeanUtils.copyProperties(entity, searchAppDomainCfg);
+			searchAppDomainCfg.setIsValid(0);
+			searchAppDomainCfg.setIsAudit(0);
 			searchAppDomainCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppTopicDomainCfg)) {
 			BeanUtils.copyProperties(entity, searchAppTopicCfg);
+			searchAppTopicCfg.setIsValid(0);
+			searchAppTopicCfg.setIsAudit(0);
 			searchAppTopicCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppSslCertCfg)) {
 			BeanUtils.copyProperties(entity, searchAppSslCertCfg);
+			searchAppSslCertCfg.setIsValid(0);
+			searchAppSslCertCfg.setIsAudit(0);
 			searchAppSslCertCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppIpCfg)) {
 			BeanUtils.copyProperties(entity, searchAppIpCfg);
+			searchAppIpCfg.setIsValid(0);
+			searchAppIpCfg.setIsAudit(0);
 			searchAppIpCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppFeatureIndex)) {
 			BeanUtils.copyProperties(entity, searchAppFeatureIndex);
+			searchAppFeatureIndex.setIsValid(0);
+			searchAppFeatureIndex.setIsAudit(0);
 			searchAppFeatureIndex.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof DnsResStrategy)) {
 			BeanUtils.copyProperties(entity, searchDnsResStrategy);
+			searchDnsResStrategy.setIsValid(0);
+			searchDnsResStrategy.setIsAudit(0);
 			searchDnsResStrategy.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof DnsIpCfg)) {
 			BeanUtils.copyProperties(entity, searchDnsIpCfg);
+			searchDnsIpCfg.setIsValid(0);
+			searchDnsIpCfg.setIsAudit(0);
 			searchDnsIpCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof PxyObjKeyring)) {
 			BeanUtils.copyProperties(entity, searchObjKeyringCfg);
+			searchObjKeyringCfg.setIsValid(0);
+			searchObjKeyringCfg.setIsAudit(0);
 			searchObjKeyringCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof PxyObjTrustedCaCert)) {
 			BeanUtils.copyProperties(entity, searchTrustedCaCertCfg);
+			searchTrustedCaCertCfg.setIsValid(0);
+			searchTrustedCaCertCfg.setIsAudit(0);
 			searchTrustedCaCertCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AsnIpCfg)) {
 			BeanUtils.copyProperties(entity, searchAsnIpCfg);
+			searchAsnIpCfg.setIsValid(0);
+			searchAsnIpCfg.setIsAudit(0);
 			searchAsnIpCfg.setFunctionId(functionId);
 		}
 		

src/main/java/com/nis/web/controller/SystemController.java

@@ -209,6 +209,8 @@ public class SystemController  extends BaseController{
 	public boolean clearPolicies(HttpServletRequest request, HttpServletResponse response) {
 		try {
 			systemService.clearPolicies();
+			/*ArrayList<Object> list = Lists.newArrayList();
+			System.out.println(list.get(6));*/
 			return true;
 		} catch (Exception e) {
 			logger.error("Clear Policies Error",e);

src/main/java/com/nis/web/controller/configuration/AppCfgController.java

@@ -126,9 +126,9 @@ public class AppCfgController extends BaseController {
 	 */
 	@RequestMapping(value = "ajaxAppName", method = RequestMethod.POST)
 	@ResponseBody
-	public List<Map<String, String>> ajaxAppName(Model model, String ids,Integer cfgType) {
+	public List<Map<String, String>> ajaxAppName(Model model, String ids) {
 		List<Map<String, String>> dataList = new ArrayList<>();
-		List<SpecificServiceCfg> serviceList = specificServiceCfgService.getBySpecServiceCodes(ids,cfgType);
+		List<SpecificServiceCfg> serviceList = specificServiceCfgService.getBySpecServiceCodes(ids);
 		Map<String, String> appMap = new HashMap<>();
 		Map<String, String> behavMap = new HashMap<>();
 		for (SpecificServiceCfg cfg : serviceList) {
@@ -192,24 +192,6 @@ public class AppCfgController extends BaseController {
 	public String policyCfgForm(Model model, String ids, AppPolicyCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids), null);
-			
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setSpecServiceId(app.getSpecServiceId());
-			}
-			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -374,22 +356,8 @@ public class AppCfgController extends BaseController {
 		Page<AppIpCfg> searchPage = new Page<AppIpCfg>(request, response, "r");
 		Page<AppIpCfg> page = appCfgService.findAppIpList(searchPage, cfg);
 		for (AppIpCfg entity : page.getList()) {
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppName(app.getSpecServiceName());
-			}
+			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
+			entity.setAppName(app.getSpecServiceName());
 		}
 		model.addAttribute("page", page);
 		initPageCondition(model, cfg);
@@ -409,24 +377,6 @@ public class AppCfgController extends BaseController {
 	public String ipCfgForm(Model model, String ids, AppIpCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppIpCfg(Long.parseLong(ids));
-			
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setSpecServiceId(app.getSpecServiceId());
-			}
-			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -601,22 +551,8 @@ public class AppCfgController extends BaseController {
 		Page<AppHttpCfg> searchPage = new Page<AppHttpCfg>(request, response, "r");
 		Page<AppHttpCfg> page = appCfgService.findAppHttpList(searchPage, cfg);
 		for (AppHttpCfg entity : page.getList()) {
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppName(app.getSpecServiceName());
-			}
+			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
+			entity.setAppName(app.getSpecServiceName());
 			// entity.setCfgKeywords(entity.getCfgKeywords().replace(Constants.KEYWORD_EXPR,
 			// "&"));
 		}
@@ -638,24 +574,6 @@ public class AppCfgController extends BaseController {
 	public String httpCfgForm(Model model, String ids, AppHttpCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppHttpCfg(Long.parseLong(ids));
-			
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setSpecServiceId(app.getSpecServiceId());
-			}
-			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -796,22 +714,8 @@ public class AppCfgController extends BaseController {
 		Page<AppDomainCfg> searchPage = new Page<AppDomainCfg>(request, response, "r");
 		Page<AppDomainCfg> page = appCfgService.findAppDomainList(searchPage, cfg);
 		for (AppDomainCfg entity : page.getList()) {
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppName(app.getSpecServiceName());
-			}
+			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
+			entity.setAppName(app.getSpecServiceName());
 		}
 		model.addAttribute("page", page);
 		initPageCondition(model, cfg);
@@ -831,24 +735,6 @@ public class AppCfgController extends BaseController {
 	public String domainCfgForm(Model model, String ids, AppDomainCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppDomainCfg(Long.parseLong(ids));
-			
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setSpecServiceId(app.getSpecServiceId());
-			}
-			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -1011,22 +897,8 @@ public class AppCfgController extends BaseController {
 		Page<AppByteCfg> searchPage = new Page<AppByteCfg>(request, response, "r");
 		Page<AppByteCfg> page = appCfgService.findAppByteList(searchPage, cfg);
 		for (AppByteCfg entity : page.getList()) {
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppName(app.getSpecServiceName());
-			}
+			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
+			entity.setAppName(app.getSpecServiceName());
 		}
 		model.addAttribute("page", page);
 		initPageCondition(model, cfg);
@@ -1046,24 +918,6 @@ public class AppCfgController extends BaseController {
 	public String byteCfgForm(Model model, String ids, AppByteCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppByteCfg(Long.parseLong(ids));
-			
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setSpecServiceId(app.getSpecServiceId());
-			}
-			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -1180,22 +1034,8 @@ public class AppCfgController extends BaseController {
 		Page<AppSslCertCfg> searchPage = new Page<AppSslCertCfg>(request, response, "r");
 		Page<AppSslCertCfg> page = appCfgService.findAppSslList(searchPage, cfg);
 		for (AppSslCertCfg entity : page.getList()) {
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppName(app.getSpecServiceName());
-			}
+			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
+			entity.setAppName(app.getSpecServiceName());
 		}
 		model.addAttribute("page", page);
 		initPageCondition(model, cfg);
@@ -1215,24 +1055,6 @@ public class AppCfgController extends BaseController {
 	public String sslCfgForm(Model model, String ids, AppSslCertCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppSslCfg(Long.parseLong(ids));
-			
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setSpecServiceId(app.getSpecServiceId());
-			}
-			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -1262,13 +1084,7 @@ public class AppCfgController extends BaseController {
 				entity.setAppCode(specificService.getSpecServiceCode());
 			}
 			appCfgService.saveOrUpdateAppSslCfg(entity);
-			//配置仅保存
-			if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) {
-				addMessage(redirectAttributes, "success", "save_success");
-			}else {
-			//配置直接生效
-				addMessage(redirectAttributes, "success", "audit_success");
-			}
+			addMessage(redirectAttributes, "success", "save_success");
 		} catch (Exception e) {
 			e.printStackTrace();
 			logger.error("saveAppSslCfg failed", e);
@@ -1380,9 +1196,7 @@ public class AppCfgController extends BaseController {
 		Page<AppTcpCfg> page = appCfgService.findAppTcpList(searchPage, cfg);
 		for (AppTcpCfg entity : page.getList()) {
 			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
-			if(app!=null){
-				entity.setAppName(app.getSpecServiceName());
-			}
+			entity.setAppName(app.getSpecServiceName());
 		}
 		model.addAttribute("page", page);
 		initPageCondition(model, cfg);
@@ -1402,24 +1216,6 @@ public class AppCfgController extends BaseController {
 	public String tcpCfgForm(Model model, String ids, AppTcpCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppTcpCfg(Long.parseLong(ids));
-			
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setSpecServiceId(app.getSpecServiceId());
-			}
-			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -1535,22 +1331,8 @@ public class AppCfgController extends BaseController {
 		Page<AppHeaderCfg> searchPage = new Page<AppHeaderCfg>(request, response, "r");
 		Page<AppHeaderCfg> page = appCfgService.findAppHeaderList(searchPage, cfg);
 		for (AppHeaderCfg entity : page.getList()) {
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppName(app.getSpecServiceName());
-			}
+			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
+			entity.setAppName(app.getSpecServiceName());
 		}
 		model.addAttribute("page", page);
 		initPageCondition(model, cfg);
@@ -1570,24 +1352,6 @@ public class AppCfgController extends BaseController {
 	public String headerCfgForm(Model model, String ids, AppHeaderCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppHeaderCfg(Long.parseLong(ids));
-			
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setSpecServiceId(app.getSpecServiceId());
-			}
-			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -2084,20 +1848,8 @@ public class AppCfgController extends BaseController {
 					logTotal.put("sum",0L);
 					logTotals.add(logTotal);
 				}
-				// 查找社交应用的所有有效一级特定服务
-				SpecificServiceCfg appSpec = new SpecificServiceCfg();
-				for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-					if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-						appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-						break;
-					}
-				}
-				appSpec.setIsValid(Constants.VALID_YES);
-				appSpec.setIsLeaf(0);
-				appSpec.setSpecServiceCode(policy.getAppCode());
-				List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-				if (!StringUtil.isEmpty(appList)) {
-					SpecificServiceCfg app = appList.get(0);
+				SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId());
+				if (app != null) {
 					policy.setSocialName(app.getSpecServiceName());
 				}
 			}
@@ -2307,9 +2059,7 @@ public class AppCfgController extends BaseController {
 
 			for (AppIpCfg appIp : ipLists) {
 				SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(appIp.getSpecServiceId());
-				if(app!=null){
-					appIp.setAppName(app.getSpecServiceName());
-				}
+				appIp.setAppName(app.getSpecServiceName());
 			}
 			titleList.add(entity.getMenuNameCode());
 			classMap.put(entity.getMenuNameCode(), AppIpCfg.class);
@@ -2382,22 +2132,8 @@ public class AppCfgController extends BaseController {
 					http.setIsCaseInsenstive(0);
 				}
 				http.setCfgKeywords(Functions.replace(http.getCfgKeywords(), "***and***", " "));
-				// 查找社交应用的所有有效一级特定服务
-				SpecificServiceCfg appSpec = new SpecificServiceCfg();
-				for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-					if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-						appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-						break;
-					}
-				}
-				appSpec.setIsValid(Constants.VALID_YES);
-				appSpec.setIsLeaf(0);
-				appSpec.setSpecServiceCode(http.getAppCode());
-				List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-				if (!StringUtil.isEmpty(appList)) {
-					SpecificServiceCfg app = appList.get(0);
-					http.setAppName(app.getSpecServiceName());
-				}
+				SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(http.getSpecServiceId());
+				http.setAppName(app.getSpecServiceName());
 			}
 
 			titleList.add(entity.getMenuNameCode());
@@ -2469,22 +2205,8 @@ public class AppCfgController extends BaseController {
 				}else{
 					domain.setIsCaseInsenstive(0);
 				}
-				// 查找社交应用的所有有效一级特定服务
-				SpecificServiceCfg appSpec = new SpecificServiceCfg();
-				for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-					if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-						appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-						break;
-					}
-				}
-				appSpec.setIsValid(Constants.VALID_YES);
-				appSpec.setIsLeaf(0);
-				appSpec.setSpecServiceCode(domain.getAppCode());
-				List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-				if (!StringUtil.isEmpty(appList)) {
-					SpecificServiceCfg app = appList.get(0);
-					domain.setAppName(app.getSpecServiceName());
-				}
+				SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(domain.getSpecServiceId());
+				domain.setAppName(app.getSpecServiceName());
 			}
 
 			titleList.add(entity.getMenuNameCode());
@@ -2558,22 +2280,8 @@ public class AppCfgController extends BaseController {
 					ssl.setIsCaseInsenstive(0);
 				}
 				ssl.setCfgKeywords(Functions.replace(ssl.getCfgKeywords(), "***and***", " "));
-				// 查找社交应用的所有有效一级特定服务
-				SpecificServiceCfg appSpec = new SpecificServiceCfg();
-				for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-					if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-						appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-						break;
-					}
-				}
-				appSpec.setIsValid(Constants.VALID_YES);
-				appSpec.setIsLeaf(0);
-				appSpec.setSpecServiceCode(ssl.getAppCode());
-				List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-				if (!StringUtil.isEmpty(appList)) {
-					SpecificServiceCfg app = appList.get(0);
-					ssl.setAppName(app.getSpecServiceName());
-				}
+				SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(ssl.getSpecServiceId());
+				ssl.setAppName(app.getSpecServiceName());
 			}
 			titleList.add(entity.getMenuNameCode());
 			classMap.put(entity.getMenuNameCode(), AppSslCertCfg.class);

src/main/java/com/nis/web/controller/configuration/AppFeatureCfgController.java

@@ -87,22 +87,8 @@ public class AppFeatureCfgController extends BaseController {
 		Page<AppFeatureIndex> searchPage = new Page<AppFeatureIndex>(request, response, "r");
 		Page<AppFeatureIndex> page = appMultiFeatureCfgService.findAppFeatureIndexList(searchPage, cfg);
 		for (AppFeatureIndex entity : page.getList()) {
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppName(app.getSpecServiceName());
-			}
+			SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(entity.getSpecServiceId());
+			entity.setAppName(app.getSpecServiceName());
 		}
 		model.addAttribute("page", page);
 		initPageCondition(model, cfg);
@@ -129,24 +115,6 @@ public class AppFeatureCfgController extends BaseController {
 					entity.getFunctionId(), null));
 			entity.setNumCfgList(
 					appMultiFeatureCfgService.getAppTcpCfg(entity.getCompileId(), entity.getFunctionId(), null));
-			
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setSpecServiceId(app.getSpecServiceId());
-			}
-			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -383,22 +351,8 @@ public class AppFeatureCfgController extends BaseController {
 			}
 
 			for (AppFeatureIndex feature : ipLists) {
-				// 查找社交应用的所有有效一级特定服务
-				SpecificServiceCfg appSpec = new SpecificServiceCfg();
-				for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-					if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-						appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-						break;
-					}
-				}
-				appSpec.setIsValid(Constants.VALID_YES);
-				appSpec.setIsLeaf(0);
-				appSpec.setSpecServiceCode(feature.getAppCode());
-				List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-				if (!StringUtil.isEmpty(appList)) {
-					SpecificServiceCfg app = appList.get(0);
-					feature.setAppName(app.getSpecServiceName());
-				}
+				SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(feature.getSpecServiceId());
+				feature.setAppName(app.getSpecServiceName());
 			}
 			String cfgIndexInfoNoExport = ",letter,whether_area_block,classification,attribute,label,do_log,block_type,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 			String appComplexNoExport = ",do_log,block_type,config_describe,valid_identifier,is_audit,creator,creator"
@@ -408,7 +362,7 @@ public class AppFeatureCfgController extends BaseController {
 			String ipPortInfoNoExport = ",do_log,block_type,config_describe,valid_identifier,is_audit,creator,creator"
 					+ ",config_time,editor,edit_time,auditor,audit_time"
 					+ ",letter,whether_area_block,classification,attribute,label"
-					+ ",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,client_ip,src_ip_pattern,client_port,src_port_pattern,";
+					+ ",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,group_name,";
 
 			// 时间过滤
 			if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) {

src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java

@@ -24,7 +24,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
-import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.configuration.AppPolicyCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
@@ -37,7 +36,6 @@ import com.nis.exceptions.CallExternalProceduresException;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
-import com.nis.util.DictUtils;
 import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
@@ -132,25 +130,6 @@ public class BasicProtocolController extends BaseController {
 	public String policyCfgForm(Model model, String ids, AppPolicyCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids), null);
-			
-
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_BASIC_PROTOCOL.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setSpecServiceId(app.getSpecServiceId());
-			}
-			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -344,20 +323,8 @@ public class BasicProtocolController extends BaseController {
 					logTotal.put("sum",0L);
 					logTotals.add(logTotal);
 				}
-				// 查找社交应用的所有有效一级特定服务 TODO
-				SpecificServiceCfg appSpec = new SpecificServiceCfg();
-				for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-					if (Constants.SPECIFIC_SERVICE_CFG_TYPE_BASIC_PROTOCOL.equals(dict.getItemValue())) {
-						appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-						break;
-					}
-				}
-				appSpec.setIsValid(Constants.VALID_YES);
-				appSpec.setIsLeaf(0);
-				appSpec.setSpecServiceCode(policy.getAppCode());
-				List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-				if (!StringUtil.isEmpty(appList)) {
-					SpecificServiceCfg app = appList.get(0);
+				SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId());
+				if (app != null) {
 					policy.setAppName(app.getSpecServiceName());
 				}
 

src/main/java/com/nis/web/controller/configuration/CommonController.java

@@ -8,8 +8,10 @@
  */
 package com.nis.web.controller.configuration;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -17,22 +19,38 @@ import java.util.Properties;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.axis2.databinding.types.soapencoding.Array;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.ui.Model;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import com.nis.domain.FunctionRegionDict;
+import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.configuration.HttpBodyCfg;
+import com.nis.domain.configuration.HttpReqHeadCfg;
+import com.nis.domain.configuration.HttpResHeadCfg;
 import com.nis.domain.configuration.HttpUrlCfg;
+import com.nis.domain.configuration.template.IpAllTemplate;
+import com.nis.domain.configuration.template.IpCfgTemplate;
+import com.nis.domain.specific.ConfigGroupInfo;
 import com.nis.domain.configuration.IpPortCfg;
+import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
+import com.nis.util.DictUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.excel.ExportExcel;
+import com.nis.util.excel.ImportExcel;
 import com.nis.web.controller.BaseController;
+import com.nis.web.dao.configuration.IpCfgDao;
+import com.nis.web.security.UserUtils;
 
 /**
  * @ClassName: CommonController.java 
@@ -270,7 +288,15 @@ public class CommonController extends BaseController {
 			e.printStackTrace();
 		}
 	}*/
-	
+	public void _importFileTemplate(HttpServletRequest request,HttpServletResponse response, 
+    		RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode) {
+		this.importCfgTemplate(request, response, redirectAttributes, functionId, cfgRegionCode);
+	}
+	@Deprecated
+	public void _importFileTemplate(HttpServletRequest request,HttpServletResponse response, 
+			RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode,Class clazz) {
+		this.importCfgTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,clazz);
+	}
 	//ip配置导出
 	public void _exportIp(String columns,Model model,HttpServletRequest  request,HttpServletResponse response,
 			IpPortCfg entity,String ids,RedirectAttributes redirectAttributes){

src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java

@@ -151,24 +151,6 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 	public String policyCfgForm(Model model, String ids, AppPolicyCfg entity) {
 		if (StringUtils.isNotBlank(ids)) {
 			entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids), null);
-			
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceCode(entity.getAppCode());
-			List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setSpecServiceId(app.getSpecServiceId());
-			}
-			
 			initUpdateFormCondition(model, entity);
 		} else {
 			initFormCondition(model, entity);
@@ -365,20 +347,8 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 					logTotal.put("sum",0L);
 					logTotals.add(logTotal);
 				}
-				// 查找社交应用的所有有效一级特定服务 TODO
-				SpecificServiceCfg appSpec = new SpecificServiceCfg();
-				for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-					if (Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR.equals(dict.getItemValue())) {
-						appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-						break;
-					}
-				}
-				appSpec.setIsValid(Constants.VALID_YES);
-				appSpec.setIsLeaf(0);
-				appSpec.setSpecServiceCode(policy.getAppCode());
-				List<SpecificServiceCfg> appList = specificServiceCfgService.findAllSpecificServiceCfg(appSpec, null);
-				if (!StringUtil.isEmpty(appList)) {
-					SpecificServiceCfg app = appList.get(0);
+				SpecificServiceCfg app = specificServiceCfgService.getBySpecServiceId(policy.getSpecServiceId());
+				if (app != null) {
 					policy.setBehaviorName(app.getSpecServiceName());
 				}
 			}

src/main/java/com/nis/web/controller/configuration/maintenance/DnsIpCfgController.java

@@ -250,7 +250,7 @@ public class DnsIpCfgController extends BaseController {
 			}
 			titleList.add(entity.getMenuNameCode());
 			classMap.put(entity.getMenuNameCode(), DnsIpCfg.class);
-			String cfgIndexInfoNoExport = ",log_total,whether_area_block,client_ip,src_ip_pattern,src_port_pattern,dest_port_pattern,client_port,server_port,ir_type,direction,protocol,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
+			String cfgIndexInfoNoExport = ",log_total,whether_area_block,client_ip,port_pattern,client_port,server_port,ir_type,direction,protocol,do_log,client_port,ir_type,group_name,userregion1,userregion2,userregion3,userregion4,userregion5,";
 
 			// 时间过滤
 			if (entity.getSearch_create_time_start() == null && entity.getSearch_create_time_end() == null) {

src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java

@@ -40,6 +40,7 @@ import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.IpReuseDnatPolicyCfg;
 import com.nis.domain.configuration.IpReusePolicyCfg;
 import com.nis.domain.configuration.UserManage;
+import com.nis.domain.configuration.template.IpMultiplexPolicyTemplate;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
@@ -120,6 +121,26 @@ public class IpMultiplexController extends CommonController {
 		return "redirect:" + adminPath + "/manipulation/ipmulitiplex/list?functionId=" + cfg.getFunctionId();
 	}
 
+	// ip配置导入
+	/*
+	 * @RequestMapping(value = "/import", method=RequestMethod.POST) public
+	 * String importIp(String cfgName,RedirectAttributes redirectAttributes,
+	 * 
+	 * @RequestParam("file") MultipartFile file,IpPortCfg cfg) {
+	 * this._importIp(cfgName,redirectAttributes,
+	 * file,cfg,IpMultiplexPolicyTemplate.class);
+	 * redirectAttributes.addAttribute("urlPrefix","/manipulation/ipmulitiplex")
+	 * ; redirectAttributes.addAttribute("requiresPermissionPrefix",
+	 * "ip:mulitiplex"); return "redirect:" + adminPath
+	 * +"/manipulation/ipmulitiplex/list?functionId="+cfg.getFunctionId(); }
+	 */
+	// ip模板下载
+	@RequestMapping(value = "import/template")
+	public void importFileTemplate(HttpServletRequest request, HttpServletResponse response,
+			RedirectAttributes redirectAttributes, Integer functionId, Integer cfgRegionCode) {
+		this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,
+				IpMultiplexPolicyTemplate.class);
+	}
 
 	// ip配置导出
 	@RequestMapping(value = "export")

src/main/java/com/nis/web/controller/configuration/manipulation/RatelimitController.java

@@ -112,7 +112,20 @@ public class RatelimitController extends CommonController {
 		redirectAttributes.addAttribute("requiresPermissionPrefix","domain:ratelimit");
 		return "redirect:" + adminPath +"/manipulation/ratelimit/domain/list?functionId="+cfg.getFunctionId();
 	}
-	
+	//ip配置导入
+	/*@RequestMapping(value = "/ip/import", method=RequestMethod.POST)
+	public String importIp(String cfgName,RedirectAttributes redirectAttributes,
+			@RequestParam("file") MultipartFile file,IpPortCfg cfg) {
+		this._importIp(cfgName,redirectAttributes, file,cfg,IpRateLimitTemplate.class);
+		redirectAttributes.addAttribute("urlPrefix","/manipulation/ratelimit/ip");
+		redirectAttributes.addAttribute("requiresPermissionPrefix","ip:ratelimit");
+		return "redirect:" + adminPath +"/manipulation/ratelimit/ip/list?functionId="+cfg.getFunctionId();
+	}*/
+	@RequestMapping(value = "/ip/import/template")
+	public void importFileTemplate(HttpServletRequest request,HttpServletResponse response, 
+    		RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode) {
+		this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,IpRateLimitTemplate.class);
+	}
 	//ip配置导出
 	@RequestMapping(value = "/ip/export")
 	public void exportIp(String columns,Model model,HttpServletRequest  request,HttpServletResponse response,

src/main/java/com/nis/web/controller/configuration/ntc/AvController.java

@@ -311,13 +311,7 @@ public class AvController extends BaseController {
 			}
 
 			avCfgService.saveOrUpdateAvFileSample(entity, srcFile);
-			//配置仅保存
-			if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) {
-				addMessage(redirectAttributes, "success", "save_success");
-			}else {
-			//配置直接生效
-				addMessage(redirectAttributes, "success", "audit_success");
-			}
+			addMessage(redirectAttributes, "success", "save_success");
 		} catch (Exception e) {
 			logger.error("文件上传失败", e);
 			e.printStackTrace();
@@ -345,13 +339,7 @@ public class AvController extends BaseController {
 			RedirectAttributes redirectAttributes, String ids, AvSignSampleCfg entity) {
 		try {
 			avCfgService.saveOrUpdateAvSignSample(entity);
-			//配置仅保存
-			if(StringUtil.isEmpty(entity.getIsValid()) || entity.getIsValid()!=1) {
-				addMessage(redirectAttributes, "success", "save_success");
-			}else {
-			//配置直接生效
-				addMessage(redirectAttributes, "success", "audit_success");
-			}
+			addMessage(redirectAttributes, "success", "save_success");
 		} catch (Exception e) {
 			logger.error("saveAudioSignSample failed", e);
 			e.printStackTrace();
@@ -603,13 +591,7 @@ public class AvController extends BaseController {
 				// if(!avSignSampleCfg.getAction().equals(avSignSampleCfg.getActionOld())||!avSignSampleCfg.getIsValid().equals(avSignSampleCfg.getIsValidOld())){
 				try {
 					avCfgService.auditAvSignSample(avSignSampleCfg);
-					//配置仅保存
-					if(StringUtil.isEmpty(avSignSampleCfg.getIsValid()) || avSignSampleCfg.getIsValid()!=1) {
-						addMessage(redirectAttributes, "success", "save_success");
-					}else {
-					//配置直接生效
-						addMessage(redirectAttributes, "success", "audit_success");
-					}
+					addMessage(redirectAttributes, "success", "save_success");
 				} catch (Exception e) {
 					e.printStackTrace();
 					if (e instanceof MaatConvertException) {

src/main/java/com/nis/web/controller/configuration/ntc/IpController.java

@@ -27,6 +27,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 import com.nis.domain.FunctionRegionDict;
 import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
+import com.nis.domain.configuration.AppPolicyCfg;
 import com.nis.domain.configuration.AsnKeywordCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.IpPortCfg;
@@ -65,6 +66,7 @@ import com.nis.domain.configuration.template.SnatTemplate;
 import com.nis.domain.configuration.template.StringAllNotDoLogTemplate;
 import com.nis.domain.configuration.template.StringAllTemplate;
 import com.nis.domain.configuration.template.TopicWebsiteTemplate;
+import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;

src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java

@@ -14,11 +14,15 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.apache.taglibs.standard.functions.Functions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.FunctionRegionDict;
@@ -27,6 +31,10 @@ import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.ComplexkeywordCfg;
 import com.nis.domain.configuration.DnsResStrategy;
+import com.nis.domain.configuration.ComplexStringCfgTemplate;
+import com.nis.domain.configuration.template.IpCfgTemplate;
+import com.nis.domain.specific.ConfigGroupInfo;
+import com.nis.domain.configuration.StringCfgTemplate;
 import com.nis.domain.configuration.HttpBodyCfg;
 import com.nis.domain.configuration.HttpReqHeadCfg;
 import com.nis.domain.configuration.HttpResHeadCfg;
@@ -39,6 +47,7 @@ import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
+import com.nis.util.excel.ImportExcel;
 import com.nis.web.controller.BaseController;
 import com.nis.web.security.UserUtils;
 
@@ -633,6 +642,13 @@ public class WebsiteController extends BaseController {
 		return "redirect:" + adminPath + "/ntc/website/dnsList?functionId=" + functionId;
 	}
 
+	@Deprecated
+	// 下载导入模板
+	@RequestMapping(value = "import/template")
+	public void importFileTemplate(HttpServletRequest request, HttpServletResponse response,
+			RedirectAttributes redirectAttributes, Integer functionId, Integer cfgRegionCode) {
+		this.importCfgTemplate(request, response, redirectAttributes, functionId, cfgRegionCode);
+	}
 	// http配置导入
 	/*
 	 * @RequestMapping(value = "importHttp", method=RequestMethod.POST) public

src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java

@@ -1,6 +1,7 @@
 package com.nis.web.controller.configuration.ntc;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -25,11 +26,13 @@ import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.HttpUrlCfg;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.NtcSubscribeIdCfg;
+import com.nis.domain.configuration.template.WhiteListIpTemplate;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.LogUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.controller.configuration.CommonController;
+import com.nis.web.security.UserUtils;
 
 /**
  * 白名单
@@ -401,6 +404,24 @@ public class WhiteListController extends CommonController {
 		return "redirect:" + adminPath + "/ntc/whitelist/domain/list?functionId=" + functionId;
 	}
 
+	// ip配置导入
+	/*
+	 * @RequestMapping(value = "ip/import", method=RequestMethod.POST) public
+	 * String importIp(String cfgName,RedirectAttributes redirectAttributes,
+	 * 
+	 * @RequestParam("file") MultipartFile file,IpPortCfg cfg) {
+	 * this._importIp(cfgName,redirectAttributes,
+	 * file,cfg,WhiteListIpTemplate.class); return "redirect:" + adminPath
+	 * +"/ntc/whitelist/ip/list?functionId="+cfg.getFunctionId(); }
+	 */
+	// ip模板下载
+	@RequestMapping(value = "ip/import/template")
+	public void importFileTemplate(HttpServletRequest request, HttpServletResponse response,
+			RedirectAttributes redirectAttributes, Integer functionId, Integer cfgRegionCode) {
+		this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode,
+				WhiteListIpTemplate.class);
+	}
+
 	// ip配置导出
 	@RequestMapping(value = "ip/export")
 	public void exportIp(String columns, Model model, HttpServletRequest request, HttpServletResponse response,

src/main/java/com/nis/web/controller/configuration/proxy/ControlController.java

@@ -120,6 +120,11 @@ public class ControlController extends CommonController {
 		redirectAttributes.addAttribute("requiresPermissionPrefix","control:ip");
 		return "redirect:" + adminPath +"/proxy/control/ip/list?functionId="+cfg.getFunctionId();
 	}
+	@RequestMapping(value = "/ip/import/template")
+	public void importFileTemplate(HttpServletRequest request,HttpServletResponse response, 
+    		RedirectAttributes redirectAttributes,Integer functionId,Integer cfgRegionCode) {
+		this._importFileTemplate(request, response, redirectAttributes, functionId, cfgRegionCode);
+	}
 	//ip配置导出
 	@RequestMapping(value = "/ip/export")
 	public void exportIp(String columns,Model model,HttpServletRequest  request,HttpServletResponse response,

src/main/java/com/nis/web/controller/configuration/proxy/ControlPolicyController.java

@@ -157,13 +157,7 @@ public class ControlPolicyController extends BaseController{
 			,RedirectAttributes redirectAttributes){
 		try{
 			controlPolicyService.saveOrUpdate(cfg,areaCfgIds);
-			//配置仅保存
-			if(StringUtil.isEmpty(cfg.getIsValid()) || cfg.getIsValid()!=1) {
-				addMessage(redirectAttributes, "success", "save_success");
-			}else {
-			//配置直接生效
-				addMessage(redirectAttributes, "success", "audit_success");
-			}
+			addMessage(redirectAttributes,"success","save_success");
 		}catch(Exception e){
 			logger.error("信息保存失败",e);
 			if(e instanceof MaatConvertException) {

src/main/java/com/nis/web/controller/configuration/proxy/FileStrategyController.java

@@ -118,13 +118,7 @@ public class FileStrategyController extends CommonController {
 				cfg.setContentLength(file.length());//文件长度
  			}
 			proxyFileStrategyService.saveOrUpdate(cfg);
-			//配置仅保存
-			if(StringUtil.isEmpty(cfg.getIsValid()) || cfg.getIsValid()!=1) {
-				addMessage(redirectAttributes, "success", "save_success");
-			}else {
-			//配置直接生效
-				addMessage(redirectAttributes, "success", "audit_success");
-			}			
+			addMessage(redirectAttributes,"success","save_success");
 		}catch(Exception e){
 			logger.error("信息保存失败",e);
 			if(e instanceof MaatConvertException) {

src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java

@@ -399,15 +399,6 @@ public class InterceptController extends CommonController {
 					}
 				}
 			}
-			
-			if (214==entity.getFunctionId()) {
-				for (CfgIndexInfo cfg : ipLists) {
-					if (!StringUtil.isBlank(cfg.getUserRegion1())) {
-						cfg.setUserRegion1(DictUtils.getDictLabels("SPOOFING_IP_TYPE", cfg.getUserRegion1(),cfg.getUserRegion1()));
-					}
-				}
-			}
-			
 			pktBinList = BaseStringCfg.replaceBaseKeyList(pktBinList);
 			httpUrlList = BaseStringCfg.baseHexList(httpUrlList);
 			dataMap.put(entity.getMenuNameCode(), ipLists);

src/main/java/com/nis/web/dao/SchedulerDao.java

@@ -79,8 +79,4 @@ public interface SchedulerDao extends CrudDao<ScheduleCfg> {
 	 */
 	int updateScheduleExceNew(ScheduleExceInfo exceInfo);
 	
-	/**
-	 * 失效所有定时任务
-	 */
-	void inValidAllSchedule();
 }

src/main/java/com/nis/web/dao/SchedulerDao.xml

@@ -364,12 +364,6 @@
 			compile_Id = #{compileId} and issue_status = #{issueStatus}
 	</update>
 
-	<update id="inValidAllSchedule">
-		update schedule_cfg 
-		<set>
-			del_flag = 0
-		</set>
-		WHERE del_flag =1
-	</update>
+
 
 </mapper>

src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml

@@ -5,8 +5,7 @@
 	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
 	    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
 	    <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-	    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+	    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
 	    <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
 	    <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
 	    <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -49,7 +48,7 @@
     </resultMap>
   	
     <sql id="columns">
-	    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.src_ip_pattern,r.dest_ip_pattern,r.src_port_pattern,r.dest_port_pattern,r.src_port
+	    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port
 	    ,r.protocol,r.protocol_id,r.direction,r.cfg_type,r.action,r.dest_port,r.dest_ip_address
 		,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
 		,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id,
@@ -92,11 +91,8 @@
 	    	<if test="ipType != null">
 	    		AND r.IP_TYPE=#{ipType,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="srcIpPattern != null">
-	    		AND r.src_ip_pattern=#{srcIpPattern,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="destIpPattern != null">
-	    		AND r.dest_ip_pattern=#{destIpPattern,jdbcType=INTEGER}
+	    	<if test="ipPattern != null">
+	    		AND r.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcIpAddress != null and srcIpAddress != ''">
 	    		AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
@@ -104,11 +100,8 @@
 	    	<if test="destIpAddress != null and destIpAddress != ''">
 	    		AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
 	    	</if>
-	    	<if test="srcPortPattern != null">
-	    		AND r.src_port_pattern=#{srcPortPattern,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="destPortPattern != null">
-	    		AND r.dest_port_pattern=#{destPortPattern,jdbcType=INTEGER}
+	    	<if test="portPattern != null">
+	    		AND r.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcPort != null and srcPort !=''">
 	    		AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
@@ -128,32 +121,15 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND r.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND r.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND r.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
-	    	
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName !=''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -251,11 +227,8 @@
 	    	<if test="ipType != null">
 	    		AND r.IP_TYPE=#{ipType,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="srcIpPattern != null">
-	    		AND r.src_ip_pattern=#{srcIpPattern,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="destIpPattern != null">
-	    		AND r.dest_ip_pattern=#{destIpPattern,jdbcType=INTEGER}
+	    	<if test="ipPattern != null">
+	    		AND r.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcIpAddress != null and srcIpAddress != ''">
 	    		AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
@@ -263,11 +236,8 @@
 	    	<if test="destIpAddress != null and destIpAddress != ''">
 	    		AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
 	    	</if>
-	    	<if test="srcPortPattern != null">
-	    		AND r.src_port_pattern=#{srcPortPattern,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="destPortPattern != null">
-	    		AND r.dest_port_pattern=#{destPortPattern,jdbcType=INTEGER}
+	    	<if test="portPattern != null">
+	    		AND r.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcPort != null and srcPort !=''">
 	    		AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
@@ -378,7 +348,9 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -419,8 +391,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER},
@@ -504,17 +476,11 @@
       <if test="srcIpAddress != null and srcIpAddress != ''" >
         src_ip_address = #{srcIpAddress,jdbcType=VARCHAR},
       </if>
-      <if test="srcIpPattern != null" >
-        src_ip_pattern = #{srcIpPattern,jdbcType=INTEGER},
+      <if test="ipPattern != null" >
+        ip_pattern = #{ipPattern,jdbcType=INTEGER},
       </if>
-      <if test="destIpPattern != null" >
-        dest_ip_pattern =#{destIpPattern,jdbcType=INTEGER},
-      </if>
-      <if test="srcPortPattern != null" >
-        src_port_pattern = #{srcPortPattern,jdbcType=INTEGER},
-      </if>
-      <if test="destPortPattern != null" >
-        dest_port_pattern = #{destPortPattern,jdbcType=INTEGER},
+      <if test="portPattern != null" >
+        port_pattern = #{portPattern,jdbcType=INTEGER},
       </if>
       <if test="srcPort != null and srcPort != ''" >
         src_port = #{srcPort,jdbcType=VARCHAR},
@@ -601,7 +567,7 @@
 	    INSERT INTO asn_ip_cfg
 	            (CFG_DESC,ACTION,IS_VALID,IS_AUDIT,CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,
 	            AUDIT_TIME,SERVICE_ID,REQUEST_ID,region_id,compile_id,IS_AREA_EFFECTIVE,CLASSIFY,ATTRIBUTE,LABLE,
-    			AREA_EFFECTIVE_IDS,function_id,ip_type,src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,src_port,
+    			AREA_EFFECTIVE_IDS,function_id,ip_type,src_ip_address,ip_pattern,port_pattern,src_port,
     			protocol,protocol_id,direction,dest_port,dest_ip_address,cfg_type,cfg_region_code,
 				asn_ip_group,user_region1,user_region2,user_region3,user_region4,user_region5,organization,country,detail)
 	    VALUES
@@ -628,10 +594,8 @@
     	#{asnIp.functionId,jdbcType=INTEGER},
     	#{asnIp.ipType,jdbcType=INTEGER},
     	#{asnIp.srcIpAddress,jdbcType=VARCHAR},
-    	#{asnIp.srcIpPattern,jdbcType=INTEGER},
-    	#{asnIp.destIpPattern,jdbcType=INTEGER},
-    	#{asnIp.srcPortPattern,jdbcType=INTEGER},
-    	#{asnIp.destPortPattern,jdbcType=INTEGER},
+    	#{asnIp.ipPattern,jdbcType=INTEGER},
+    	#{asnIp.portPattern,jdbcType=INTEGER},
     	#{asnIp.srcPort,jdbcType=VARCHAR},
     	#{asnIp.protocol,jdbcType=INTEGER},
     	#{asnIp.protocolId,jdbcType=INTEGER},

src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml

@@ -43,8 +43,7 @@
     <result column="app_code" property="appCode" jdbcType="INTEGER" />
     <result column="behav_code" property="behavCode" jdbcType="INTEGER" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="port_pattern" property="portPattern" jdbcType="INTEGER" />
@@ -236,8 +235,7 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -396,7 +394,7 @@
     r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
     r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
     r.ATTRIBUTE,r.LABLE,AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
-    r.IP_TYPE, r.SRC_IP_PATTERN,r.DEST_IP_PATTERN, r.SRC_IP_ADDRESS,r.DEST_IP_ADDRESS, r.SRC_PORT_PATTERN,r.DEST_PORT_PATTERN,r.SRC_PORT,DEST_PORT,
+    r.IP_TYPE, r.IP_PATTERN, r.SRC_IP_ADDRESS,r.DEST_IP_ADDRESS, r.PORT_PATTERN,r.SRC_PORT,DEST_PORT,
     r.DIRECTION,r.PROTOCOL,r.DO_LOG,r.USER_REGION1,r.USER_REGION2,r.USER_REGION3,r.USER_REGION4,r.USER_REGION5
   </sql>
   
@@ -463,7 +461,7 @@
   </sql>
   
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id
 	,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id,
@@ -620,13 +618,8 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="appCode != null">
-    			AND r.app_code=#{appCode,jdbcType=INTEGER}
-    		</if>
-    		<if test="appCode == null">
-    			<if test="specServiceId != null">
-	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
-	    		</if>
+	    	<if test="specServiceId != null">
+    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
@@ -726,42 +719,21 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-    		<if test="appCode != null">
-    			AND r.app_code=#{appCode,jdbcType=INTEGER}
-    		</if>
-    		<if test="appCode == null">
-    			<if test="specServiceId != null">
-	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
-	    		</if>
+	    	<if test="specServiceId != null">
+    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
     		</if>
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  r.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  r.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND r.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -906,13 +878,8 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="appCode != null">
-    			AND r.app_code=#{appCode,jdbcType=INTEGER}
-    		</if>
-    		<if test="appCode == null">
-    			<if test="specServiceId != null">
-	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
-	    		</if>
+	    	<if test="specServiceId != null">
+    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{CFG_TYPE,jdbcType=VARCHAR}),'%') 
@@ -920,11 +887,8 @@
 	    	<if test="ipType != null">
 	    		AND r.IP_TYPE=#{ipType,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="srcIpPattern != null">
-	    		AND r.src_ip_pattern=#{srcIpPattern,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="destIpPattern != null">
-	    		AND r.dest_ip_pattern=#{destIpPattern,jdbcType=INTEGER}
+	    	<if test="ipPattern != null">
+	    		AND r.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcIpAddress != null and srcIpAddress != ''">
 	    		AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
@@ -932,11 +896,8 @@
 	    	<if test="destIpAddress != null and destIpAddress != ''">
 	    		AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
 	    	</if>
-	    	<if test="srcPortPattern != null">
-	    		AND r.src_port_pattern=#{srcPortPattern,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="destPortPattern != null">
-	    		AND r.dest_port_pattern=#{destPortPattern,jdbcType=INTEGER}
+	    	<if test="portPattern != null">
+	    		AND r.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcPort != null and srcPort !=''">
 	    		AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
@@ -953,31 +914,15 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  r.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  r.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND r.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -1082,13 +1027,8 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="appCode != null">
-    			AND r.app_code=#{appCode,jdbcType=INTEGER}
-    		</if>
-    		<if test="appCode == null">
-    			<if test="specServiceId != null">
-	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
-	    		</if>
+	    	<if test="specServiceId != null">
+    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
@@ -1102,31 +1042,15 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  r.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  r.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND r.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -1206,13 +1130,8 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="appCode != null">
-    			AND r.app_code=#{appCode,jdbcType=INTEGER}
-    		</if>
-    		<if test="appCode == null">
-    			<if test="specServiceId != null">
-	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
-	    		</if>
+	    	<if test="specServiceId != null">
+    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
@@ -1223,31 +1142,15 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  r.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  r.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND r.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -1359,31 +1262,15 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  r.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  r.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND r.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -1482,13 +1369,8 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="appCode != null">
-    			AND r.app_code=#{appCode,jdbcType=INTEGER}
-    		</if>
-    		<if test="appCode == null">
-    			<if test="specServiceId != null">
-	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
-	    		</if>
+	    	<if test="specServiceId != null">
+    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
@@ -1682,13 +1564,8 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="appCode != null">
-    			AND r.app_code=#{appCode,jdbcType=INTEGER}
-    		</if>
-    		<if test="appCode == null">
-    			<if test="specServiceId != null">
-	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
-	    		</if>
+	    	<if test="specServiceId != null">
+    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
@@ -1702,31 +1579,15 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  r.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  r.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND r.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -1962,12 +1823,12 @@
     CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
-    IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT,
+    IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
     DIRECTION,PROTOCOL,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5
     )values (
      <include refid="AppCommonCfg_Value_List" />,
-     #{ipType,jdbcType=INTEGER}, #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
-    #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
+     #{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
+    #{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
     #{protocol,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER},#{userRegion1,jdbcType=VARCHAR},#{userRegion2,jdbcType=VARCHAR}
     ,#{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR}
     )
@@ -1978,12 +1839,12 @@
     CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
-    IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT,
+    IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
     DIRECTION,PROTOCOL,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5
     )values (
      <include refid="AppCommonCfg_Value_List" />,
-     #{ipType,jdbcType=INTEGER}, #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
-    #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
+     #{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
+    #{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
     #{protocol,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER},#{userRegion1,jdbcType=VARCHAR},#{userRegion2,jdbcType=VARCHAR}
     ,#{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR}
     )
@@ -1994,7 +1855,7 @@
     CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
-    IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT,
+    IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
     DIRECTION,PROTOCOL,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5
     )values
     <foreach collection ="list" item="appIp" separator =",">
@@ -2007,10 +1868,9 @@
     #{appIp.requestId,jdbcType=INTEGER},#{appIp.compileId,jdbcType=INTEGER},#{appIp.isAreaEffective,jdbcType=INTEGER},
     #{appIp.classify,jdbcType=VARCHAR},#{appIp.attribute,jdbcType=VARCHAR},#{appIp.lable,jdbcType=VARCHAR},    
     #{appIp.areaEffectiveIds,jdbcType=VARCHAR},#{appIp.ratelimit,jdbcType=VARCHAR},#{appIp.functionId,jdbcType=INTEGER},
-    #{appIp.cfgType,jdbcType=VARCHAR},#{appIp.cfgRegionCode,jdbcType=INTEGER},#{appIp.ipType,jdbcType=INTEGER}, 
-    #{appIp.srcIpPattern,jdbcType=INTEGER},#{appIp.destIpPattern,jdbcType=INTEGER},#{appIp.srcIpAddress,jdbcType=VARCHAR},
-    #{appIp.destIpAddress,jdbcType=VARCHAR},#{appIp.srcPortPattern,jdbcType=INTEGER},#{appIp.destPortPattern,jdbcType=INTEGER},
-    #{appIp.srcPort,jdbcType=VARCHAR},#{appIp.destPort,jdbcType=VARCHAR},#{appIp.direction,jdbcType=INTEGER}, 
+    #{appIp.cfgType,jdbcType=VARCHAR},#{appIp.cfgRegionCode,jdbcType=INTEGER},
+     #{appIp.ipType,jdbcType=INTEGER}, #{appIp.ipPattern,jdbcType=INTEGER},#{appIp.srcIpAddress,jdbcType=VARCHAR},#{appIp.destIpAddress,jdbcType=VARCHAR},
+    #{appIp.portPattern,jdbcType=INTEGER},#{appIp.srcPort,jdbcType=VARCHAR},#{appIp.destPort,jdbcType=VARCHAR},#{appIp.direction,jdbcType=INTEGER}, 
     #{appIp.protocol,jdbcType=INTEGER},#{appIp.doLog,jdbcType=INTEGER},#{appIp.userRegion1,jdbcType=VARCHAR},#{appIp.userRegion2,jdbcType=VARCHAR}
     ,#{appIp.userRegion3,jdbcType=VARCHAR},#{appIp.userRegion4,jdbcType=VARCHAR},#{appIp.userRegion5,jdbcType=VARCHAR}
     )
@@ -2197,7 +2057,9 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -2228,8 +2090,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 
@@ -2432,11 +2294,8 @@
       <if test="ipType != null" >
         IP_TYPE = #{ipType,jdbcType=INTEGER},
       </if>
-      <if test="srcIpPattern != null">
-   		SRC_IP_PATTERN=#{srcIpPattern,jdbcType=INTEGER},
-   	  </if>
-      <if test="destIpPattern != null">
-   		DEST_IP_PATTERN=#{destIpPattern,jdbcType=INTEGER},
+      <if test="ipPattern != null">
+   		IP_PATTERN=#{ipPattern,jdbcType=INTEGER},
    	  </if>
    	  <if test="srcIpAddress != null and srcIpAddress != ''">
    		SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR},
@@ -2444,11 +2303,8 @@
    	  <if test="destIpAddress != null and destIpAddress != ''">
    		DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR},
    	  </if>
-   	  <if test="srcPortPattern != null">
-   		SRC_PORT_PATTERN=#{srcPortPattern,jdbcType=INTEGER},
-   	  </if>
-   	  <if test="destPortPattern != null">
-   		DEST_PORT_PATTERN=#{destPortPattern,jdbcType=INTEGER},
+   	  <if test="portPattern != null">
+   		PORT_PATTERN=#{portPattern,jdbcType=INTEGER},
    	  </if>
    	  <if test="srcPort != null and srcPort !=''">
    		SRC_PORT=#{srcPort,jdbcType=VARCHAR},

src/main/java/com/nis/web/dao/configuration/AppMultiFeatureCfgDao.xml

@@ -42,8 +42,7 @@
     <result column="app_code" property="appCode" jdbcType="INTEGER" />
     <result column="behav_code" property="behavCode" jdbcType="INTEGER" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="port_pattern" property="portPattern" jdbcType="INTEGER" />
@@ -197,7 +196,7 @@
     r.CREATOR_ID,r.CREATE_TIME,r.EDITOR_ID,r.EDIT_TIME,r.AUDITOR_ID,r.AUDIT_TIME,
     r.SERVICE_ID,r.REQUEST_ID,r.COMPILE_ID,r.IS_AREA_EFFECTIVE,r.CLASSIFY,
     r.ATTRIBUTE,r.LABLE,AREA_EFFECTIVE_IDS,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
-    r.IP_TYPE, r.src_ip_pattern,r.dest_ip_pattern, r.SRC_IP_ADDRESS,r.DEST_IP_ADDRESS, r.src_port_pattern,r.dest_port_pattern,r.SRC_PORT,DEST_PORT,
+    r.IP_TYPE, r.IP_PATTERN, r.SRC_IP_ADDRESS,r.DEST_IP_ADDRESS, r.PORT_PATTERN,r.SRC_PORT,DEST_PORT,
     r.DIRECTION,r.PROTOCOL,r.DO_LOG,r.USER_REGION1,r.USER_REGION2,r.USER_REGION3,r.USER_REGION4,r.USER_REGION5
   </sql>
   
@@ -267,42 +266,21 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="appCode != null">
-    			AND r.app_code=#{appCode,jdbcType=INTEGER}
-    		</if>
-    		<if test="appCode == null">
-    			<if test="specServiceId != null">
-	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
-	    		</if>
+	    	<if test="specServiceId != null">
+    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
     		</if>
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  r.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  r.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND r.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -562,13 +540,13 @@
     CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
-    IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT,
+    IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
     DIRECTION,PROTOCOL,DO_LOG,user_region1,user_region2,user_region3,user_region4,user_region5
     )values (
      <include refid="AppCommonCfg_Value_List" />,
      #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER},
-     #{ipType,jdbcType=INTEGER}, #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
-    #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
+     #{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
+    #{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
     #{protocol,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER},#{userRegion1,jdbcType=VARCHAR},#{userRegion2,jdbcType=VARCHAR}
     ,#{userRegion3,jdbcType=VARCHAR},#{userRegion4,jdbcType=VARCHAR},#{userRegion5,jdbcType=VARCHAR}
     )

src/main/java/com/nis/web/dao/configuration/AreaIpCfgDao.xml

@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.nis.web.dao.configuration.AreaIpCfgDao" >
-  <resultMap id="AreaIpMap" type="com.nis.domain.configuration.AreaIpCfg" >
+  <resultMap id="BaseIpMap" type="com.nis.domain.configuration.AreaIpCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
     <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="port_pattern" property="portPattern" jdbcType="INTEGER" />
@@ -37,13 +36,13 @@
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
   </resultMap>
   <sql id="AreaIpCfg_Column_List_with_id" >
-    CFG_ID,CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,
+    CFG_ID,CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,
     DEST_PORT,DIRECTION,PROTOCOL,PROTOCOL_ID,ACTION,IS_VALID,IS_AUDIT,
     CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,FUNCTION_ID
   </sql>
-  <select id="getByCompileId" resultMap="AreaIpMap" >
+  <select id="getByCompileId" resultMap="BaseIpMap" >
     SELECT 
     <include refid="AreaIpCfg_Column_List_with_id" />
     FROM area_ip_cfg
@@ -77,7 +76,9 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -108,8 +109,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 
@@ -146,7 +147,9 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -177,8 +180,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 
@@ -252,17 +255,11 @@
       <if test="srcIpAddress != null and srcIpAddress != ''" >
         src_ip_address = #{srcIpAddress,jdbcType=VARCHAR},
       </if>
-      <if test="srcIpPattern != null" >
-        src_ip_pattern = #{srcIpPattern,jdbcType=INTEGER},
+      <if test="ipPattern != null" >
+        ip_pattern = #{ipPattern,jdbcType=INTEGER},
       </if>
-      <if test="destIpPattern != null" >
-        dest_ip_pattern = #{destIpPattern,jdbcType=INTEGER},
-      </if>
-      <if test="srcPortPattern != null" >
-       src_port_pattern = #{srcPortPattern,jdbcType=INTEGER},
-      </if>
-      <if test="destPortPattern != null" >
-        dest_port_pattern = #{destPortPattern,jdbcType=INTEGER},
+      <if test="portPattern != null" >
+        port_pattern = #{portPattern,jdbcType=INTEGER},
       </if>
       <if test="srcPort != null and srcPort != ''" >
         src_port = #{srcPort,jdbcType=VARCHAR},

src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml

@@ -128,31 +128,15 @@
     	<if test="action != null">
     		AND a.ACTION=#{action,jdbcType=INTEGER}
     	</if>
-    	<choose>
-    		<!-- 判断是否批量操作 -->
-			<when test="batchValidValue != null and batchValidValue != ''">
-				AND  a.IS_VALID in (${batchValidValue})
-			</when>
-			<otherwise>
-				<if test="isValid != null">
-		    		AND  a.IS_VALID=#{isValid,jdbcType=INTEGER}
-		    	</if>
-		    	<if test="isValid == null">
-		    		AND  a.IS_VALID != -1
-		    	</if>
-			</otherwise>
-		</choose>
-    	<choose>
-    		<!-- 判断是否批量操作 -->
-			<when test="batchAuditValue != null and batchAuditValue != ''">
-		    		AND a.IS_AUDIT in(${batchAuditValue})
-			</when>
-			<otherwise>
-				<if test="isAudit != null">
-		    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-		    	</if>
-			</otherwise>
-		</choose>
+    	<if test="isValid != null">
+    		AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
+    	</if>
+    	<if test="isValid == null">
+    		AND a.IS_VALID != -1
+    	</if>
+    	<if test="isAudit != null">
+    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+    	</if>
     	<if test="creatorName != null and creatorName != ''">
     		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
     	</if>

src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml

@@ -30,8 +30,7 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -95,8 +94,7 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-	<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -195,8 +193,7 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-	<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -227,7 +224,7 @@
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
   </resultMap> 
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id
 	,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id,
@@ -241,7 +238,7 @@
     r.ATTRIBUTE,r.LABLE,r.AREA_EFFECTIVE_IDS,r.function_id,r.do_log,r.do_blacklist
   </sql>
   <sql id="AvVoipIp_Column" >
-    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.src_ip_pattern,r.dest_ip_pattern,r.src_port_pattern,r.dest_port_pattern,r.src_port
+    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port
     ,r.protocol,r.protocol_id,r.direction,r.cfg_type,r.action,r.dest_port,r.dest_ip_address
 	,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
 	,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id,
@@ -255,7 +252,7 @@
   r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,r.cfg_region_code
   </sql>
   <sql id="AvContIp_Column" >
-    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.src_ip_pattern,r.dest_ip_pattern,r.src_port_pattern,r.dest_port_pattern,r.src_port
+    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port
     ,r.protocol,r.protocol_id,r.direction,r.cfg_type,r.action,r.dest_port,r.dest_ip_address
 	,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
 	,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id,
@@ -310,31 +307,15 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  r.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  r.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND r.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -835,10 +816,8 @@
     function_id,
     ip_type,
     src_ip_address,
-    src_ip_pattern,
-    dest_ip_pattern,
-    src_port_pattern,
-    dest_port_pattern,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -869,10 +848,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-		#{srcIpPattern,jdbcType=INTEGER},
-    	#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},
-    	#{destPortPattern,jdbcType=INTEGER},    	
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER},
@@ -1076,7 +1053,9 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -1107,8 +1086,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 
@@ -1258,17 +1237,11 @@
       <if test="voipIp != null and voipIp.srcIpAddress != null and voipIp.srcIpAddress != ''" >
         src_ip_address = #{voipIp.srcIpAddress,jdbcType=VARCHAR},
       </if>
-      <if test="voipIp != null and voipIp.srcIpPattern != null" >
-        src_ip_pattern = #{voipIp.srcIpPattern,jdbcType=INTEGER},
+      <if test="voipIp != null and voipIp.ipPattern != null" >
+        ip_pattern = #{voipIp.ipPattern,jdbcType=INTEGER},
       </if>
-      <if test="voipIp != null and voipIp.destIpPattern != null" >
-        dest_ip_pattern = #{voipIp.destIpPattern,jdbcType=INTEGER},
-      </if>
-      <if test="voipIp != null and voipIp.srcPortPattern != null" >
-        src_port_pattern = #{voipIp.srcPortPattern,jdbcType=INTEGER},
-      </if>
-      <if test="voipIp != null and voipIp.destPortPattern != null" >
-        dest_port_pattern = #{voipIp.destPortPattern,jdbcType=INTEGER},
+      <if test="voipIp != null and voipIp.portPattern != null" >
+        port_pattern = #{voipIp.portPattern,jdbcType=INTEGER},
       </if>
       <if test="voipIp != null and voipIp.srcPort != null and voipIp.srcPort != ''" >
         src_port = #{voipIp.srcPort,jdbcType=VARCHAR},
@@ -1679,7 +1652,9 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -1711,8 +1686,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER},
@@ -1787,17 +1762,11 @@
       <if test="srcIpAddress != null and srcIpAddress != ''" >
         src_ip_address = #{srcIpAddress,jdbcType=VARCHAR},
       </if>
-      <if test="srcIpPattern != null" >
-        src_ip_pattern = #{srcIpPattern,jdbcType=INTEGER},
+      <if test="ipPattern != null" >
+        ip_pattern = #{ipPattern,jdbcType=INTEGER},
       </if>
-      <if test="destIpPattern != null" >
-        dest_ip_pattern = #{destIpPattern,jdbcType=INTEGER},
-      </if>
-      <if test="srcPortPattern != null" >
-        src_port_pattern = #{srcPortPattern,jdbcType=INTEGER},
-      </if>
-      <if test="destPortPattern != null" >
-        dest_port_pattern = #{destPortPattern,jdbcType=INTEGER},
+      <if test="portPattern != null" >
+        port_pattern = #{portPattern,jdbcType=INTEGER},
       </if>
       <if test="srcPort != null and srcPort != ''" >
         src_port = #{srcPort,jdbcType=VARCHAR},
@@ -2144,12 +2113,6 @@
     update ${tableName} set is_valid = #{isValid,jdbcType=INTEGER},
     <if test="isAudit != null">
     is_audit = #{isAudit,jdbcType=INTEGER},
-    </if>
-	<if test="auditTime !=null ">
-		audit_time = #{auditTime,jdbcType=TIMESTAMP},
-	</if>
-    <if test="auditorId != null" >
-      AUDITOR_ID = #{auditorId,jdbcType=INTEGER},
     </if>
     editor_id = #{editorId,jdbcType=INTEGER} , 
     edit_time = #{editTime,jdbcType=TIMESTAMP} 

src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml

@@ -30,8 +30,7 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -163,7 +162,7 @@
     a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log,a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id
 	,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id,
@@ -208,31 +207,15 @@
 	    	<if test="action != null">
 	    		AND a.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  a.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  a.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  a.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND a.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND a.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -449,7 +432,9 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -480,8 +465,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 

src/main/java/com/nis/web/dao/configuration/CommonPolicyDao.xml

@@ -74,8 +74,7 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -173,7 +172,7 @@
     a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id
 	,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id,
@@ -219,31 +218,15 @@
 	    	<if test="action != null">
 	    		AND a.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  a.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  a.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  a.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND a.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND a.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -506,7 +489,9 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -542,8 +527,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 

src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml

@@ -80,8 +80,7 @@
     <result column="app_code" property="appCode" jdbcType="INTEGER" />
     <result column="behav_code" property="behavCode" jdbcType="INTEGER" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-	<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="port_pattern" property="portPattern" jdbcType="INTEGER" />
@@ -241,8 +240,7 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-	<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -383,8 +381,7 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-	<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -704,8 +701,7 @@
 	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
 	    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
 	    <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-	    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-		<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+	    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
 	    <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
 	    <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
 	    <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -779,12 +775,12 @@
   <sql id="DdosIpCfg_Column" >
     a.cfg_id,a.cfg_desc,a.action,a.is_valid,a.is_audit,a.creator_id,a.audit_time,
 	a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable,
-	a.area_effective_ids,a.function_id,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
+	a.area_effective_ids,a.function_id,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.pps_threadshold,
     a.antiddos_protocol,a.bps_threadshold
   </sql>
   <sql id="IpCfg_Column" >
-    a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port,
+    a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port,
     a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.compile_id
   </sql>
   <sql id="IpCfg_AllColumn" >
@@ -792,7 +788,7 @@
 	a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable,
 	a.area_effective_ids,a.function_id,a.do_log,a.dns_strategy_id,a.user_region1,a.user_region2,
 	a.user_region3,a.user_region4,a.user_region5,
-	a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port,
+	a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port,
     a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type
   </sql>
   <sql id="IpDropCfg_Column" >
@@ -800,11 +796,11 @@
 	a.service_id,a.request_id,a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable,
 	a.area_effective_ids,a.function_id,a.user_region1,a.user_region2,
 	a.user_region3,a.user_region4,a.user_region5,
-	a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port,
+	a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port,
     a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type
   </sql>
   <sql id="AsnIpCfg_Column" >
-    a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
+    a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.asn_ip_group,
     a.user_region1,a.region_id
   </sql>
@@ -887,7 +883,7 @@
 		,a.area_effective_ids,a.function_id,a.cfg_region_code,a.compile_id
 	</sql>
 	<sql id="DnsIpCfgColumns">
-	    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
+	    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
 	    ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 		,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id
 		,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id,
@@ -911,7 +907,7 @@
 	    a.feature_table_type,a.app_code,a.spec_service_id,a.cfg_region_code
    </sql>
    <sql id="AppIpCfg_Column" >
-    a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
+    a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
     ,a.protocol,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.compile_id
   </sql>
 	
@@ -932,7 +928,7 @@
     a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
     a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
     a.ATTRIBUTE,a.LABLE,AREA_EFFECTIVE_IDS,a.RATELIMIT,a.FUNCTION_ID,a.CFG_TYPE,a.CFG_REGION_CODE,
-    a.IP_TYPE, a.src_ip_pattern,a.dest_ip_pattern, a.SRC_IP_ADDRESS,a.DEST_IP_ADDRESS, a.src_port_pattern,a.dest_port_pattern,a.SRC_PORT,DEST_PORT,
+    a.IP_TYPE, a.IP_PATTERN, a.SRC_IP_ADDRESS,a.DEST_IP_ADDRESS, a.PORT_PATTERN,a.SRC_PORT,DEST_PORT,
     a.DIRECTION,a.PROTOCOL,a.DO_LOG,a.USER_REGION1,a.USER_REGION2,a.USER_REGION3,a.USER_REGION4,a.USER_REGION5
   </sql>
   
@@ -1633,7 +1629,7 @@
   </select>
   <select id="getAsnIpList" resultType="com.nis.domain.basics.AsnIpCfg" parameterType="com.nis.domain.configuration.CfgIndexInfo">
 		 select 
-		 	a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
+		 	a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
 		    ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 			,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id
 			,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id,

src/main/java/com/nis/web/dao/configuration/DdosCfgDao.xml

@@ -5,8 +5,7 @@
 	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
 	    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
 	    <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-	    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+	    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
 	    <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
 	    <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
 	    <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -42,7 +41,7 @@
     </resultMap>
   
     <sql id="columns">
-	    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.src_ip_pattern,r.dest_ip_pattern,r.src_port_pattern,r.dest_port_pattern,r.src_port
+	    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port
 	    ,r.protocol,r.protocol_id,r.direction,r.cfg_type,r.action,r.dest_port,r.dest_ip_address
 		,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
 		,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id,
@@ -81,11 +80,8 @@
 	    	<if test="ipType != null">
 	    		AND r.IP_TYPE=#{ipType,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="srcIpPattern != null">
-	    		AND r.src_ip_pattern=#{srcIpPattern,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="destIpPattern != null">
-	    		AND r.dest_ip_pattern=#{destIpPattern,jdbcType=INTEGER}
+	    	<if test="ipPattern != null">
+	    		AND r.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcIpAddress != null and srcIpAddress != ''">
 	    		AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
@@ -93,11 +89,8 @@
 	    	<if test="destIpAddress != null and destIpAddress != ''">
 	    		AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
 	    	</if>
-	    	<if test="srcPortPattern != null">
-	    		AND r.src_port_pattern=#{srcPortPattern,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="destPortPattern != null">
-	    		AND r.dest_port_pattern=#{destPortPattern,jdbcType=INTEGER}
+	    	<if test="portPattern != null">
+	    		AND r.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcPort != null and srcPort !=''">
 	    		AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
@@ -117,31 +110,15 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  r.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  r.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND r.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName !=''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -240,7 +217,9 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -275,8 +254,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER},
@@ -353,17 +332,11 @@
       <if test="srcIpAddress != null and srcIpAddress != ''" >
         src_ip_address = #{srcIpAddress,jdbcType=VARCHAR},
       </if>
-      <if test="srcIpPattern != null" >
-        src_ip_pattern = #{srcIpPattern,jdbcType=INTEGER},
+      <if test="ipPattern != null" >
+        ip_pattern = #{ipPattern,jdbcType=INTEGER},
       </if>
-      <if test="destIpPattern != null" >
-        dest_ip_pattern = #{destIpPattern,jdbcType=INTEGER},
-      </if>
-      <if test="srcPortPattern != null" >
-        src_port_pattern = #{srcPortPattern,jdbcType=INTEGER},
-      </if>
-      <if test="destPortPattern != null" >
-        dest_port_pattern = #{destPortPattern,jdbcType=INTEGER},
+      <if test="portPattern != null" >
+        port_pattern = #{portPattern,jdbcType=INTEGER},
       </if>
       <if test="srcPort != null and srcPort != ''" >
         src_port = #{srcPort,jdbcType=VARCHAR},

src/main/java/com/nis/web/dao/configuration/DnsIpCfgDao.xml

@@ -5,8 +5,7 @@
 	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
 	    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
 	    <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-	    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+	    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
 	    <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
 	    <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
 	    <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -41,7 +40,7 @@
     </resultMap>
   
     <sql id="columns">
-	    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.src_ip_pattern,r.dest_ip_pattern,r.src_port_pattern,r.dest_port_pattern,r.src_port
+	    r.cfg_id,r.cfg_desc,r.ip_type,r.src_ip_address,r.ip_pattern,r.port_pattern,r.src_port
 	    ,r.protocol,r.protocol_id,r.direction,r.cfg_type,r.action,r.dest_port,r.dest_ip_address
 		,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
 		,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id,
@@ -84,11 +83,8 @@
 	    	<if test="ipType != null">
 	    		AND r.IP_TYPE=#{ipType,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="srcIpPattern != null">
-	    		AND r.src_ip_pattern=#{srcIpPattern,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="destIpPattern != null">
-	    		AND r.dest_ip_pattern=#{destIpPattern,jdbcType=INTEGER}
+	    	<if test="ipPattern != null">
+	    		AND r.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcIpAddress != null and srcIpAddress != ''">
 	    		AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
@@ -96,11 +92,8 @@
 	    	<if test="destIpAddress != null and destIpAddress != ''">
 	    		AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
 	    	</if>
-	    	<if test="srcPortPattern != null">
-	    		AND r.src_port_pattern=#{srcPortPattern,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="destPortPattern != null">
-	    		AND r.dest_port_pattern=#{destPortPattern,jdbcType=INTEGER}
+	    	<if test="portPattern != null">
+	    		AND r.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}
 	    	</if>
 	    	<if test="srcPort != null and srcPort !=''">
 	    		AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
@@ -120,31 +113,15 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  r.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  r.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND r.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName !=''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -255,7 +232,9 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -288,8 +267,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER},
@@ -364,17 +343,11 @@
       <if test="srcIpAddress != null and srcIpAddress != ''" >
         src_ip_address = #{srcIpAddress,jdbcType=VARCHAR},
       </if>
-      <if test="srcIpPattern != null" >
-        src_ip_pattern = #{srcIpPattern,jdbcType=INTEGER},
+      <if test="ipPattern != null" >
+        ip_pattern = #{ipPattern,jdbcType=INTEGER},
       </if>
-      <if test="destIpPattern != null" >
-        dest_ip_pattern = #{destIpPattern,jdbcType=INTEGER},
-      </if>
-      <if test="srcPortPattern != null" >
-        src_port_pattern = #{srcPortPattern,jdbcType=INTEGER},
-      </if>
-      <if test="destPortPattern != null" >
-        dest_port_pattern = #{destPortPattern,jdbcType=INTEGER},
+      <if test="portPattern != null" >
+        port_pattern = #{portPattern,jdbcType=INTEGER},
       </if>
       <if test="srcPort != null and srcPort != ''" >
         src_port = #{srcPort,jdbcType=VARCHAR},

src/main/java/com/nis/web/dao/configuration/DnsResStrategyDao.xml

@@ -85,31 +85,15 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  r.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  r.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND r.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml

@@ -35,8 +35,7 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -173,7 +172,7 @@
     a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id
 	,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id,
@@ -232,31 +231,9 @@
 	    	<if test="isValid == null">
 	    		AND a.IS_VALID != -1
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  a.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  a.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  a.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND a.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isAudit != null">
+	    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -476,7 +453,9 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -512,8 +491,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 
@@ -1162,31 +1141,15 @@
 	    	<if test="action != null">
 	    		AND a.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  a.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  a.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  a.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND a.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND a.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml

@@ -1,15 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.nis.web.dao.configuration.IpCfgDao" >
-  <!-- 基础 -->
   <resultMap id="BaseIpMap" type="com.nis.domain.configuration.BaseIpCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
     <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-	<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="port_pattern" property="portPattern" jdbcType="INTEGER" />
@@ -87,8 +85,7 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-	<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -119,14 +116,14 @@
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="BaseIpCfg_Column_List_with_id" >
-    CFG_ID, CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT,
+    CFG_ID, CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
     DIRECTION,PROTOCOL,PROTOCOL_ID,ACTION,IS_VALID,IS_AUDIT,
     CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,FUNCTION_ID,RATELIMIT,DNS_STRATEGY_ID,IR_TYPE,USER_REGION1,USER_REGION2,USER_REGION3,USER_REGION4,USER_REGION5
   </sql>
   <sql id="BaseIpCfg_Column_List_with_id_name" >
-    CFG_ID, CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT,
+    CFG_ID, CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
     DIRECTION,PROTOCOL,PROTOCOL_ID,ACTION,IS_VALID,IS_AUDIT,
     CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
@@ -136,8 +133,7 @@
   	<choose>
   		<when test="page !=null and page.alias != null and page.alias != ''">
   			${page.alias}.CFG_ID as cfgId, ${page.alias}.CFG_DESC as cfgDesc,${page.alias}.CFG_REGION_CODE as cfgRegionCode,${page.alias}.CFG_TYPE as cfgType, ${page.alias}.IP_TYPE as ipType, 
-  			${page.alias}.SRC_IP_PATTERN as srcIpPattern,${page.alias}.DEST_IP_PATTERN as destIpPattern, ${page.alias}.SRC_IP_ADDRESS as srcIpAddress, ${page.alias}.DEST_IP_ADDRESS as destIpAddress,
-  			${page.alias}.SRC_PORT_PATTERN as srcPortPattern,${page.alias}.DEST_PORT_PATTERN as destPortPattern,${page.alias}.SRC_PORT as srcPort,${page.alias}.DEST_PORT as destPort,
+  			${page.alias}.IP_PATTERN as ipPattern, ${page.alias}.SRC_IP_ADDRESS as srcIpAddress, ${page.alias}.DEST_IP_ADDRESS as destIpAddress, ${page.alias}.PORT_PATTERN as portPattern,${page.alias}.SRC_PORT as srcPort,${page.alias}.DEST_PORT as destPort,
     		${page.alias}.DIRECTION as direction,${page.alias}.PROTOCOL as protocol,${page.alias}.PROTOCOL_ID as protocolId,${page.alias}.ACTION as action,${page.alias}.IS_VALID as isValid,${page.alias}.IS_AUDIT as isAudit,
     		${page.alias}.CREATOR_ID as creatorId,${page.alias}.CREATE_TIME AS createTime,${page.alias}.EDITOR_ID as editorId,${page.alias}.EDIT_TIME AS editTime,${page.alias}.AUDITOR_ID as auditorId,${page.alias}.AUDIT_TIME AS auditTime,
     		${page.alias}.SERVICE_ID as serviceId,${page.alias}.REQUEST_ID AS requestId,${page.alias}.COMPILE_ID AS compileId,${page.alias}.IS_AREA_EFFECTIVE as isAreaEffective,${page.alias}.classify,
@@ -151,8 +147,7 @@
   		</when>
   		<otherwise>
   			r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc,r.CFG_REGION_CODE as cfgRegionCode,r.CFG_TYPE as cfgType, r.IP_TYPE as ipType, 
-  			r.src_ip_pattern as srcIpPattern,r.dest_ip_pattern as destIpPattern, r.SRC_IP_ADDRESS as srcIpAddress, r.DEST_IP_ADDRESS as destIpAddress,
-  			r.src_port_pattern as srcPortPattern,r.dest_port_pattern as destPortPattern,r.SRC_PORT as srcPort,r.DEST_PORT as destPort,
+  			r.IP_PATTERN as ipPattern, r.SRC_IP_ADDRESS as srcIpAddress, r.DEST_IP_ADDRESS as destIpAddress, r.PORT_PATTERN as portPattern,r.SRC_PORT as srcPort,r.DEST_PORT as destPort,
     		r.DIRECTION as direction,r.PROTOCOL as protocol,r.PROTOCOL_ID as protocolId,r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
     		r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime,
     		r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify,
@@ -168,7 +163,8 @@
   </sql>
   <sql id="BaseIpCfg_Column_List" >
     CFG_DESC,CFG_REGION_CODE,CFG_TYPE,
-    IP_TYPE,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_IP_ADDRESS,DEST_IP_ADDRESS,SRC_PORT_PATTERN,DEST_PORT_PATTERN,SRC_PORT,DEST_PORT,DIRECTION,
+    IP_TYPE,IP_PATTERN,SRC_IP_ADDRESS,DEST_IP_ADDRESS,
+    PORT_PATTERN,SRC_PORT,DEST_PORT,DIRECTION,
     PROTOCOL,PROTOCOL_ID,ACTION,
     IS_VALID,IS_AUDIT,CREATOR_ID,
     CREATE_TIME,EDITOR_ID,EDIT_TIME,
@@ -180,8 +176,8 @@
   </sql>
   <sql id="BaseIpCfg_Value_List" >
     #{cfgDesc,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER},#{cfgType,jdbcType=VARCHAR},
-    #{ipType,jdbcType=INTEGER}, #{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
-    #{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
+    #{ipType,jdbcType=INTEGER}, #{ipPattern,jdbcType=INTEGER},#{srcIpAddress,jdbcType=VARCHAR},#{destIpAddress,jdbcType=VARCHAR},
+    #{portPattern,jdbcType=INTEGER},#{srcPort,jdbcType=VARCHAR},#{destPort,jdbcType=VARCHAR},#{direction,jdbcType=INTEGER}, 
     #{protocol,jdbcType=INTEGER},#{protocolId,jdbcType=INTEGER},#{action,jdbcType=INTEGER}, 
     #{isValid,jdbcType=INTEGER},#{isAudit,jdbcType=INTEGER},#{creatorId,jdbcType=INTEGER}, 
     #{createTime,jdbcType=TIMESTAMP},#{editorId,jdbcType=INTEGER},#{editTime,jdbcType=TIMESTAMP}, 
@@ -205,7 +201,7 @@
     a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id
 	,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id,
@@ -295,11 +291,8 @@
 			    	<if test="ipType != null">
 			    		AND ${page.alias}.IP_TYPE=#{ipType,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="srcIpPattern != null">
-			    		AND ${page.alias}.SRC_IP_PATTERN=#{srcIpPattern,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="destIpPattern != null">
-			    		AND ${page.alias}.DEST_IP_PATTERN=#{destIpPattern,jdbcType=INTEGER}
+			    	<if test="ipPattern != null">
+			    		AND ${page.alias}.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="srcIpAddress != null and srcIpAddress != ''">
 			    		AND ${page.alias}.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
@@ -307,11 +300,8 @@
 			    	<if test="destIpAddress != null and destIpAddress != ''">
 			    		AND ${page.alias}.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
 			    	</if>
-			    	<if test="srcPortPattern != null">
-			    		AND ${page.alias}.SRC_PORT_PATTERN=#{srcPortPattern,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="destPortPattern != null">
-			    		AND ${page.alias}.DEST_PORT_PATTERN=#{destPortPattern,jdbcType=INTEGER}
+			    	<if test="portPattern != null">
+			    		AND ${page.alias}.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="srcPort != null and srcPort !=''">
 			    		AND ${page.alias}.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
@@ -426,11 +416,8 @@
 			    	<if test="ipType != null">
 			    		AND r.IP_TYPE=#{ipType,jdbcType=INTEGER}
 			    	</if>
-			    	<if test="srcIpPattern != null">
-			    		AND r.src_ip_pattern=#{srcIpPattern,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="destIpPattern != null">
-			    		AND r.dest_ip_pattern=#{destIpPattern,jdbcType=INTEGER}
+			    	<if test="ipPattern != null">
+			    		AND r.IP_PATTERN=#{ipPattern,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="srcIpAddress != null and srcIpAddress != ''">
 			    		AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
@@ -438,11 +425,8 @@
 			    	<if test="destIpAddress != null and destIpAddress != ''">
 			    		AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
 			    	</if>
-			    	<if test="srcPortPattern != null">
-			    		AND r.src_port_pattern=#{srcPortPattern,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="destPortPattern != null">
-			    		AND r.dest_port_pattern=#{destPortPattern,jdbcType=INTEGER}
+			    	<if test="portPattern != null">
+			    		AND r.PORT_PATTERN=#{portPattern,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="srcPort != null and srcPort !=''">
 			    		AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
@@ -612,11 +596,8 @@
 	      <if test="ipType != null" >
 	        IP_TYPE = #{ipType,jdbcType=INTEGER},
 	      </if>
-	      <if test="srcIpPattern != null">
-    		SRC_IP_PATTERN=#{srcIpPattern,jdbcType=INTEGER},
-    	  </if>
-	      <if test="destIpPattern != null">
-    		DEST_IP_PATTERN=#{destIpPattern,jdbcType=INTEGER},
+	      <if test="ipPattern != null">
+    		IP_PATTERN=#{ipPattern,jdbcType=INTEGER},
     	  </if>
     	  <if test="srcIpAddress != null and srcIpAddress != ''">
     		SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR},
@@ -625,7 +606,7 @@
     		DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR},
     	  </if>
     	  <if test="portPattern != null">
-    		PORT_PATTERN=#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+    		PORT_PATTERN=#{portPattern,jdbcType=INTEGER},
     	  </if>
     	  <if test="srcPort != null and srcPort !=''">
     		SRC_PORT=#{srcPort,jdbcType=VARCHAR},
@@ -763,8 +744,7 @@
   <select id="getListByCfgIdWithName" resultMap="BaseIpMapWithUser">
 		select 
 		r.CFG_ID as cfgId, r.CFG_DESC as cfgDesc,r.CFG_REGION_CODE as cfgRegionCode,r.CFG_TYPE as cfgType, r.IP_TYPE as ipType, 
-		r.src_ip_pattern as srcIpPattern,r.dest_ip_pattern as destIpPattern, r.SRC_IP_ADDRESS as srcIpAddress, r.DEST_IP_ADDRESS as destIpAddress, 
-		r.src_port_pattern as srcPortPattern,r.dest_port_pattern as destPortPattern,r.SRC_PORT as srcPort,r.DEST_PORT as destPort,
+		r.IP_PATTERN as ipPattern, r.SRC_IP_ADDRESS as srcIpAddress, r.DEST_IP_ADDRESS as destIpAddress, r.PORT_PATTERN as portPattern,r.SRC_PORT as srcPort,r.DEST_PORT as destPort,
    		r.DIRECTION as direction,r.PROTOCOL as protocol,r.PROTOCOL_ID as protocolId,r.ACTION as action,r.IS_VALID as isValid,r.IS_AUDIT as isAudit,
    		r.CREATOR_ID as creatorId,r.CREATE_TIME AS createTime,r.EDITOR_ID as editorId,r.EDIT_TIME AS editTime,r.AUDITOR_ID as auditorId,r.AUDIT_TIME AS auditTime,
    		r.SERVICE_ID as serviceId,r.REQUEST_ID AS requestId,r.COMPILE_ID AS compileId,r.IS_AREA_EFFECTIVE as isAreaEffective,r.classify,
@@ -947,7 +927,9 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -983,10 +965,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},
-    	#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},
-    	#{destPortPattern,jdbcType=INTEGER},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 
@@ -1098,31 +1078,15 @@
 	    	<if test="action != null">
 	    		AND a.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  a.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  a.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  a.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-		    		AND a.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND a.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml

@@ -29,8 +29,7 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -125,7 +124,7 @@
     a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.do_log,a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id
 	,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id,
@@ -385,7 +384,9 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -416,8 +417,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 

src/main/java/com/nis/web/dao/configuration/PxyObjKeyringDao.xml

@@ -171,31 +171,15 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  r.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  r.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND r.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -270,31 +254,15 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  r.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  r.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND r.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND r.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml

@@ -39,8 +39,7 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -138,7 +137,7 @@
     a.do_blacklist
   </sql>
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id
 	,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id,
@@ -189,31 +188,15 @@
 	    	<if test="action != null">
 	    		AND a.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchValidValue != null and batchValidValue != ''">
-					AND  a.IS_VALID in (${batchValidValue})
-				</when>
-				<otherwise>
-					<if test="isValid != null">
-			    		AND  a.IS_VALID=#{isValid,jdbcType=INTEGER}
-			    	</if>
-			    	<if test="isValid == null">
-			    		AND  a.IS_VALID != -1
-			    	</if>
-				</otherwise>
-			</choose>
-	    	<choose>
-	    		<!-- 判断是否批量操作 -->
-				<when test="batchAuditValue != null and batchAuditValue != ''">
-			    		AND a.IS_AUDIT in(${batchAuditValue})
-				</when>
-				<otherwise>
-					<if test="isAudit != null">
-			    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-			    	</if>
-				</otherwise>
-			</choose>
+	    	<if test="isValid != null">
+	    		AND a.IS_VALID=#{isValid,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isValid == null">
+	    		AND a.IS_VALID != -1
+	    	</if>
+	    	<if test="isAudit != null">
+	    		AND a.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+	    	</if>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -584,7 +567,9 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -620,8 +605,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 

src/main/java/com/nis/web/dao/configuration/XmppCfgDao.xml

@@ -29,8 +29,7 @@
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
     <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
     <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
     <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
     <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -126,7 +125,7 @@
     a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,do_log
   </sql>
   <sql id="IpCfg_Column" >
-    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.src_ip_pattern,a.dest_ip_pattern,a.src_port_pattern,a.dest_port_pattern,a.src_port
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
     ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
 	,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id
 	,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id,
@@ -354,7 +353,9 @@
     AREA_EFFECTIVE_IDS,
     function_id,
     ip_type,
-    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     protocol_id,
@@ -385,8 +386,8 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{protocolId,jdbcType=INTEGER}, 

src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.java

@@ -20,7 +20,7 @@ public interface SpecificServiceCfgDao extends CrudDao<SpecificServiceCfg> {
 	 * @return
 	 */
 	SpecificServiceCfg getBySpecServiceId(Integer specServiceId);
-	List<SpecificServiceCfg> getBySpecServiceCodes(@Param("ids")String ids,@Param("cfgType")Integer cfgType);
+	List<SpecificServiceCfg> getBySpecServiceCodes(@Param("ids")String ids);
 	/**
 	 * 查询所有符合条件顶层分页列表
 	 * @param specificServiceCfg

src/main/java/com/nis/web/dao/specific/SpecificServiceCfgDao.xml

@@ -39,11 +39,11 @@
   <!-- 根据id查出对象 -->
   <select id="getBySpecServiceId" resultType="com.nis.domain.specific.SpecificServiceCfg" parameterType="java.lang.Integer">
   select <include refid="specificServiceCfgColumns" />
-  from specific_service_cfg s where s.spec_service_id = #{specServiceId} and s.is_valid=1
+  from specific_service_cfg s where s.spec_service_id = #{specServiceId}
   </select>
-  <select id="getBySpecServiceCodes" resultType="com.nis.domain.specific.SpecificServiceCfg">
+  <select id="getBySpecServiceCodes" resultType="com.nis.domain.specific.SpecificServiceCfg" parameterType="java.lang.String">
   select <include refid="specificServiceCfgColumns" />
-  from specific_service_cfg s where s.spec_service_code in(${ids}) and s.is_valid=1 and s.cfg_type=#{cfgType}
+  from specific_service_cfg s where s.spec_service_code in(${ids})
   </select>
   <select id="getRepeat" resultType="com.nis.domain.specific.SpecificServiceCfg" >
   select <include refid="specificServiceCfgColumns" />
@@ -54,11 +54,11 @@
   </select>
   <select id="getParentType" resultType="java.lang.Integer" parameterType="java.lang.Integer">
   select cfg_type
-  from specific_service_cfg s where s.spec_service_id = #{specServiceId}  and s.is_valid=1
+  from specific_service_cfg s where s.spec_service_id = #{specServiceId}
   </select>
   <select id="getParentCode" resultType="java.lang.Integer" parameterType="java.lang.Integer">
   select spec_service_code
-  from specific_service_cfg s where s.spec_service_id = #{specServiceId}  and s.is_valid=1
+  from specific_service_cfg s where s.spec_service_id = #{specServiceId}
   </select>
   
   <!-- 查出所有符合条件的顶层数据 -->

src/main/java/com/nis/web/dao/specific/SpecificServiceHostCfgDao.xml

@@ -7,8 +7,7 @@
 		<id column="host_id" property="hostId" jdbcType="INTEGER" />
 		<result column="spec_service_id" property="specServiceId" jdbcType="INTEGER" />
 		<result column="ip_type" property="ipType" jdbcType="INTEGER" />
-	    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
+	    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
 	    <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
 	    <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
 	    <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
@@ -122,7 +121,9 @@ from specific_service_host_cfg s where s.spec_service_id = #{specServiceId}
 	<!-- 新增 -->
 	<insert id="insert" parameterType="com.nis.domain.specific.SpecificServiceHostCfg">
 	insert into specific_service_host_cfg (spec_service_id,ip_type,
-    src_ip_address,SRC_IP_PATTERN,DEST_IP_PATTERN,SRC_PORT_PATTERN,DEST_PORT_PATTERN,
+    src_ip_address,
+    ip_pattern,
+    port_pattern,
     src_port,
     protocol,
     direction,
@@ -131,8 +132,8 @@ from specific_service_host_cfg s where s.spec_service_id = #{specServiceId}
     is_valid,is_audit,creator_id,create_time,editor_id,edit_time,auditor_id,audit_time)
 	values(#{specServiceId},#{ipType,jdbcType=INTEGER},
     	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,jdbcType=INTEGER},
     	#{srcPort,jdbcType=VARCHAR},
     	#{protocol,jdbcType=INTEGER},
     	#{direction,jdbcType=INTEGER},
@@ -145,10 +146,10 @@ from specific_service_host_cfg s where s.spec_service_id = #{specServiceId}
 	update specific_service_host_cfg s set 
 		s.spec_service_id = #{specServiceId},
         s.IP_TYPE = #{ipType,jdbcType=INTEGER},
-   		s.IP_PATTERN=#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
+   		s.IP_PATTERN=#{ipPattern,jdbcType=INTEGER},
    		s.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR},
    		s.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR},
-   		s.PORT_PATTERN=#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
+   		s.PORT_PATTERN=#{portPattern,jdbcType=INTEGER},
    		s.SRC_PORT=#{srcPort,jdbcType=VARCHAR},
    		s.DEST_PORT=#{destPort,jdbcType=VARCHAR},
         s.direction = #{direction,jdbcType=INTEGER},

src/main/java/com/nis/web/service/BaseService.java

@@ -1053,45 +1053,31 @@ public abstract class BaseService {
 	 */
 	public static List<IpCfg> ipConvert(IpCfg dstIp, BaseIpCfg srcIp) {
 		List<IpCfg> ipConvertList = Lists.newArrayList();
-		List<IpCfg> tempList = Lists.newArrayList();
-		List<IpCfg> tempList1 = Lists.newArrayList();
-		if (srcIp.getIpType().equals(4)) {// IP V4
-			if(srcIp.getSrcIpPattern().equals(2)) {//源IP范围
-					if (srcIp.getSrcIpAddress() != null) {
-						String startIpPart = srcIp.getSrcIpAddress().split("-")[0];
-						String endIpPart = srcIp.getSrcIpAddress().split("-")[1];
-						Integer startNum = Integer.parseInt(startIpPart.split("\\.")[3]);
-						Integer endNum = Integer.parseInt(endIpPart.split("\\.")[3]);
-						for (int i = startNum; i <= endNum; i++) {
-							IpCfg tempIp = new IpCfg();
-							BeanUtils.copyProperties(dstIp, tempIp);
-							tempIp.setSrcIp(startIpPart.substring(0, startIpPart.lastIndexOf(".") + 1) + i);
-							tempIp.setSrcIpMask("255.255.255.255");
-							tempList.add(tempIp);
-						}
-					}else {
-						dstIp.setSrcIp("0.0.0.0");
-						dstIp.setSrcIpMask("255.255.255.255");
-						tempList.add(dstIp);
+		boolean isRange = ((srcIp.getIpPattern() != null && srcIp.getIpPattern() == 2)
+				|| (srcIp.getSrcIpAddress() != null && srcIp.getSrcIpAddress().indexOf("-") > -1)
+				|| (srcIp.getDestIpAddress() != null && srcIp.getDestIpAddress().indexOf("-") > -1));
+		if (isRange) {
+			List<IpCfg> tempList = Lists.newArrayList();
+			List<IpCfg> tempList1 = Lists.newArrayList();
+			if (srcIp.getIpType().intValue() == 4) {
+				if (srcIp.getSrcIpAddress() != null) {
+					String startIpPart = srcIp.getSrcIpAddress().split("-")[0];
+					String endIpPart = srcIp.getSrcIpAddress().split("-")[1];
+					Integer startNum = Integer.parseInt(startIpPart.split("\\.")[3]);
+					Integer endNum = Integer.parseInt(endIpPart.split("\\.")[3]);
+					for (int i = startNum; i <= endNum; i++) {
+						IpCfg tempIp = new IpCfg();
+						BeanUtils.copyProperties(dstIp, tempIp);
+						tempIp.setSrcIp(startIpPart.substring(0, startIpPart.lastIndexOf(".") + 1) + i);
+						tempIp.setSrcIpMask("255.255.255.255");
+						tempList.add(tempIp);
 					}
-			}else if(srcIp.getSrcIpPattern().equals(1)){
-				Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]);
-				if (srcMaskNum == 0) {
-					dstIp.setSrcIpMask("0.0.0.0");
 				} else {
-					dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum));
+					dstIp.setSrcIp("0.0.0.0");
+					dstIp.setSrcIpMask("255.255.255.255");
+					tempList.add(dstIp);
 				}
-				dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
-				tempList.add(dstIp);
-			}else if(srcIp.getSrcIpPattern().equals(3)){
-				dstIp.setSrcIp(srcIp.getSrcIpAddress());
-				dstIp.setSrcIpMask("255.255.255.255");
-				tempList.add(dstIp);
-			}else {
-				throw new RuntimeException("Unsupported IP Pattern " + srcIp.getSrcIpPattern());
-			}
-			if (srcIp.getDestIpAddress() != null) {
-				if(srcIp.getDestIpPattern().equals(2)) {
+				if (srcIp.getDestIpAddress() != null) {
 					String startIpPart = srcIp.getDestIpAddress().split("-")[0];
 					String endIpPart = srcIp.getDestIpAddress().split("-")[1];
 					Integer startNum = Integer.parseInt(startIpPart.split("\\.")[3]);
@@ -1111,93 +1097,217 @@ public abstract class BaseService {
 						}
 					}
 					tempList.clear();
-				}else if(srcIp.getDestIpPattern().equals(1)) {
-					Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]);
+				} else {
 					for (IpCfg _cfg : tempList) {
-						IpCfg tempIp = new IpCfg();
-						BeanUtils.copyProperties(_cfg, tempIp);
-						if (dstMaskNum == 0) {
-							tempIp.setDstIpMask("0.0.0.0");
-						} else {
-							tempIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));
-						}
-						tempIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
-						if (!tempIp.getSrcIp().equals(tempIp.getDstIp())) {
-							// 处理
-							convertPortValues(tempIp, srcIp);
-							tempList1.add(tempIp);
-						}
+						_cfg.setDstIp("0.0.0.0");
+						_cfg.setSrcIpMask("255.255.255.255");
+						convertPortValues(_cfg, srcIp);
 					}
-					tempList.clear();
-				}else {
-					for (IpCfg _cfg : tempList) {
-						IpCfg tempIp = new IpCfg();
-						BeanUtils.copyProperties(_cfg, tempIp);
-						tempIp.setDstIp(srcIp.getDestIpAddress());
-						if (!tempIp.getSrcIp().equals(tempIp.getDstIp())) {
-							tempIp.setDstIpMask("255.255.255.255");
-							// 处理
-							convertPortValues(tempIp, srcIp);
-							tempList1.add(tempIp);
-						}
-					}
-					tempList.clear();
 				}
-			}else {
-				for (IpCfg _cfg : tempList) {
-					_cfg.setDstIp("0.0.0.0");
-					_cfg.setSrcIpMask("255.255.255.255");
-					convertPortValues(_cfg, srcIp);
+				if (tempList1.size() > 0) {
+					ipConvertList.addAll(tempList1);
+				} else {
+					ipConvertList.addAll(tempList);
 				}
-			}
-			if (tempList1.size() > 0) {
-				ipConvertList.addAll(tempList1);
-			} else {
-				ipConvertList.addAll(tempList);
-			}
-		}else if(srcIp.getIpType().equals(6)){// IP V6
-			if (srcIp.getSrcIpAddress() != null) {
-				if(srcIp.getSrcIpPattern().equals(2)) {
+			} else if (srcIp.getIpType().intValue() == 6) {
+				if (srcIp.getSrcIpAddress() != null) {
 					IPv6Address address1 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[0]);
 					IPv6Address address2 = IPv6Address.fromString(srcIp.getSrcIpAddress().split("-")[1]);
 					IPv6Network network = IPv6Network.fromTwoAddresses(address1, address2);
 					dstIp.setSrcIp(address1.toString());
 					dstIp.setSrcIpMask(network.getNetmask().asAddress().toString());
-				}else if(srcIp.getSrcIpPattern().equals(1)){// IP/掩码
-					IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress());
-					dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
-					dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString());
-				}else {// IP
-					dstIp.setSrcIp(srcIp.getSrcIpAddress());
+				} else {
+					dstIp.setSrcIp("::");
 					dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
 				}
-			} else {
-				dstIp.setSrcIp("::");
-				dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
-			}
-			if (srcIp.getDestIpAddress() != null) {
-				if(srcIp.getDestIpPattern().equals(2)) {
+				if (srcIp.getDestIpAddress() != null) {
 					IPv6Address address1 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[0]);
 					IPv6Address address2 = IPv6Address.fromString(srcIp.getDestIpAddress().split("-")[1]);
 					IPv6Network network = IPv6Network.fromTwoAddresses(address1, address2);
 					dstIp.setDstIp(address1.toString());
 					dstIp.setDstIpMask(network.getNetmask().asAddress().toString());
-				}else if(srcIp.getDestIpPattern().equals(1)) {// IP/掩码
-					IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress());
-					dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
-					dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString());
-				}else {// IP
-					dstIp.setDstIp(srcIp.getDestIpAddress());
+				} else {
+					dstIp.setDstIp("::");
 					dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
 				}
+
+				ipConvertList.add(dstIp);
 			} else {
-				dstIp.setDstIp("::");
-				dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
+				throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
+			}
+		} else {
+			if (srcIp.getSrcIpAddress() != null) {
+				if (srcIp.getSrcIpAddress().indexOf("/") != -1) {
+					if (srcIp.getIpType() == 4 /* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
+						Integer srcMaskNum = Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]);
+						if (srcMaskNum == 0) {
+							dstIp.setSrcIpMask("0.0.0.0");
+						} else {
+							dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum));
+						}
+
+						dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
+					} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
+						IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getSrcIpAddress());
+						dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
+						dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString());
+					} /*
+						 * else { Pattern
+						 * patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); Pattern
+						 * patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); Matcher
+						 * matchernV4Subnet=patternV4Subnet.matcher(srcIp.getSrcIpAddress()); Matcher
+						 * matcherV6Subnet=patternV6Subnet.matcher(srcIp.getSrcIpAddress());
+						 * if(matchernV4Subnet.matches()) { Integer srcMaskNum =
+						 * Integer.parseInt(srcIp.getSrcIpAddress().split("/")[1]); if(srcMaskNum==0){
+						 * dstIp.setSrcIpMask("0.0.0.0"); }else{
+						 * dstIp.setSrcIpMask(IpUtil.convertMask(srcMaskNum)); }
+						 * dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]); }else
+						 * if(matcherV6Subnet.matches()){ IPv6Network strangeNetwork =
+						 * IPv6Network.fromString(srcIp.getSrcIpAddress());
+						 * dstIp.setSrcIp(srcIp.getSrcIpAddress().split("/")[0]);
+						 * dstIp.setSrcIpMask(strangeNetwork.getNetmask().asAddress().toString()); }else
+						 * { throw new RuntimeException("Invalid IP/subnet mask format"); } }
+						 */
+					else {
+						throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
+					}
+				} else {
+					if (srcIp.getIpType() == 4/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
+						dstIp.setSrcIp(srcIp.getSrcIpAddress());
+						dstIp.setSrcIpMask("255.255.255.255");
+					} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
+						dstIp.setSrcIp(srcIp.getSrcIpAddress());
+						dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
+					} /*
+						 * else {//all Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP);
+						 * Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); Matcher
+						 * matcherV4=patternV4.matcher(srcIp.getSrcIpAddress()); Matcher
+						 * matcherV6=patternV6.matcher(srcIp.getSrcIpAddress()); if(matcherV4.matches())
+						 * { dstIp.setSrcIp(srcIp.getSrcIpAddress());
+						 * dstIp.setSrcIpMask("255.255.255.255"); }else if(matcherV6.matches()) {
+						 * dstIp.setSrcIp(srcIp.getSrcIpAddress());
+						 * dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else { throw
+						 * new RuntimeException("Invalid IP format"); } }
+						 */
+					else {
+						throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
+					}
+				}
+			} else {
+				if (srcIp.getIpType() == 4/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
+					dstIp.setSrcIp(srcIp.getSrcIpAddress());
+					dstIp.setSrcIpMask("255.255.255.255");
+				} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
+					dstIp.setSrcIp(srcIp.getSrcIpAddress());
+					dstIp.setSrcIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
+				} /*
+					 * else {//all dstIp.setSrcIp(srcIp.getSrcIpAddress());
+					 * dstIp.setSrcIpMask("255.255.255.255"); }
+					 */
+				else {
+					throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
+				}
+			}
+			if (srcIp.getDestIpAddress() != null) {
+				if (srcIp.getDestIpAddress().indexOf("/") != -1) {
+					if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
+						Integer dstMaskNum = Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]);
+						if (dstMaskNum == 0) {
+							dstIp.setDstIpMask("0.0.0.0");
+						} else {
+							dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));
+							;
+						}
+						dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
+					} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
+						IPv6Network strangeNetwork = IPv6Network.fromString(srcIp.getDestIpAddress());
+						dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
+						dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString());
+					} /*
+						 * else { Pattern
+						 * patternV4Subnet=Pattern.compile(Constants.IPV4_IP_SUBNET_REGEXP); Pattern
+						 * patternV6Subnet=Pattern.compile(Constants.IPV6_IP_SUBNET_REGEXP); Matcher
+						 * matchernV4Subnet=patternV4Subnet.matcher(srcIp.getDestIpAddress()); Matcher
+						 * matcherV6Subnet=patternV6Subnet.matcher(srcIp.getDestIpAddress());
+						 * if(matchernV4Subnet.matches()) { Integer dstMaskNum =
+						 * Integer.parseInt(srcIp.getDestIpAddress().split("/")[1]); if(dstMaskNum==0){
+						 * dstIp.setDstIpMask("0.0.0.0"); }else{
+						 * dstIp.setDstIpMask(IpUtil.convertMask(dstMaskNum));; }
+						 * dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]); }else
+						 * if(matcherV6Subnet.matches()){ IPv6Network strangeNetwork =
+						 * IPv6Network.fromString(srcIp.getDestIpAddress());
+						 * dstIp.setDstIp(srcIp.getDestIpAddress().split("/")[0]);
+						 * dstIp.setDstIpMask(strangeNetwork.getNetmask().asAddress().toString()); }else
+						 * { throw new RuntimeException("Invalid IP/subnet mask format"); } }
+						 */
+					else {
+						throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
+					}
+
+				} else {
+					if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
+						dstIp.setDstIp(srcIp.getDestIpAddress());
+						dstIp.setDstIpMask("255.255.255.255");
+					} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
+						dstIp.setDstIp(srcIp.getDestIpAddress());
+						dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
+					} /*
+						 * else {//all Pattern patternV4=Pattern.compile(Constants.IPV4_IP_REGEXP);
+						 * Pattern patternV6=Pattern.compile(Constants.IPV6_IP_REGEXP); Matcher
+						 * matcherV4=patternV4.matcher(srcIp.getDestIpAddress()); Matcher
+						 * matcherV6=patternV6.matcher(srcIp.getDestIpAddress());
+						 * if(matcherV4.matches()) { dstIp.setDstIp(srcIp.getDestIpAddress());
+						 * dstIp.setDstIpMask("255.255.255.255"); }else if(matcherV6.matches()) {
+						 * dstIp.setDstIp(srcIp.getDestIpAddress());
+						 * dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF"); }else { throw
+						 * new RuntimeException("invalid ip format"); } }
+						 */
+					else {
+						throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
+					}
+				}
+			} else {
+				if (srcIp.getIpType() == 4/* || srcIp.getIpType()==64 */) {// 64表示源ip为ipv6，目的ip为ipv4
+					dstIp.setDstIp(srcIp.getDestIpAddress());
+					dstIp.setDstIpMask("255.255.255.255");
+				} else if (srcIp.getIpType() == 6/* || srcIp.getIpType()==46 */) {// 46表示源ip为ipv4，目的ip为ipv6
+					dstIp.setDstIp(srcIp.getDestIpAddress());
+					dstIp.setDstIpMask("FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF");
+				} /*
+					 * else {//all dstIp.setDstIp(srcIp.getDestIpAddress());
+					 * dstIp.setDstIpMask("255.255.255.255"); }
+					 */
+				else {
+					throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
+				}
+			}
+			if (srcIp.getSrcPort() != null) {
+				if (srcIp.getSrcPort().indexOf("/") != -1) {
+					String srcMaskNum = srcIp.getSrcPort().split("/")[1];
+					dstIp.setSrcPortMask(srcMaskNum);
+					dstIp.setSrcPort(srcIp.getSrcPort().split("/")[0]);
+				} else {
+					dstIp.setSrcPort(srcIp.getSrcPort());
+					dstIp.setSrcPortMask("65535");
+				}
+			} else {
+				dstIp.setSrcPort("0");
+				dstIp.setSrcPortMask("65535");
+			}
+			if (srcIp.getDestPort() != null) {
+				if (srcIp.getDestPort().indexOf("/") != -1) {
+					String dstMaskNum = srcIp.getDestPort().split("/")[1];
+					dstIp.setDstPortMask(dstMaskNum);
+					dstIp.setDstPort(srcIp.getDestPort().split("/")[0]);
+				} else {
+					dstIp.setDstPort(srcIp.getDestPort());
+					dstIp.setDstPortMask("65535");
+				}
+			} else {
+				dstIp.setDstPort("0");
+				dstIp.setDstPortMask("65535");
 			}
-			convertPortValues(dstIp, srcIp);
 			ipConvertList.add(dstIp);
-		}else {
-			throw new RuntimeException("Unsupported IP type " + srcIp.getIpType());
 		}
 		return ipConvertList;
 	}
@@ -2495,15 +2605,7 @@ public abstract class BaseService {
 									if(_cfg.getAction().equals(Constants.MONIT_ACTION)) {
 										maatCfg.setUserRegion(Constants.INTERCEPT_IP_MONIT_USER_REGION_KEY+"="+Constants.USER_REGION_PLACEHOLDER);
 									}*/
-									if(serviceDict!=null&&serviceDict.getAction().equals(Constants.MONIT_ACTION)) {// 监测 需要发keyring_id、拦截强度
-										_cfg.setUserRegion1(StringUtil.isEmpty(_cfg.getUserRegion1()) ? "0":_cfg.getUserRegion1());
-										_cfg.setUserRegion5(StringUtil.isEmpty(_cfg.getUserRegion5()) ? "1":_cfg.getUserRegion5());
-										maatCfg.setUserRegion(Constants.INTERCEPT_IP_MONIT_USER_REGION_KEY+"=0"+";"+Constants.INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY+"="+_cfg.getUserRegion5());
-									}
-									if(serviceDict!=null&&serviceDict.getAction().equals(64)) {
-										maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+_cfg.getUserRegion2());
-									}
-									
+									maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+_cfg.getUserRegion2());
 								}else if(regionDict.getFunctionId()==207 || regionDict.getFunctionId()==208 || regionDict.getFunctionId()==209) {// HTTP(s)阻断、重定向、替换
 									String userRegion = Constants.USER_REGION_PLACEHOLDER;
 									if(_cfg.getAction().equals(Constants.REJECT_ACTION)) {// 阻断

src/main/java/com/nis/web/service/SystemService.java

@@ -7,11 +7,6 @@ import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
-import javax.ws.rs.client.Invocation.Builder;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -29,13 +24,10 @@ import com.nis.domain.SrcIp;
 import com.nis.domain.SysRole;
 import com.nis.domain.SysUser;
 import com.nis.util.Configurations;
-import com.nis.util.Constants;
 import com.nis.util.DateUtils;
 import com.nis.util.IpUtil;
 import com.nis.util.ServiceConfigTemplateUtil;
 import com.nis.util.TimeConstants;
-import com.nis.util.httpclient.ClientUtil;
-import com.nis.web.dao.SchedulerDao;
 import com.nis.web.dao.SrcIpDao;
 import com.nis.web.dao.SysOfficeDao;
 import com.nis.web.dao.UserDao;
@@ -64,9 +56,6 @@ public class SystemService extends BaseService{
 	@Autowired
 	private CommonPolicyDao commonPolicyDao;
 	
-	@Autowired
-	private SchedulerDao schedulerDao;
-	
 	@Autowired
 	private SrcIpDao srcIpDao;
 	private RedisSerializer keySerializer = new StringSerializer();
@@ -184,27 +173,16 @@ public class SystemService extends BaseService{
 	}
 
 	public void clearPolicies() throws Exception {
-		// 调用服务接口 告知flushAll
-		String url = Constants.SERVICE_URL + Constants.DEL_ALL_CFG;
-		// 创建连接
-		WebTarget wt = ClientUtil.getWebTarger(url);
-		// 获取响应结果
-		Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON);
-		Response response = header.delete(); 
-		if(response.getStatus() == 200){
-			//String result= response.readEntity(String.class);
-			Set<String> tableNameSet = ServiceConfigTemplateUtil.getAllTableName();
-			tableNameSet.add("pxy_obj_spoofing_ip_pool");
-			for (String tableName : tableNameSet) {
-				commonPolicyDao.clearPolicies(tableName);
-			}
-			// 初始化分组
-			asnGroupInfoService.reLoadGroupInfo();
-			// 失效定时任务
-			schedulerDao.inValidAllSchedule();
-		}else {
-			throw new RuntimeException();
+		// TODO 调用服务接口 告知flushAll
+		/*String destUrl = Constants.SERVICE_URL;
+		HttpClientUtil.get(destUrl);*/
+		Set<String> tableNameSet = ServiceConfigTemplateUtil.getAllTableName();
+		tableNameSet.add("pxy_obj_spoofing_ip_pool");
+		for (String tableName : tableNameSet) {
+			commonPolicyDao.clearPolicies(tableName);
 		}
+		// 初始化分组
+		asnGroupInfoService.reLoadGroupInfo();
 		
 	}
 }

src/main/java/com/nis/web/service/configuration/AppCfgService.java

@@ -16,7 +16,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.google.common.collect.Lists;
 import com.nis.domain.Page;
-import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.basics.Varibles;
 import com.nis.domain.configuration.AppByteCfg;
@@ -91,32 +90,6 @@ public class AppCfgService extends BaseService {
 	public Page<AppPolicyCfg> findAppPolicyList(Page<AppPolicyCfg> page, AppPolicyCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
-		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (entity.getFunctionId() == 63 && Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-				if (entity.getFunctionId() == 407 && Constants.SPECIFIC_SERVICE_CFG_TYPE_BASIC_PROTOCOL.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-				if (entity.getFunctionId() == 408 && Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceId(entity.getSpecServiceId());
-			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppCode(app.getSpecServiceCode());
-			}
-		}
 		List<AppPolicyCfg> list = appCfgDao.findAppPolicyList(entity);
 		page.setList(list);
 		return page;
@@ -131,59 +104,11 @@ public class AppCfgService extends BaseService {
 	public Page<AppIpCfg> findAppIpList(Page<AppIpCfg> page, AppIpCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
-		
-		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceId(entity.getSpecServiceId());
-			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppCode(app.getSpecServiceCode());
-			}
-		}
-		
 		List<AppIpCfg> list = appCfgDao.findAppIpList(entity);
 		page.setList(list);
 		return page;
 	}
 	public List<AppIpCfg> findAppIpList(AppIpCfg entity) {
-		
-		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (entity.getFunctionId() == 63 && Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-				if (entity.getFunctionId() == 407 && Constants.SPECIFIC_SERVICE_CFG_TYPE_BASIC_PROTOCOL.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-				if (entity.getFunctionId() == 408 && Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceId(entity.getSpecServiceId());
-			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppCode(app.getSpecServiceCode());
-			}
-		}
-		
 		List<AppIpCfg> list = appCfgDao.findAppIpList(entity);
 		return list;
 	}
@@ -196,26 +121,6 @@ public class AppCfgService extends BaseService {
 	public Page<AppHttpCfg> findAppHttpList(Page<AppHttpCfg> page, AppHttpCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
-		
-		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceId(entity.getSpecServiceId());
-			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppCode(app.getSpecServiceCode());
-			}
-		}
-		
 		List<AppHttpCfg> list = appCfgDao.findAppHttpList(entity);
 		page.setList(list);
 		return page;
@@ -229,26 +134,6 @@ public class AppCfgService extends BaseService {
 	public Page<AppDomainCfg> findAppDomainList(Page<AppDomainCfg> page, AppDomainCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
-		
-		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceId(entity.getSpecServiceId());
-			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppCode(app.getSpecServiceCode());
-			}
-		}
-		
 		List<AppDomainCfg> list = appCfgDao.findAppDomainList(entity);
 		page.setList(list);
 		return page;
@@ -289,26 +174,6 @@ public class AppCfgService extends BaseService {
 	public Page<AppByteCfg> findAppByteList(Page<AppByteCfg> page, AppByteCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
-		
-		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceId(entity.getSpecServiceId());
-			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppCode(app.getSpecServiceCode());
-			}
-		}
-		
 		List<AppByteCfg> list = appCfgDao.findAppByteList(entity);
 		page.setList(list);
 		return page;
@@ -317,26 +182,6 @@ public class AppCfgService extends BaseService {
 	public Page<AppSslCertCfg> findAppSslList(Page<AppSslCertCfg> page, AppSslCertCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
-		
-		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceId(entity.getSpecServiceId());
-			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppCode(app.getSpecServiceCode());
-			}
-		}
-		
 		List<AppSslCertCfg> list = appCfgDao.findAppSslList(entity);
 		page.setList(list);
 		return page;
@@ -350,26 +195,6 @@ public class AppCfgService extends BaseService {
 	public Page<AppTcpCfg> findAppTcpList(Page<AppTcpCfg> page, AppTcpCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
-		
-		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceId(entity.getSpecServiceId());
-			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppCode(app.getSpecServiceCode());
-			}
-		}
-		
 		List<AppTcpCfg> list = appCfgDao.findAppTcpList(entity);
 		page.setList(list);
 		return page;
@@ -566,7 +391,7 @@ public class AppCfgService extends BaseService {
 				if(entity.getFunctionId() == 408){
 					entity.setConfigType(Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR);
 				}
-				auditAppPolicyCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditAppPolicyCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}
@@ -644,7 +469,7 @@ public class AppCfgService extends BaseService {
 					BeanUtils.copyProperties(entity, cfg,
 							new String[] { "cfgRegionCode", "cfgType", "ipType", "isAreaEffective",
 									"areaEffectiveIds", "protocol", "portPattern", "srcPort", "destPort",
-									"direction", "destIpAddress", "srcIpAddress", "srcIpPattern", "destIpPattern" });
+									"direction", "destIpAddress", "srcIpAddress", "ipPattern" });
 					areaIpCfgDao.saveAreaIpCfg(cfg);
 				}
 			}
@@ -675,7 +500,7 @@ public class AppCfgService extends BaseService {
 					BeanUtils.copyProperties(entity, cfg,
 							new String[] { "cfgRegionCode", "cfgType", "ipType", "isAreaEffective", "areaEffectiveIds",
 									"protocol", "portPattern", "srcPort", "destPort", "direction", "destIpAddress",
-									"srcIpAddress", "srcIpPattern", "destIpPattern" });
+									"srcIpAddress", "ipPattern" });
 					areaIpCfgDao.saveAreaIpCfg(cfg);
 				}
 			}
@@ -829,7 +654,7 @@ public class AppCfgService extends BaseService {
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditAppDomainCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditAppDomainCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}
@@ -897,7 +722,7 @@ public class AppCfgService extends BaseService {
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditAppTopicDomainCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditAppTopicDomainCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}
@@ -960,10 +785,6 @@ public class AppCfgService extends BaseService {
 	public void saveOrUpdateAppSslCfg(AppSslCertCfg entity) throws Exception {
 		// 设置区域运营商信息
 		setAreaEffectiveIds(entity);
-		int isValid=0; 
-		if(!StringUtil.isEmpty(entity.getIsValid()) && entity.getIsValid()==1) {
-			isValid=1;
-		}
 		if (entity.getCfgId() == null) {
 			Integer compileId = 0;
 			try {
@@ -1015,12 +836,6 @@ public class AppCfgService extends BaseService {
 			}
 
 		}
-		if(isValid==1) {
-			entity.setIsAudit(1);
-			entity.setIsValid(1);			
-			entity.setAuditTime(new Date());
-			auditAppSslCfg(entity, entity.getIsAudit());
-		}
 
 	}
 
@@ -2246,26 +2061,6 @@ public class AppCfgService extends BaseService {
 	public Page<AppHeaderCfg> findAppHeaderList(Page<AppHeaderCfg> page, AppHeaderCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
-		
-		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceId(entity.getSpecServiceId());
-			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppCode(app.getSpecServiceCode());
-			}
-		}
-		
 		List<AppHeaderCfg> list = appCfgDao.findAppHeaderList(entity);
 		page.setList(list);
 		return page;
@@ -2435,5 +2230,4 @@ public class AppCfgService extends BaseService {
 		
 	}
 	
-	
 }

src/main/java/com/nis/web/service/configuration/AppMultiFeatureCfgService.java

@@ -15,7 +15,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.nis.domain.Page;
-import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.configuration.AppComplexFeatureCfg;
 import com.nis.domain.configuration.AppFeatureIndex;
 import com.nis.domain.configuration.AppHttpCfg;
@@ -35,7 +34,6 @@ import com.nis.domain.maat.MaatCfg.GroupCfg;
 import com.nis.domain.maat.MaatCfg.IpCfg;
 import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
 import com.nis.domain.maat.MaatCfg.StringCfg;
-import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.domain.maat.ToMaatBean;
 import com.nis.domain.maat.ToMaatResult;
 import com.nis.exceptions.MaatConvertException;
@@ -44,7 +42,6 @@ import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.dao.configuration.AppMultiFeatureCfgDao;
-import com.nis.web.dao.specific.SpecificServiceCfgDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
 
@@ -58,33 +55,11 @@ import com.nis.web.service.BaseService;
 public class AppMultiFeatureCfgService extends BaseService {
 	@Autowired
 	protected AppMultiFeatureCfgDao appMultiFeatureCfgDao;
-	@Autowired
-	protected SpecificServiceCfgDao specificServiceCfgDao;
 
 	//分页查询
 	public Page<AppFeatureIndex> findAppFeatureIndexList(Page<AppFeatureIndex> page, AppFeatureIndex entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
-		
-		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
-			// 查找社交应用的所有有效一级特定服务
-			SpecificServiceCfg appSpec = new SpecificServiceCfg();
-			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
-				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
-					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
-					break;
-				}
-			}
-			appSpec.setIsValid(Constants.VALID_YES);
-			appSpec.setIsLeaf(0);
-			appSpec.setSpecServiceId(entity.getSpecServiceId());
-			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
-			if (!StringUtil.isEmpty(appList)) {
-				SpecificServiceCfg app = appList.get(0);
-				entity.setAppCode(app.getSpecServiceCode());
-			}
-		}
-		
 		List<AppFeatureIndex> list = appMultiFeatureCfgDao.findAppFeatureIndexList(entity);
 		page.setList(list);
 		return page;
@@ -280,7 +255,7 @@ public class AppMultiFeatureCfgService extends BaseService {
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditAppFeatureCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditAppFeatureCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}

src/main/java/com/nis/web/service/configuration/AvContentCfgService.java

@@ -213,13 +213,7 @@ public class AvContentCfgService extends BaseService{
 				entity.setCompileId(compileId);
 				entity.setCreateTime(new Date());
 				entity.setCreatorId(entity.getCurrentUser().getId());
-				avContentCfgDao.insertCfgIndexInfo(entity);
-/*						if(entity.getVoipIps()!=null){
-							for (AvVoipIpCfg voipIp : entity.getVoipIps()) {
-								entity.setVoipIp(voipIp);
-								avContentCfgDao.insertAvVoipIp(entity);
-							}
-						}*/
+				avContentCfgDao.insertCfgIndexInfo(entity);
 				if(entity.getIpPortList()!=null){
 					for(IpPortCfg cfg:entity.getIpPortList()){
 						BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
@@ -311,7 +305,7 @@ public class AvContentCfgService extends BaseService{
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditAvVoip(entity,entity.getIsAudit(), Constants.UPDATE_ACTION);
+				auditAvVoip(entity,entity.getIsAudit(), Constants.INSERT_ACTION);
 			}
 		}
 	}
@@ -528,7 +522,7 @@ public class AvContentCfgService extends BaseService{
 				}
 			}
 		}
-		//保存区域IP信息
+		//保存区域IP信息
 		List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
 		if(!StringUtil.isEmpty(areaIpCfgList)){
 			AreaIpCfg cfg = new AreaIpCfg();
@@ -782,11 +776,9 @@ public class AvContentCfgService extends BaseService{
 						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
 																				,"cfgType"
 																				,"ipType"
-																				,"srcIpPattern"
-																				,"destIpPattern"
+																				,"ipPattern"
 																				,"srcIpAddress"
-																				,"srcPortPattern"
-																				,"destPortPattern"
+																				,"portPattern"
 																				,"srcPort"
 																				,"destPort"
 																				,"protocol"
@@ -824,11 +816,9 @@ public class AvContentCfgService extends BaseService{
 																				,"cfgType"
 																				,"cfgId"
 																				,"ipType"
-																				,"srcIpPattern"
-																				,"destIpPattern"
+																				,"ipPattern"
 																				,"srcIpAddress"
-																				,"srcPortPattern"
-																				,"destPortPattern"
+																				,"portPattern"
 																				,"srcPort"
 																				,"destPort"
 																				,"protocol"
@@ -843,11 +833,9 @@ public class AvContentCfgService extends BaseService{
 						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
 								,"cfgType"
 								,"ipType"
-								,"srcIpPattern"
-								,"destIpPattern"
+								,"ipPattern"
 								,"srcIpAddress"
-								,"srcPortPattern"
-								,"destPortPattern"
+								,"portPattern"
 								,"srcPort"
 								,"destPort"
 								,"protocol"
@@ -952,11 +940,9 @@ public class AvContentCfgService extends BaseService{
 				,"cfgType"
 				,"cfgId"
 				,"ipType"
-				,"srcIpPattern"
-				,"destIpPattern"
+				,"ipPattern"
 				,"srcIpAddress"
-				,"srcPortPattern"
-				,"destPortPattern"
+				,"portPattern"
 				,"srcPort"
 				,"destPort"
 				,"protocol"
@@ -1129,11 +1115,9 @@ public class AvContentCfgService extends BaseService{
 						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
 								,"cfgType"
 								,"ipType"
-								,"srcIpPattern"
-								,"destIpPattern"
+								,"ipPattern"
 								,"srcIpAddress"
-								,"srcPortPattern"
-								,"destPortPattern"
+								,"portPattern"
 								,"srcPort"
 								,"destPort"
 								,"protocol"
@@ -1171,11 +1155,9 @@ public class AvContentCfgService extends BaseService{
 								,"cfgType"
 								,"cfgId"
 								,"ipType"
-								,"srcIpPattern"
-								,"destIpPattern"
+								,"ipPattern"
 								,"srcIpAddress"
-								,"srcPortPattern"
-								,"destPortPattern"
+								,"portPattern"
 								,"srcPort"
 								,"destPort"
 								,"protocol"
@@ -1190,11 +1172,9 @@ public class AvContentCfgService extends BaseService{
 						BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
 								,"cfgType"
 								,"ipType"
-								,"srcIpPattern"
-								,"destIpPattern"
+								,"ipPattern"
 								,"srcIpAddress"
-								,"srcPortPattern"
-								,"destPortPattern"
+								,"portPattern"
 								,"srcPort"
 								,"destPort"
 								,"protocol"
@@ -1299,11 +1279,9 @@ public class AvContentCfgService extends BaseService{
 				,"cfgType"
 				,"cfgId"
 				,"ipType"
-				,"srcIpPattern"
-				,"destIpPattern"
+				,"ipPattern"
 				,"srcIpAddress"
-				,"srcPortPattern"
-				,"destPortPattern"
+				,"portPattern"
 				,"srcPort"
 				,"destPort"
 				,"protocol"
@@ -1554,7 +1532,7 @@ public class AvContentCfgService extends BaseService{
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditContUrl(entity,entity.getIsAudit(), Constants.UPDATE_ACTION);
+				auditContUrl(entity,entity.getIsAudit(), Constants.INSERT_ACTION);
 			}
 		}
 }

src/main/java/com/nis/web/service/configuration/BgpCfgService.java

@@ -246,7 +246,7 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditBgpCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditBgpCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}

src/main/java/com/nis/web/service/configuration/CachePolicyService.java

@@ -262,7 +262,7 @@ public class CachePolicyService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditCachePolicy(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditCachePolicy(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}

src/main/java/com/nis/web/service/configuration/ControlPolicyService.java

@@ -151,7 +151,7 @@ public class ControlPolicyService extends BaseService{
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				audit(entity.getIsAudit(), entity.getIsValid(), entity.getFunctionId(), entity.getId().toString(), new Date(), Constants.REPLACE_REQ_KEY_VALUE, Constants.UPDATE_ACTION);
+				audit(entity.getIsAudit(), entity.getIsValid(), entity.getFunctionId(), entity.getId().toString(), new Date(), Constants.REPLACE_REQ_KEY_VALUE, Constants.INSERT_ACTION);
 			}
 		}
 	}

src/main/java/com/nis/web/service/configuration/DdosCfgService.java

@@ -139,7 +139,7 @@ public class DdosCfgService extends BaseService{
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				audit(entity.getIsAudit(), isValid, entity.getFunctionId(),String.valueOf(entity.getCfgId()), new Date(),Constants.UPDATE_ACTION);
+				audit(entity.getIsAudit(), isValid, entity.getFunctionId(),String.valueOf(entity.getCfgId()), new Date(),Constants.INSERT_ACTION);
 			}
 		}
 	}

src/main/java/com/nis/web/service/configuration/DnsIpCfgService.java

@@ -150,13 +150,11 @@ public class DnsIpCfgService extends BaseService{
 		dnsIp.setFunctionId(401);
 		dnsIp.setCfgRegionCode(1);
 		dnsIp.setCfgType("dns_fake_ip");
-		dnsIp.setSrcIpPattern(3);
-		dnsIp.setDestIpPattern(3);
+		dnsIp.setIpPattern(3);
 		dnsIp.setSrcIpAddress("0.0.0.0");
 		dnsIp.setDestPort("0");
 		dnsIp.setSrcPort("0");
-		dnsIp.setSrcPortPattern(1);
-		dnsIp.setDestPortPattern(1);
+		dnsIp.setPortPattern(1);
 		dnsIp.setDnsStrategyId(0);
 		dnsIp.setAction(16);
 		dnsIp.setServiceId(64);

src/main/java/com/nis/web/service/configuration/DomainService.java

@@ -76,7 +76,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 					c.initDefaultValue();
 					BeanUtils.copyProperties(cfg, c,new String[]{"cfgId","ipType","direction",
 							"protocol","protocolId","areaEffectiveIds","cfgRegionCode",
-							"cfgType","srcIpPattern","destIpPattern","srcIpAddress","srcPortPattern","destPortPattern","srcPort","destIpAddress","destPort"});	
+							"cfgType","ipPattern","srcIpAddress","portPattern","srcPort","destIpAddress","destPort"});	
 					c.setTableName(AreaIpCfg.getTablename());
 				}
 				this.saveIpBatch(cfg.getAreaCfg());
@@ -106,7 +106,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 				c.initDefaultValue();
 				BeanUtils.copyProperties(cfg, c,new String[]{"cfgId","ipType","direction",
 						"protocol","protocolId","areaEffectiveIds","cfgRegionCode",
-						"cfgType","srcIpPattern","destIpPattern","srcIpAddress","srcPortPattern","destPortPattern","srcPort","destIpAddress","destPort"});	
+						"cfgType","ipPattern","srcIpAddress","portPattern","srcPort","destIpAddress","destPort"});	
 				c.setTableName(AreaIpCfg.getTablename());
 				c.setCreatorId(cfg.getCurrentUser().getId());
 				c.setCreateTime(date);
@@ -202,11 +202,9 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 					,"cfgType"
 					,"cfgId"
 					,"ipType"
-					,"srcIpPattern"
-					,"destIpPattern"
+					,"ipPattern"
 					,"srcIpAddress"
-					,"srcPortPattern"
-					,"destPortPattern"
+					,"portPattern"
 					,"srcPort"
 					,"destPort"
 					,"protocol"
@@ -537,7 +535,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditDomainCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditDomainCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}

src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java

@@ -235,7 +235,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditFtpCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditFtpCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}
@@ -569,7 +569,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditFileDigestCfg(entity.getIsAudit(), isValid,entity.getFunctionId(),entity.getCfgId()+"",Constants.UPDATE_ACTION);
+				auditFileDigestCfg(entity.getIsAudit(), isValid,entity.getFunctionId(),entity.getCfgId()+"",Constants.INSERT_ACTION);
 			}
 		}
 	}
@@ -926,7 +926,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditP2pCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditP2pCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}

src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java

@@ -294,7 +294,7 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditHttpCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditHttpCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}

src/main/java/com/nis/web/service/configuration/InterceptCfgService.java

@@ -285,7 +285,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditInterceptIpCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditInterceptIpCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}

src/main/java/com/nis/web/service/configuration/IpCfgService.java

@@ -98,10 +98,9 @@ public class IpCfgService extends CrudService<IpCfgDao, BaseIpCfg> {
 			if (cfg.getAreaCfg() != null && cfg.getAreaCfg().size() > 0) {
 				for (AreaIpCfg c : cfg.getAreaCfg()) {
 					c.initDefaultValue();
-					BeanUtils.copyProperties(cfg, c,
-							new String[] { "cfgId", "ipType", "direction", "protocol", "protocolId", "areaEffectiveIds",
-									"cfgRegionCode", "cfgType", "srcIpPattern", "destIpPattern", "srcIpAddress",
-									"srcPortPattern", "destPortPattern", "srcPort", "destIpAddress", "destPort" });
+					BeanUtils.copyProperties(cfg, c,new String[]{"cfgId","ipType","direction",
+							"protocol","protocolId","areaEffectiveIds","cfgRegionCode",
+							"cfgType","ipPattern","srcIpAddress","portPattern","srcPort","destIpAddress","destPort"});	
 					c.setTableName(AreaIpCfg.getTablename());
 				}
 				this.saveIpBatch(cfg.getAreaCfg());
@@ -287,7 +286,7 @@ public class IpCfgService extends CrudService<IpCfgDao, BaseIpCfg> {
 			if (isValid == 1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditIpCfg(entity, entity.getIsAudit(), Constants.UPDATE_ACTION);
+				auditIpCfg(entity, entity.getIsAudit(), Constants.INSERT_ACTION);
 			}
 		}
 	}
@@ -357,10 +356,9 @@ public class IpCfgService extends CrudService<IpCfgDao, BaseIpCfg> {
 		if (cfg.getAreaCfg() != null && cfg.getAreaCfg().size() > 0) {
 			for (AreaIpCfg c : cfg.getAreaCfg()) {
 				c.initDefaultValue();
-				BeanUtils.copyProperties(cfg, c,
-						new String[] { "cfgId", "ipType", "direction", "protocol", "protocolId", "areaEffectiveIds",
-								"cfgRegionCode", "cfgType", "srcIpPattern", "destIpPattern", "srcIpAddress",
-								"srcPortPattern", "destPortPattern", "srcPort", "destIpAddress", "destPort" });
+				BeanUtils.copyProperties(cfg, c,new String[]{"cfgId","ipType","direction",
+						"protocol","protocolId","areaEffectiveIds","cfgRegionCode",
+						"cfgType","ipPattern","srcIpAddress","portPattern","srcPort","destIpAddress","destPort"});	
 				c.setTableName(AreaIpCfg.getTablename());
 				c.setCreatorId(cfg.getCurrentUser().getId());
 				c.setCreateTime(date);
@@ -376,13 +374,22 @@ public class IpCfgService extends CrudService<IpCfgDao, BaseIpCfg> {
 		List<BaseIpCfg> beans = new ArrayList<>();
 		beans.add(cfg);
 		ipCfgDao.audit(cfg);
-		List<BaseIpCfg> beans1 = new ArrayList<>();
-		List<AreaIpCfg> areaIpCfgList = areaIpCfgDao.getByCompileId(cfg.getCompileId());
-		for (AreaIpCfg area : areaIpCfgList) {
-			BeanUtils.copyProperties(cfg, area,
-					new String[] { "cfgRegionCode", "cfgType", "cfgId", "ipType", "srcIpPattern", "destIpPattern",
-							"srcIpAddress", "srcPortPattern", "destPortPattern", "srcPort", "destPort", "protocol",
-							"direction", "protocolId" });
+		List<BaseIpCfg> beans1=new ArrayList<>();
+		List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(cfg.getCompileId());
+		for(AreaIpCfg area:areaIpCfgList){
+			BeanUtils.copyProperties(cfg,area ,new String[]{"cfgRegionCode"
+					,"cfgType"
+					,"cfgId"
+					,"ipType"
+					,"ipPattern"
+					,"srcIpAddress"
+					,"portPattern"
+					,"srcPort"
+					,"destPort"
+					,"protocol"
+					,"direction"
+					,"protocolId"
+					});
 			beans1.add(area);
 		}
 		this.auditIpBatch(beans1);

src/main/java/com/nis/web/service/configuration/IpMultiplexService.java

@@ -1,11 +1,14 @@
 package com.nis.web.service.configuration;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -13,12 +16,14 @@ import org.springframework.transaction.annotation.Transactional;
 import com.beust.jcommander.internal.Lists;
 import com.nis.domain.Page;
 import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.domain.configuration.DdosIpCfg;
 import com.nis.domain.configuration.IpReuseDnatPolicyCfg;
 import com.nis.domain.configuration.IpReusePolicyCfg;
 import com.nis.domain.maat.ToMaatResult;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
+import com.nis.util.StringUtils;
 import com.nis.web.dao.configuration.IpMultiplexDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;

src/main/java/com/nis/web/service/configuration/MailCfgService.java

@@ -249,7 +249,7 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditMailCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditMailCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}

src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java

@@ -374,7 +374,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditHttpCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditHttpCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}
@@ -828,7 +828,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditSslCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditSslCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}
@@ -1131,7 +1131,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditDnsCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditDnsCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}

src/main/java/com/nis/web/service/specific/SpecificServiceCfgService.java

@@ -33,11 +33,11 @@ public class SpecificServiceCfgService extends BaseService{
 	public SpecificServiceCfg getBySpecServiceId(Integer specServiceId) {
 		return specificServiceCfgDao.getBySpecServiceId(specServiceId);
 	}
-	public List<SpecificServiceCfg> getBySpecServiceCodes(String specServiceCodes,Integer cfgType) {
+	public List<SpecificServiceCfg> getBySpecServiceCodes(String specServiceCodes) {
 		for(String specServiceId:specServiceCodes.split(",")) {
 			Integer.parseInt(specServiceId);
 		}
-		return specificServiceCfgDao.getBySpecServiceCodes(specServiceCodes,cfgType);
+		return specificServiceCfgDao.getBySpecServiceCodes(specServiceCodes);
 	}
 	/**
 	 * 查询所有符合条件的顶层分页

src/main/java/com/nis/web/service/specific/SpecificServiceHostCfgService.java

@@ -17,6 +17,7 @@ import com.nis.domain.Page;
 import com.nis.domain.SysUser;
 import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.domain.specific.SpecificServiceHostCfg;
+import com.nis.util.BasicProvingUtil;
 import com.nis.util.StringUtil;
 import com.nis.web.dao.specific.SpecificServiceHostCfgDao;
 import com.nis.web.security.UserUtils;
@@ -57,66 +58,45 @@ public class SpecificServiceHostCfgService extends BaseService{
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public void saveOrUpdate(SpecificServiceHostCfg specificServiceHostCfg) {
 		SysUser user = UserUtils.getUser();
-		String defaultSrcIp = "0.0.0.0"; //缺省0.0.0.0值表示任意
-		String defaultDestIp = "0.0.0.0"; //缺省0.0.0.0值表示任意
+		String defaultIp = "0.0.0.0"; //缺省0.0.0.0值表示任意
 		if(specificServiceHostCfg.getIpType().equals(4)){
-			if(specificServiceHostCfg.getSrcIpPattern()==1){
-				defaultSrcIp = "0.0.0.0/32"; //0.0.0.0表示任意
-			}else if(specificServiceHostCfg.getSrcIpPattern()==2){
-				defaultSrcIp = "0.0.0.0-0.0.0.0"; 
+			if(specificServiceHostCfg.getIpPattern()==1){
+				defaultIp = "0.0.0.0/32"; //0.0.0.0表示任意
+			}else if(specificServiceHostCfg.getIpPattern()==2){
+				defaultIp = "0.0.0.0-0.0.0.0"; 
 			}else{
-				defaultSrcIp = "0.0.0.0";
-			}
-			if(specificServiceHostCfg.getDestIpPattern()==1){
-				defaultDestIp = "0.0.0.0/32"; //0.0.0.0表示任意
-			}else if(specificServiceHostCfg.getDestIpPattern()==2){
-				defaultDestIp = "0.0.0.0-0.0.0.0"; 
-			}else{
-				defaultDestIp = "0.0.0.0";
+				defaultIp = "0.0.0.0";
 			}
 			
 		}
 		if(specificServiceHostCfg.getIpType().equals(6)){
-			if(specificServiceHostCfg.getSrcIpPattern()==1){
-				defaultSrcIp = "::/64";
-			}else if(specificServiceHostCfg.getSrcIpPattern()==2){
-				defaultSrcIp = "::-::"; 
+			if(specificServiceHostCfg.getIpPattern()==1){
+				defaultIp = "::/64";
+			}else if(specificServiceHostCfg.getIpPattern()==2){
+				defaultIp = "::-::"; 
 			}else{
-				defaultSrcIp = "::";
-			}
-			if(specificServiceHostCfg.getDestIpPattern()==1){
-				defaultDestIp = "::/64";
-			}else if(specificServiceHostCfg.getDestIpPattern()==2){
-				defaultDestIp = "::-::"; 
-			}else{
-				defaultDestIp = "::";
+				defaultIp = "::";
 			}
 		}
-		String defaultSrcPort = "0"; //0表示任意
-		String defaultDestPort = "0"; //0表示任意
-		if(specificServiceHostCfg.getSrcPortPattern().equals(1)){
-			defaultSrcPort = "0";
+		String defaultPort = "0"; //0表示任意
+		if(specificServiceHostCfg.getPortPattern().equals(1)){
+			defaultPort = "0";
 		}else{
-			defaultSrcPort = "0/0";
-		}
-		if(specificServiceHostCfg.getDestPortPattern().equals(1)){
-			defaultDestPort = "0";
-		}else{
-			defaultDestPort = "0/0";
+			defaultPort = "0/0";
 		}
 		//ip地址默认  缺省0.0.0.0值表示任意
 		if(StringUtil.isBlank(specificServiceHostCfg.getSrcIpAddress())){
-			specificServiceHostCfg.setSrcIpAddress(defaultSrcIp);
+			specificServiceHostCfg.setSrcIpAddress(defaultIp);
 		}
 		if(StringUtil.isBlank(specificServiceHostCfg.getDestIpAddress())){
-			specificServiceHostCfg.setDestIpAddress(defaultDestIp);
+			specificServiceHostCfg.setDestIpAddress(defaultIp);
 		}
 		//端口掩码默认
 		if(StringUtil.isBlank(specificServiceHostCfg.getSrcPort())){
-			specificServiceHostCfg.setSrcPort(defaultSrcPort);
+			specificServiceHostCfg.setSrcPort(defaultPort);
 		}
 		if(StringUtil.isBlank(specificServiceHostCfg.getDestPort())){
-			specificServiceHostCfg.setDestPort(defaultDestPort);
+			specificServiceHostCfg.setDestPort(defaultPort);
 		}
 		//方向缺省
 		if(specificServiceHostCfg.getDirection()==null){

src/main/java/com/nis/web/test/MaatCfgConverTest.java

@@ -31,24 +31,20 @@ public class MaatCfgConverTest {
 		ToMaatBean maat = new ToMaatBean();
 		BaseStringCfg str = new BaseStringCfg();
 		BaseIpCfg ip = new BaseIpCfg();
-		ip.setSrcIpPattern(1);
-		ip.setDestIpPattern(1);
+		ip.setIpPattern(1);
 		ip.setIpType(4);
 		ip.setSrcIpAddress("192.168.10.0/24");
-		ip.setSrcPortPattern(2);
-		ip.setDestPortPattern(2);
+		ip.setPortPattern(2);
 		ip.setSrcPort("8080-8089");
 		ip.setCompileId(123);
 		ip.setProtocol(6);
 		ip.setDirection(2);
 		ipList.add(ip);
 		ip = new BaseIpCfg();
-		ip.setSrcIpPattern(2);
-		ip.setDestIpPattern(2);
+		ip.setIpPattern(2);
 		ip.setIpType(4);
 		ip.setSrcIpAddress("10.0.6.0-10.0.6.100");
-		ip.setSrcPortPattern(1);
-		ip.setDestPortPattern(1);
+		ip.setPortPattern(1);
 		ip.setSrcPort("7080/65534");
 		ip.setCompileId(124);
 		ip.setDirection(1);
@@ -71,17 +67,17 @@ public class MaatCfgConverTest {
 		for(BaseIpCfg c:ipList){
 			IpCfg ipCfg = new IpCfg();
 			ipCfg.setRegionId(regionId);
-			if(c.getSrcIpPattern()==1){
+			if(c.getIpPattern()==1){
 				ipCfg.setSrcIp(c.getSrcIpAddress().split("/")[0]);
 				ipCfg.setSrcIpMask(IpUtil.convertMask(Integer.parseInt(c.getSrcIpAddress().split("/")[1])));
-			}else if(c.getSrcIpPattern()==2){
+			}else if(c.getIpPattern()==2){
 				ipCfg.setSrcIp(c.getSrcIpAddress().split("-")[0]);
 				ipCfg.setSrcIpMask(IpUtil.getMask(c.getSrcIpAddress().split("-")[0], c.getSrcIpAddress().split("-")[1]));
 			}
-			if(c.getSrcPortPattern()==1){
+			if(c.getPortPattern()==1){
 				ipCfg.setSrcPort(c.getSrcPort().split("/")[0]);
 				ipCfg.setSrcPortMask(c.getSrcPort().split("/")[1]);
-			}else if(c.getSrcPortPattern()==2){
+			}else if(c.getPortPattern()==2){
 				ipCfg.setSrcPort(c.getSrcPort().split("-")[0]);
 				Integer portMask = Integer.parseInt(c.getSrcPort().split("-")[1])-Integer.parseInt(c.getSrcPort().split("-")[0]);
 				ipCfg.setSrcPortMask(portMask.toString());

src/main/resources/messages/message_en.properties

@@ -547,7 +547,7 @@ ftp_ip=FTP IP Configuration
 dns_ip=DNS IP Configuration
 dns_domain=DNS Domain Configuration
 action=Action
-has_prohibit_delete=Only unaudited and cancel configurations can be deleted
+has_prohibit_delete=Only unconfirmed configuration can be deleted
 has_prohibit_nopass=Only unconfirmed configuration can be confirmed
 has_prohibit_pass=Only unconfirmed configuration can be confirmed
 multiple_keywords_tip=Multiple keyword can be input,Please separate it with the return key.
@@ -1523,8 +1523,7 @@ common_ip_config=Common IP Config
 common_group=Common Group
 dns_keyword_group_manage=DNS Keyword Group Manage
 old_asn_group_manage=ASN Group
-url_group_manage=URL Group Manage
-range_cross=Found intersections between Server IP address and Client IP address
+url_group_manage=URL Group Manage
+range_cross=Found intersections between Server IP address and Client IP address
 app_ip_correlation=APP IP Correlation
-public_private_file_error=Public-private key mismatch
-https_url_format_tip=URL(http[s]://xxx.xx)
+public_private_file_error=Public-private key mismatch

src/main/resources/messages/message_ru.properties

@@ -547,7 +547,7 @@ ftp_ip=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f
 dns_ip=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f DNS IP
 dns_domain=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0434\u043e\u043c\u0435\u043d\u0430 DNS
 action=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435
-has_prohibit_delete= только удаляет незаконченные настройки и отменяет проверку конфигурации
+has_prohibit_delete=\u0422\u043e\u043b\u044c\u043a\u043e \u043d\u0435\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u043d\u0430\u044f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0443\u0434\u0430\u043b\u0435\u043d\u0430
 has_prohibit_nopass=\u0422\u043e\u043b\u044c\u043a\u043e \u043d\u0435\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u043d\u0430\u044f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0430
 has_prohibit_pass=\u0422\u043e\u043b\u044c\u043a\u043e \u043d\u0435\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u043d\u0430\u044f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0430
 multiple_keywords_tip=\u041c\u043e\u0436\u043d\u043e \u0432\u0432\u0435\u0441\u0442\u0438 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043a\u043b\u044e\u0447\u0435\u0432\u044b\u0445 \u0441\u043b\u043e\u0432,\u0440\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u0435 \u0438\u0445 \u043a\u043b\u0430\u0432\u0438\u0448\u0435\u0439 "Enter".
@@ -1512,7 +1512,7 @@ effective=\u0410\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u04
 admin_user_warn=\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435 \u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0410\u0434\u043c\u0438\u043d
 interface_total=\u041e\u0431\u0449\u0435\u0435 \u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0418\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430
 service_total=\u041e\u0431\u0449\u0435\u0435 \u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0421\u0435\u0440\u0432\u0438\u0441\u0430
-none_file_tip=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b%21
+none_file_tip=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b%21
 the_same_ip_type=IP-\u0430\u0434\u0440\u0435\u0441 \u043A\u043B\u0438\u0435\u043D\u0442\u0430 \u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0434\u043E\u043B\u0436\u043D\u044B \u0438\u043C\u0435\u0442\u044C \u043E\u0434\u0438\u043D \u0438 \u0442\u043E\u0442 \u0436\u0435 \u0442\u0438\u043F.
 src_ip_pattern=\u0424\u043e\u0440\u043c\u0430\u0442 ip \u041a\u043b\u0438\u0435\u043d\u0442\u0430
 dest_ip_pattern=\u0424\u043e\u0440\u043c\u0430\u0442 ip \u0421\u0435\u0440\u0432\u0435\u0440\u0430
@@ -1520,14 +1520,12 @@ src_port_pattern=\u0424\u043e\u0440\u043c\u0430\u0442 \u041f\u043e\u0440\u0442\u
 dest_port_pattern=\u0424\u043e\u0440\u043c\u0430\u0442 \u041f\u043e\u0440\u0442\u0430 \u0421\u0435\u0440\u0432\u0435\u0440\u0430
 url_group_configuration=URL Group Configuration
 dns_keyword_group_configuration=DNS Keyword Group Configuration
-app_ip_correlation=APP IP Correlation
 ip_group=IP Group
 common_ip_config=Common IP Config
 common_group=Common Group
 dns_keyword_group_manage=DNS Keyword Group Manage
 old_asn_group_manage=ASN Group
-url_group_manage=URL Group Manage
+url_group_manage=URL Group Manage
 range_cross=\u041d\u0430\u0439\u0434\u0435\u043d\u044b \u043f\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043d\u0438\u044f \u043c\u0435\u0436\u0434\u0443 ip-\u0430\u0434\u0440\u0435\u0441\u043e\u043c \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0438 ip-\u0430\u0434\u0440\u0435\u0441\u043e\u043c \u043a\u043b\u0438\u0435\u043d\u0442\u0430
 app_ip_correlation=\u041a\u043e\u0440\u0440\u0435\u043b\u044f\u0446\u0438\u044f ip-\u0430\u0434\u0440\u0435\u0441\u043e\u0432 \u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439
-public_private_file_error=\u041d\u0435\u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435 \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u043e-\u043f\u0440\u0438\u0432\u0430\u0442\u043d\u043e\u0433\u043e \u043a\u043b\u044e\u0447\u0430.
-https_url_format_tip=URL(http[s]://xxx.xx)
+public_private_file_error=\u041d\u0435\u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435 \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u043e-\u043f\u0440\u0438\u0432\u0430\u0442\u043d\u043e\u0433\u043e \u043a\u043b\u044e\u0447\u0430.

src/main/resources/messages/message_zh_CN.properties

@@ -546,7 +546,7 @@ ftp_ip=FTP IP\u914d\u7f6e
 dns_ip=DNS IP\u914d\u7f6e
 dns_domain=DNS\u57df\u540d\u914d\u7f6e
 action=\u52a8\u4f5c
-has_prohibit_delete=\u53ea\u80fd\u5220\u9664\u672a\u5ba1\u6838\u7684\u914d\u7f6e\u4e0e\u53d6\u6d88\u5ba1\u6838\u901a\u8fc7\u7684\u914d\u7f6e
+has_prohibit_delete=\u53ea\u6709\u672a\u5ba1\u6838\u7684\u914d\u7f6e\u53ef\u5220\u9664
 has_prohibit_nopass=\u53ea\u6709\u672a\u5ba1\u6838\u7684\u914d\u7f6e\u53ef\u672a\u901a\u8fc7\u5ba1\u6838
 has_prohibit_pass=\u53ea\u6709\u672a\u5ba1\u6838\u7684\u914d\u7f6e\u53ef\u4ee5\u5ba1\u6838\u901a\u8fc7
 multiple_keywords_tip=\u53ef\u540c\u65f6\u8f93\u5165\u591a\u6761\u5173\u952e\u5b57\uff0c\u8bf7\u4ee5\u56de\u8f66\u952e\u9694\u5f00\u3002
@@ -706,7 +706,7 @@ ir_type=\u590d\u7528\u7c7b\u578b
 dns_strategy_id=DNS\u7b56\u7565ID
 no_strategy=\u9ed8\u8ba4\u7b56\u7565
 domain=\u57df\u540d
-app_ip_config=APP\u534F\u8BAEIP\u914D\u7F6E
+app_ip_config=APP IP
 bytes=\u5b57\u8282
 app_http_config=APP HTTP\u7279\u5f81
 app_domain_config=APP\u57df\u540d\u7279\u5f81
@@ -1116,11 +1116,11 @@ access_policy=\u8bbf\u95ee\u7b56\u7565
 nat_policy=\u5730\u5740\u8f6c\u6362\u7b56\u7565
 dns_policy_object=DNS\u7b56\u7565\u5bf9\u8c61
 proxy_policy_object=Proxy\u7b56\u7565\u5bf9\u8c61 
-APP_PAYLOAD_ADMIN=APP Payload \u7279\u5f81
-APP_HTTP_ADMIN=APP HTTP \u7279\u5f81
-APP_DNS_ADMIN=APP DNS \u7279\u5f81
-APP_SSL_ADMIN=APP SSL \u7279\u5f81
-APP_DK_GL=APP \u5173\u8054\u7279\u5f81
+APP_PAYLOAD_ADMIN=APP Payload Admin
+APP_HTTP_ADMIN=APP HTTP Admin
+APP_DNS_ADMIN=APP DNS Admin
+APP_SSL_ADMIN=APP SSL Admin
+APP_DK_GL=APP Correlation Feature
 dnat_complex_loop=DNAT IP\u590d\u7528\u56de\u6d41
 snat_policy=SNAT\u590d\u7528\u7b56\u7565
 dnat_policy=DNAT\u590d\u7528\u7b56\u7565
@@ -1133,15 +1133,15 @@ av_voip_reject=VoIP\u963b\u65ad
 label_proto_source=\u534f\u8bae\u6765\u6e90
 label_behav_source=\u884c\u4e3a\u6765\u6e90
 label_app_source=\u5e94\u7528\u6765\u6e90
-packet=\u5305
-stream=\u6D41
+packet=Packet
+stream=Stream
 protocol_menu=Protocol
 advanced=Advanced
-protocol_identify=\u57FA\u7840\u534F\u8BAE
+protocol_identify=Protocol Identify
 MM_FILE_DIGEST=\u6587\u4ef6\u6458\u8981
 NTC_ASN_IP=ASN
 NTC_STREAMING_MEDIA_URL=URL
-NTC_VOIP_ACCOUNT=VoIP \u8d26\u6237
+NTC_VOIP_ACCOUNT=VoIP Account
 export_failed=\u5bfc\u51fa\u5931\u8d25
 user_manage=\u5ba2\u6237\u7aef\u8d26\u53f7\u7ba1\u7406
 ip_reuse_policy_object=IP\u590d\u7528\u7b56\u7565\u5bf9\u8c61
@@ -1163,7 +1163,7 @@ log_user=\u64cd\u4f5c\u7528\u6237
 log_submission=\u8bf7\u6c42\u65b9\u6cd5
 log_ip=\u64cd\u4f5c\u8005IP
 log_exception_info=\u5f02\u5e38\u4fe1\u606f
-system_log=Log \u7ba1\u7406
+system_log=Log Management
 protected_ddos=\u4fdd\u62a4DDOS\u653b\u51fb
 usual_ddos=\u5e38\u7528DDOS\u653b\u51fb
 mail_address=\u90ae\u4ef6\u5730\u5740
@@ -1194,17 +1194,17 @@ certificate_error=\u516c\u94a5\u3001\u79c1\u94a5\u6587\u4ef6\u683c\u5f0f\u9519\u
 public_file_error=\u516c\u94a5\u6587\u4ef6\u683c\u5f0f\u9519\u8bef
 keyframe_pic_required=\u5c1a\u672a\u9009\u62e9\u5173\u952e\u5e27\u56fe\u7247
 private_file_error=\u79c1\u94a5\u6587\u4ef6\u683c\u5f0f\u9519\u8bef
-ipv4_range_tip=IPv4 \u8303\u56f4
-ipv4_subnet_tip=IPv4/\u5b50\u7f51\u63a9\u7801
-ipv6_range_tip=IPv6 \u8303\u56f4
-ipv6_subnet_tip=IPv6/\u5b50\u7f51\u63a9\u7801
-example_tip=\u4f8b\u5982
-rule_desc_tip=\u89c4\u5219\u63cf\u8ff0
-port_comment_tip=Port\u5fc5\u987b\u5728 0 \u548c 65535 \u4e4b\u95f4
-port_mask_comment_tip=Port \u548c port \u63a9\u7801 \u5fc5\u987b\u5728 0 \u548c 65535 \u4e4b\u95f4
-multi_keywords_tip=\u5141\u8bb8\u8f93\u5165\u591a\u4e2a\u5173\u952e\u5b57\uff0c\u5e76\u7528\u6362\u884c\u7b26\u66ff\u6362\u591a\u4e2a\u5173\u952e\u5b57
-visible_keyword_tip=\u5355\u4e2a\u5173\u952e\u5b57\u4e0d\u5141\u8bb8\u8f93\u5165\u4e0d\u53ef\u89c1\u7684\u5b57\u7b26
-single_keyword_tip=\u53ea\u5141\u8bb8\u8f93\u5165\u4e00\u4e2a\u952e
+ipv4_range_tip=IPv4 Range
+ipv4_subnet_tip=IPv4/Subnet Mask
+ipv6_range_tip=IPv6 Range
+ipv6_subnet_tip=IPv6/Subnet Mask
+example_tip=For Example
+rule_desc_tip=Rule description
+port_comment_tip=Port must between 0 and 65535
+port_mask_comment_tip=Port and port mask must between 0 and 65535
+multi_keywords_tip=Allow multiple keywords to be entered and multiple keywords to be replaced by line breaks.
+visible_keyword_tip=Single keyword is not allowed to enter invisible characters.
+single_keyword_tip=Only single key input is allowed.
 ipv4_mask_range_tip=IP\u63a9\u7801\u5fc5\u987b\u4ecb\u4e8e16\u548c32\u4e4b\u95f4
 ipv6_mask_range_tip=IP\u63a9\u7801\u5fc5\u987b\u4ecb\u4e8e2\u548c128\u4e4b\u95f4
 letter_cancel_info=\u53d6\u6d88\u5ba1\u6838\u6765\u51fd
@@ -1216,7 +1216,7 @@ has_invisible_char=%s\u5305\u542b\u4e0d\u53ef\u89c1\u5b57\u7b26
 not_multiple=%s\u4e0d\u652f\u6301\u591a\u4e2a\u5173\u952e\u5b57
 template_error=\u5bfc\u5165\u6a21\u677f\u9519\u8bef.
 asn_no=ASN
-query=\u67e5\u8be2
+query=Query
 cfg_operation_log=\u914d\u7f6e\u64cd\u4f5c\u65e5\u5fd7
 function_name=\u64cd\u4f5c\u6a21\u5757
 config_service_statistics=\u914d\u7f6e\u7edf\u8ba1
@@ -1232,7 +1232,7 @@ default_value=\u9ed8\u8ba4\u503c
 intercept=\u62e6\u622a
 unkown_error=\u672a\u77e5\u9519\u8bef\u4fe1\u606f
 exception_info=\u5f02\u5e38\u4fe1\u606f
-no_tc_udp_port_comment_tip=Port \u5fc5\u987b\u4e3a 0
+no_tc_udp_port_comment_tip=Port must be 0
 website_advanced_reject=HTTP Advanced\u963b\u65ad
 website_advanced_monit=HTTP Advanced\u76d1\u6d4b
 snat_ip_reuse_adress_pool_loop=SNAT\u5730\u5740\u6c60\u7ba1\u7406\u56de\u6d41
@@ -1322,10 +1322,10 @@ transfer_bytes=\u4f20\u8f93\u6570\u636e\u5b57\u8282
 user_info=\u7528\u6237\u4fe1\u606f
 user_list=\u7528\u6237\u5217\u8868
 equal_password=\u5bc6\u7801\u4e0d\u4e00\u81f4\uff01
-outgoing_unicast_packets=\u4e0a\u4f20\u6570\u636e\u5305\u6570
-outgoing_unicast_total_size=\u4e0a\u4f20\u6570\u636e\u5b57\u8282\u6570
-incoming_unicast_packets=\u4e0b\u8f7d\u6570\u636e\u5305\u6570
-incoming_unicast_total_size=\u4e0b\u8f7d\u6570\u636e\u5b57\u8282\u6570
+outgoing_unicast_packets=Upload Packets
+outgoing_unicast_total_size=Upload Byte
+incoming_unicast_packets=Download Packets
+incoming_unicast_total_size=Download Byte
 address_pool=\u5730\u5740\u6c60\u540d\u79f0
 ip_total=IP\u603b\u6570
 available_ip_total=\u53ef\u7528IP\u6570
@@ -1358,17 +1358,17 @@ website_keyword_monit=\u5173\u952e\u5b57\u76d1\u6d4b
 website_keyword_reject=\u5173\u952e\u5b57\u963b\u65ad
 radius_log=Radius \u65e5\u5fd7
 message_type=Code
-nas_ip=NAS IP \u5730\u5740
-framed_ip=Framed IP \u5730\u5740
-log_user_name=\u7528\u6237\u540d
+nas_ip=NAS IP Address
+framed_ip=Framed IP Address
+log_user_name=User Name
 av_tips=\u5bf9\u4e8e\u97f3\u89c6\u9891\u7f16\u7801\u7684\u7d22\u5f15\u4fe1\u606f\u5728\u97f3\u89c6\u9891\u6587\u4ef6\u5c3e\u90e8\u7684\u60c5\u51b5\uff0c\u672c\u7cfb\u7edf\u4e0d\u4e88\u652f\u6301\uff0c\u5bf9\u4e8e\u5206\u8fa8\u7387\u5927\u4e8e4\u5146\u7684\u89c6\u9891\uff0c\u672c\u7cfb\u7edf\u4e0d\u4e88\u652f\u6301
 asn_ip_group_delete=(\u8be5ASN\u7ec4\u4e0b\u7684IP\u914d\u7f6e\u4e5f\u4f1a\u88ab\u5220\u9664)
 keyword_log_tips=\u6e05\u6d17\u540e\u7f51\u9875\u5173\u952e\u5b57\u65e5\u5fd7\uff0c\u7f51\u9875\u5173\u952e\u5b57\u7ba1\u63a7\u72b6\u51b5\u4e0d\u7406\u60f3\u65f6\uff0c\u53ef\u5c06\u6e05\u6d17\u540e\u5efa\u8bae\u7ed9\u51fa\u7684\u547d\u4e2d\u5173\u952e\u5b57\u7f51\u9875\u914d\u7f6e\u4e3aURL\u7ba1\u63a7
 conn_record=\u901a\u8054\u5173\u7cfb
 bps=Gbps
-bps_percent=Bps \u767e\u5206\u6bd4
+bps_percent=Bps Percent
 pps=PPS
-pps_percent=pps \u767e\u5206\u6bd4
+pps_percent=pps Percent
 spoofing_ip_object=Spoofing IP Pool
 spoofing_ip_policy=IP Spoofing
 action_spoofing=Spoofing
@@ -1376,32 +1376,32 @@ spoofing=spoofing
 service=Service
 s_asn=SASN
 d_asn=DASN
-asn_conn_report=ASN\u7edf\u8ba1
-https_url_report=Http(s) URL\u7edf\u8ba1
+asn_conn_report=ASN Statistics
+https_url_report=Http(s) URL Statistics
 url=URL
-sum=\u603b\u91cf
-url_count=URL \u6570\u91cf
-ip_range_report=IP\u8303\u56f4\u7edf\u8ba1
+sum=SUM
+url_count=URL Count
+ip_range_report=IN/EX Host Identity
 ip_start=Start IP
 ip_end=End IP
-ip_start_num=IP Start \u6570\u91cf
-ip_end_num=IP End \u6570\u91cf
+ip_start_num=IP Start Num
+ip_end_num=IP End Num
 ip_sub=IP Subnet
-start_ip=\u6e90 IP
-end_ip=\u76ee\u7684 IP
+start_ip=Start IP
+end_ip=End IP
 action_detail=\u52a8\u4f5c\u8be6\u60c5
 pass=Pass
 live_link=Live
-area_type=\u5730\u57df\u7c7b\u578b
+area_type=Area Type
 dns_group_manage=DNS\u5206\u7ec4\u7ba1\u7406
 asn_group_manage=ASN\u5206\u7ec4\u7ba1\u7406
 ip_group_manage=IP\u5206\u7ec4\u7ba1\u7406
 ip_spoofing_group_manage=IP Spoofing\u5206\u7ec4\u7ba1\u7406
-min_tcp=\u6700\u5c0f
-max_tcp=\u6700\u5927
+min_tcp=Min
+max_tcp=Max
 APP_TCP_SESSION_BYTE=Session
-ip_count=Unique IP \u6570\u91cf
-counnection_count=Connection \u6570\u91cf
+ip_count=Unique IP Count
+counnection_count=Connection Count
 asn=ASN
 Unique_num=Unique
 ip=IP
@@ -1410,8 +1410,8 @@ unique_num=Unique
 import_limit_is=\u5bfc\u5165\u9650\u5236\u6700\u5927\u6761\u6570
 upload_limit_is=\u6587\u4ef6\u4e0a\u4f20\u4e2a\u6570\u9650\u5236
 count=\u6570\u91cf
-do_blacklist=\u672c\u5730\u9ed1\u540d\u5355
-l3_header_error=\u6700\u591a\u53ea\u5141\u8bb8\u8f93\u5165\u56db\u4e2a\u5c5e\u6027\u503c
+do_blacklist=Blacklist Option
+l3_header_error=Only four attribute values are allowed to be entered at most
 IP_HEADER=IP Header
 ICMP_HEADER=ICMP Header
 offset_expression=Offset Expression
@@ -1486,7 +1486,7 @@ GByte=GByte
 interval=\u95f4\u9694
 month=\u6708
 day=\u65e5
-week=\u5468
+week=weeks
 startTime=\u5f00\u59cb\u65f6\u95f4
 endTime=\u7ed3\u675f\u65f6\u95f4
 single=\u5355\u6b21
@@ -1496,8 +1496,8 @@ everyMonth=\u6bcf\u6708
 on=On
 validate_error=\u9a8c\u8bc1\u65f6\u53d1\u751f\u610f\u5916\u9519\u8bef
 is_schduler=\u5b9a\u65f6\u5668
-v4_num=IPv4 \u6570\u91cf
-v6_num=IPv6 \u6570\u91cf
+v4_num=IPv4 Number
+v6_num=IPv6 Number
 always=\u957f\u671f
 schedule=Scheduler
 cancel_all=\u53d6\u6d88\u6240\u6709\u914d\u7f6e!
@@ -1515,17 +1515,16 @@ the_same_ip_type=\u6e90IP\u4e0e\u76ee\u7684IP\u7684IP\u7c7b\u578b\u5fc5\u987b\u7
 src_ip_pattern=\u6E90IP\u683C\u5F0F
 dest_ip_pattern=\u76EE\u7684IP\u683C\u5F0F
 src_port_pattern=\u6E90\u7AEF\u53E3\u683C\u5F0F
-dest_port_pattern=\u76EE\u7684\u7AEF\u53E3\u683C\u5F0F
-url_group_configuration=URL \u5206\u7ec4\u914d\u7f6e
-dns_keyword_group_configuration=DNS \u5173\u952e\u5b57\u5206\u7ec4\u914d\u7f6e
-app_ip_correlation=APP IP \u901a\u8054
-ip_group=IP \u5206\u7ec4
-common_ip_config=Common IP \u914d\u7f6e
-common_group=Common \u5206\u7ec4
-dns_keyword_group_manage=DNS \u5173\u952e\u5b57\u5206\u7ec4\u7ba1\u7406
-old_asn_group_manage=ASN \u5206\u7ec4
-url_group_manage=URL \u5206\u7ec4 \u7ba1\u7406
-range_cross=\u6E90IP\u4E0E\u76EE\u7684IP\u8303\u56F4\u6709\u4EA4\u53C9
+dest_port_pattern=\u76EE\u7684\u7AEF\u53E3\u683C\u5F0F
+url_group_configuration=URL Group Configuration
+dns_keyword_group_configuration=DNS Keyword Group Configuration
+app_ip_correlation=APP IP Correlation
+ip_group=IP Group
+common_ip_config=Common IP Config
+common_group=Common Group
+dns_keyword_group_manage=DNS Keyword Group Manage
+old_asn_group_manage=ASN Group
+url_group_manage=URL Group Manage
+range_cross=\u6E90IP\u4E0E\u76EE\u7684IP\u8303\u56F4\u6709\u4EA4\u53C9
 app_ip_correlation=APP\u5173\u8054\u7279\u5F81IP\u914D\u7F6E
-public_private_file_error=\u516C\u79C1\u94A5\u8BC1\u4E66\u4E0D\u5339\u914D
-https_url_format_tip=URL(http[s]://xxx.xx)
+public_private_file_error=\u516C\u79C1\u94A5\u8BC1\u4E66\u4E0D\u5339\u914D

src/main/resources/nis.properties

@@ -9,6 +9,9 @@ page.pageSize=20
 #\u5206\u9875\u914d\u7f6e
 page.count=0
 
+#\u7d22\u5f15\u9875\u8def\u5f84
+web.view.index=/nis/index
+
 #\u7f13\u5b58\u8bbe\u7f6e
 ehcache.configFile=cache/ehcache-local.xml
 #ehcache.configFile=cache/ehcache-rmi.xml
@@ -57,12 +60,71 @@ version=V1.0.0
 #\u4e0a\u4f20\u6587\u4ef6\u7edd\u5bf9\u8def\u5f84, \u8def\u5f84\u4e2d\u4e0d\u5141\u8bb8\u5305\u542b\u201cuserfiles\u201d
 userfiles.basedir=upload
 
+
+#============================#
+#===== webservice settings ======#
+#============================#
+
+#ESB\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\u1e69\ufffd\ufffd\u0373\u04bb\ufffd\ufffd\u05b7
+webservice.esb.endpoint=http://10.55.0.197:7879/TongServiceProxy_doprocess/services/WebService1/
+#webservice RID
+webservice.rid=XFBL
+
+#webservice user SID
+webservice.yh.sid=s_2016_x2000
+
+#webservice office SID
+webservice.jg.sid=s_2015_x2000
+
+#webservice data dict SID
+webservice.data.dict.sid=s_2031_x2000
+
+#webservice data dict bm SID
+webservice.data.dict.bm.sid=s_2032_x2000
+
+#webservice data dict code SID
+webservice.data.dict.code.sid=s_2042_0660BD17-35E4-4482-AA3A-556F2C024902
+
+#webservice request timeout for seconds
+webservice.request.timeout=30
+
+#\ufffd\ufffd\ufffd\ufffd\ufffdURL
+webservice.jg.service.url=http://10.55.0.155:8080/jgService
+
+#\ufffd\u00fb\ufffd\ufffd\ufffd\ufffd\ufffdURL
+webservice.yh.service.url=http://10.55.0.155:8080/ryService
+
+#\ufffd\ufffd\ufffd\ufffd\u05b5\ufffdURL
+webservice.data.dict.service.url=http://10.55.0.155:8080/sjzdService
+
+#\ufffd\ufffd\ufffd\ufffd\u05b5\ufffd\ufffd\ufffd\ufffdURL
+webservice.data.dict.bm.url=http://10.55.0.155:8080/sjzdbmService
+
+#\ufffd\ufffd\ufffd\ufffd\ufffd\ufffdURL
+webservice.data.code.url=http://10.55.0.155:8080/sjmbService
+
+#webservice\ufffd\u04ff\ufffd\ufffd\ufffd\ufffd\u00ff\u04b3\ufffd\ufffd\ufffd\ufffd
+webservice.data.pagesize = 2000
+#webservice\ufffd\ufffd\u01f0\u012c\ufffd\ufffd\u04b3
+webservice.data.currentpage = 1
+
+#webservice \ufffd\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
+webservice.jgmb.name=CK_T_JC_RY
+#webservice \ufffd\u00fb\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd
+webservice.yhmb.name=CK_T_YH_RY
+#webservice\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd \u022b\ufffd\ufffd
+webservice.method.name.ql=getData
+# webservice\ufffd\ufffd\ufffd\ufffd\ufffd\ufffd \ufffd\ufffd\ufffd\ufffd
+webservice.method.name.zl=getDataZL
+
 # redis\u914d\u7f6e\u6587\u4ef6
 #redis \u5404\u4e2a\u5206\u7247\u7684 IP\u7aef\u53e3
 redis.cluster.host_port=10.0.6.32:6379,10.0.6.32:6380,10.0.6.32:6381,10.0.6.33:6379,10.0.6.33:6380,10.0.6.33:6381
 
 
 #\u4e2d\u5fc3\u73b0\u573aredis\u5730\u5740\u548c\u7aef\u53e3
+#redis.cluster.host_port=10.174.196.33:6379,10.174.196.33:6380,10.174.196.33:6381,10.174.196.34:6379,10.174.196.34:6380,10.174.196.34:6381,10.174.196.35:6379,10.174.196.35:6380,10.174.196.35:6381,10.174.196.36:6379,10.174.196.36:6380,10.174.196.36:6381,10.174.196.37:6379,10.174.196.37:6380,10.174.196.37:6381,10.174.196.38:6379,10.174.196.38:6380,10.174.196.38:6381,10.174.196.39:6379,10.174.196.39:6380,10.174.196.39:6381
+
 redis.cluster.connectiontimeout=5000
 redis.cluster.sotimeout=5000
 redis.cluster.maxattempts=3
@@ -107,12 +169,54 @@ http.pool.maxTotal=200
 http.pool.defaultMaxPerRoute=100 
 ##########HTTPCLIENT POOL END###################
 search.dateformat=yyyy-MM-dd HH:mm:ss
+search.eshostandport_A=10.0.6.115:9200
+search.eshostandport_B=10.0.6.115:9200
+search.eshostandport_C=10.0.6.115:9200
+
+#search.eshostandport=10.174.196.135:9200
+
+
+#\u65e5\u5fd7\u662f\u5426\u4ecehive\u4e2d\u67e5\u8be2
+selFromHive=false
+
+#\u662f\u5426\u83b7\u53d6\u6570\u636e\u4e2d\u5fc3\u67e5\u8be2\u8bb0\u5f55\u7684\u603b\u6761\u6570
+isGetHiveCount=false
+
 #\u6bcf\u6b21\u83b7\u53d6\u6570\u636e\u4e2d\u5fc3\u591a\u5c11\u6761\u6570\u636e,\u54b1\u4eec\u5728\u5bf9\u83b7\u53d6\u7684\u6570\u636e\u8fdb\u884c\u5206\u9875\u5904\u7406
 everyGetHiveDataNum=10000
 
+#oracle\u6570\u636e\u5e93\u6709\u95ee\u9898\u4e0d\u4eceoracle\u67e5\u8be2\u6570\u636e,\u6240\u6709\u65e5\u5fd7\u6570\u636e\u5747\u4ece\u6570\u636e\u4e2d\u5fc3\u67e5\u8be2
+onlySelFromHive=false
+
+#\u662f\u5426\u67e5\u8be2\u795e\u901a\u6570\u636e\u5e93
+isSelectCluster=true
+
 #\u7528\u6237\u67e5\u8be2\u65e5\u5fd7\u8d85\u8fc7\u591a\u5c11\u5c0f\u65f6\u53bb\u6570\u636e\u4e2d\u5fc3\u67e5\u8be2
 dataCenterTime=48
 
+#\u662f\u5426\u5f00\u542f\u57fa\u7840\u9a8c\u8bc1
+baseValidate=true
+
+#\u662f\u5426\u5f00\u542f\u4e1a\u52a1\u9a8c\u8bc1
+serviceValidate=true
+
+
+
+#\u65e5\u5fd7\u5b58\u50a8\u672c\u5730\u65f6\u95f4(\u5355\u4f4d\u5c0f\u65f6)
+logLocalTime=48
+#\u5b9e\u65f6\u7edf\u8ba1\u9ed8\u8ba4\u67e5\u8be2\u672c\u5730\u4e00\u4e2a\u5c0f\u65f6\u7684\u6570\u636e(\u5355\u4f4d\uff1a\u5c0f\u65f6)
+reportLocalTime=1
+
+#\u795e\u901a\u6570\u636e\u5e93\u6700\u65e9\u65e5\u5fd7\u65f6\u95f4(A\u7248\u6beb\u79d2)
+#2017-08-13 10:07:25
+clusterAStartTime=1503504000725
+#\u795e\u901a\u6570\u636e\u5e93\u6700\u65e9\u7ed3\u675f\u65f6\u95f4(B\u7248\u6beb\u79d2)
+#2017-08-13 10:07:25
+clusterBStartTime=1503504000725
+############################################################################################################################################
+#\u8bbe\u7f6e\u914d\u7f6e\u662f\u5426\u5165\u5e93
+############################################################################################################################################
+isCommit=true
 ############################################################################################################################################
 ############################################################################################################################################
 httpUrl=http://10.0.7.14:9999/galaxy-service/service/cfg/
@@ -182,8 +286,8 @@ ntcTotalReport=v1/ntcTotalReport
 trafficIpActiveFiveMinute=v1/trafficIpActiveFiveMinute
 trafficIpActiveOneHour=v1/trafficIpActiveOneHour
 
-client_connect_timeout=500000
-client_read_timeout=500000
+client_connect_timeout=300000
+client_read_timeout=300000
 log_time_interval=300000
 logsearch_menu_id=152
 #use elasticsearch or not#
@@ -485,7 +589,7 @@ ntcCollectRadiusLog=v1/ntcCollectRadiusLogs
 ntcConnRecordLog=v1/ntcConnRecordLogs
 ntcConnRecordPercent=v1/ntcConnRecordPercent
 #\u5bfc\u51fa\u6700\u5927\u6761\u6570
-maxLogExportSize=20000
+maxLogExportSize=2000
 pxy_crtl_subscribe_id_region=PXY_CTRL_SUBSCRIBE_ID
 ntc_subscribe_id_region=NTC_SUBSCRIBE_ID
 ntcAsnRecord=v1/ntcAsnRecord
@@ -519,5 +623,4 @@ trafficAppBpsTrend=v1/trafficAppBpsTrend
 #vpn cgi error info
 cgiError=cannot connect to vpnserver,Connection to the server has failed,Specified object can not be found,Too many users,User already exists,Too many created users,The destination server is not a VPN server,The connection has been interrupted,
 #\u83b7\u53d6\u670d\u52a1\u914d\u7f6e\u603b\u91cf\u63a5\u53e3
-getConfigByService=v1/getConfigByService
-delAllCfg=v1/delAllConfig
+getConfigByService=v1/getConfigByService

src/main/resources/sql/20190130/help_document.sql

@@ -144,7 +144,7 @@ is automatically deleted from the cache by the cache manager, regardless
 of whether or not it has expired.
 
 ', null);
-INSERT INTO `help_document` VALUES ('2', 'Control Policy
+INSERT INTO `help_document` VALUES ('2', 'control_policy.md', 'Control Policy
 
 On National Proxy System, Individual Control policy rules determine
 whether to allow, block, redirect or replace a session based on traffic

src/main/resources/sql/20190328/alert_proc_statistics_config.sql

@@ -1,4 +1,5 @@
-drop PROCEDURE proc_statistics_config;
+DROP PROCEDURE IF EXISTS `proc_statistics_config`;
+delimiter ;;
 CREATE DEFINER=`root`@`%` PROCEDURE `proc_statistics_config`()
 BEGIN
 
@@ -66,7 +67,7 @@ BEGIN
 
 
 			#20190328 增加定时任务后is_audit=1 && (is_valid=1 || is_valid=0) 即为approved （增加cfg_state=4[is_valid=0 && is_audit=1],代表定时任务审核过的），而cfg_state=1仅仅代表审核通过且有效的，界面展示的approved值实际包含cfg_state=4和cfg_state=1
-			set @insert_statistics_sql := concat('insert into cfg_num_statistics(statistic_time,function_id,service_id,action,compile_id,cfg_state) select  ','''',ntime,'''',',','function_id,service_id,action,compile_id,if(is_valid=-1,-1,if(is_valid=1,1,if(is_audit=0,0,if(is_audit=1,4,if(is_audit=2,2,if(is_audit=3,3,0)))))) cfg_state from ',tabName);
+			set @insert_statistics_sql := concat('insert into cfg_num_statistics(statistic_time,audit_time,function_id,service_id,action,compile_id,cfg_state) select  ','''',ntime,'''',',','audit_time,function_id,service_id,action,compile_id,if(is_valid=-1,-1,if(is_valid=1,1,if(is_audit=0,0,if(is_audit=1,4,if(is_audit=2,2,if(is_audit=3,3,0)))))) cfg_state from ',tabName);
 
 
 			PREPARE  execs FROM @insert_statistics_sql;
@@ -129,4 +130,9 @@ BEGIN
 		COMMIT;
 	END IF;
 	COMMIT;
-END
+END
+;;
+delimiter ;
+
+#执行存储过程
+call exec_procs();

src/main/resources/sql/20190417/extends_ip_port_pattern.sql

@@ -73,32 +73,32 @@ UPDATE function_region_dict SET config_ip_port_show=3 WHERE function_id=401;
 #ASN IP修改只显示目的IP
 UPDATE function_region_dict SET config_ip_port_show=3 WHERE function_id=600;
 #sql 更新字段语句
-UPDATE app_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM app_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE app_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM app_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
+UPDATE app_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
+UPDATE app_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
 
-UPDATE app_ip_range_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM app_ip_range_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE app_ip_range_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM app_ip_range_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
+UPDATE app_ip_range_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
+UPDATE app_ip_range_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
 
-UPDATE area_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM area_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE area_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM area_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
+UPDATE area_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
+UPDATE area_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
 
-UPDATE asn_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM asn_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE asn_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM asn_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
+UPDATE asn_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
+UPDATE asn_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
 
-UPDATE av_cont_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM av_cont_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE av_cont_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM av_cont_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
+UPDATE av_cont_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
+UPDATE av_cont_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
 
-UPDATE av_pic_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM av_pic_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE av_pic_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM av_pic_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
+UPDATE av_pic_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
+UPDATE av_pic_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
 
-UPDATE av_voip_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM av_voip_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE av_voip_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM av_voip_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
+UPDATE av_voip_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
+UPDATE av_voip_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
 
-UPDATE ddos_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ddos_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE ddos_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM ddos_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
+UPDATE ddos_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
+UPDATE ddos_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
 
-UPDATE dns_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM dns_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE dns_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM dns_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
+UPDATE dns_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
+UPDATE dns_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
 
-UPDATE ip_port_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE ip_port_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
+UPDATE ip_port_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)
+UPDATE ip_port_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM port_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`)

src/main/resources/sql/20190424/update_sys_menu.sql

@@ -1,17 +0,0 @@
---修改实时报表->流量统计->协议统计 国际化代码
-UPDATE sys_menu SET code='protocol_statistics', name ='Protocol Statistics' WHERE id = 1215
-
---修改实时报表->流量统计->流量统计 国际化代码
-UPDATE sys_menu SET code='traffic_statistics' WHERE id = 1207 >
-
---修改实时报表->流量统计->活跃IP统计 国际化代码
-UPDATE sys_menu SET code='active_ip_statistics' WHERE id = 1211 >
-
---修改实时报表->流量统计->App统计 国际化代码
-UPDATE sys_menu SET code='app_statistics' WHERE id = 1213 >
-
---修改实时报表->流量统计->服务统计 国际化代码
-UPDATE sys_menu SET code='service_statistics' WHERE id = 1209 >
-
---修改实时报表->流量统计->网站统计 国际化代码
-UPDATE sys_menu SET code='website_statistics' WHERE id = 1205 >

src/main/resources/sql/deploymentsql/20190520extends_ip_port_pattern.sql

@@ -1,104 +0,0 @@
-#function_region_dict 对应ip_pattern，port_pattern的字段长度拓展一倍，使用分号分隔源/目的
-ALTER TABLE function_region_dict MODIFY config_ip_pattern VARCHAR(20) COMMENT "ip的格式 1:ip掩码;2:IP范围;3:IP;使用逗号分隔,源ip与目的IP使用;分隔";
-ALTER TABLE function_region_dict MODIFY config_port_pattern VARCHAR(20) COMMENT "端口的格式，1:port;2:port_mask;使用逗号分隔,源端口与目的端口使用;分隔";
-#各表修改ip_pattern，port_pattern
-#app_ip_cfg
-ALTER TABLE app_ip_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式';
-ALTER TABLE app_ip_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式';
-ALTER TABLE app_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式';
-ALTER TABLE app_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式';
-#app_ip_range_cfg
-ALTER TABLE app_ip_range_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式';
-ALTER TABLE app_ip_range_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式';
-ALTER TABLE app_ip_range_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式';
-ALTER TABLE app_ip_range_cfg ADD dest_port_pattern INT COMMENT '目的端口格式';
-#area_ip_cfg
-ALTER TABLE area_ip_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式';
-ALTER TABLE area_ip_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式';
-ALTER TABLE area_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式';
-ALTER TABLE area_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式';
-#asn_ip_cfg
-ALTER TABLE asn_ip_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式';
-ALTER TABLE asn_ip_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式';
-ALTER TABLE asn_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式';
-ALTER TABLE asn_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式';
-#av_cont_ip_cfg
-ALTER TABLE av_cont_ip_cfg change ip_pattern src_ip_pattern int COMMENT '源ip格式';
-ALTER TABLE av_cont_ip_cfg add dest_ip_pattern INT COMMENT '目的ip格式';
-ALTER TABLE av_cont_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式';
-ALTER TABLE av_cont_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式';
-#av_pic_ip_cfg
-ALTER TABLE av_pic_ip_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式';
-ALTER TABLE av_pic_ip_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式';
-ALTER TABLE av_pic_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式';
-ALTER TABLE av_pic_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式';
-#av_voip_ip_cfg
-ALTER TABLE av_voip_ip_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式';
-ALTER TABLE av_voip_ip_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式';
-ALTER TABLE av_voip_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式';
-ALTER TABLE av_voip_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式';
-#ddos_ip_cfg
-ALTER TABLE ddos_ip_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式';
-ALTER TABLE ddos_ip_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式';
-ALTER TABLE ddos_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式';
-ALTER TABLE ddos_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式';
-#dns_ip_cfg
-ALTER TABLE dns_ip_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式';
-ALTER TABLE dns_ip_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式';
-ALTER TABLE dns_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式';
-ALTER TABLE dns_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式';
-#ip_port_cfg
-ALTER TABLE ip_port_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式';
-ALTER TABLE ip_port_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式';
-ALTER TABLE ip_port_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式';
-ALTER TABLE ip_port_cfg ADD dest_port_pattern INT COMMENT '目的端口格式';
-#ip_reuse_ip_cfg
-ALTER TABLE ip_reuse_ip_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式';
-ALTER TABLE ip_reuse_ip_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式';
-ALTER TABLE ip_reuse_ip_cfg CHANGE port_pattern src_port_pattern INT COMMENT '源端口格式';
-ALTER TABLE ip_reuse_ip_cfg ADD dest_port_pattern INT COMMENT '目的端口格式';
-#ip_reuse_policy_cfg
-ALTER TABLE ip_reuse_policy_cfg CHANGE ip_pattern src_ip_pattern INT COMMENT '源ip格式';
-ALTER TABLE ip_reuse_policy_cfg ADD dest_ip_pattern INT COMMENT '目的ip格式';
-#修改字典的值
-UPDATE function_region_dict SET config_ip_pattern ="1,2,3;1,2,3" WHERE config_ip_pattern="1,2,3";
-UPDATE function_region_dict SET config_ip_pattern ="1;1" WHERE config_ip_pattern="1";
-UPDATE function_region_dict SET config_ip_pattern ="3;3" WHERE config_ip_pattern="3";
-UPDATE function_region_dict SET config_ip_pattern ="1,3;1,3" WHERE config_ip_pattern="1,3";
-
-UPDATE function_region_dict SET config_port_pattern ="1;1" WHERE config_port_pattern="1";
-UPDATE function_region_dict SET config_port_pattern ="1,2;1,2" WHERE config_port_pattern="1,2";
-#Spoofing IP修改只显示目的IP
-UPDATE function_region_dict SET config_ip_port_show=3 WHERE function_id=401;
-#ASN IP修改只显示目的IP
-UPDATE function_region_dict SET config_ip_port_show=3 WHERE function_id=600;
-#sql 更新字段语句
-UPDATE app_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM app_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE app_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM app_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-
-UPDATE app_ip_range_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM app_ip_range_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE app_ip_range_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM app_ip_range_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-
-UPDATE area_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM area_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE area_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM area_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-
-UPDATE asn_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM asn_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE asn_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM asn_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-
-UPDATE av_cont_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM av_cont_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE av_cont_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM av_cont_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-
-UPDATE av_pic_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM av_pic_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE av_pic_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM av_pic_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-
-UPDATE av_voip_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM av_voip_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE av_voip_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM av_voip_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-
-UPDATE ddos_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ddos_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE ddos_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM ddos_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-
-UPDATE dns_ip_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM dns_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE dns_ip_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM dns_ip_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-
-UPDATE ip_port_cfg c SET c.dest_ip_pattern =(SELECT b.src_ip_pattern FROM ( SELECT a.src_ip_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`);
-UPDATE ip_port_cfg c SET c.dest_port_pattern =(SELECT b.src_port_pattern FROM ( SELECT a.src_port_pattern,a.`cfg_id` FROM ip_port_cfg a) b WHERE b.cfg_id=c.`cfg_id`);

src/main/webapp/WEB-INF/include/form/dDosIpInfo.jsp

@@ -10,36 +10,7 @@
 <div class="row ipInfo">
 
 	<div class="row">
-		<div class="col-md-6">
-	        <div class="form-group ">
-	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
-	            <div class="col-md-6">
-           				<select name="protocol" class="selectpicker show-tick form-control required">
-           					<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
-								<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
-            				</c:forEach>
-           				</select>
-	                <input type="hidden" name="protocolId" value="0">
-	            </div>
-	            <div for="protocol"></div>
-	        </div>
-	    </div>
-		<div class="col-md-6">
-	        <div class="form-group">
-	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
-	            <div class="col-md-6">
-	            	<select name="direction" class="selectpicker show-tick form-control required" >
-	                   <c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
-							<option value="${directionC.itemCode}" <c:if test="${_cfg.direction==directionC.itemCode || (_cfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
-              			</c:forEach>
-	                 </select>
-	            </div>
-	            <div for="direction"></div>
-	        </div>
-	    </div>
-	</div>
-	<div class="row">
-		<div class="col-md-6">
+	    <div class="col-md-6">
 	        <div class="form-group">
 	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
 	            <div class="col-md-6">
@@ -59,67 +30,33 @@
 	            <div for="ipType"></div>
 	        </div>
 	    </div>
-    </div>
-	<div class="row ipCol">
-	    <div class="col-md-6">
-	        <div class="form-group">
-	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="src_ip_pattern"/></label>
-	            <div class="col-md-6">
-	            	 <select name="srcIpPattern" class="selectpicker show-tick form-control required">
-	                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
-							<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.srcIpPattern==ipPatternC.itemCode || (_cfg.srcIpPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
-              			</c:forEach>
-	                 </select>
-	            </div>
-	            <div for="srcIpPattern"></div>
-	        </div>
-	    </div>
 	    <div class="col-md-6">
 	        <div class="form-group ">
-	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
+	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
 	            <div class="col-md-6">
-	                 <input class="form-control required ipCheck" type="text" name="srcIpAddress" value="${_cfg.srcIpAddress}">
+           				<select name="protocol" class="selectpicker show-tick form-control required">
+           					<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+								<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
+            				</c:forEach>
+           				</select>
+	                <input type="hidden" name="protocolId" value="0">
 	            </div>
-	            <div for="srcIpAddress"></div>
+	            <div for="protocol"></div>
 	        </div>
 	    </div>
 	</div>
-	<div class="row hidden ipCol">
+	<div class="row">
 	    <div class="col-md-6">
 	        <div class="form-group">
-	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="src_port_pattern"/></label>
+	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
 	            <div class="col-md-6">
-	            	 <select name="srcPortPattern" class="selectpicker show-tick form-control required">
-	                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
-							<option value="${portPatternC.itemCode}" <c:if test="${_cfg.srcPortPattern==portPatternC.itemCode || (_cfg.srcPortPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
-              			</c:forEach>
-	                 </select>
-	            </div>
-	            <div for="srcPortPattern"></div>
-	        </div>
-	    </div>
-	    <div class="col-md-6">
-	        <div class="form-group ">
-	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
-	            <div class="col-md-6">
-	                 <input class="form-control required portCheck" type="text" name="srcPort" value="${_cfg.srcPort}">
-	            </div>
-	            <div for="srcPort"></div>
-	        </div>
-	    </div>
-	</div>
-	<div class="row hidden ipCol">
-	    <div class="col-md-6">
-	        <div class="form-group">
-	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="dest_ip_pattern"/></label>
-	            <div class="col-md-6">
-	            	 <select name="destIpPattern" class="selectpicker show-tick form-control required">
+	            	 <select name="ipPattern" class="selectpicker show-tick form-control required">
 	                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
-							<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.destIpPattern==ipPatternC.itemCode || (_cfg.destIpPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
+							<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.ipPattern==ipPatternC.itemCode || (_cfg.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
               			</c:forEach>
 	                 </select>
 	            </div>
-	            <div for="destIpPattern"></div>
+	            <div for="ipPattern"></div>
 	        </div>
 	    </div>
 	    <div class="col-md-6">
@@ -132,18 +69,25 @@
 	        </div>
 	    </div>
 	</div>
-	<div class="row hidden ipCol">
+	<c:choose>
+		<c:when test="${_cfg.cfgId==null}">
+			<div class="row hidden port">
+		</c:when>
+		<c:otherwise>
+			<div class="row port">
+		</c:otherwise>
+	</c:choose>
 	    <div class="col-md-6">
 	        <div class="form-group">
-	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="dest_port_pattern"/></label>
+	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
 	            <div class="col-md-6">
-	            	 <select name="destPortPattern" class="selectpicker show-tick form-control required">
+	            	 <select name="portPattern" class="selectpicker show-tick form-control required">
 	                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
-							<option value="${portPatternC.itemCode}" <c:if test="${_cfg.destPortPattern==portPatternC.itemCode || (_cfg.destPortPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
+							<option value="${portPatternC.itemCode}" <c:if test="${_cfg.portPattern==portPatternC.itemCode || (_cfg.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
               			</c:forEach>
 	                 </select>
 	            </div>
-	            <div for="destPortPattern"></div>
+	            <div for="portPattern"></div>
 	        </div>
 	    </div>
 	    <div class="col-md-6">
@@ -156,8 +100,49 @@
 	        </div>
 	    </div>
 	</div>
-	<div class="row">
+	<c:choose>
+		<c:when test="${_cfg.cfgId==null}">
+			<div class="row hidden destPort">
+		</c:when>
+		<c:otherwise>
+			<div class="row destPort">
+		</c:otherwise>
+	</c:choose>
+		
+	    <div class="col-md-6">
+	        <div class="form-group">
+	            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
+	            <div class="col-md-6">
+	            	<select name="direction" class="selectpicker show-tick form-control required" >
+	                   <c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+							<option value="${directionC.itemCode}" <c:if test="${_cfg.direction==directionC.itemCode || (_cfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
+              			</c:forEach>
+	                 </select>
+	            </div>
+	            <div for="direction"></div>
+	        </div>
+	    </div>
+	</div>
+	<c:if test="${_cfg.cfgId==null}">
+		<div class="row">
 		<button type="button" class="btn btn-red-hollow center-block" onClick="more(this);" data-click-times="0"><spring:message code="show_more"/></button>
+		</div>
+	</c:if>
+	<div class="row destPort">
+	    <div class="col-md-6">
+	        <div class="form-group">
+	            <div class="col-md-6">
+	                 <input type="hidden" name="srcIpAddress" value="${_cfg.srcIpAddress}">
+	            </div>
+	        </div>
+	    </div>
+	    <div class="col-md-6">
+	        <div class="form-group ">
+	            <div class="col-md-6">
+	                 <input type="hidden" name="srcPort" value="${_cfg.srcPort}">
+	            </div>
+	        </div>
+	    </div>
 	</div>
 </div>
 </c:if>

src/main/webapp/WEB-INF/tags/sys/delRow.tag

@@ -122,7 +122,7 @@ function isBatch(url){
 	){
 		flag = true;
 	}
-	return flag;
+	return false;
 }
 
 //删除
@@ -164,26 +164,6 @@ function del(url){
 			}
 		}
 	}else{
-		var isAudit=$("#isAudit").val();
-		var isValid=$("#isValid").val();
-		
-		// 批量删除：is_audit 3/0/null &&  is_valid 0/null  此条件下允许（取反提示）
-		if(!((isAudit==null || isAudit=='' || isAudit==3 || isAudit==0 ) 
-				&& (isValid==null || isValid==''|| isValid==0))){
-			top.$.jBox.tip("<spring:message code='has_prohibit_delete'/>", "<spring:message code='info'/>");
-			return;
-		}
-		
-		if(isAudit==null || isAudit==''){
-			isAudit="3,0";
-		}
-		if(isValid==null || isValid==''){
-			isValid="0";
-		}
-		
-		url=url+"&batchAuditValue="+isAudit;
-		url=url+"&batchValidValue="+isValid;
-		
 		url = url+"&"
 		if(isBatch(url)) {
 			top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='delete_all'/>",function(v,h,f){
@@ -209,10 +189,11 @@ function update(url){
 		return;
 	} */
 	if($(checkboxes).filter(":checked").length==1){
-		/* if(cked.val()==1){
+		//TODO 生效配置可更改功能，在最后功能实现完成后打开【打开时确认来函和专项是否影响】
+		if(cked.val()==1){
 			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
 			return;
-		} *//*else if(cked.val()==3){
+		}/*else if(cked.val()==3){
 			 top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
 			return;
 		}*/
@@ -247,24 +228,6 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 					doAll(checkboxes,url);
 		}
 	}else{
-		var isAudit=$("#isAudit").val();
-		var isValid=$("#isValid").val();
-		
-		// 审核通过：is_audit 0/null &&  is_valid 0  此条件下允许（取反提示）
-		if(!((isAudit==null || isAudit=='' || isAudit==0 ) 
-				&& (isValid==null  || isValid==''|| isValid==0))){
-			top.$.jBox.tip("<spring:message code='has_prohibit_pass'/>", "<spring:message code='info'/>");
-			return;
-		}
-		
-		if(isAudit==null || isAudit==''){
-			isAudit="0";
-		}
-		if(isValid==null || isValid==''){
-			isValid="0";
-		}
-		url=url+"&batchAuditValue="+isAudit;
-		url=url+"&batchValidValue="+isValid;
 		url = url+"&"
 		//配置批量下发
 		if(isBatch(url)){
@@ -293,27 +256,6 @@ function noPassOpt(url){
 		}
 		
 	}else{
-		
-		var isAudit=$("#isAudit").val();
-		var isValid=$("#isValid").val();
-		
-		// 审核不通过：is_audit 0/null &&  is_valid 0/null  此条件下允许（取反提示）
-		if(!((isAudit==null || isAudit=='' || isAudit==0 ) 
-				&& (isValid==null  || isValid==''|| isValid==0))){
-			top.$.jBox.tip("<spring:message code='has_prohibit_nopass'/>", "<spring:message code='info'/>");
-			return;
-		}
-		
-		if(isAudit==null || isAudit==''){
-			isAudit="0";
-		}
-		if(isValid==null || isValid==''){
-			isValid="0";
-		}
-		
-		url=url+"&batchAuditValue="+isAudit;
-		url=url+"&batchValidValue="+isValid;
-		
 		url = url+"&"
 		//配置批量审核（未通过）
 		if(isBatch(url)){
@@ -392,24 +334,6 @@ function cancelPassOpt(url){
 		}
 		
 	}else{
-		var isAudit=$("#isAudit").val();
-		var isValid=$("#isValid").val();
-		// 取消审核通过：is_audit 1/null &&  is_valid 0(定时任务)/1/null  此条件下允许（取反提示）
-		if(!((isAudit==null || isAudit=='' || isAudit==1 ) 
-				&& (isValid==null || isValid=='' || isValid==1 || isValid==0))){
-			top.$.jBox.tip("<spring:message code='hasnot_approved'/>", "<spring:message code='info'/>");
-			return;
-		}
-		
-		if(isAudit==null || isAudit==''){
-			isAudit="1";
-		}
-		if(isValid==null || isValid==''){
-			isValid="1,0";
-		}
-		url=url+"&batchAuditValue="+isAudit;
-		url=url+"&batchValidValue="+isValid;
-		
 		url = url+"&"
 		//配置批量取消
 		if(isBatch(url)){

src/main/webapp/WEB-INF/views/basics/asnGroupList.jsp

@@ -116,7 +116,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		
 			<%-- <shiro:hasPermission name="avContUrl:config"> --%>
-				<button type="button" class="addId btn btn-primary"
+				<button type="button" class="btn btn-primary"
 			onClick="javascript:window.location='${ctx}/basics/asnGroup/asnGroupForm'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>

src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp

@@ -6,8 +6,8 @@
 <script type="text/javascript">
 var defaultIpInfo;
 $(function(){
-	//$("input[name$='destPort']").parents(".form-group").addClass("hidden");
-	//$("select[name$='portPattern']").parents(".form-group").addClass("hidden");
+	$("input[name$='destPort']").parents(".form-group").addClass("hidden");
+	$("select[name$='portPattern']").parents(".form-group").addClass("hidden");
 	$("select[name$='protocol']").parents(".form-group").addClass("hidden");
 	$("select[name$='direction']").parents(".form-group").addClass("hidden");
 	defaultIpInfo=$(".ipInfo").clone();
@@ -93,7 +93,7 @@ var addContent = function(obj, contentClassName) {
 	$("select[name$='ipType']").on("change",function(){
 		switchIpInfo(this);
 	});
-	$("select[name$='IpPattern']").on("change",function(){
+	$("select[name$='ipPattern']").on("change",function(){
 		switchIpInfo(this);
 	});
 }
@@ -167,10 +167,8 @@ var reSort=function(obj,index){
 		                   		 serviceType="${region.configServiceType}"
 		                   		 ipPortShow="${region.configIpPortShow}"
 		                   		 ipType="${region.configIpType}"
-		                   		 srcIpPattern="${fn:split(region.configIpPattern,';')[0]}"
-		                   		 destIpPattern="${fn:split(region.configIpPattern,';')[1]}"
-		                   		 srcPortPattern="${fn:split(region.configPortPattern,';')[0]}"
-		                   		 destPortPattern="${fn:split(region.configPortPattern,';')[1]}"
+		                   		 ipPattern="${region.configIpPattern}"
+		                   		 portPattern="${region.configPortPattern}"
 		                   		 direction="${region.configDirection}"
 		                   		 protocol="${region.configProtocol}"
 		                   		 regionType="${region.regionType}"
@@ -267,6 +265,96 @@ var reSort=function(obj,index){
 											onClick="delContent(this,'ipInfo');" />
 									</div>
 								</div>
+								<div class="row">
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
+								            <div class="col-md-6">
+								            	 <select name="asnIpCfgs[0].ipType" class="selectpicker show-tick form-control required">
+								                   <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
+														<option value="${ipTypeC.itemCode}" 
+																<c:if test="${_cfg.asnIpCfgs[0].ipType==ipTypeC.itemCode 
+																	|| (_cfg.asnIpCfgs[0].ipType==null && ipTypeC.itemCode==4)}">
+																	selected
+																</c:if>
+																>
+														<spring:message code="${ipTypeC.itemValue}"/>
+														</option>
+							               			</c:forEach>
+								                 </select>
+								            </div>
+								            <div for="asnIpCfgs[0].ipType"></div>
+								        </div>
+								    </div>
+								</div>
+								<div class="row ip">
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
+								            <div class="col-md-6">
+								            	 <select name="asnIpCfgs[0].ipPattern" class="selectpicker show-tick form-control required">
+								                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+														<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.asnIpCfgs[0].ipPattern==ipPatternC.itemCode || (_cfg.asnIpCfgs[0].ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
+							              			</c:forEach>
+								                 </select>
+								            </div>
+								            <div for="asnIpCfgs[0].ipPattern"></div>
+								        </div>
+								    </div>
+								    <div class="col-md-6">
+								        <div class="form-group ">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
+								            <div class="col-md-6">
+								                 <input class="form-control required ipCheck" type="text" name="asnIpCfgs[0].srcIpAddress" value="${_cfg.asnIpCfgs[0].srcIpAddress}">
+								            </div>
+								            <div for="asnIpCfgs[0].srcIpAddress"></div>
+								        </div>
+								    </div>
+								</div>
+								<div class="row  port">
+								    <div class="col-md-6">
+								        <div class="form-group">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
+								            <div class="col-md-6">
+								            	 <select name="asnIpCfgs[0].portPattern" class="selectpicker show-tick form-control required">
+								                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
+														<option value="${portPatternC.itemCode}" <c:if test="${_cfg.asnIpCfgs[0].portPattern==portPatternC.itemCode || (_cfg.asnIpCfgs[0].portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
+							              			</c:forEach>
+								                 </select>
+								            </div>
+								            <div for="asnIpCfgs[0].portPattern"></div>
+								        </div>
+								    </div>
+								    <div class="col-md-6">
+								        <div class="form-group ">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
+								            <div class="col-md-6">
+								                 <input class="form-control required portCheck" type="text" name="asnIpCfgs[0].srcPort" value="${_cfg.asnIpCfgs[0].srcPort}">
+								            </div>
+								            <div for="asnIpCfgs[0].srcPort"></div>
+								        </div>
+								    </div>
+								</div>
+								<div class="row  destPort">
+								    <div class="col-md-6">
+								        <div class="form-group ">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
+								            <div class="col-md-6">
+								                 <input class="form-control required ipCheck" type="text" name="asnIpCfgs[0].destIpAddress" value="${_cfg.asnIpCfgs[0].destIpAddress}">
+								            </div>
+								            <div for="asnIpCfgs[0].destIpAddress"></div>
+								        </div>
+								    </div>
+								     <div class="col-md-6">
+								        <div class="form-group ">
+								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
+								            <div class="col-md-6">
+								                 <input class="form-control required portCheck" type="text" name="asnIpCfgs[0].destPort" value="${_cfg.asnIpCfgs[0].destPort}">
+								            </div>
+								            <div for="asnIpCfgs[0].destPort"></div>
+								        </div>
+								    </div>
+								</div>
 								<div class="row  protocol">
 									<div class="col-md-6">
 										<div class="form-group ">
@@ -299,125 +387,6 @@ var reSort=function(obj,index){
 										</div>
 									</div>
 								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
-								            <div class="col-md-6">
-								            	 <select name="asnIpCfgs[0].ipType" class="selectpicker show-tick form-control required">
-								                   <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
-														<option value="${ipTypeC.itemCode}" 
-																<c:if test="${_cfg.asnIpCfgs[0].ipType==ipTypeC.itemCode 
-																	|| (_cfg.asnIpCfgs[0].ipType==null && ipTypeC.itemCode==4)}">
-																	selected
-																</c:if>
-																>
-														<spring:message code="${ipTypeC.itemValue}"/>
-														</option>
-							               			</c:forEach>
-								                 </select>
-								            </div>
-								            <div for="asnIpCfgs[0].ipType"></div>
-								        </div>
-								    </div>
-								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="src_ip_pattern"/></label>
-								            <div class="col-md-6">
-								            	 <select name="asnIpCfgs[0].srcIpPattern" class="selectpicker show-tick form-control required">
-								                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
-														<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.asnIpCfgs[0].srcIpPattern==ipPatternC.itemCode || (_cfg.asnIpCfgs[0].srcIpPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
-							              			</c:forEach>
-								                 </select>
-								            </div>
-								            <div for="asnIpCfgs[0].srcIpPattern"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
-								        <div class="form-group ">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
-								            <div class="col-md-6">
-								                 <input class="form-control required ipCheck" type="text" name="asnIpCfgs[0].srcIpAddress" value="${_cfg.asnIpCfgs[0].srcIpAddress}">
-								            </div>
-								            <div for="asnIpCfgs[0].srcIpAddress"></div>
-								        </div>
-								    </div>
-								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="src_port_pattern"/></label>
-								            <div class="col-md-6">
-								            	 <select name="asnIpCfgs[0].srcPortPattern" class="selectpicker show-tick form-control required">
-								                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
-														<option value="${portPatternC.itemCode}" <c:if test="${_cfg.asnIpCfgs[0].srcPortPattern==portPatternC.itemCode || (_cfg.asnIpCfgs[0].srcPortPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
-							              			</c:forEach>
-								                 </select>
-								            </div>
-								            <div for="asnIpCfgs[0].srcPortPattern"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
-								        <div class="form-group ">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
-								            <div class="col-md-6">
-								                 <input class="form-control required portCheck" type="text" name="asnIpCfgs[0].srcPort" value="${_cfg.asnIpCfgs[0].srcPort}">
-								            </div>
-								            <div for="asnIpCfgs[0].srcPort"></div>
-								        </div>
-								    </div>
-								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
-								            <div class="col-md-6">
-								            	 <select name="asnIpCfgs[0].destIpPattern" class="selectpicker show-tick form-control required">
-								                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
-														<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.asnIpCfgs[0].destIpPattern==ipPatternC.itemCode || (_cfg.asnIpCfgs[0].destIpPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
-							              			</c:forEach>
-								                 </select>
-								            </div>
-								            <div for="asnIpCfgs[0].destIpPattern"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
-								        <div class="form-group ">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
-								            <div class="col-md-6">
-								                 <input class="form-control required ipCheck" type="text" name="asnIpCfgs[0].destIpAddress" value="${_cfg.asnIpCfgs[0].destIpAddress}">
-								            </div>
-								            <div for="asnIpCfgs[0].destIpAddress"></div>
-								        </div>
-								    </div>
-								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="dest_port_pattern"/></label>
-								            <div class="col-md-6">
-								            	 <select name="asnIpCfgs[0].destPortPattern" class="selectpicker show-tick form-control required">
-								                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
-														<option value="${portPatternC.itemCode}" <c:if test="${_cfg.asnIpCfgs[0].destPortPattern==portPatternC.itemCode || (_cfg.asnIpCfgs[0].destPortPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
-							              			</c:forEach>
-								                 </select>
-								            </div>
-								            <div for="asnIpCfgs[0].destPortPattern"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
-								        <div class="form-group ">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
-								            <div class="col-md-6">
-								                 <input class="form-control required portCheck" type="text" name="asnIpCfgs[0].destPort" value="${_cfg.asnIpCfgs[0].destPort}">
-								            </div>
-								            <div for="asnIpCfgs[0].destPort"></div>
-								        </div>
-								    </div>
-								</div>
-								
 								<%-- <div class="row">
 									<button type="button" class="btn btn-red-hollow center-block"
 										onClick="more(this);" data-click-times="0">