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;
+	}
+	
+}