DDOS、Proxy配置导入增加doLog属性.

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

@@ -0,0 +1,60 @@
+package com.nis.domain.configuration.template;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * @Description: excel导入增强字符串类配置
+ */
+public class ComplexStringAllNotDoLogTemplate extends BasicTemplate{
+	private String cfgDesc;
+	
+	private String district;
+	private String cfgKeywords;
+	private Integer matchMethod ;
+	private Integer isHex;
+	private Integer isCaseInsenstive;
+	
+	@ExcelField(title="config_describe",align=2,sort=1)
+	public String getCfgDesc() {
+		return cfgDesc;
+	}
+	public void setCfgDesc(String cfgDesc) {
+		this.cfgDesc = cfgDesc;
+	}
+	@ExcelField(title="district",sort=11)
+	public String getDistrict() {
+		return district;
+	}
+	public void setDistrict(String district) {
+		this.district = district;
+	}
+	@ExcelField(title="key_word",sort=12)
+	public String getCfgKeywords() {
+		return cfgKeywords;
+	}
+	public void setCfgKeywords(String cfgKeywords) {
+		this.cfgKeywords = cfgKeywords;
+	}
+	@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=14)
+	public Integer getMatchMethod() {
+		return matchMethod;
+	}
+	public void setMatchMethod(Integer matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+	@ExcelField(title="is_hex",dictType="IS_HEX",sort=15)
+	public Integer getIsHex() {
+		return isHex;
+	}
+	public void setIsHex(Integer isHex) {
+		this.isHex = isHex;
+	}
+	@ExcelField(title="is_case_insenstive",dictType="CASE_INSENSTIVE",sort=16)
+	public Integer getIsCaseInsenstive() {
+		return isCaseInsenstive;
+	}
+	public void setIsCaseInsenstive(Integer isCaseInsenstive) {
+		this.isCaseInsenstive = isCaseInsenstive;
+	}
+	
+}

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

@@ -6,21 +6,21 @@ public class DdosIpTemplate extends IpAllTemplate {
 	private String antiddosProtocol;
 	private Long bpsThreadshold;
 	private Long ppsThreadshold;
-	@ExcelField(title="antiddos_protocol",align=2,sort=2)
+	@ExcelField(title="antiddos_protocol",align=2,sort=3)
 	public String getAntiddosProtocol() {
 		return antiddosProtocol;
 	}
 	public void setAntiddosProtocol(String antiddosProtocol) {
 		this.antiddosProtocol = antiddosProtocol;
 	}
-	@ExcelField(title="bps_threadshold",align=2,sort=3)
+	@ExcelField(title="bps_threadshold",align=2,sort=4)
 	public Long getBpsThreadshold() {
 		return bpsThreadshold;
 	}
 	public void setBpsThreadshold(Long bpsThreadshold) {
 		this.bpsThreadshold = bpsThreadshold;
 	}
-	@ExcelField(title="pps_threadshold",align=2,sort=4)
+	@ExcelField(title="pps_threadshold",align=2,sort=5)
 	public Long getPpsThreadshold() {
 		return ppsThreadshold;
 	}

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

@@ -7,7 +7,7 @@ import com.nis.util.excel.ExcelField;
  * @author dell
  *
  */
-public class DomainInterceptMonitTemplate extends StringAllTemplate{
+public class DomainInterceptMonitTemplate extends StringAllNotDoLogTemplate{
 	
 	private String userRegion5;
 	private String cfgKeywords;

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

@@ -7,7 +7,7 @@ import com.nis.util.excel.ExcelField;
  * @author dell
  *
  */
-public class DomainInterceptRateLimitTemplate extends StringAllTemplate{
+public class DomainInterceptRateLimitTemplate extends StringAllNotDoLogTemplate{
 	
 	private String userRegion2;
 	private String cfgKeywords;

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

@@ -2,7 +2,7 @@ package com.nis.domain.configuration.template;
 
 import com.nis.util.excel.ExcelField;
 
-public class DomainInterceptTemplate extends StringAllTemplate{
+public class DomainInterceptTemplate extends StringAllNotDoLogTemplate{
 	private String cfgKeywords;
 	
 	@ExcelField(title="domain_name",sort=11)

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

@@ -12,7 +12,7 @@ public class HttpsRedirectComplexTemplate extends ComplexStringAllTemplate{
 	private String userRegion1;// 重定向应答码
 	private String userRegion2;// 重定向URL
 	
-	@ExcelField(title="redirect_response_code",dictType="REDIRECT_RESPONSE_CODE",align=2,sort=2)
+	@ExcelField(title="redirect_response_code",dictType="REDIRECT_RESPONSE_CODE",align=2,sort=3)
 	public String getUserRegion1() {
 		return userRegion1;
 	}
@@ -21,7 +21,7 @@ public class HttpsRedirectComplexTemplate extends ComplexStringAllTemplate{
 		this.userRegion1 = userRegion1;
 	}
 	
-	@ExcelField(title="redirect_url",align=2,sort=3)
+	@ExcelField(title="redirect_url",align=2,sort=4)
 	public String getUserRegion2() {
 		return userRegion2;
 	}

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

@@ -12,7 +12,7 @@ public class HttpsRedirectIpTemplate extends IpAllTemplate{
 	private String userRegion1;// 重定向应答码
 	private String userRegion2;// 重定向URL
 	
-	@ExcelField(title="redirect_response_code",dictType="REDIRECT_RESPONSE_CODE",align=2,sort=2)
+	@ExcelField(title="redirect_response_code",dictType="REDIRECT_RESPONSE_CODE",align=2,sort=3)
 	public String getUserRegion1() {
 		return userRegion1;
 	}
@@ -21,7 +21,7 @@ public class HttpsRedirectIpTemplate extends IpAllTemplate{
 		this.userRegion1 = userRegion1;
 	}
 	
-	@ExcelField(title="redirect_url",align=2,sort=3)
+	@ExcelField(title="redirect_url",align=2,sort=4)
 	public String getUserRegion2() {
 		return userRegion2;
 	}

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

@@ -12,7 +12,7 @@ public class HttpsRedirectTemplate extends StringAllTemplate{
 	private String userRegion1;// 重定向应答码
 	private String userRegion2;// 重定向URL
 	
-	@ExcelField(title="redirect_response_code",dictType="REDIRECT_RESPONSE_CODE",align=2,sort=2)
+	@ExcelField(title="redirect_response_code",dictType="REDIRECT_RESPONSE_CODE",align=2,sort=3)
 	public String getUserRegion1() {
 		return userRegion1;
 	}
@@ -21,7 +21,7 @@ public class HttpsRedirectTemplate extends StringAllTemplate{
 		this.userRegion1 = userRegion1;
 	}
 	
-	@ExcelField(title="redirect_url",align=2,sort=3)
+	@ExcelField(title="redirect_url",align=2,sort=4)
 	public String getUserRegion2() {
 		return userRegion2;
 	}

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

@@ -12,7 +12,7 @@ public class HttpsRejectComplexTemplate extends ComplexStringAllTemplate{
 	private String userRegion1;// 应答码
 	private String userRegion2;// 响应内容
 	
-	@ExcelField(title="response_code",dictType="RESPONSE_CODE",align=2,sort=2)
+	@ExcelField(title="response_code",dictType="RESPONSE_CODE",align=2,sort=3)
 	public String getUserRegion1() {
 		return userRegion1;
 	}
@@ -21,7 +21,7 @@ public class HttpsRejectComplexTemplate extends ComplexStringAllTemplate{
 		this.userRegion1 = userRegion1;
 	}
 	
-	@ExcelField(title="response_content",align=2,sort=3)
+	@ExcelField(title="response_content",align=2,sort=4)
 	public String getUserRegion2() {
 		return userRegion2;
 	}

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

@@ -12,7 +12,7 @@ public class HttpsRejectIpTemplate extends IpAllTemplate{
 	private String userRegion1;// 应答码
 	private String userRegion2;// 响应内容
 	
-	@ExcelField(title="response_code",dictType="RESPONSE_CODE",align=2,sort=2)
+	@ExcelField(title="response_code",dictType="RESPONSE_CODE",align=2,sort=3)
 	public String getUserRegion1() {
 		return userRegion1;
 	}
@@ -21,7 +21,7 @@ public class HttpsRejectIpTemplate extends IpAllTemplate{
 		this.userRegion1 = userRegion1;
 	}
 	
-	@ExcelField(title="response_content",align=2,sort=3)
+	@ExcelField(title="response_content",align=2,sort=4)
 	public String getUserRegion2() {
 		return userRegion2;
 	}

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

@@ -12,7 +12,7 @@ public class HttpsRejectTemplate extends StringAllTemplate{
 	private String userRegion1;// 应答码
 	private String userRegion2;// 响应内容
 	
-	@ExcelField(title="response_code",dictType="RESPONSE_CODE",align=2,sort=2)
+	@ExcelField(title="response_code",dictType="RESPONSE_CODE",align=2,sort=3)
 	public String getUserRegion1() {
 		return userRegion1;
 	}
@@ -21,7 +21,7 @@ public class HttpsRejectTemplate extends StringAllTemplate{
 		this.userRegion1 = userRegion1;
 	}
 	
-	@ExcelField(title="response_content",align=2,sort=3)
+	@ExcelField(title="response_content",align=2,sort=4)
 	public String getUserRegion2() {
 		return userRegion2;
 	}

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

@@ -13,7 +13,7 @@ public class HttpsReplaceComplexTemplate extends ComplexStringAllTemplate{
 	private String userRegion2;// 发现内容
 	private String userRegion3;// 替换内容
 	
-	@ExcelField(title="replace_zone",dictType="CONTROL_REPLACE_ZONE",align=2,sort=2)
+	@ExcelField(title="replace_zone",dictType="CONTROL_REPLACE_ZONE",align=2,sort=3)
 	public String getUserRegion1() {
 		return userRegion1;
 	}
@@ -22,7 +22,7 @@ public class HttpsReplaceComplexTemplate extends ComplexStringAllTemplate{
 		this.userRegion1 = userRegion1;
 	}
 	
-	@ExcelField(title="replaced_content",align=2,sort=3)
+	@ExcelField(title="replaced_content",align=2,sort=4)
 	public String getUserRegion2() {
 		return userRegion2;
 	}
@@ -31,7 +31,7 @@ public class HttpsReplaceComplexTemplate extends ComplexStringAllTemplate{
 		this.userRegion2 = userRegion2;
 	}
 	
-	@ExcelField(title="replace_content",align=2,sort=4)
+	@ExcelField(title="replace_content",align=2,sort=5)
 	public String getUserRegion3() {
 		return userRegion3;
 	}

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

@@ -13,7 +13,7 @@ public class HttpsReplaceIpTemplate extends IpAllTemplate{
 	private String userRegion2;// 发现内容
 	private String userRegion3;// 替换内容
 	
-	@ExcelField(title="replace_zone",dictType="CONTROL_REPLACE_ZONE",align=2,sort=2)
+	@ExcelField(title="replace_zone",dictType="CONTROL_REPLACE_ZONE",align=2,sort=3)
 	public String getUserRegion1() {
 		return userRegion1;
 	}
@@ -22,7 +22,7 @@ public class HttpsReplaceIpTemplate extends IpAllTemplate{
 		this.userRegion1 = userRegion1;
 	}
 	
-	@ExcelField(title="replaced_content",align=2,sort=3)
+	@ExcelField(title="replaced_content",align=2,sort=4)
 	public String getUserRegion2() {
 		return userRegion2;
 	}
@@ -31,7 +31,7 @@ public class HttpsReplaceIpTemplate extends IpAllTemplate{
 		this.userRegion2 = userRegion2;
 	}
 	
-	@ExcelField(title="replace_content",align=2,sort=4)
+	@ExcelField(title="replace_content",align=2,sort=5)
 	public String getUserRegion3() {
 		return userRegion3;
 	}

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

@@ -13,7 +13,7 @@ public class HttpsReplaceTemplate extends StringAllTemplate{
 	private String userRegion2;// 发现内容
 	private String userRegion3;// 替换内容
 	
-	@ExcelField(title="replace_zone",dictType="CONTROL_REPLACE_ZONE",align=2,sort=2)
+	@ExcelField(title="replace_zone",dictType="CONTROL_REPLACE_ZONE",align=2,sort=3)
 	public String getUserRegion1() {
 		return userRegion1;
 	}
@@ -22,7 +22,7 @@ public class HttpsReplaceTemplate extends StringAllTemplate{
 		this.userRegion1 = userRegion1;
 	}
 	
-	@ExcelField(title="replaced_content",align=2,sort=3)
+	@ExcelField(title="replaced_content",align=2,sort=4)
 	public String getUserRegion2() {
 		return userRegion2;
 	}
@@ -31,7 +31,7 @@ public class HttpsReplaceTemplate extends StringAllTemplate{
 		this.userRegion2 = userRegion2;
 	}
 	
-	@ExcelField(title="replace_content",align=2,sort=4)
+	@ExcelField(title="replace_content",align=2,sort=5)
 	public String getUserRegion3() {
 		return userRegion3;
 	}

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

@@ -6,7 +6,7 @@ import com.nis.util.excel.ExcelField;
  * EXCEL IP导入限速模板
  *
  */
-public class IpRateLimitTemplate extends IpAllTemplate {
+public class IpRateLimitTemplate extends IpAllNotDoLogTemplate {
 	public static String userRegion1="0";
 	private String userRegion2;
 	@ExcelField(title="ratelimit",dictType="RATE_LIMIT",align=2,sort=2)

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

@@ -0,0 +1,52 @@
+package com.nis.domain.configuration.template;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * @Description: excel导入字符串类配置
+ */
+public class StringAllNotDoLogTemplate extends BasicTemplate{
+	private String cfgDesc;
+	
+	private String cfgKeywords;
+	private Integer matchMethod ;
+	private Integer isHex;
+	private Integer isCaseInsenstive;
+	
+	@ExcelField(title="config_describe",align=2,sort=1)
+	public String getCfgDesc() {
+		return cfgDesc;
+	}
+	public void setCfgDesc(String cfgDesc) {
+		this.cfgDesc = cfgDesc;
+	}
+	@ExcelField(title="key_word",sort=11)
+	public String getCfgKeywords() {
+		return cfgKeywords;
+	}
+	public void setCfgKeywords(String cfgKeywords) {
+		this.cfgKeywords = cfgKeywords;
+	}
+	@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=13)
+	public Integer getMatchMethod() {
+		return matchMethod;
+	}
+	public void setMatchMethod(Integer matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+	@ExcelField(title="is_hex",dictType="IS_HEX",sort=14)
+	public Integer getIsHex() {
+		return isHex;
+	}
+	public void setIsHex(Integer isHex) {
+		this.isHex = isHex;
+	}
+	@ExcelField(title="is_case_insenstive",dictType="CASE_INSENSTIVE",sort=15)
+	public Integer getIsCaseInsenstive() {
+		return isCaseInsenstive;
+	}
+	public void setIsCaseInsenstive(Integer isCaseInsenstive) {
+		this.isCaseInsenstive = isCaseInsenstive;
+	}
+	
+}

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

@@ -113,6 +113,11 @@ public class CheckIpFormatThread implements Callable<String>{
 				errInfo.append(prop.getProperty("config_describe")+prop.getProperty("length_error")+" "+String.format(prop.getProperty("max_length")+":128") + ";");
 			}
 			
+			if(regionDict.getFunctionId().equals(200)) {
+				if(!serviceDict.getAction().equals(1)) {
+					baseIpCfg.setDoLog(0);
+				}
+			}
 			// doLog属性检验
 			this.validDoLog(baseIpCfg,errInfo);
 			

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

@@ -98,6 +98,11 @@ public class CheckStringFormatThread implements Callable<String>{
 				errInfo.append(prop.getProperty("config_describe")+prop.getProperty("length_error")+" "+String.format(prop.getProperty("max_length")+":128") + ";");
 			}
 			
+			if(regionDict.getFunctionId().equals(200)) {
+				if(!serviceDict.getAction().equals(1)) {
+					baseStringCfg.setDoLog(0);
+				}
+			}
 			// doLog属性检验
 			this.validDoLog(baseStringCfg,errInfo);
 			

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

@@ -80,6 +80,7 @@ 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;
+import com.nis.domain.configuration.template.ComplexStringAllNotDoLogTemplate;
 import com.nis.domain.configuration.template.ComplexStringAllTemplate;
 import com.nis.domain.configuration.template.DdosIpTemplate;
 import com.nis.domain.configuration.template.DnsComplexStringTemplate;
@@ -106,6 +107,7 @@ import com.nis.domain.configuration.template.IpRateLimitTemplate;
 import com.nis.domain.configuration.template.IpWhitelistTemplate;
 import com.nis.domain.configuration.template.P2pHashStringTemplate;
 import com.nis.domain.configuration.template.P2pIpTemplate;
+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.log.BaseLogEntity;
@@ -1415,9 +1417,17 @@ public class BaseController {
 						}else if(regionDict.getFunctionId().equals(209)){// HTTP(s)替换
 							BlockingQueue<HttpsReplaceIpTemplate> list = ei.getDataList(HttpsReplaceIpTemplate.class );
 							ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,asnGroupInfos, list);
-						}else if(regionDict.getFunctionId().equals(200) && serviceDict.getAction().equals(64)) {// 拦截策略（限速）
-							BlockingQueue<IpRateLimitTemplate> list = ei.getDataList(IpRateLimitTemplate.class );
-							ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict,null,asnGroupInfos, list);
+						}else if(regionDict.getFunctionId().equals(211)){// HTTP(s)白名单
+							BlockingQueue<IpAllNotDoLogTemplate> list = ei.getDataList(IpAllNotDoLogTemplate.class );
+							ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,asnGroupInfos, list);
+						}else if(regionDict.getFunctionId().equals(200)) {// 拦截策略
+							if(serviceDict.getAction().equals(64)) {
+								BlockingQueue<IpRateLimitTemplate> list = ei.getDataList(IpRateLimitTemplate.class );
+								ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict,null,asnGroupInfos, list);
+							}else {
+								BlockingQueue<IpAllNotDoLogTemplate> list = ei.getDataList(IpAllNotDoLogTemplate.class );
+								ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict,null,asnGroupInfos, list);
+							}
 						}else if(regionDict.getFunctionId().equals(3)) { // IP白名单
 							BlockingQueue<IpWhitelistTemplate> list = ei.getDataList(IpWhitelistTemplate.class );
 							ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict,null,asnGroupInfos, list);
@@ -1455,6 +1465,9 @@ public class BaseController {
 						}else if(regionDict.getFunctionId().equals(209)){// HTTP(s)替换
 							BlockingQueue<HttpsReplaceTemplate> list = ei.getDataList(HttpsReplaceTemplate.class);
 							stringCfgs=this.checkStringCfgMulity(errTip,serviceDict, regionDict, list);
+						}else if(regionDict.getFunctionId().equals(211)){// HTTP(s)白名单
+							BlockingQueue<StringAllNotDoLogTemplate> list = ei.getDataList(StringAllNotDoLogTemplate.class);
+							stringCfgs=this.checkStringCfgMulity(errTip,serviceDict, regionDict, list);
 						}else if(regionDict.getFunctionId().equals(560)){// 主题网站
 							BlockingQueue<TopicWebsiteTemplate> list = ei.getDataList(TopicWebsiteTemplate.class);
 							appTopicDomainCfgs=this.checkTopicWebsiteCfgMulity(errTip,serviceDict, regionDict, list);
@@ -1477,6 +1490,9 @@ public class BaseController {
 						} else if(regionDict.getFunctionId().equals(209)){// HTTP(s)替换
 							BlockingQueue<HttpsReplaceComplexTemplate> list = ei.getDataList(HttpsReplaceComplexTemplate.class);
 							complexkeywordCfgs = this.checkComplexStringCfgMulity(errTip,serviceDict, regionDict, list);
+						} else if(regionDict.getFunctionId().equals(211)){// HTTP(s)白名单
+							BlockingQueue<ComplexStringAllNotDoLogTemplate> list = ei.getDataList(ComplexStringAllNotDoLogTemplate.class);
+							complexkeywordCfgs = this.checkComplexStringCfgMulity(errTip,serviceDict, regionDict, list);
 						} else if(regionDict.getFunctionId().equals(563)){// APP Payload
 							BlockingQueue<AppPayloadTemplate> list = ei.getDataList(AppPayloadTemplate.class);
 							appComplexFeatureCfgs = this.checkAppComplexFeatureStringCfgMulity(errTip,serviceDict, regionDict, list);
@@ -2267,8 +2283,14 @@ public class BaseController {
 				ei.loadInitParams(HttpsRedirectIpTemplate.class, this.getMsgProp(), regionDict, serviceDict);
 			} else if(regionDict.getFunctionId().equals(209)){// HTTP(s)替换
 				ei.loadInitParams(HttpsReplaceIpTemplate.class, this.getMsgProp(), regionDict, serviceDict);
-			} else if(regionDict.getFunctionId().equals(200) && serviceDict.getAction().intValue()==64){// 拦截策略（限速）
-				ei.loadInitParams(IpRateLimitTemplate.class, msgProp, regionDict, serviceDict);
+			} else if(regionDict.getFunctionId().equals(211)){// HTTP(s)白名单
+				ei.loadInitParams(IpAllNotDoLogTemplate.class, this.getMsgProp(), regionDict, serviceDict);
+			} else if(regionDict.getFunctionId().equals(200)){// 拦截策略
+				if(serviceDict.getAction().intValue()==64) {
+					ei.loadInitParams(IpRateLimitTemplate.class, msgProp, regionDict, serviceDict);
+				}else {
+					ei.loadInitParams(IpAllNotDoLogTemplate.class, msgProp, regionDict, serviceDict);
+				}
 			} else if(regionDict.getFunctionId().equals(3)) { // IP白名单
 				ei.loadInitParams(IpWhitelistTemplate.class, msgProp, regionDict, serviceDict);
 			} else {
@@ -2294,6 +2316,8 @@ public class BaseController {
 				ei.loadInitParams(HttpsRedirectTemplate.class, this.getMsgProp(), regionDict, serviceDict);
 			}else if(regionDict.getFunctionId().equals(209)){// HTTP(s)替换
 				ei.loadInitParams(HttpsReplaceTemplate.class, this.getMsgProp(), regionDict, serviceDict);
+			}else if(regionDict.getFunctionId().equals(211)){// HTTP(s)白名单
+				ei.loadInitParams(StringAllNotDoLogTemplate.class, this.getMsgProp(), regionDict, serviceDict);
 			}else if(regionDict.getFunctionId().equals(560)){// 主题网站
 				ei.loadInitParams(TopicWebsiteTemplate.class, this.getMsgProp(), regionDict, serviceDict);
 			}else {
@@ -2309,6 +2333,8 @@ public class BaseController {
 				ei.loadInitParams(HttpsRedirectComplexTemplate.class, this.getMsgProp(), regionDict, serviceDict);
 			}else if(regionDict.getFunctionId().equals(209)){// HTTP(s)替换
 				ei.loadInitParams(HttpsReplaceComplexTemplate.class, this.getMsgProp(), regionDict, serviceDict);
+			}else if(regionDict.getFunctionId().equals(211)){// HTTP(s)白名单
+				ei.loadInitParams(ComplexStringAllNotDoLogTemplate.class, this.getMsgProp(), regionDict, serviceDict);
 			}else if(regionDict.getFunctionId().equals(563)) {// APP Payload
 				ei.loadInitParams(AppPayloadTemplate.class, this.getMsgProp(), regionDict, serviceDict);
 			} else {

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

@@ -32,6 +32,7 @@ import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.domain.configuration.template.AppDomainTemplate;
 import com.nis.domain.configuration.template.AppPayloadTemplate;
 import com.nis.domain.configuration.template.AsnIpTemplate;
+import com.nis.domain.configuration.template.ComplexStringAllNotDoLogTemplate;
 import com.nis.domain.configuration.template.ComplexStringAllTemplate;
 import com.nis.domain.configuration.template.DdosIpTemplate;
 import com.nis.domain.configuration.template.DnsComplexStringTemplate;
@@ -58,6 +59,7 @@ import com.nis.domain.configuration.template.IpWhitelistTemplate;
 import com.nis.domain.configuration.template.P2pHashStringTemplate;
 import com.nis.domain.configuration.template.P2pIpTemplate;
 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.exceptions.MaatConvertException;
@@ -382,23 +384,35 @@ public class IpController extends BaseController{
 			}else if(regionDict.getFunctionId().equals(207)){// HTTP(s)阻断
 				List<HttpsRejectIpTemplate> classList=new ArrayList<HttpsRejectIpTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, HttpsRejectIpTemplate.class, 2);
-				excel.setDataList(this.getMsgProp(),classList,null).
+				excel.setDataList(pro,classList,null).
 		    	write(request,response, fileName).dispose();
 			}else if(regionDict.getFunctionId().equals(208)){// HTTP(s)重定向
 				List<HttpsRedirectIpTemplate> classList=new ArrayList<HttpsRedirectIpTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, HttpsRedirectIpTemplate.class, 2);
-				excel.setDataList(this.getMsgProp(),classList,null).
+				excel.setDataList(pro,classList,null).
 		    	write(request,response, fileName).dispose();
 			}else if(regionDict.getFunctionId().equals(209)){// HTTP(s)替换
 				List<HttpsReplaceIpTemplate> classList=new ArrayList<HttpsReplaceIpTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, HttpsReplaceIpTemplate.class, 2);
-				excel.setDataList(this.getMsgProp(),classList,null).
-		    	write(request,response, fileName).dispose();
-			}else if(regionDict.getFunctionId().equals(200) && serviceDict.getAction().equals(64)) {// 拦截策略（IP）限速
-				List<IpRateLimitTemplate> classList=new ArrayList<IpRateLimitTemplate>();
-				ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpRateLimitTemplate.class, 2);
 				excel.setDataList(pro,classList,null).
 		    	write(request,response, fileName).dispose();
+			}else if(regionDict.getFunctionId().equals(211)){// HTTP(s)白名单
+				List<IpAllNotDoLogTemplate> classList=new ArrayList<IpAllNotDoLogTemplate>();
+				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, IpAllNotDoLogTemplate.class, 2);
+				excel.setDataList(pro,classList,null).
+		    	write(request,response, fileName).dispose();
+			}else if(regionDict.getFunctionId().equals(200)) {// 拦截策略（IP）
+				if(serviceDict.getAction().equals(64)) {
+					List<IpRateLimitTemplate> classList=new ArrayList<IpRateLimitTemplate>();
+					ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpRateLimitTemplate.class, 2);
+					excel.setDataList(pro,classList,null).
+			    	write(request,response, fileName).dispose();
+				}else {
+					List<IpAllNotDoLogTemplate> classList=new ArrayList<IpAllNotDoLogTemplate>();
+					ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpAllNotDoLogTemplate.class, 2);
+					excel.setDataList(pro,classList,null).
+			    	write(request,response, fileName).dispose();
+				}
 			}else{
 				List<IpAllTemplate> classList=new ArrayList<IpAllTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpAllTemplate.class, 2);
@@ -438,22 +452,27 @@ public class IpController extends BaseController{
 			}else if(regionDict.getFunctionId().equals(207)){// HTTP(s)阻断
 				List<HttpsRejectTemplate> classList=new ArrayList<HttpsRejectTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, HttpsRejectTemplate.class, 2);
-				excel.setDataList(this.getMsgProp(),classList,null).
+				excel.setDataList(pro,classList,null).
 		    	write(request,response, fileName).dispose();
 			}else if(regionDict.getFunctionId().equals(208)){// HTTP(s)重定向
 				List<HttpsRedirectTemplate> classList=new ArrayList<HttpsRedirectTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, HttpsRedirectTemplate.class, 2);
-				excel.setDataList(this.getMsgProp(),classList,null).
+				excel.setDataList(pro,classList,null).
 		    	write(request,response, fileName).dispose();
 			}else if(regionDict.getFunctionId().equals(209)){// HTTP(s)替换
 				List<HttpsReplaceTemplate> classList=new ArrayList<HttpsReplaceTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, HttpsReplaceTemplate.class, 2);
-				excel.setDataList(this.getMsgProp(),classList,null).
+				excel.setDataList(pro,classList,null).
+		    	write(request,response, fileName).dispose();
+			}else if(regionDict.getFunctionId().equals(211)){// HTTP(s)白名单
+				List<StringAllNotDoLogTemplate> classList=new ArrayList<StringAllNotDoLogTemplate>();
+				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, StringAllNotDoLogTemplate.class, 2);
+				excel.setDataList(pro,classList,null).
 		    	write(request,response, fileName).dispose();
 			}else if(regionDict.getFunctionId().equals(560)) {// 主题网站
 				List<TopicWebsiteTemplate> classList=new ArrayList<TopicWebsiteTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, TopicWebsiteTemplate.class, 2);
-				excel.setDataList(this.getMsgProp(),classList,null).
+				excel.setDataList(pro,classList,null).
 		    	write(request,response, fileName).dispose();
 			}else{
 				List<StringAllTemplate> classList=new ArrayList<StringAllTemplate>();
@@ -473,22 +492,27 @@ public class IpController extends BaseController{
 			}else if(regionDict.getFunctionId().equals(207)){// HTTP(s)阻断
 				List<HttpsRejectComplexTemplate> classList=new ArrayList<HttpsRejectComplexTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, HttpsRejectComplexTemplate.class, 2);
-				excel.setDataList(this.getMsgProp(),classList,null).
+				excel.setDataList(pro,classList,null).
 		    	write(request,response, fileName).dispose();
 			}else if(regionDict.getFunctionId().equals(208)){// HTTP(s)重定向
 				List<HttpsRedirectComplexTemplate> classList=new ArrayList<HttpsRedirectComplexTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, HttpsRedirectComplexTemplate.class, 2);
-				excel.setDataList(this.getMsgProp(),classList,null).
+				excel.setDataList(pro,classList,null).
 		    	write(request,response, fileName).dispose();
 			}else if(regionDict.getFunctionId().equals(209)){// HTTP(s)替换
 				List<HttpsReplaceComplexTemplate> classList=new ArrayList<HttpsReplaceComplexTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, HttpsReplaceComplexTemplate.class, 2);
-				excel.setDataList(this.getMsgProp(),classList,null).
+				excel.setDataList(pro,classList,null).
+		    	write(request,response, fileName).dispose();
+			}else if(regionDict.getFunctionId().equals(211)){// HTTP(s)白名单
+				List<ComplexStringAllNotDoLogTemplate> classList=new ArrayList<ComplexStringAllNotDoLogTemplate>();
+				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, ComplexStringAllNotDoLogTemplate.class, 2);
+				excel.setDataList(pro,classList,null).
 		    	write(request,response, fileName).dispose();
 			}else if(regionDict.getFunctionId().equals(563)) {// APP Payload
 				List<AppPayloadTemplate> classList=new ArrayList<AppPayloadTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,this.getMsgProp(),null, AppPayloadTemplate.class, 2);
-				excel.setDataList(this.getMsgProp(),classList,null).
+				excel.setDataList(pro,classList,null).
 		    	write(request,response, fileName).dispose();
 			}else{
 				List<ComplexStringAllTemplate> classList=new ArrayList<ComplexStringAllTemplate>();