注释P2P日志查询结果打印语句

(2)serviceId设置改为在jsp页面进行
(3)fns.tld调整错误的函数返回值

.classpath

@@ -28,11 +28,6 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.8.0_144">
-		<attributes>
-			<attribute name="maven.pomderived" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="lib" path="lib/jersey-client-2.23.1.jar">
 		<attributes>
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
@@ -158,5 +153,10 @@
 			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+		<attributes>
+			<attribute name="owner.project.facets" value="java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.settings/org.eclipse.jdt.core.prefs

@@ -1,13 +1,13 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.source=1.8

.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -2,8 +2,8 @@
 <faceted-project>
   <fixed facet="wst.jsdt.web"/>
   <installed facet="wst.jsdt.web" version="1.0"/>
-  <installed facet="java" version="1.7"/>
   <installed facet="jst.web" version="3.0"/>
   <installed facet="jst.jaxrs" version="1.1"/>
   <installed facet="maven" version="1.0"/>
+  <installed facet="java" version="1.8"/>
 </faceted-project>

README.md

@@ -1 +1 @@
-gk for web 
+在公共分组功能逻辑完善之前，此分支为ntc界面系统的全集上线升级分支合并版。

pom.xml

@@ -710,5 +710,27 @@
 		    <artifactId>jersey-apache-connector</artifactId>
 		    <version>2.23.1</version>
 		</dependency>
+		<!-- quartz  -->
+		<dependency>
+	         <groupId>org.quartz-scheduler</groupId>
+	         <artifactId>quartz</artifactId>
+	         <version>2.2.1</version>
+	    </dependency>
+	    <dependency>
+            <groupId>org.quartz-scheduler</groupId>
+            <artifactId>quartz-jobs</artifactId>
+            <version>2.2.1</version>
+        </dependency>
+        
+		<dependency>
+		    <groupId>com.alibaba</groupId>
+		    <artifactId>druid</artifactId>
+		    <version>1.1.10</version>
+		</dependency>
+		<dependency>
+		    <groupId>com.alibaba</groupId>
+		    <artifactId>fastjson</artifactId>
+		    <version>1.2.57</version>
+		</dependency>
 	</dependencies>
 </project>

src/main/java/com/nis/domain/Nets.java

@@ -0,0 +1,31 @@
+package com.nis.domain;
+
+/**
+ * Created by dell on 2018-8-30.
+ */
+public class Nets {
+
+    private String StartIP;
+    private String EndIP;
+    private String NetMask;
+    public String getStartIP() {
+        return StartIP;
+    }
+    public void setStartIP(String startIP) {
+        StartIP = startIP;
+    }
+    public String getEndIP() {
+        return EndIP;
+    }
+    public void setEndIP(String endIP) {
+        EndIP = endIP;
+    }
+    public String getNetMask() {
+        return NetMask;
+    }
+    public void setNetMask(String netMask) {
+        NetMask = netMask;
+    }
+
+
+}

src/main/java/com/nis/domain/ScheduleCfg.java

@@ -0,0 +1,56 @@
+package com.nis.domain;
+
+import com.nis.domain.configuration.BaseCfg;
+
+/**
+ * 定时任务信息 schedule_info
+ * @author ThinkPad
+ *
+ */
+public class ScheduleCfg extends BaseCfg<ScheduleCfg>{
+	private static final long serialVersionUID = 7151915080876949497L;
+	
+	private String name;//定时任务名称，预留
+	private String cronValid;//生效cron表达式
+	private String cronInvalid;//失效cron表达式
+	private String whereStr;//动态where 条件
+	private int delFlag;
+	private int type;
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public String getCronValid() {
+		return cronValid;
+	}
+	public void setCronValid(String cronValid) {
+		this.cronValid = cronValid;
+	}
+	public String getCronInvalid() {
+		return cronInvalid;
+	}
+	public void setCronInvalid(String cronInvalid) {
+		this.cronInvalid = cronInvalid;
+	}
+	public String getWhereStr() {
+		return whereStr;
+	}
+	public void setWhereStr(String whereStr) {
+		this.whereStr = whereStr;
+	}
+	public int getType() {
+		return type;
+	}
+	public void setType(int type) {
+		this.type = type;
+	}
+	public int getDelFlag() {
+		return delFlag;
+	}
+	public void setDelFlag(int delFlag) {
+		this.delFlag = delFlag;
+	}
+	
+}

src/main/java/com/nis/domain/ScheduleExceInfo.java

@@ -0,0 +1,66 @@
+package com.nis.domain;
+
+import java.util.Date;
+
+import com.nis.domain.configuration.BaseCfg;
+
+/**
+ *  定时任务执行信息 schedule_exce_log/schedule_exce_new
+ *    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键自增',
+  `schedule_id` bigint(20) NOT NULL COMMENT 'schedule_info 表的主键',
+  `exce_time` datetime DEFAULT NULL COMMENT '最新执行时间',
+  `issue_status` int(255) DEFAULT NULL COMMENT '下发状态：1：生效，0：失效',
+  `issue_result` int(255) DEFAULT NULL COMMENT '下发结果：1：成功，0：失败',
+  `error_info` varchar(255) DEFAULT NULL COMMENT '下发失败原因',
+  `compile_id` bigint(20) DEFAULT NULL COMMENT '编译id',
+ * @author fang
+ *
+ */
+public class ScheduleExceInfo extends BaseCfg<ScheduleExceInfo>{
+	private static final long serialVersionUID = 7151915080876949497L;
+	
+	private Long scheduleId;//定时器id
+	private Date exceTime;//下发时间
+	private Integer issueStatus;//下发 的状态
+	private Integer issueResult;//下发结果
+	private String errorInfo;//动态where 条件
+	private Integer isIssue;//是否需要下发配置，1：需要，0：不需要
+	
+	public Long getScheduleId() {
+		return scheduleId;
+	}
+	public void setScheduleId(Long scheduleId) {
+		this.scheduleId = scheduleId;
+	}
+	public Date getExceTime() {
+		return exceTime;
+	}
+	public void setExceTime(Date exceTime) {
+		this.exceTime = exceTime;
+	}
+	public Integer getIssueStatus() {
+		return issueStatus;
+	}
+	public void setIssueStatus(Integer issueStatus) {
+		this.issueStatus = issueStatus;
+	}
+	public Integer getIssueResult() {
+		return issueResult;
+	}
+	public void setIssueResult(Integer issueResult) {
+		this.issueResult = issueResult;
+	}
+	public String getErrorInfo() {
+		return errorInfo;
+	}
+	public void setErrorInfo(String errorInfo) {
+		this.errorInfo = errorInfo;
+	}
+	public Integer getIsIssue() {
+		return isIssue;
+	}
+	public void setIsIssue(Integer isIssue) {
+		this.isIssue = isIssue;
+	}
+
+}

src/main/java/com/nis/domain/SysUserWarn.java

@@ -0,0 +1,92 @@
+package com.nis.domain;
+
+import java.util.Date;
+
+import javax.xml.bind.annotation.XmlTransient;
+
+import org.apache.poi.ss.formula.functions.T;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+public class SysUserWarn {
+	
+	private  String serviceId; //业务Id
+	private  String serviceDesc;//业务描述
+	private  Integer interfaceCfgTotal;//界面配置数量
+	
+	private  Integer systemCfgTotal;//服务端配置数量
+	
+	private  Date time;//时间
+	private  String remark;//备注
+	
+	private  Integer id;//serviceID
+	private  String tableName;//表名
+	/**
+	 * 当前实体分页对象
+	 */
+	protected Page<SysUserWarn> page;
+	
+	public String getServiceId() {
+		return serviceId;
+	}
+	public void setServiceId(String serviceId) {
+		this.serviceId = serviceId;
+	}
+	public String getServiceDesc() {
+		return serviceDesc;
+	}
+	public void setServiceDesc(String serviceDesc) {
+		this.serviceDesc = serviceDesc;
+	}
+	public Integer getInterfaceCfgTotal() {
+		return interfaceCfgTotal;
+	}
+	public void setInterfaceCfgTotal(Integer interfaceCfgTotal) {
+		this.interfaceCfgTotal = interfaceCfgTotal;
+	}
+	public Integer getSystemCfgTotal() {
+		return systemCfgTotal;
+	}
+	public void setSystemCfgTotal(Integer systemCfgTotal) {
+		this.systemCfgTotal = systemCfgTotal;
+	}
+	public Date getTime() {
+		return time;
+	}
+	public void setTime(Date time) {
+		this.time = time;
+	}
+	public String getRemark() {
+		return remark;
+	}
+	public void setRemark(String remark) {
+		this.remark = remark;
+	}
+	public Integer getId() {
+		return id;
+	}
+	public void setId(Integer id) {
+		this.id = id;
+	}
+	public String getTableName() {
+		return tableName;
+	}
+	public void setTableName(String tableName) {
+		this.tableName = tableName;
+	}
+	@JsonIgnore
+	@XmlTransient
+	public Page<SysUserWarn> getPage() {
+		if (page == null){
+			page = new Page<SysUserWarn>();
+		}
+		return page;
+	}
+	
+	public Page<SysUserWarn> setPage(Page<SysUserWarn> page) {
+		this.page = page;
+		return page;
+	}
+	
+	
+}

src/main/java/com/nis/domain/SysUserWarnData.java

@@ -0,0 +1,46 @@
+package com.nis.domain;
+
+import java.util.List;
+import java.util.Map;
+
+public class SysUserWarnData {
+	
+	private  Map<String,List<String>>  effective;
+	private  Integer effectiveCount;
+	private  Map<String,List<String>>  obsolete;
+	private  Integer obsoleteCount;
+	
+	
+	public Map<String, List<String>> getEffective() {
+		return effective;
+	}
+	public void setEffective(Map<String, List<String>> effective) {
+		this.effective = effective;
+	}
+	public Integer getEffectiveCount() {
+		return effectiveCount;
+	}
+	public void setEffectiveCount(Integer effectiveCount) {
+		this.effectiveCount = effectiveCount;
+	}
+	public Map<String, List<String>> getObsolete() {
+		return obsolete;
+	}
+	public void setObsolete(Map<String, List<String>> obsolete) {
+		this.obsolete = obsolete;
+	}
+	public Integer getObsoleteCount() {
+		return obsoleteCount;
+	}
+	public void setObsoleteCount(Integer obsoleteCount) {
+		this.obsoleteCount = obsoleteCount;
+	}
+	@Override
+	public String toString() {
+		return "SysUserWarnData [effective=" + effective + ", effectiveCount=" + effectiveCount + ", obsolete="
+				+ obsolete + ", obsoleteCount=" + obsoleteCount + "]";
+	}
+	
+	
+	
+}

src/main/java/com/nis/domain/SysUserWarnRecvData.java

@@ -0,0 +1,67 @@
+package com.nis.domain;
+
+public class SysUserWarnRecvData {
+	private Integer status;
+	private Integer businessCode;
+	private String reason;
+	private String msg;
+	private String fromuri;
+	private String logSource;
+	private String traceCode;
+	private SysUserWarnData  data;
+	
+	
+	public Integer getStatus() {
+		return status;
+	}
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+	public Integer getBusinessCode() {
+		return businessCode;
+	}
+	public void setBusinessCode(Integer businessCode) {
+		this.businessCode = businessCode;
+	}
+	public String getReason() {
+		return reason;
+	}
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+	public String getMsg() {
+		return msg;
+	}
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+	public String getFromuri() {
+		return fromuri;
+	}
+	public void setFromuri(String fromuri) {
+		this.fromuri = fromuri;
+	}
+	public String getLogSource() {
+		return logSource;
+	}
+	public void setLogSource(String logSource) {
+		this.logSource = logSource;
+	}
+	public String getTraceCode() {
+		return traceCode;
+	}
+	public void setTraceCode(String traceCode) {
+		this.traceCode = traceCode;
+	}
+	public SysUserWarnData getData() {
+		return data;
+	}
+	public void setData(SysUserWarnData data) {
+		this.data = data;
+	}
+	
+	
+
+	
+	
+}

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

@@ -20,12 +20,14 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
 	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=6)
 	@SerializedName("ipType")
 	private Integer ipType;
-	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=8)
-	private Integer ipPattern; 
+	private Integer srcIpPattern; 
+	@ExcelField(title="dest_ip_pattern",dictType="IP_PATTERN",sort=8)
+	private Integer destIpPattern; 
 	private String srcIpAddress; 
 	@ExcelField(title="ip",sort=7)
 	private String destIpAddress; 
-	private Integer portPattern; 
+	private Integer srcPortPattern; 
+	private Integer destPortPattern; 
 	private String srcPort; 
 	private String destPort; 
 	//@ExcelField(title="group",sort=2)
@@ -117,11 +119,30 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
 	public void setIpType(Integer ipType) {
 		this.ipType = ipType;
 	}
-	public Integer getIpPattern() {
-		return ipPattern;
+	
+	public Integer getSrcIpPattern() {
+		return srcIpPattern;
 	}
-	public void setIpPattern(Integer ipPattern) {
-		this.ipPattern = 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 String getSrcIpAddress() {
 		return srcIpAddress;
@@ -135,12 +156,6 @@ 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;
 	}
@@ -176,9 +191,10 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
 	}
 	@Override
 	public String toString() {
-		return "AsnIpCfg [regionId=" + regionId + ", ratelimit=" + ratelimit + ", ipType=" + ipType + ", ipPattern="
-				+ ipPattern + ", srcIpAddress=" + srcIpAddress + ", destIpAddress=" + destIpAddress + ", portPattern="
-				+ portPattern + ", srcPort=" + srcPort + ", destPort=" + destPort + ", asnIpGroupName=" + asnIpGroupName
+		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
 				+ ", 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/basics/CommonGroupInfo.java

@@ -0,0 +1,74 @@
+package com.nis.domain.basics;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
+
+/**
+ * 公共分组实体
+ */
+public class CommonGroupInfo extends BaseCfg<CommonGroupInfo> implements Serializable{
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 7931466570918016654L;
+	
+	private Integer groupId;
+	
+	@ExcelField(title="group_name",sort=1)
+	private String groupName;
+	
+	@ExcelField(title="group_type",dictType="GROUP_TYPE",sort=2)
+	private Integer groupType;
+	
+	private Integer serviceGroupId;
+	
+	@ExcelField(title="desc",sort=4)
+	private String description;
+	
+	public Integer getServiceGroupId() {
+		return serviceGroupId;
+	}
+	public void setServiceGroupId(Integer serviceGroupId) {
+		this.serviceGroupId = serviceGroupId;
+	}
+	public Integer getGroupId() {
+		return groupId;
+	}
+	public void setGroupId(Integer groupId) {
+		this.groupId = groupId;
+	}
+	public String getGroupName() {
+		return groupName;
+	}
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public Date getEditTime() {
+		return editTime;
+	}
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+	public Integer getGroupType() {
+		return groupType;
+	}
+	public void setGroupType(Integer groupType) {
+		this.groupType = groupType;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+}

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

@@ -0,0 +1,67 @@
+package com.nis.domain.basics;
+
+import com.nis.domain.configuration.BaseStringCfg;
+import com.nis.util.excel.ExcelField;
+
+public class DomainCommCfg extends BaseStringCfg<DomainCommCfg>{
+
+	private static final long serialVersionUID = 5117517145731135023L;
+	private static final String tableName="domain_comm_cfg";
+
+    @ExcelField(title="key_word",sort=3)
+    protected String cfgKeywords;
+
+    protected Integer isHexbin;
+    
+    protected String ratelimit;
+    
+    @ExcelField(title="group_name",sort=2)
+    protected String  groupName;//公共组名称
+    
+    @ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=18)
+	protected Integer exprType;
+    
+	@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=20)
+	protected Integer matchMethod;
+
+    public String getCfgKeywords() {
+        return cfgKeywords;
+    }
+    public void setCfgKeywords(String cfgKeywords) {
+        this.cfgKeywords = cfgKeywords;
+    }
+    public Integer getIsHexbin() {
+        return isHexbin;
+    }
+    public void setIsHexbin(Integer isHexbin) {
+        this.isHexbin = isHexbin;
+    }
+    public String getRatelimit() {
+        return ratelimit;
+    }
+    public void setRatelimit(String ratelimit) {
+        this.ratelimit = ratelimit;
+    }
+    public static String getTablename() {
+        return tableName;
+    }
+    public String getGroupName() {
+        return groupName;
+    }
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+	public Integer getMatchMethod() {
+		return matchMethod;
+	}
+	public void setMatchMethod(Integer matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+	public Integer getExprType() {
+		return exprType;
+	}
+	public void setExprType(Integer exprType) {
+		this.exprType = exprType;
+	}
+
+}

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

@@ -0,0 +1,312 @@
+package com.nis.domain.basics;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
+
+public class IpCommCfg extends BaseCfg<IpCommCfg> {
+
+
+    /**
+     *
+     */
+    private static final long serialVersionUID = 4218856118489784060L;
+
+    /**
+     * 创建一个新的实例 BaseIpCfg.
+     *
+     */
+    public IpCommCfg() {
+        super();
+        // TODO Auto-generated constructor stub
+    }
+    private static final String indexTable="ip_comm_cfg";
+    /**
+     * ip类型
+     */
+    @Expose
+    @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)
+    protected String srcIpAddress;
+    @ExcelField(title="dest_ip_pattern",dictType="IP_PATTERN",sort=53)
+    protected Integer destIpPattern;
+    @ExcelField(title="server_ip",sort=54)
+    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=56)
+    protected Integer destPortPattern;
+    @ExcelField(title="client_port",sort=55)
+    protected String srcPort;
+    @ExcelField(title="server_port",sort=57)
+    protected String destPort;
+    protected Integer dnsStrategyId;
+    @ExcelField(title="ir_type",dictType="IR_TYPE",sort=58)
+    protected Integer irType;
+    @ExcelField(title="group_name",sort=45)
+    protected String groupName;
+    //	@ExcelField(title="log_total",sort=42)
+    private Long totalLogs;
+    private Integer regionId;
+    private Integer groupId;
+
+    public Integer getRegionId() {
+        return regionId;
+    }
+    public void setRegionId(Integer regionId) {
+        this.regionId = regionId;
+    }
+    public Integer getGroupId() {
+        return groupId;
+    }
+    public void setGroupId(Integer groupId) {
+        this.groupId = groupId;
+    }
+    public Long getTotalLogs() {
+        return totalLogs;
+    }
+    public void setTotalLogs(Long totalLogs) {
+        this.totalLogs = totalLogs;
+    }
+    /**
+     * irType
+     * @return  irType
+     */
+
+    public Integer getIrType() {
+        return irType;
+    }
+    /**
+     * @param irType the irType to set
+     */
+    public void setIrType(Integer irType) {
+        this.irType = irType;
+    }
+    /**
+     * groupName
+     * @return  groupName
+     */
+
+    public String getGroupName() {
+        return groupName;
+    }
+    /**
+     * @param groupName the groupName to set
+     */
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+    /**
+     * 方向
+     */
+    @Expose
+    @SerializedName("direction")
+    @ExcelField(title="direction",dictType="DIRECTION",sort=58)
+    protected Integer direction ;
+    /**
+     * 协议
+     */
+    @Expose
+    @SerializedName("protocol")
+    @ExcelField(title="protocol",dictType="PROTOCOL",sort=59)
+    protected Integer protocol ;
+    /**
+     * 协议ID
+     */
+    @Expose
+    @SerializedName("protocolId")
+    protected Integer protocolId ;
+    /**
+     * 限速比例
+     */
+    protected String ratelimit ;
+
+    /**
+     * ratelimit
+     * @return  ratelimit
+     */
+
+    public String getRatelimit() {
+        return ratelimit;
+    }
+    /**
+     * @param ratelimit the ratelimit to set
+     */
+    public void setRatelimit(String ratelimit) {
+        this.ratelimit = ratelimit;
+    }
+    /**
+     * ipType
+     * @return  ipType
+     */
+
+    public Integer getIpType() {
+        return ipType;
+    }
+    /**
+     * @param ipType the ipType to set
+     */
+    public void setIpType(Integer ipType) {
+        this.ipType = ipType;
+    }
+
+    /**
+     * direction
+     * @return  direction
+     */
+
+    public Integer getDirection() {
+        return direction;
+    }
+    /**
+     * @param direction the direction to set
+     */
+    public void setDirection(Integer direction) {
+        this.direction = direction;
+    }
+    /**
+     * protocol
+     * @return  protocol
+     */
+
+    public Integer getProtocol() {
+        return protocol;
+    }
+    /**
+     * @param protocol the protocol to set
+     */
+    public void setProtocol(Integer protocol) {
+        this.protocol = protocol;
+    }
+    /**
+     * protocolId
+     * @return  protocolId
+     */
+
+    public Integer getProtocolId() {
+        return protocolId;
+    }
+    /**
+     * @param protocolId the protocolId to set
+     */
+    public void setProtocolId(Integer protocolId) {
+        this.protocolId = protocolId;
+    }
+
+
+    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;
+    }
+    /**
+     * srcIpAddress
+     * @return  srcIpAddress
+     */
+
+    public String getSrcIpAddress() {
+        return srcIpAddress;
+    }
+    /**
+     * @param srcIpAddress the srcIpAddress to set
+     */
+    public void setSrcIpAddress(String srcIpAddress) {
+        this.srcIpAddress = srcIpAddress;
+    }
+    /**
+     * destIpAddress
+     * @return  destIpAddress
+     */
+
+    public String getDestIpAddress() {
+        return destIpAddress;
+    }
+    /**
+     * @param destIpAddress the destIpAddress to set
+     */
+    public void setDestIpAddress(String destIpAddress) {
+        this.destIpAddress = destIpAddress;
+    }
+    /**
+     * srcPort
+     * @return  srcPort
+     */
+
+    public String getSrcPort() {
+        return srcPort;
+    }
+    /**
+     * @param srcPort the srcPort to set
+     */
+    public void setSrcPort(String srcPort) {
+        this.srcPort = srcPort;
+    }
+    /**
+     * destPort
+     * @return  destPort
+     */
+
+    public String getDestPort() {
+        return destPort;
+    }
+    /**
+     * @param destPort the destPort to set
+     */
+    public void setDestPort(String destPort) {
+        this.destPort = destPort;
+    }
+
+    /**
+     * dnsStrategyId
+     * @return  dnsStrategyId
+     */
+
+    public Integer getDnsStrategyId() {
+        return dnsStrategyId;
+    }
+    /**
+     * @param dnsStrategyId the dnsStrategyId to set
+     */
+    public void setDnsStrategyId(Integer dnsStrategyId) {
+        this.dnsStrategyId = dnsStrategyId;
+    }
+    @Override
+    public void initDefaultValue(){
+        super.initDefaultValue();
+        this.direction = 0;
+    }
+
+    public static String getIndexTable() {
+        return indexTable;
+    }
+    public Integer getIndex() {
+        return index;
+    }
+    public void setIndex(Integer index) {
+        this.index = index;
+    }
+}

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

@@ -0,0 +1,57 @@
+package com.nis.domain.basics;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.nis.domain.configuration.BaseCfg;
+
+public class ProtectionListInfo extends BaseCfg<ProtectionListInfo> implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -3781310894175345207L;
+	private Integer proId;
+	private String keyword;
+	private String targetType;
+	private String description;
+	
+	
+	public Integer getProId() {
+		return proId;
+	}
+	public void setProId(Integer proId) {
+		this.proId = proId;
+	}
+	public String getKeyword() {
+		return keyword;
+	}
+	public void setKeyword(String keyword) {
+		this.keyword = keyword;
+	}
+	public String getTargetType() {
+		return targetType;
+	}
+	public void setTargetType(String targetType) {
+		this.targetType = targetType;
+	}
+	public Date getCreateTime() {
+		return createTime;
+	}
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+	public Date getEditTime() {
+		return editTime;
+	}
+	public void setEditTime(Date editTime) {
+		this.editTime = editTime;
+	}
+	public String getDescription() {
+		return description;
+	}
+	public void setDescription(String description) {
+		this.description = description;
+	}
+	
+}

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

@@ -0,0 +1,67 @@
+package com.nis.domain.basics;
+
+import com.nis.domain.configuration.BaseStringCfg;
+import com.nis.util.excel.ExcelField;
+
+public class ScriberIdCommCfg extends BaseStringCfg<ScriberIdCommCfg>{
+
+	private static final long serialVersionUID = 5117517145731135023L;
+	private static final String tableName="scriberid_comm_cfg";
+
+    @ExcelField(title="key_word",sort=3)
+    protected String cfgKeywords;
+
+    protected Integer isHexbin;
+    
+    protected String ratelimit;
+    
+    @ExcelField(title="group_name",sort=2)
+    protected String  groupName;//公共组名称
+    
+    @ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=18)
+	protected Integer exprType;
+    
+	@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=20)
+	protected Integer matchMethod;
+
+    public String getCfgKeywords() {
+        return cfgKeywords;
+    }
+    public void setCfgKeywords(String cfgKeywords) {
+        this.cfgKeywords = cfgKeywords;
+    }
+    public Integer getIsHexbin() {
+        return isHexbin;
+    }
+    public void setIsHexbin(Integer isHexbin) {
+        this.isHexbin = isHexbin;
+    }
+    public String getRatelimit() {
+        return ratelimit;
+    }
+    public void setRatelimit(String ratelimit) {
+        this.ratelimit = ratelimit;
+    }
+    public static String getTablename() {
+        return tableName;
+    }
+    public String getGroupName() {
+        return groupName;
+    }
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+	public Integer getMatchMethod() {
+		return matchMethod;
+	}
+	public void setMatchMethod(Integer matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+	public Integer getExprType() {
+		return exprType;
+	}
+	public void setExprType(Integer exprType) {
+		this.exprType = exprType;
+	}
+
+}

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

@@ -0,0 +1,66 @@
+package com.nis.domain.basics;
+
+import com.nis.domain.configuration.BaseStringCfg;
+import com.nis.util.excel.ExcelField;
+
+public class UrlCommCfg extends BaseStringCfg<UrlCommCfg>{
+
+    private static final long serialVersionUID = 398247881810945300L;
+    private static final String tableName="url_comm_cfg";
+
+    @ExcelField(title="key_word",sort=3)
+    protected String  cfgKeywords;//url关键字配置
+
+    protected Integer  isHexbin;//是否大小写敏感
+    protected String  ratelimit;//限速比例,0到1之间
+    @ExcelField(title="group_name",sort=2)
+    protected String  groupName;//公共组名称
+    
+    @ExcelField(title="expression_type",dictType="EXPRESSION_TYPE",sort=18)
+	protected Integer exprType;
+    
+	@ExcelField(title="match_method",dictType="MATCH_METHOD",sort=20)
+	protected Integer matchMethod;
+
+    public String getCfgKeywords() {
+        return cfgKeywords;
+    }
+    public void setCfgKeywords(String cfgKeywords) {
+        this.cfgKeywords = cfgKeywords;
+    }
+    public Integer getIsHexbin() {
+        return isHexbin;
+    }
+    public void setIsHexbin(Integer isHexbin) {
+        this.isHexbin = isHexbin;
+    }
+    public String getRatelimit() {
+        return ratelimit;
+    }
+    public void setRatelimit(String ratelimit) {
+        this.ratelimit = ratelimit;
+    }
+    public static String getTablename() {
+        return tableName;
+    }
+
+    public String getGroupName() {
+        return groupName;
+    }
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+	public Integer getMatchMethod() {
+		return matchMethod;
+	}
+	public void setMatchMethod(Integer matchMethod) {
+		this.matchMethod = matchMethod;
+	}
+	public Integer getExprType() {
+		return exprType;
+	}
+	public void setExprType(Integer exprType) {
+		this.exprType = exprType;
+	}
+
+}

src/main/java/com/nis/domain/callback/ProxyFileHijackCfg.java

@@ -0,0 +1,54 @@
+package com.nis.domain.callback;
+
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
+
+/**
+ * http代理劫持文件
+ * @author lenovo
+ * 
+ */
+public class ProxyFileHijackCfg extends BaseCfg<ProxyFileHijackCfg>{
+
+	private static final long serialVersionUID = -4600604393808056286L;
+	public String indexTable = "pxy_profile_hijack_files";//对应表名
+	@ExcelField(title="profile_name",sort=1)
+	private String profileName;//名称，辅助记忆
+	@ExcelField(title="content_type",sort=3)
+	private String contentType;//填充HTTP content-type，如“video/mp4” （exe、apk）
+	@ExcelField(title="hijack_file_strategy",sort=2)
+	private String path;//储存路径
+	@ExcelField(title="content_name",sort=4)
+	private String contentName;//内容格式
+		
+	public String getContentName() {
+		return contentName;
+	}
+	public void setContentName(String contentName) {
+		this.contentName = contentName;
+	}	
+	public String getIndexTable() {
+		return indexTable;
+	}
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+	public String getProfileName() {
+		return profileName;
+	}
+	public void setProfileName(String profileName) {
+		this.profileName = profileName;
+	}
+	public String getContentType() {
+		return contentType;
+	}
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+	public String getPath() {
+		return path;
+	}
+	public void setPath(String path) {
+		this.path = path;
+	}
+}

src/main/java/com/nis/domain/callback/ProxyFileHijackCfgAudit.java

@@ -0,0 +1,114 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+
+public class ProxyFileHijackCfgAudit {
+	
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Integer profileId;//compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String profileName;
+	@Expose
+	private String contentType;
+	@Expose
+	private String path;
+	@Expose
+	private String contentName;
+	@Expose
+	private Long opUser;
+	
+	public Long getOpUser() {
+		return opUser;
+	}
+	public void setOpUser(Long opUser) {
+		this.opUser = opUser;
+	}
+	
+	public String getContentName() {
+		return contentName;
+	}
+
+	public void setContentName(String contentName) {
+		this.contentName = contentName;
+	}
+
+	public String getPath() {
+		return path;
+	}
+
+	public void setPath(String path) {
+		this.path = path;
+	}
+
+	public Long getId() {
+		return id;
+	}
+	
+	public Integer getProfileId() {
+		return profileId;
+	}
+
+	public void setProfileId(Integer profileId) {
+		this.profileId = profileId;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public Integer getService() {
+		return service;
+	}
+	public void setService(Integer service) {
+		this.service = service;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public Date getOpTime() {
+		return opTime;
+	}
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+	public String getProfileName() {
+		return profileName;
+	}
+	public void setProfileName(String profileName) {
+		this.profileName = profileName;
+	}
+	public String getContentType() {
+		return contentType;
+	}
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+}

src/main/java/com/nis/domain/callback/ProxyFileInsertScriptCfg.java

@@ -0,0 +1,40 @@
+package com.nis.domain.callback;
+
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
+
+public class ProxyFileInsertScriptCfg extends BaseCfg<ProxyFileInsertScriptCfg>{
+	
+	private static final long serialVersionUID = 4705202662940705064L;
+	public String indexTable = "pxy_profile_insert_scripts";//对应表名
+	@ExcelField(title="script_name",sort=1)
+	private String cfgDesc;//名称，辅助记忆
+	@ExcelField(title="script_format",sort=3)
+	private String format;//css/js
+	@ExcelField(title="script_file",sort=2)
+	private String path;//储存路径	
+	public String getIndexTable() {
+		return indexTable;
+	}
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+	public String getCfgDesc() {
+		return cfgDesc;
+	}
+	public void setCfgDesc(String cfgDesc) {
+		this.cfgDesc = cfgDesc;
+	}
+	public String getFormat() {
+		return format;
+	}
+	public void setFormat(String format) {
+		this.format = format;
+	}
+	public String getPath() {
+		return path;
+	}
+	public void setPath(String path) {
+		this.path = path;
+	}
+}

src/main/java/com/nis/domain/callback/ProxyFileInsertScriptCfgAudit.java

@@ -0,0 +1,99 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+
+public class ProxyFileInsertScriptCfgAudit {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Integer profileId;//compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String profileName;
+	@Expose
+	private String format;
+	@Expose
+	private String path;
+	@Expose
+	private Long opUser;
+	
+	public Long getOpUser() {
+		return opUser;
+	}
+	public void setOpUser(Long opUser) {
+		this.opUser = opUser;
+	}
+	
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getProfileId() {
+		return profileId;
+	}
+	public void setProfileId(Integer profileId) {
+		this.profileId = profileId;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public Integer getService() {
+		return service;
+	}
+	public void setService(Integer service) {
+		this.service = service;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public Date getOpTime() {
+		return opTime;
+	}
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+	public String getProfileName() {
+		return profileName;
+	}
+	public void setProfileName(String profileName) {
+		this.profileName = profileName;
+	}
+	public String getFormat() {
+		return format;
+	}
+	public void setFormat(String format) {
+		this.format = format;
+	}
+	public String getPath() {
+		return path;
+	}
+	public void setPath(String path) {
+		this.path = path;
+	}
+	
+}

src/main/java/com/nis/domain/callback/ProxyFileResponsePageCfg.java

@@ -0,0 +1,67 @@
+package com.nis.domain.callback;
+
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
+/**
+ * http代理文件策略
+ * @author nanfang
+ * 
+ */
+public class ProxyFileResponsePageCfg extends BaseCfg<ProxyFileResponsePageCfg> {
+	
+	private static final long serialVersionUID = -1989406217948847813L;
+	public final static String TABLE_NAME = "pxy_profile_response_pages";//对应表名
+	private String indexTable = "pxy_profile_response_pages";
+	@ExcelField(title="file_desc",sort=1)
+	private String fileDesc;//文件描述
+	@ExcelField(title="response_file",sort=2)
+	private String url;//文件保存的url
+	@ExcelField(title="format",sort=3)
+	private String contentType;//内容类型，如text/html，取字典表contentType
+	private String md5;//文件md5值
+	private Long contentLength;//文件长度	
+
+	public String getIndexTable() {
+		return indexTable;
+	}
+
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+
+	public ProxyFileResponsePageCfg() {
+		super();
+	}
+	
+	public String getFileDesc() {
+		return fileDesc;
+	}
+	public void setFileDesc(String fileDesc) {
+		this.fileDesc = fileDesc;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getContentType() {
+		return contentType;
+	}
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+	public Long getContentLength() {
+		return contentLength;
+	}
+	public void setContentLength(Long contentLength) {
+		this.contentLength = contentLength;
+	}
+	public String getMd5() {
+		return md5;
+	}
+	public void setMd5(String md5) {
+		this.md5 = md5;
+	}
+	
+}

src/main/java/com/nis/domain/callback/ProxyFileResponsePageCfgAudit.java

@@ -0,0 +1,106 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+
+public class ProxyFileResponsePageCfgAudit {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String format;
+	@Expose
+	private Long contentLength;
+	@Expose
+	private String path;
+	@Expose
+	private Long profileId;
+	@Expose
+	private String profileName;
+	@Expose
+	private Long opUser;
+	
+	public Long getOpUser() {
+		return opUser;
+	}
+	public void setOpUser(Long opUser) {
+		this.opUser = opUser;
+	}
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public Integer getService() {
+		return service;
+	}
+	public void setService(Integer service) {
+		this.service = service;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public Date getOpTime() {
+		return opTime;
+	}
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+	public String getFormat() {
+		return format;
+	}
+	public void setFormat(String format) {
+		this.format = format;
+	}
+	public Long getContentLength() {
+		return contentLength;
+	}
+	public void setContentLength(Long contentLength) {
+		this.contentLength = contentLength;
+	}
+	public String getPath() {
+		return path;
+	}
+	public void setPath(String path) {
+		this.path = path;
+	}
+	public Long getProfileId() {
+		return profileId;
+	}
+	public void setProfileId(Long profileId) {
+		this.profileId = profileId;
+	}
+	public String getProfileName() {
+		return profileName;
+	}
+	public void setProfileName(String profileName) {
+		this.profileName = profileName;
+	}
+	
+}

src/main/java/com/nis/domain/callback/ProxyFileStrategyCfg.java

@@ -9,12 +9,21 @@ import com.nis.domain.configuration.BaseCfg;
 public class ProxyFileStrategyCfg extends BaseCfg<ProxyFileStrategyCfg> {
 	private static final long serialVersionUID = 4283944377949702481L;
 	public final static String TABLE_NAME = "PROXY_FILE_STRATEGY_CFG";//对应表名
+	private String indexTable = "proxy_file_strategy_cfg";
 	private String fileDesc;//文件描述
 	private String url;//文件保存的url
 	private String contentType;//内容类型，如text/html，取字典表contentType
 	private String md5;//文件md5值
 	private Long contentLength;//文件长度
 	
+	public String getIndexTable() {
+		return indexTable;
+	}
+
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+
 	public ProxyFileStrategyCfg() {
 		super();
 	}

src/main/java/com/nis/domain/callback/ProxyFileStrategyCfgAudit.java

@@ -0,0 +1,106 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+
+import com.google.gson.annotations.Expose;
+
+public class ProxyFileStrategyCfgAudit {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String contentType;
+	@Expose
+	private Long contentLength;
+	@Expose
+	private String filePath;
+	@Expose
+	private Long fileId;
+	@Expose
+	private String fileDesc;
+	@Expose
+	private Long opUser;
+	
+	public Long getOpUser() {
+		return opUser;
+	}
+	public void setOpUser(Long opUser) {
+		this.opUser = opUser;
+	}
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public Integer getService() {
+		return service;
+	}
+	public void setService(Integer service) {
+		this.service = service;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public Date getOpTime() {
+		return opTime;
+	}
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+	public String getContentType() {
+		return contentType;
+	}
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+	public Long getContentLength() {
+		return contentLength;
+	}
+	public void setContentLength(Long contentLength) {
+		this.contentLength = contentLength;
+	}
+	public String getFilePath() {
+		return filePath;
+	}
+	public void setFilePath(String filePath) {
+		this.filePath = filePath;
+	}
+	public Long getFileId() {
+		return fileId;
+	}
+	public void setFileId(Long fileId) {
+		this.fileId = fileId;
+	}
+	public String getFileDesc() {
+		return fileDesc;
+	}
+	public void setFileDesc(String fileDesc) {
+		this.fileDesc = fileDesc;
+	}
+	
+}

src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfg.java

@@ -0,0 +1,45 @@
+package com.nis.domain.callback;
+
+
+import java.util.Arrays;
+
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.excel.ExcelField;
+
+import antlr.collections.List;
+
+public class ProxyFileTrafficMirrorCfg extends BaseCfg<ProxyFileTrafficMirrorCfg>{
+	
+	private static final long serialVersionUID = -5895958073449509268L;
+	public  String indexTable = "pxy_profile_traffic_mirror";//对应表名
+	@ExcelField(title="address_name",sort=1)
+	private String cfgDesc;//名称，辅助记忆
+	@ExcelField(title="mirror_addr_list",sort=3)
+	private String addrList;//目标表示列表
+	@ExcelField(title="mirror_addr_type",sort=2)
+	private String addrType;//目标表示类型
+	public String getIndexTable() {
+		return indexTable;
+	}
+	public void setIndexTable(String indexTable) {
+		this.indexTable = indexTable;
+	}
+	public String getCfgDesc() {
+		return cfgDesc;
+	}
+	public void setCfgDesc(String cfgDesc) {
+		this.cfgDesc = cfgDesc;
+	}
+	public String getAddrList() {
+		return addrList;
+	}
+	public void setAddrList(String addrList) {
+		this.addrList = addrList;
+	}
+	public String getAddrType() {
+		return addrType;
+	}
+	public void setAddrType(String addrType) {
+		this.addrType = addrType;
+	}	
+}

src/main/java/com/nis/domain/callback/ProxyFileTrafficMirrorCfgAudit.java

@@ -0,0 +1,106 @@
+package com.nis.domain.callback;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import com.google.gson.annotations.Expose;
+
+public class ProxyFileTrafficMirrorCfgAudit {
+	@Expose
+	private Long id; //compileId
+	@Expose
+	private Integer cfgId; //compileId
+	@Expose
+	private Integer profileId;//compileId
+	@Expose
+	private Integer action;
+	@Expose
+	private Integer service;
+	@Expose
+	private Integer isValid;
+	@Expose
+	private Date opTime;
+	@Expose
+	private String profileName;
+	@Expose
+	private String addrList;
+	@Expose
+	private String addrContent;
+	@Expose
+	private String addrType;
+	@Expose
+	private Long opUser;
+	public Long getId() {
+		return id;
+	}
+	public void setId(Long id) {
+		this.id = id;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public Integer getProfileId() {
+		return profileId;
+	}
+	public void setProfileId(Integer profileId) {
+		this.profileId = profileId;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public Integer getService() {
+		return service;
+	}
+	public void setService(Integer service) {
+		this.service = service;
+	}
+	public Integer getIsValid() {
+		return isValid;
+	}
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+	public Date getOpTime() {
+		return opTime;
+	}
+	public void setOpTime(Date opTime) {
+		this.opTime = opTime;
+	}
+	public String getProfileName() {
+		return profileName;
+	}
+	public void setProfileName(String profileName) {
+		this.profileName = profileName;
+	}	
+	public String getAddrList() {
+		return addrList;
+	}
+	public void setAddrList(String addrList) {
+		this.addrList = addrList;
+	}
+	public String getAddrContent() {
+		return addrContent;
+	}
+	public void setAddrContent(String addrContent) {
+		this.addrContent = addrContent;
+	}
+	public String getAddrType() {
+		return addrType;
+	}
+	public void setAddrType(String addrType) {
+		this.addrType = addrType;
+	}
+	public Long getOpUser() {
+		return opUser;
+	}
+	public void setOpUser(Long opUser) {
+		this.opUser = opUser;
+	}	
+}

src/main/java/com/nis/domain/callback/ProxyObjKeyring.java

@@ -26,7 +26,7 @@ public class ProxyObjKeyring {
 	private String privateKeyFile;
 	@Expose
 	private String publicKeyFile;
-	@Expose
+	//@Expose
 	private Integer expireAfter;
 	@Expose
 	private String publicKeyAlgo;

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

@@ -1,8 +1,6 @@
 
 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;
@@ -34,11 +32,13 @@ public class AppIpCfg extends BaseCfg<AppIpCfg> {
 	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=3)
 	@SerializedName("ipType")
 	protected Integer ipType;
-	protected Integer ipPattern; 
+	protected Integer srcIpPattern; 
+	protected Integer destIpPattern; 
 	protected String srcIpAddress; 
 	@ExcelField(title="server_ip",sort=4)
 	protected String destIpAddress; 
-	protected Integer portPattern; 
+	protected Integer srcPortPattern; 
+	protected Integer destPortPattern; 
 	protected String srcPort; 
 	@ExcelField(title="server_port",sort=5)
 	protected String destPort; 
@@ -121,34 +121,7 @@ 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
@@ -158,6 +131,30 @@ 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
 	 */
@@ -257,16 +254,10 @@ 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
-				+ ", 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 + "]";
+				+ ", srcIpPattern=" + srcIpPattern + ", destIpPattern=" + destIpPattern + ", srcIpAddress="
+				+ srcIpAddress + ", destIpAddress=" + destIpAddress + ", srcPortPattern=" + srcPortPattern
+				+ ", destPortPattern=" + destPortPattern + ", srcPort=" + srcPort + ", destPort=" + destPort
+				+ ", direction=" + direction + ", protocol=" + protocol + "]";
 	}
+	
 }

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

@@ -39,6 +39,9 @@ public class AppTopicDomainCfg extends BaseCfg<AppTopicDomainCfg> {
 	@ExcelField(title="topic",dictType="TOPIC",sort=2)
 	private Long topicId;
 	
+	private String topic;
+	private String websiteService;
+	
 	/**
 	 * 表达式类型
 	 */
@@ -180,4 +183,20 @@ public class AppTopicDomainCfg extends BaseCfg<AppTopicDomainCfg> {
 		this.websiteServiceId = websiteServiceId;
 	}
 
+	public String getTopic() {
+		return topic;
+	}
+
+	public void setTopic(String topic) {
+		this.topic = topic;
+	}
+
+	public String getWebsiteService() {
+		return websiteService;
+	}
+
+	public void setWebsiteService(String websiteService) {
+		this.websiteService = websiteService;
+	}
+
 }

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

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

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

@@ -9,8 +9,18 @@ package com.nis.domain.configuration;
  * @version V1.0
  */
 public class AvVoipAccountCfg extends BaseStringCfg<AvVoipAccountCfg>{
-	
+	private static final String tableName="av_voip_account_cfg";
 	
 	private static final long serialVersionUID = -7398698517584394431L;
 	
+	@Override
+	public void initDefaultValue() {
+		super.initDefaultValue();
+		this.exprType=0;
+		this.matchMethod=0;
+	}
+	public static String getTablename() {
+		return tableName;
+	}
+	
 }

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

@@ -16,6 +16,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import com.nis.domain.BaseEntity;
+import com.nis.domain.ScheduleCfg;
 import com.nis.domain.SysMenu;
 import com.nis.util.Constants;
 import com.nis.util.StringUtil;
@@ -61,16 +62,43 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	protected String exType;//导出类型
 	protected String hColumns;//导出隐藏列
 	
-	private String commonGroupIds; //公共组织id(考虑一个compile存在多个asn组织的情况)
+	protected String compileIdNew;// 查询 配置ID 范围
+	
+	//批量操作时，记录isAudit和isValid检索条件
+	protected String batchAuditValue;
+	protected String batchValidValue;
+
+	/**
+	 * 定时任务信息
+	 */
+	//protected List<ScheduleCfg> schedules;
+	/**
+	 * 定时任务信息，2019年1月18日18:54:53 修改
+	 */
+	protected ScheduleCfg schedule;
+
+	protected String commonGroupIds; //公共组织id(考虑一个compile存在多个asn组织的情况)
+	protected Integer groupType; //url组以及dns组相关功能使用
+	protected Integer udFlag; //url组以及dns组相关功能使用 过滤数据库数据标记
+	
 	public String getCommonGroupIds() {
 		return commonGroupIds;
 	}
-	
 	public void setCommonGroupIds(String commonGroupIds) {
 		this.commonGroupIds = commonGroupIds;
 	}
-	
-	
+	public Integer getGroupType() {
+		return groupType;
+	}
+	public void setGroupType(Integer groupType) {
+		this.groupType = groupType;
+	}
+	public Integer getUdFlag() {
+		return udFlag;
+	}
+	public void setUdFlag(Integer udFlag) {
+		this.udFlag = udFlag;
+	}
 	
 	public String getExType() {
 		return exType;
@@ -98,7 +126,13 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	public void setCompileGroupMap(Map<Integer, Integer> compileGroupMap) {
 		this.compileGroupMap = compileGroupMap;
 	}
-	
+	public String getCompileIdNew() {
+		return compileIdNew;
+	}
+	public void setCompileIdNew(String compileIdNew) {
+		this.compileIdNew = compileIdNew;
+	}
+
 	/**
 	 * 编译id
 	 */
@@ -350,26 +384,24 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	 */
 	public void setFunctionId(Integer functionId) {
 		this.functionId = functionId;
-		if(!StringUtil.isEmpty(functionId) && StringUtil.isEmpty(this.menuNameCode)){
-			List<SysMenu> list = UserUtils.getMenuList();
+	}
+	
+	public String getMenuNameCode() {
+		if(!StringUtil.isEmpty(this.functionId) && StringUtil.isEmpty(menuNameCode)){
+			List<SysMenu> list = UserUtils.getMenuCfgList();
 			if(!StringUtil.isEmpty(list)) {
 				for (SysMenu menu :list) {
 					if (!StringUtil.isEmpty(menu.getCode()) 
 							&&menu.getFunctionId()!=null 
-							&& menu.getFunctionId().equals(functionId)
+							&& menu.getFunctionId().equals(this.functionId)
 							//&& menu.getFunctionId().equals(functionId)
 							) {
 						this.setMenuNameCode(menu.getCode());
 						break;
 					}
-					
 				}
 			}
 		}
-
-	}
-	
-	public String getMenuNameCode() {
 		return menuNameCode;
 	}
 	public void setMenuNameCode(String menuNameCode) {
@@ -982,5 +1014,23 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	public void setDoBlackList(Integer doBlackList) {
 		this.doBlackList = doBlackList;
 	}
+	public ScheduleCfg getSchedule() {
+		return schedule;
+	}
+	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

@@ -9,6 +9,7 @@
 package com.nis.domain.configuration;
 
 import java.util.List;
+import java.util.Map;
 
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
@@ -45,14 +46,18 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	@SerializedName("ipType")
 	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=50)
 	protected Integer ipType;
-	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=51)
-	protected Integer ipPattern; 
-	@ExcelField(title="client_ip",sort=53)
+	@ExcelField(title="src_ip_pattern",dictType="IP_PATTERN",sort=51)
+	protected Integer srcIpPattern; 
+	@ExcelField(title="client_ip",sort=52)
 	protected String srcIpAddress; 
-	@ExcelField(title="server_ip",sort=52)
+	@ExcelField(title="dest_ip_pattern",dictType="IP_PATTERN",sort=53)
+	protected Integer destIpPattern; 
+	@ExcelField(title="server_ip",sort=54)
 	protected String destIpAddress;
-	@ExcelField(title="port_pattern",dictType="PORT_PATTERN",sort=54)
-	protected Integer portPattern;
+	@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="client_port",sort=55)
 	protected String srcPort;
 	@ExcelField(title="server_port",sort=56)
@@ -75,7 +80,7 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	protected String organization; //仅用于copy属性使用
 	protected String country; //仅用于copy属性使用
 	protected String detail; //仅用于copy属性使用
-	@ExcelField(title="log_total",sort=42)
+//	@ExcelField(title="log_total",sort=42)
 	private Long totalLogs;
 	
 	public String getOrganization() {
@@ -269,35 +274,31 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 		this.protocolId = protocolId;
 	}
 	
-	/**
-	 * ipPattern
-	 * @return  ipPattern
-	*/
 	
-	public Integer getIpPattern() {
-		return ipPattern;
+	public Integer getSrcIpPattern() {
+		return srcIpPattern;
 	}
-	/**
-	 * @param ipPattern the ipPattern to set
-	 */
-	public void setIpPattern(Integer ipPattern) {
-		this.ipPattern = ipPattern;
+	public void setSrcIpPattern(Integer srcIpPattern) {
+		this.srcIpPattern = srcIpPattern;
 	}
-	/**
-	 * portPattern
-	 * @return  portPattern
-	*/
-	
-	public Integer getPortPattern() {
-		return portPattern;
+	public Integer getDestIpPattern() {
+		return destIpPattern;
 	}
-	/**
-	 * @param portPattern the portPattern to set
-	 */
-	public void setPortPattern(Integer portPattern) {
-		this.portPattern = 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;
 	}
-	
 	/**
 	 * srcIpAddress
 	 * @return  srcIpAddress
@@ -399,4 +400,125 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	public void setIndex(Integer index) {
 		this.index = index;
 	}
+	protected Integer keyring;
+	protected Integer evCert;
+	protected Integer certTransparency;
+	protected Integer clientCertReq;
+	protected Integer pinning;
+	protected Integer protocolErrors;
+	protected Integer cn;
+	protected Integer issuer;
+	protected Integer selfSigned;
+	protected Integer expiration;
+	protected String failMethod;
+	protected String min;
+	protected String max;
+	protected Integer mirrorClient;
+	protected Integer allowHttp2;
+	protected Integer enable;
+	protected Integer mirrorProfile;
+
+	public Integer getKeyring() {
+		return keyring;
+	}
+	public void setKeyring(Integer keyring) {
+		this.keyring = keyring;
+	}
+	public Integer getEvCert() {
+		return evCert;
+	}
+	public void setEvCert(Integer evCert) {
+		this.evCert = evCert;
+	}
+	public Integer getCertTransparency() {
+		return certTransparency;
+	}
+	public void setCertTransparency(Integer certTransparency) {
+		this.certTransparency = certTransparency;
+	}
+	public Integer getClientCertReq() {
+		return clientCertReq;
+	}
+	public void setClientCertReq(Integer clientCertReq) {
+		this.clientCertReq = clientCertReq;
+	}
+	public Integer getPinning() {
+		return pinning;
+	}
+	public void setPinning(Integer pinning) {
+		this.pinning = pinning;
+	}	
+	public Integer getProtocolErrors() {
+		return protocolErrors;
+	}
+	public void setProtocolErrors(Integer protocolErrors) {
+		this.protocolErrors = protocolErrors;
+	}
+	public Integer getCn() {
+		return cn;
+	}
+	public void setCn(Integer cn) {
+		this.cn = cn;
+	}
+	public Integer getIssuer() {
+		return issuer;
+	}
+	public void setIssuer(Integer issuer) {
+		this.issuer = issuer;
+	}
+	public Integer getSelfSigned() {
+		return selfSigned;
+	}
+	public void setSelfSigned(Integer selfSigned) {
+		this.selfSigned = selfSigned;
+	}
+	public Integer getExpiration() {
+		return expiration;
+	}
+	public void setExpiration(Integer expiration) {
+		this.expiration = expiration;
+	}
+	public String getFailMethod() {
+		return failMethod;
+	}
+	public void setFailMethod(String failMethod) {
+		this.failMethod = failMethod;
+	}
+	public String getMin() {
+		return min;
+	}
+	public void setMin(String min) {
+		this.min = min;
+	}
+	public String getMax() {
+		return max;
+	}
+	public void setMax(String max) {
+		this.max = max;
+	}
+	public Integer getMirrorClient() {
+		return mirrorClient;
+	}
+	public void setMirrorClient(Integer mirrorClient) {
+		this.mirrorClient = mirrorClient;
+	}
+	
+	public Integer getAllowHttp2() {
+		return allowHttp2;
+	}
+	public void setAllowHttp2(Integer allowHttp2) {
+		this.allowHttp2 = allowHttp2;
+	}
+	public Integer getEnable() {
+		return enable;
+	}
+	public void setEnable(Integer enable) {
+		this.enable = enable;
+	}
+	public Integer getMirrorProfile() {
+		return mirrorProfile;
+	}
+	public void setMirrorProfile(Integer mirrorProfile) {
+		this.mirrorProfile = mirrorProfile;
+	}
 }

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

@@ -45,7 +45,14 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
 	protected Integer specServiceId;//仅用于copy属性使用
 	protected String domain;//仅用于copy属性使用
 	protected Integer dnsStrategyId;//仅用作复制属性使用
+	protected String groupName;
 	
+	public String getGroupName() {
+		return groupName;
+	}
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
 	public Integer getDnsStrategyId() {
 		return dnsStrategyId;
 	}
@@ -238,7 +245,13 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
 		for (int i = 0; i < list.size(); i++) {
 			BaseStringCfg  base=(BaseStringCfg)list.get(i);
 			base.setIsHex(base.getIsHexbin());
-			base.setIsCaseInsenstive(base.getIsHexbin());
+//			base.setIsCaseInsenstive(base.getIsHexbin());
+			// '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX',
+			if(base.getIsHexbin()==2){
+				base.setIsCaseInsenstive(1);
+			}else{
+				base.setIsCaseInsenstive(0);
+			}
 			base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," "));
 	 }
 		return list;
@@ -248,7 +261,13 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
 		for (int i = 0; i < list.size(); i++) {
 			BaseStringCfg  base=(BaseStringCfg)list.get(i);
 			base.setIsHex(base.getIsHexbin());
-			base.setIsCaseInsenstive(base.getIsHexbin());
+//			base.setIsCaseInsenstive(base.getIsHexbin());
+			// '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX',
+			if(base.getIsHexbin()==2){
+				base.setIsCaseInsenstive(1);
+			}else{
+				base.setIsCaseInsenstive(0);
+			}
 		}
 		return list;
 	}
@@ -270,5 +289,124 @@ public class BaseStringCfg<T> extends BaseCfg<T> {
 	public void setRegionId(Integer regionId) {
 		this.regionId = regionId;
 	}
-	
+	protected Integer keyring;
+	protected Integer evCert;
+	protected Integer certTransparency;
+	protected Integer clientCertReq;
+	protected Integer pinning;
+	protected Integer protocolErrors;
+	protected Integer cn;
+	protected Integer issuer;
+	protected Integer selfSigned;
+	protected Integer expiration;
+	protected String failMethod;
+	protected String min;
+	protected String max;
+	protected Integer mirrorClient;
+	protected Integer allowHttp2;
+	protected Integer enable;
+	protected Integer mirrorProfile;
+
+	public Integer getKeyring() {
+		return keyring;
+	}
+	public void setKeyring(Integer keyring) {
+		this.keyring = keyring;
+	}
+	public Integer getEvCert() {
+		return evCert;
+	}
+	public void setEvCert(Integer evCert) {
+		this.evCert = evCert;
+	}
+	public Integer getCertTransparency() {
+		return certTransparency;
+	}
+	public void setCertTransparency(Integer certTransparency) {
+		this.certTransparency = certTransparency;
+	}
+	public Integer getClientCertReq() {
+		return clientCertReq;
+	}
+	public void setClientCertReq(Integer clientCertReq) {
+		this.clientCertReq = clientCertReq;
+	}
+	public Integer getPinning() {
+		return pinning;
+	}
+	public void setPinning(Integer pinning) {
+		this.pinning = pinning;
+	}	
+	public Integer getProtocolErrors() {
+		return protocolErrors;
+	}
+	public void setProtocolErrors(Integer protocolErrors) {
+		this.protocolErrors = protocolErrors;
+	}
+	public Integer getCn() {
+		return cn;
+	}
+	public void setCn(Integer cn) {
+		this.cn = cn;
+	}
+	public Integer getIssuer() {
+		return issuer;
+	}
+	public void setIssuer(Integer issuer) {
+		this.issuer = issuer;
+	}
+	public Integer getSelfSigned() {
+		return selfSigned;
+	}
+	public void setSelfSigned(Integer selfSigned) {
+		this.selfSigned = selfSigned;
+	}
+	public Integer getExpiration() {
+		return expiration;
+	}
+	public void setExpiration(Integer expiration) {
+		this.expiration = expiration;
+	}
+	public String getFailMethod() {
+		return failMethod;
+	}
+	public void setFailMethod(String failMethod) {
+		this.failMethod = failMethod;
+	}
+	public String getMin() {
+		return min;
+	}
+	public void setMin(String min) {
+		this.min = min;
+	}
+	public String getMax() {
+		return max;
+	}
+	public void setMax(String max) {
+		this.max = max;
+	}
+	public Integer getMirrorClient() {
+		return mirrorClient;
+	}
+	public void setMirrorClient(Integer mirrorClient) {
+		this.mirrorClient = mirrorClient;
+	}	
+	public Integer getAllowHttp2() {
+		return allowHttp2;
+	}
+	public void setAllowHttp2(Integer allowHttp2) {
+		this.allowHttp2 = allowHttp2;
+	}
+	public Integer getEnable() {
+		return enable;
+	}
+	public void setEnable(Integer enable) {
+		this.enable = enable;
+	}
+	public Integer getMirrorProfile() {
+		return mirrorProfile;
+	}
+	public void setMirrorProfile(Integer mirrorProfile) {
+		this.mirrorProfile = mirrorProfile;
+	}
 }

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

@@ -14,7 +14,11 @@ import java.util.Map;
 import com.google.gson.annotations.Expose;
 import com.nis.domain.basics.AsnGroupInfo;
 import com.nis.domain.basics.AsnIpCfg;
+import com.nis.domain.basics.DomainCommCfg;
+import com.nis.domain.basics.IpCommCfg;
 import com.nis.domain.basics.IpReuseIpCfg;
+import com.nis.domain.basics.ScriberIdCommCfg;
+import com.nis.domain.basics.UrlCommCfg;
 import com.nis.util.Constants;
 import com.nis.util.excel.ExcelField;
 
@@ -88,8 +92,12 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	private List<AsnKeywordCfg> asnKeywords;
 	@ExcelField(title="log_total",sort=42)
 	private Long totalLogs;
-
-
+	private List<UrlCommCfg> urlCommGroupList;
+	private List<IpCommCfg> ipCommGroupCfgList;
+	private List<DomainCommCfg> domainCommGroupList;
+	private List<ScriberIdCommCfg> scriberIdCommGroupList;
+	private String groupName;
+	
 	/*private CachePolicyUserRegion cachePolicyUserRegion;//缓存策略用户自定义域参数
 	
 	public static class CachePolicyUserRegion{
@@ -101,6 +109,18 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	public String getOrganization() {
 		return organization;
 	}
+	public String getGroupName() {
+		return groupName;
+	}
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+	public List<IpCommCfg> getIpCommGroupCfgList() {
+		return ipCommGroupCfgList;
+	}
+	public void setIpCommGroupCfgList(List<IpCommCfg> ipCommGroupCfgList) {
+		this.ipCommGroupCfgList = ipCommGroupCfgList;
+	}
 	public List<AsnKeywordCfg> getAsnKeywords() {
 		return asnKeywords;
 	}
@@ -411,4 +431,26 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	public void setTotalLogs(Long totalLogs) {
 		this.totalLogs = totalLogs;
 	}
+	public List<UrlCommCfg> getUrlCommGroupList() {
+		return urlCommGroupList;
+	}
+	public void setUrlCommGroupList(List<UrlCommCfg> urlCommGroupList) {
+		this.urlCommGroupList = urlCommGroupList;
+	}
+	
+	public List<DomainCommCfg> getDomainCommGroupList() {
+		return domainCommGroupList;
+	}
+	public void setDomainCommGroupList(List<DomainCommCfg> domainCommGroupList) {
+		this.domainCommGroupList = domainCommGroupList;
+	}
+	
+	public List<ScriberIdCommCfg> getScriberIdCommGroupList() {
+		return scriberIdCommGroupList;
+	}
+	public void setScriberIdCommGroupList(List<ScriberIdCommCfg> scriberIdCommGroupList) {
+		this.scriberIdCommGroupList = scriberIdCommGroupList;
+	}
+	
+
 }

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

@@ -211,7 +211,12 @@ public class ComplexkeywordCfg extends BaseCfg<ComplexkeywordCfg>{
 		for (int i = 0; i < list.size(); i++) {
 			ComplexkeywordCfg  base=(ComplexkeywordCfg)list.get(i);
 			base.setIsHex(base.getIsHexbin());
-			base.setIsCaseInsenstive(base.getIsHexbin());
+			// '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX',
+			if(base.getIsHexbin()==2){
+				base.setIsCaseInsenstive(1);
+			}else{
+				base.setIsCaseInsenstive(0);
+			}
 			base.setCfgKeywords(Functions.replace(base.getCfgKeywords(), "***and***"," "));
 	 }
 		return list;

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

@@ -29,6 +29,8 @@ public class DdosIpCfg extends BaseIpCfg {
 	private Long bpsThreadshold;// 即DDoS攻击保护动作触发阈值，每秒Bit数和每秒包数
 	@ExcelField(title="pps_threadshold",sort=48)
 	private Long ppsThreadshold;
+	@ExcelField(title="log_total",sort=42)
+	private Long totalLogs;
 
 	public String getAntiddosProtocol() {
 		return antiddosProtocol;
@@ -54,6 +56,12 @@ public class DdosIpCfg extends BaseIpCfg {
 	public void setIndexTable(String indexTable) {
 		this.indexTable = indexTable;
 	}
+	public Long getTotalLogs() {
+		return totalLogs;
+	}
+	public void setTotalLogs(Long totalLogs) {
+		this.totalLogs = totalLogs;
+	}
 	
 	
 }

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

@@ -0,0 +1,34 @@
+package com.nis.domain.configuration;
+
+import java.util.Date;
+
+import com.nis.domain.BaseEntity;
+import com.nis.util.excel.ExcelField;
+
+public class HelpInfo extends BaseEntity<HelpInfo>{
+
+	private static final long serialVersionUID = 2451757008384840494L;
+	private String fileName;
+	private String fileComment;
+	private String backFileComment;
+	public String getFileName() {
+		return fileName;
+	}
+	public void setFileName(String fileName) {
+		this.fileName = fileName;
+	}
+	public String getFileComment() {
+		return fileComment;
+	}
+	public void setFileComment(String fileComment) {
+		this.fileComment = fileComment;
+	}
+	public String getBackFileComment() {
+		return backFileComment;
+	}
+	public void setBackFileComment(String backFileComment) {
+		this.backFileComment = backFileComment;
+	}
+	
+	
+}

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

@@ -0,0 +1,58 @@
+package com.nis.domain.configuration;
+
+import com.nis.util.excel.ExcelField;
+
+public class ManipulatCfgExport extends CfgIndexInfo {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -842585769617969577L;
+	
+	@ExcelField(title="block_type",dictType="SERVICE_ACTION",sort=2)
+	private String actionExport;
+	
+	@ExcelField(title="method_export",dictType="SERVICE_ACTION",sort=3)
+	private String methodExport;
+	
+	@ExcelField(title="response_code",sort=3)
+	private String responseCode;
+	
+	@ExcelField(title="profile_info",sort=10)
+	private String profileInfo;
+	
+	private Integer action;
+	
+	public String getResponseCode() {
+		return responseCode;
+	}
+	public void setResponseCode(String responseCode) {
+		this.responseCode = responseCode;
+	}
+	public String getMethodExport() {
+		return methodExport;
+	}
+	public void setMethodExport(String methodExport) {
+		this.methodExport = methodExport;
+	}
+	public String getProfileInfo() {
+		return profileInfo;
+	}
+	public void setProfileInfo(String profileInfo) {
+		this.profileInfo = profileInfo;
+	}
+	public String getActionExport() {
+		return actionExport;
+	}
+	public void setActionExport(String actionExport) {
+		this.actionExport = actionExport;
+	}
+	
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	
+}

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

@@ -0,0 +1,60 @@
+package com.nis.domain.configuration;
+
+import com.nis.util.excel.ExcelField;
+
+public class ObjGroupCfg extends BaseCfg<ObjGroupCfg> {
+
+    @ExcelField(title="ip_group",sort=33)
+    private String ipGroup;
+    @ExcelField(title="url_group",sort=35)
+    private String urlGroup;
+    @ExcelField(title="subscribe_id_group",sort=34)
+    private String subscribeIdGroup;
+    @ExcelField(title="domain_group",sort=36)
+    private String domainGroup;
+    @ExcelField(title="block_type",sort=2)//这里没有使用公共方法处理，直接将字典值set进去了，不用使用dictType
+    protected String actionCode;
+    @ExcelField(title="protocol",sort=3)
+    protected String userRegion1;
+
+    public String getActionCode() {
+        return actionCode;
+    }
+
+    public void setActionCode(String actionCode) {
+        this.actionCode = actionCode;
+    }
+
+    public String getIpGroup() {
+        return ipGroup;
+    }
+
+    public void setIpGroup(String ipGroup) {
+        this.ipGroup = ipGroup;
+    }
+
+    public String getUrlGroup() {
+        return urlGroup;
+    }
+
+    public void setUrlGroup(String urlGroup) {
+        this.urlGroup = urlGroup;
+    }
+
+    public String getSubscribeIdGroup() {
+        return subscribeIdGroup;
+    }
+
+    public void setSubscribeIdGroup(String subscribeIdGroup) {
+        this.subscribeIdGroup = subscribeIdGroup;
+    }
+
+    public String getDomainGroup() {
+        return domainGroup;
+    }
+
+    public void setDomainGroup(String domainGroup) {
+        this.domainGroup = domainGroup;
+    }
+    protected Integer action;//覆盖默认的action上的注解
+}

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

@@ -0,0 +1,153 @@
+package com.nis.domain.configuration;
+
+import com.nis.util.excel.ExcelField;
+
+public class PxyInterceptCfg extends CfgIndexInfo {
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 994229066993318362L;
+	@ExcelField(title="pxy_intercept_monit_keyring",sort=8)
+	private String keyring;
+	@ExcelField(title="exclusions_ev_cert",dictType="SYS_YES_NO",sort=9)
+	private String evCert;
+	@ExcelField(title="exclusions_cert_transparency",dictType="SYS_YES_NO",sort=10)
+	private String certTransparency;
+	@ExcelField(title="exclusions_client_cert_req",dictType="SYS_YES_NO",sort=11)
+	private String clientCertReq;
+	@ExcelField(title="exclusions_pinning",dictType="SYS_YES_NO",sort=12)
+	private String pinning;
+	@ExcelField(title="exclusions_protocol_errors",dictType="SYS_YES_NO",sort=13)
+	private String protocolErrors;
+	@ExcelField(title="cert_verify_approach_cn",dictType="SYS_YES_NO",sort=14)
+	private String cn;
+	@ExcelField(title="cert_verify_approach_issuer",dictType="SYS_YES_NO",sort=15)
+	private String issuer;
+	@ExcelField(title="cert_verify_approach_self_signed",dictType="SYS_YES_NO",sort=16)
+	private String selfSigned;
+	@ExcelField(title="cert_verify_approach_expiration",dictType="SYS_YES_NO",sort=17)
+	private String expiration;
+	@ExcelField(title="cert_verify_fail_method",dictType="FAIL_METHOD",sort=18)
+	private String failMethod;
+	@ExcelField(title="ssl_ver_min",dictType="SSL_VERSION",sort=19)
+	private String min;
+	@ExcelField(title="ssl_ver_max",dictType="SSL_VERSION",sort=20)
+	private String max;
+	@ExcelField(title="ssl_ver_mirror_client",dictType="SYS_YES_NO",sort=21)
+	private String mirrorClient;
+	@ExcelField(title="ssl_ver_allow_http2",dictType="SYS_YES_NO",sort=22)
+	private String allowHttp2;
+	@ExcelField(title="decrypt_mirror_enable",dictType="SYS_YES_NO",sort=23)
+	private String enable;
+	@ExcelField(title="decrypt_mirror_mirror_profile",sort=24)
+	private String mirrorProfile;
+	private String userRegion1;
+	private String userRegion2;
+	private String userRegion3;
+	private String userRegion4;
+//	private String userRegion5;
+	public String getKeyring() {
+		return keyring;
+	}
+	public void setKeyring(String keyring) {
+		this.keyring = keyring;
+	}
+	public String getEvCert() {
+		return evCert;
+	}
+	public void setEvCert(String evCert) {
+		this.evCert = evCert;
+	}
+	public String getCertTransparency() {
+		return certTransparency;
+	}
+	public void setCertTransparency(String certTransparency) {
+		this.certTransparency = certTransparency;
+	}
+	public String getClientCertReq() {
+		return clientCertReq;
+	}
+	public void setClientCertReq(String clientCertReq) {
+		this.clientCertReq = clientCertReq;
+	}
+	public String getPinning() {
+		return pinning;
+	}
+	public void setPinning(String pinning) {
+		this.pinning = pinning;
+	}	
+	public String getProtocolErrors() {
+		return protocolErrors;
+	}
+	public void setProtocolErrors(String protocolErrors) {
+		this.protocolErrors = protocolErrors;
+	}
+	public String getCn() {
+		return cn;
+	}
+	public void setCn(String cn) {
+		this.cn = cn;
+	}
+	public String getIssuer() {
+		return issuer;
+	}
+	public void setIssuer(String issuer) {
+		this.issuer = issuer;
+	}
+	public String getSelfSigned() {
+		return selfSigned;
+	}
+	public void setSelfSigned(String selfSigned) {
+		this.selfSigned = selfSigned;
+	}
+	public String getExpiration() {
+		return expiration;
+	}
+	public void setExpiration(String expiration) {
+		this.expiration = expiration;
+	}
+	public String getFailMethod() {
+		return failMethod;
+	}
+	public void setFailMethod(String failMethod) {
+		this.failMethod = failMethod;
+	}
+	public String getMin() {
+		return min;
+	}
+	public void setMin(String min) {
+		this.min = min;
+	}
+	public String getMax() {
+		return max;
+	}
+	public void setMax(String max) {
+		this.max = max;
+	}
+	public String getMirrorClient() {
+		return mirrorClient;
+	}
+	public void setMirrorClient(String mirrorClient) {
+		this.mirrorClient = mirrorClient;
+	}	
+	public String getAllowHttp2() {
+		return allowHttp2;
+	}
+	public void setAllowHttp2(String allowHttp2) {
+		this.allowHttp2 = allowHttp2;
+	}
+	public String getEnable() {
+		return enable;
+	}
+	public void setEnable(String enable) {
+		this.enable = enable;
+	}
+	public String getMirrorProfile() {
+		return mirrorProfile;
+	}
+	public void setMirrorProfile(String mirrorProfile) {
+		this.mirrorProfile = mirrorProfile;
+	}
+	
+}

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

@@ -25,6 +25,7 @@ public class PxyObjKeyring extends BaseCfg<PxyObjKeyring> {
 	@ExcelField(title="expire_after",sort=5)
 	private Integer expireAfter;
 	private String publicKeyAlgo;
+	@ExcelField(title="CRL",sort=5)
 	private String crl;
 	@ExcelField(title="issuer",sort=6)
 	private String issuer;

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

@@ -18,9 +18,18 @@ public class PxyObjTrustedCaCert extends BaseCfg<PxyObjTrustedCaCert> {
 	private String issuer; //颁发者
 	@ExcelField(title="certificate_file",sort=2)
 	private String certFile; 
-	@ExcelField(title="crl_file",sort=4)
+	//@ExcelField(title="crl_file",sort=4)
 	private String crlFile;
+	private Integer builtIn;//是否内置证书
+	@ExcelField(title="built_in",sort=5)//是否内置证书(导出用)
+	private String builtInExp;
 	
+	public String getBuiltInExp() {
+		return builtInExp;
+	}
+	public void setBuiltInExp(String builtInExp) {
+		this.builtInExp = builtInExp;
+	}
 	public String getCrlFile() {
 		return crlFile;
 	}
@@ -47,6 +56,11 @@ public class PxyObjTrustedCaCert extends BaseCfg<PxyObjTrustedCaCert> {
 	public void setIndexTable(String indexTable) {
 		this.indexTable = indexTable;
 	}
-	
+	public Integer getBuiltIn() {
+		return builtIn;
+	}
+	public void setBuiltIn(Integer builtIn) {
+		this.builtIn = builtIn;
+	}
 	
 }

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

@@ -0,0 +1,23 @@
+package com.nis.domain.configuration.template;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * 域名公共组配置 导入模板
+ * @author dell
+ *
+ */
+public class DomainCommCfgTemplate extends StringAllNotDoLogTemplate{
+	
+	@ExcelField(title="group_name",align=2,sort=10)
+	private String groupName;
+
+	public String getGroupName() {
+		return groupName;
+	}
+
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+
+}

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

@@ -12,7 +12,7 @@ public class DomainInterceptMonitTemplate extends StringAllNotDoLogTemplate{
 	private String userRegion5;
 	private String cfgKeywords;
 	
-	@ExcelField(title="intercept_intensity",dictType="INTERCEPT_DOMAIN_INTENSITY",align=2,sort=2)
+	@ExcelField(title="intercept_intensity",dictType="INTERCEPT_DOMAIN_INTENSITY",align=2,sort=12)
 	public String getUserRegion5() {
 		return userRegion5;
 	}

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

@@ -0,0 +1,160 @@
+package com.nis.domain.configuration.template;
+
+import com.nis.util.excel.ExcelField;
+
+public class InterceptDomainTemplate extends StringAllNotDoLogTemplate {
+	private Integer keyring;
+	
+	private Integer evCert;
+	
+	private Integer certTransparency;
+	
+	private Integer clientCertReq;
+	
+	private Integer pinning;
+	
+	private Integer protocolErrors;
+	
+	private Integer cn;
+	
+	private Integer issuer;
+	
+	private Integer selfSigned;
+	
+	private Integer expiration;
+	
+	private String failMethod;
+	
+	private String min;
+	
+	private String max;
+	
+	private Integer mirrorClient;
+	
+	private Integer allowHttp2;
+	
+	private Integer enable;
+	
+	private Integer mirrorProfile;
+	
+	@ExcelField(title="pxy_intercept_monit_keyring",align=2,sort=17)
+	public Integer getKeyring() {
+		return keyring;
+	}
+	public void setKeyring(Integer keyring) {
+		this.keyring = keyring;
+	}
+	@ExcelField(title="exclusions_ev_cert",align=2,sort=18)
+	public Integer getEvCert() {
+		return evCert;
+	}
+	public void setEvCert(Integer evCert) {
+		this.evCert = evCert;
+	}
+	@ExcelField(title="exclusions_cert_transparency",align=2,sort=19)
+	public Integer getCertTransparency() {
+		return certTransparency;
+	}
+	public void setCertTransparency(Integer certTransparency) {
+		this.certTransparency = certTransparency;
+	}
+	@ExcelField(title="exclusions_client_cert_req",align=2,sort=20)
+	public Integer getClientCertReq() {
+		return clientCertReq;
+	}
+	public void setClientCertReq(Integer clientCertReq) {
+		this.clientCertReq = clientCertReq;
+	}
+	@ExcelField(title="exclusions_pinning",align=2,sort=21)
+	public Integer getPinning() {
+		return pinning;
+	}
+	public void setPinning(Integer pinning) {
+		this.pinning = pinning;
+	}
+	@ExcelField(title="protocol_errors",align=2,sort=22)
+	public Integer getProtocolErrors() {
+		return protocolErrors;
+	}
+	public void setProtocolErrors(Integer protocolErrors) {
+		this.protocolErrors = protocolErrors;
+	}
+	@ExcelField(title="cert_verify_approach_cn",align=2,sort=23)
+	public Integer getCn() {
+		return cn;
+	}
+	public void setCn(Integer cn) {
+		this.cn = cn;
+	}
+	@ExcelField(title="cert_verify_approach_issuer",align=2,sort=24)
+	public Integer getIssuer() {
+		return issuer;
+	}
+	public void setIssuer(Integer issuer) {
+		this.issuer = issuer;
+	}
+	@ExcelField(title="cert_verify_approach_self_signed",align=2,sort=25)
+	public Integer getSelfSigned() {
+		return selfSigned;
+	}
+	public void setSelfSigned(Integer selfSigned) {
+		this.selfSigned = selfSigned;
+	}
+	@ExcelField(title="cert_verify_approach_expiration",align=2,sort=26)
+	public Integer getExpiration() {
+		return expiration;
+	}
+	public void setExpiration(Integer expiration) {
+		this.expiration = expiration;
+	}
+	@ExcelField(title="cert_verify_fail_method",dictType="FAIL_METHOD",align=2,sort=27)
+	public String getFailMethod() {
+		return failMethod;
+	}
+	public void setFailMethod(String failMethod) {
+		this.failMethod = failMethod;
+	}
+	@ExcelField(title="ssl_ver_min",dictType="SSL_VERSION",align=2,sort=28)
+	public String getMin() {
+		return min;
+	}
+	public void setMin(String min) {
+		this.min = min;
+	}
+	@ExcelField(title="ssl_ver_max",dictType="SSL_VERSION",align=2,sort=29)
+	public String getMax() {
+		return max;
+	}
+	public void setMax(String max) {
+		this.max = max;
+	}
+	@ExcelField(title="ssl_ver_mirror_client",align=2,sort=30)
+	public Integer getMirrorClient() {
+		return mirrorClient;
+	}
+	public void setMirrorClient(Integer mirrorClient) {
+		this.mirrorClient = mirrorClient;
+	}
+	@ExcelField(title="ssl_ver_allow_http2",align=2,sort=31)
+	public Integer getAllowHttp2() {
+		return allowHttp2;
+	}
+	public void setAllowHttp2(Integer allowHttp2) {
+		this.allowHttp2 = allowHttp2;
+	}
+	@ExcelField(title="decrypt_mirror_enable",align=2,sort=32)
+	public Integer getEnable() {
+		return enable;
+	}
+	public void setEnable(Integer enable) {
+		this.enable = enable;
+	}
+	@ExcelField(title="decrypt_mirror_mirror_profile",align=2,sort=33)
+	public Integer getMirrorProfile() {
+		return mirrorProfile;
+	}
+	public void setMirrorProfile(Integer mirrorProfile) {
+		this.mirrorProfile = mirrorProfile;
+	}
+
+}

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

@@ -0,0 +1,161 @@
+package com.nis.domain.configuration.template;
+
+import com.nis.util.excel.ExcelField;
+
+public class InterceptIpTemplate extends IpAllNotDoLogTemplate {
+	
+	private Integer keyring;
+	
+	private Integer evCert;
+	
+	private Integer certTransparency;
+	
+	private Integer clientCertReq;
+	
+	private Integer pinning;
+	
+	private Integer protocolErrors;
+	
+	private Integer cn;
+	
+	private Integer issuer;
+	
+	private Integer selfSigned;
+	
+	private Integer expiration;
+	
+	private String failMethod;
+	
+	private String min;
+	
+	private String max;
+	
+	private Integer mirrorClient;
+	
+	private Integer allowHttp2;
+	
+	private Integer enable;
+	
+	private Integer mirrorProfile;
+	
+	@ExcelField(title="pxy_intercept_monit_keyring",align=2,sort=17)
+	public Integer getKeyring() {
+		return keyring;
+	}
+	public void setKeyring(Integer keyring) {
+		this.keyring = keyring;
+	}
+	@ExcelField(title="exclusions_ev_cert",align=2,sort=18)
+	public Integer getEvCert() {
+		return evCert;
+	}
+	public void setEvCert(Integer evCert) {
+		this.evCert = evCert;
+	}
+	@ExcelField(title="exclusions_cert_transparency",align=2,sort=19)
+	public Integer getCertTransparency() {
+		return certTransparency;
+	}
+	public void setCertTransparency(Integer certTransparency) {
+		this.certTransparency = certTransparency;
+	}
+	@ExcelField(title="exclusions_client_cert_req",align=2,sort=20)
+	public Integer getClientCertReq() {
+		return clientCertReq;
+	}
+	public void setClientCertReq(Integer clientCertReq) {
+		this.clientCertReq = clientCertReq;
+	}
+	@ExcelField(title="exclusions_pinning",align=2,sort=21)
+	public Integer getPinning() {
+		return pinning;
+	}
+	public void setPinning(Integer pinning) {
+		this.pinning = pinning;
+	}
+	@ExcelField(title="exclusions_protocol_errors",align=2,sort=22)
+	public Integer getProtocolErrors() {
+		return protocolErrors;
+	}
+	public void setProtocolErrors(Integer protocolErrors) {
+		this.protocolErrors = protocolErrors;
+	}
+	@ExcelField(title="cert_verify_approach_cn",align=2,sort=23)
+	public Integer getCn() {
+		return cn;
+	}
+	public void setCn(Integer cn) {
+		this.cn = cn;
+	}
+	@ExcelField(title="cert_verify_approach_issuer",align=2,sort=24)
+	public Integer getIssuer() {
+		return issuer;
+	}
+	public void setIssuer(Integer issuer) {
+		this.issuer = issuer;
+	}
+	@ExcelField(title="cert_verify_approach_self_signed",align=2,sort=25)
+	public Integer getSelfSigned() {
+		return selfSigned;
+	}
+	public void setSelfSigned(Integer selfSigned) {
+		this.selfSigned = selfSigned;
+	}
+	@ExcelField(title="cert_verify_approach_expiration",align=2,sort=26)
+	public Integer getExpiration() {
+		return expiration;
+	}
+	public void setExpiration(Integer expiration) {
+		this.expiration = expiration;
+	}
+	@ExcelField(title="cert_verify_fail_method",dictType="FAIL_METHOD",align=2,sort=27)
+	public String getFailMethod() {
+		return failMethod;
+	}
+	public void setFailMethod(String failMethod) {
+		this.failMethod = failMethod;
+	}
+	@ExcelField(title="ssl_ver_min",dictType="SSL_VERSION",align=2,sort=28)
+	public String getMin() {
+		return min;
+	}
+	public void setMin(String min) {
+		this.min = min;
+	}
+	@ExcelField(title="ssl_ver_max",dictType="SSL_VERSION",align=2,sort=29)
+	public String getMax() {
+		return max;
+	}
+	public void setMax(String max) {
+		this.max = max;
+	}
+	@ExcelField(title="ssl_ver_mirror_client",align=2,sort=30)
+	public Integer getMirrorClient() {
+		return mirrorClient;
+	}
+	public void setMirrorClient(Integer mirrorClient) {
+		this.mirrorClient = mirrorClient;
+	}
+	@ExcelField(title="ssl_ver_allow_http2",align=2,sort=31)
+	public Integer getAllowHttp2() {
+		return allowHttp2;
+	}
+	public void setAllowHttp2(Integer allowHttp2) {
+		this.allowHttp2 = allowHttp2;
+	}
+	@ExcelField(title="decrypt_mirror_enable",align=2,sort=32)
+	public Integer getEnable() {
+		return enable;
+	}
+	public void setEnable(Integer enable) {
+		this.enable = enable;
+	}
+	@ExcelField(title="decrypt_mirror_mirror_profile",align=2,sort=33)
+	public Integer getMirrorProfile() {
+		return mirrorProfile;
+	}
+	public void setMirrorProfile(Integer mirrorProfile) {
+		this.mirrorProfile = mirrorProfile;
+	}
+
+}

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

@@ -1,31 +0,0 @@
-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/IpAllNotDoLogTemplate.java

@@ -15,13 +15,13 @@ public class IpAllNotDoLogTemplate extends BasicTemplate{
 	
 
 	
-	private String cfgDesc;
-	private String srcIpAddress; 
-	private String destIpAddress; 
-	private String srcPort; 
-	private String destPort;
-	private Integer protocol;
-	private Integer direction;
+	protected String cfgDesc;
+	protected String srcIpAddress; 
+	protected String destIpAddress; 
+	protected String srcPort; 
+	protected String destPort;
+	protected Integer protocol;
+	protected Integer direction;
 	
 	@ExcelField(title="config_describe",align=2,sort=1)
 	public String getCfgDesc() {

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

@@ -8,7 +8,6 @@
  */
 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

@@ -1,310 +0,0 @@
-/**
- *@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/IpCommCfgTemplate.java

@@ -0,0 +1,20 @@
+package com.nis.domain.configuration.template;
+
+import com.nis.util.excel.ExcelField;
+
+public class IpCommCfgTemplate extends IpAllNotDoLogTemplate{
+	
+    @ExcelField(title="group_name",align=2,sort=10)
+    private String groupName;
+
+	public String getGroupName() {
+		return groupName;
+	}
+
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+
+	
+
+}

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

@@ -1,47 +0,0 @@
-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

@@ -1,31 +0,0 @@
-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/P2pIpTemplate.java

@@ -10,7 +10,7 @@ public class P2pIpTemplate extends IpAllTemplate {
 	
 	private String userRegion2;
 	
-	@ExcelField(title="p2p_ip_config_type",dictType="P2P_IP_TYPE",align=2,sort=2)
+	@ExcelField(title="p2p_ip_config_type",dictType="P2P_IP_TYPE",align=2,sort=5)
 	public String getUserRegion2() {
 		return userRegion2;
 	}

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

@@ -0,0 +1,23 @@
+package com.nis.domain.configuration.template;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * 域名公共组配置 导入模板
+ * @author dell
+ *
+ */
+public class ScriberIdCommCfgTemplate extends StringAllNotDoLogTemplate{
+	
+	@ExcelField(title="group_name",align=2,sort=10)
+	private String groupName;
+
+	public String getGroupName() {
+		return groupName;
+	}
+
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+
+}

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

@@ -7,28 +7,12 @@ import com.nis.util.excel.ExcelField;
  * @author dell
  *
  */
-public class TopicWebsiteTemplate extends StringAllTemplate{
+public class TopicWebsiteTemplate extends StringAllNotDoLogTemplate{
 	
-	private Long topicId;			// 主题
-	private Long websiteServiceId;	// 网站
+	private String topic;			// 主题
+	private String websiteService;	// 网站
 	private String cfgKeywords;		// 域名
 	
-	@ExcelField(title="topic",dictType="TOPIC",sort=2)
-	public Long getTopicId() {
-		return topicId;
-	}
-	public void setTopicId(Long topicId) {
-		this.topicId = topicId;
-	}
-	
-	@ExcelField(title="website_server",dictType="WEBSITE_SERVER",sort=3)
-	public Long getWebsiteServiceId() {
-		return websiteServiceId;
-	}
-	public void setWebsiteServiceId(Long websiteServiceId) {
-		this.websiteServiceId = websiteServiceId;
-	}
-	
 	@ExcelField(title="domain_name",sort=4)
 	public String getCfgKeywords() {
 		return cfgKeywords;
@@ -36,5 +20,21 @@ public class TopicWebsiteTemplate extends StringAllTemplate{
 	public void setCfgKeywords(String cfgKeywords) {
 		this.cfgKeywords = cfgKeywords;
 	}
+	
+	@ExcelField(title="topic",sort=2)
+	public String getTopic() {
+		return topic;
+	}
+	public void setTopic(String topic) {
+		this.topic = topic;
+	}
+	
+	@ExcelField(title="website_server",sort=3)
+	public String getWebsiteService() {
+		return websiteService;
+	}
+	public void setWebsiteService(String websiteService) {
+		this.websiteService = websiteService;
+	}
 		
 }

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

@@ -1,37 +0,0 @@
-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/UrlCommCfgTemplate.java

@@ -0,0 +1,23 @@
+package com.nis.domain.configuration.template;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * URL公共组配置 导入模板
+ * @author dell
+ *
+ */
+public class UrlCommCfgTemplate extends StringAllNotDoLogTemplate{
+	
+	@ExcelField(title="group_name",align=2,sort=10)
+	private String groupName;
+
+	public String getGroupName() {
+		return groupName;
+	}
+
+	public void setGroupName(String groupName) {
+		this.groupName = groupName;
+	}
+
+}

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

@@ -1,66 +0,0 @@
-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/dashboard/ConfigStatistic.java

@@ -0,0 +1,116 @@
+package com.nis.domain.dashboard;
+
+import com.nis.domain.report.BaseReport;
+import com.nis.util.excel.ExcelField;
+
+public class ConfigStatistic extends BaseReport<ConfigStatistic>{
+	private static final long serialVersionUID = 8905927100915123026L;
+	
+	@ExcelField(title="cfg_id",sort=1)
+	private String cfgId;
+	@ExcelField(title="config_describe",sort=2)
+	private String cfgDesc;
+	private String serviceId;
+	private String tableName;//表名
+	private String beginDate;
+	private String endDate;
+	private String area;//区域
+	private String operator;//运营商
+	private String chartType;//图表类型
+
+	public String getBeginDate() {
+		return beginDate;
+	}
+
+	public void setBeginDate(String beginDate) {
+		this.beginDate = beginDate;
+	}
+
+	public String getEndDate() {
+		return endDate;
+	}
+
+	public void setEndDate(String endDate) {
+		this.endDate = endDate;
+	}
+
+	public String getTime() {
+		return time;
+	}
+
+	public void setTime(String time) {
+		this.time = time;
+	}
+
+	public String getCfgId() {
+		return cfgId;
+	}
+
+	public void setCfgId(String cfgId) {
+		this.cfgId = cfgId;
+	}
+
+	public String getCfgDesc() {
+		return cfgDesc;
+	}
+
+	public void setCfgDesc(String cfgDesc) {
+		this.cfgDesc = cfgDesc;
+	}
+
+	public String getServiceId() {
+		return serviceId;
+	}
+
+	public void setServiceId(String serviceId) {
+		this.serviceId = serviceId;
+	}
+
+	public String getTableName() {
+		return tableName;
+	}
+
+	public void setTableName(String tableName) {
+		this.tableName = tableName;
+	}
+	
+	public Long getSum() {
+		return sum;
+	}
+
+	public void setSum(Long sum) {
+		this.sum = sum;
+	}
+
+	public Integer getService() {
+		return service;
+	}
+
+	public void setService(Integer service) {
+		this.service = service;
+	}
+
+	public String getArea() {
+		return area;
+	}
+
+	public void setArea(String area) {
+		this.area = area;
+	}
+
+	public String getOperator() {
+		return operator;
+	}
+
+	public void setOperator(String operator) {
+		this.operator = operator;
+	}
+
+	public String getChartType() {
+		return chartType;
+	}
+
+	public void setChartType(String chartType) {
+		this.chartType = chartType;
+	}
+}

src/main/java/com/nis/domain/dashboard/SysIspInfo.java

@@ -18,6 +18,7 @@ public class SysIspInfo implements Serializable {
 	private Integer ispKeyCode;// 运营商唯一标识编码,
 	private Date createTime;
 	
+	private String ispNum; // 出入口跟设备号拼接
 	
 	public Long getId() {
 		return id;
@@ -67,6 +68,11 @@ public class SysIspInfo implements Serializable {
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
 	}
-	
+	public String getIspNum() {
+		return ispNum;
+	}
+	public void setIspNum(String ispNum) {
+		this.ispNum = ispNum;
+	}
 	
 }

src/main/java/com/nis/domain/dashboard/codedic/CodeDomainDic.java

@@ -0,0 +1,94 @@
+package com.nis.domain.dashboard.codedic;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class CodeDomainDic implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8878203808371459079L;
+
+	private Integer id;
+
+    private String websiteServiceId;
+
+    private String domain;
+
+    private String topicId;
+
+    private Date createTime;
+
+    private String creatorId;
+
+    private Integer isValid;
+    
+    private String ican;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public String getWebsiteServiceId() {
+		return websiteServiceId;
+	}
+
+	public void setWebsiteServiceId(String websiteServiceId) {
+		this.websiteServiceId = websiteServiceId;
+	}
+
+	public String getDomain() {
+		return domain;
+	}
+
+	public void setDomain(String domain) {
+		this.domain = domain;
+	}
+
+	public String getTopicId() {
+		return topicId;
+	}
+
+	public void setTopicId(String topicId) {
+		this.topicId = topicId;
+	}
+
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	public String getCreatorId() {
+		return creatorId;
+	}
+
+	public void setCreatorId(String creatorId) {
+		this.creatorId = creatorId;
+	}
+
+	public Integer getIsValid() {
+		return isValid;
+	}
+
+	public void setIsValid(Integer isValid) {
+		this.isValid = isValid;
+	}
+
+	public String getIcan() {
+		return ican;
+	}
+
+	public void setIcan(String ican) {
+		this.ican = ican;
+	}
+    
+    
+}

src/main/java/com/nis/domain/log/NtcCollectRadiusLog.java

@@ -6,7 +6,7 @@ public class NtcCollectRadiusLog extends BaseLogEntity<NtcCollectRadiusLog> {
 
 	private static final long serialVersionUID = -4947912502754359817L;
 	
-	@ExcelField(title="message_type",dictType="MESSAGE_TYPE",sort=10)
+	@ExcelField(title="code",dictType="MESSAGE_TYPE",sort=10)
 	protected Integer code;
 	@ExcelField(title="nas_ip",sort=15)
 	protected String nasIp;

src/main/java/com/nis/domain/log/NtcConnRecordLog.java

@@ -1,5 +1,6 @@
 package com.nis.domain.log;
 
+import com.google.gson.annotations.Expose;
 import com.nis.util.excel.ExcelField;
 
 public class NtcConnRecordLog extends BaseLogEntity<NtcConnRecordLog> {
@@ -29,8 +30,10 @@ public class NtcConnRecordLog extends BaseLogEntity<NtcConnRecordLog> {
 	protected String totalByte;
 	
 	protected String ispCode;//运营商
+	protected String ispNum;//运营商 （entrance_id+device_id）
+	protected String ispName;//运营商
+	
 	
-
 	
 	public String getIspCode() {
 		return ispCode;
@@ -120,4 +123,20 @@ public class NtcConnRecordLog extends BaseLogEntity<NtcConnRecordLog> {
 		this.s2cByteNum = s2cByteNum;
 	}
 
+	public String getIspName() {
+		return ispName;
+	}
+
+	public void setIspName(String ispName) {
+		this.ispName = ispName;
+	}
+
+	public String getIspNum() {
+		return ispNum;
+	}
+
+	public void setIspNum(String ispNum) {
+		this.ispNum = ispNum;
+	}
+
 }

src/main/java/com/nis/domain/log/PxyHttpLog.java

@@ -31,7 +31,7 @@ public class PxyHttpLog extends BaseLogEntity<NtcIpLog> {
 	@ExcelField(title="req_body",sort=78)
 	private String reqBody;
 	@ExcelField(title="resp_body",sort=79)
-	private String resBody;
+	private String respBody;
 	@ExcelField(title="website",sort=8)
 	private String website;
 	
@@ -115,23 +115,30 @@ public class PxyHttpLog extends BaseLogEntity<NtcIpLog> {
 	public void setReqBody(String reqBody) {
 		this.reqBody = reqBody;
 	}
-	public String getResBody() {
-		return resBody;
+	public String getRespBody() {
+		return respBody;
 	}
-	public void setResBody(String resBody) {
-		this.resBody = resBody;
+	public void setRespBody(String respBody) {
+		this.respBody = respBody;
 	}
 	@Override
 	public String toString() {
-		return "{\"url\"=\"" + url + "\", \"reqLine\"=\"" + reqLine
-				+ "\", \"resLine\"=\"" + resLine + "\", \"cookie\"=\"" + cookie
-				+ "\", \"referer\"=\"" + referer + "\", \"userAgent\"=\""
-				+ userAgent + "\", \"contentLen\"=\"" + contentLen
-				+ "\", \"contentType\"=\"" + contentType
-				+ "\", \"setCookie\"=\"" + setCookie + "\", \"reqHeader\"=\""
-				+ reqHeader + "\", \"respHeader\"=\"" + respHeader
-				+ "\", \"reqBody\"=\"" + reqBody + "\", \"resBody\"=\""
-				+ resBody + "\"}";
+		return "PxyHttpLog [url=" + url + ", reqLine=" + reqLine + ", resLine=" + resLine + ", cookie=" + cookie
+				+ ", referer=" + referer + ", userAgent=" + userAgent + ", contentLen=" + contentLen + ", contentType="
+				+ contentType + ", setCookie=" + setCookie + ", reqHeader=" + reqHeader + ", respHeader=" + respHeader
+				+ ", reqBody=" + reqBody + ", respBody=" + respBody + ", website=" + website + ", cfgId=" + cfgId
+				+ ", foundTime=" + foundTime + ", recvTime=" + recvTime + ", transProto=" + transProto + ", addrType="
+				+ addrType + ", dIp=" + dIp + ", sIp=" + sIp + ", dPort=" + dPort + ", sPort=" + sPort + ", service="
+				+ service + ", entranceId=" + entranceId + ", deviceId=" + deviceId + ", direction=" + direction
+				+ ", streamDir=" + streamDir + ", capIp=" + capIp + ", addrList=" + addrList + ", serverLocate="
+				+ serverLocate + ", clientLocate=" + clientLocate + ", sAsn=" + sAsn + ", dAsn=" + dAsn
+				+ ", sSubscribeId=" + sSubscribeId + ", dSubscribeId=" + dSubscribeId + ", sceneFile=" + sceneFile
+				+ ", functionId=" + functionId + ", action=" + action + ", date=" + date + ", seltype=" + seltype
+				+ ", searchFoundStartTime=" + searchFoundStartTime + ", searchFoundEndTime=" + searchFoundEndTime
+				+ ", isLogTotalSearch=" + isLogTotalSearch + ", orderBy=" + orderBy + ", encapType=" + encapType
+				+ ", linkId=" + linkId + ", innerSmac=" + innerSmac + ", innerDmac=" + innerDmac + ", id=" + id
+				+ ", currentUser=" + currentUser + ", page=" + page + ", pageLog=" + pageLog + ", sqlMap=" + sqlMap
+				+ ", isNewRecord=" + isNewRecord + ", isFilterAction=" + isFilterAction + "]";
 	}
 	
 }

src/main/java/com/nis/domain/log/PxyHttpManipulationLog.java

@@ -0,0 +1,736 @@
+package com.nis.domain.log;
+
+import com.google.gson.annotations.Expose;
+import com.nis.domain.BaseEntity;
+import com.nis.util.excel.ExcelField;
+/**
+ * （日志 代理）HTTP 操控  实体类 
+ *
+ */
+public class PxyHttpManipulationLog extends  BaseEntity<PxyHttpManipulationLog>{
+	private static final long serialVersionUID = -3046458130302949428L;
+	
+	@ExcelField(title="found_time",sort=5)
+	protected String foundTime; //发现时间，timestamp
+	@ExcelField(title="recv_time",sort=6)
+	protected String recvTime; //接收时间，timestamp
+	@ExcelField(title="transport_layer_protocol",dictType="LOG_PROTOCOL",sort=30)
+	protected String transProto; //协议类型，从字典LOG_PROTOCOL取值
+	@ExcelField(title="addr_type",dictType="IP_TYPE",sort=35)
+	protected Integer addrType; //ip地址类型，从字典IP_TYPE取值
+	@ExcelField(title="URL",sort=8)
+	private String url;
+	@ExcelField(title="host",sort=8)
+	private String host;//主机地址
+	@ExcelField(title="domain_name",sort=8)
+	private String domain;//域名
+	@ExcelField(title="category",sort=8)
+	private String category;//域名分类
+	@ExcelField(title="req_line",sort=9)
+	private String reqLine;
+	@ExcelField(title="res_line",sort=10)
+	private String resLine;
+	@ExcelField(title="PXY_CACHE_HTTP_COOKIE",sort=11)
+	private String cookie;
+	@ExcelField(title="referer",sort=12)
+	private String referer;
+	@ExcelField(title="user_agent",sort=13)
+	private String userAgent;
+	@ExcelField(title="content_len",sort=14)
+	private String contentLen;
+	@ExcelField(title="content_type",sort=15)
+	private String contentType;
+	@ExcelField(title="set_cookie",sort=16)
+	private String setCookie;
+	@ExcelField(title="req_header",sort=17)
+	private String reqHeader;
+	@ExcelField(title="resp_header",sort=18)
+	private String respHeader;
+	@ExcelField(title="req_body",sort=78)
+	private String reqBody;
+	@ExcelField(title="resp_body",sort=79)
+	private String respBody;
+//	@ExcelField(title="website",sort=8)
+//	private String website;
+	@ExcelField(title="cfg_id",sort=1)
+	private Integer policyId;//
+	@ExcelField(title="app_proto",sort=31)
+	private String appProto;//应用协议类型	
+	@ExcelField(title="startTime",sort=5)
+	private String startTime;//会话创建时间
+	@ExcelField(title="endTime",sort=5)
+	private String endTime;//会话结束时间	
+	@Expose
+	@ExcelField(title="server_ip",sort=40)
+	protected String serverIp; //服务端ip地址
+	@Expose
+	@ExcelField(title="client_ip",sort=41)
+	protected String clientIp; //客户端ip地址
+	@Expose
+	@ExcelField(title="server_port",sort=42)
+	protected String serverPort; //服务端ip端口
+	@Expose
+	@ExcelField(title="client_port",sort=43)
+	protected String clientPort; //客户端ip端口
+	@ExcelField(title="entrance_id",dictType="ENTRANCE",sort=7)
+	protected Integer entranceId; //出入口编号
+	@ExcelField(title="deviceid",dictType="DEVICE",sort=50)
+	protected Integer deviceId; //串联设备编号
+	@ExcelField(title="direction",dictType="LOG_DIRECTION",sort=55)
+	protected Integer direction; //传输方向   0：域内->域外，1：域外->域内，从字典LOG_DIRECTION取值
+	@ExcelField(title="stream_type",dictType="LOG_STREAM_TYPE",sort=65)
+	protected Integer streamDir; //流类型  0：c2s；1：s2c；2：double，从字典LOG_STREAMTYPE取值
+	@ExcelField(title="clj_ip",sort=27)
+	protected String capIp; //处理机IP
+	@ExcelField(title="nest_addr_list",sort=66)
+	protected String addrList; //嵌套地址列表
+	@ExcelField(title="server_locate",sort=67)
+	protected String serverLocation;// 服务端地址定位信息
+	@ExcelField(title="client_locate",sort=68)
+	protected String clientLocation;// 客户端地址定位信息
+	@ExcelField(title="s_asn",sort=70)
+	protected String clientAsn;//客户端ASN
+	@ExcelField(title="d_asn",sort=71)
+	protected String serverAsn;//服务端ASN
+	@ExcelField(title="s_subscribe_id",sort=73)
+	protected String subscribeId;//客户端用户名
+	@ExcelField(title="scene_file",sort=77)
+	protected String sceneFile;//现场日志文件地址
+	
+	@ExcelField(title="isp",sort=80)
+	protected String isp;//运营商
+	protected Integer service; //配置表的serviceId
+	protected Integer functionId;
+	@ExcelField(title="action",dictType="SERVICE_ACTION",sort=2)
+	protected Integer action;	
+	//新增字段
+	@ExcelField(title="encap_type",dictType="ENCAP_TYPE",sort=52)
+	protected Integer encapType;//原始二层封装格式
+	@ExcelField(title="link_id",dictType="LINK",sort=51)
+	protected Integer linkId;//串联设备链路号
+	@ExcelField(title="inner_smac",sort=58)
+	protected String innerSmac;//MAC_IN_MAC的内层源MAC
+	@ExcelField(title="inner_dmac",sort=59)
+	protected String innerDmac;//MAC_IN_MAC的内层目标MAC
+	//自定义字段	
+	protected String date;//配置界面日志总量查询时间
+	protected String seltype;//选中类型,页面搜索用
+	protected String searchFoundStartTime;//开始时间，格式为yyyy-mm-dd hh24:mi:ss
+	protected String searchFoundEndTime;//结束时间，格式同上
+	protected String isLogTotalSearch;//由配置界面跳转日志查询标识
+	protected String orderBy;//排序参数
+	protected Integer cfgId;
+	protected String fields;
+
+	protected Integer compileId;//
+	protected String startRecvTime;//开始时间
+	protected String endRecvTime; //结束时间
+	@ExcelField(title="con_duration_ms",sort=81)
+	protected Integer conDurationMs;//通信时长	
+	protected String reqBodyKey;//请求体转储文件KEY	
+	protected String resBodyKey;//应答体转储文件KEY
+	@ExcelField(title="version",sort=82)
+	protected String version;//版本
+	@ExcelField(title="sni",sort=83)
+	protected String sni;//
+	@ExcelField(title="san",sort=84)
+	protected String san;
+	@ExcelField(title="cn",sort=85)
+	protected String cn;	
+	@ExcelField(title="social_app",sort=86)
+	protected String appId;//app
+//	@ExcelField(title="social_app",sort=86)
+	protected String appName;//app
+	@ExcelField(title="protocol",sort=87)
+	protected String protocolId;//协议
+//	@ExcelField(title="protocol",sort=87)
+	protected String protocolName;//协议
+	@ExcelField(title="con_latency_ms",sort=88)
+	protected Integer conLatencyMs;//握手延迟
+	@ExcelField(title="pinning",dictType="PINNING",sort=89)
+	protected Integer pinningst;//pinning状态
+	@ExcelField(title="intercept_state",dictType="INTERCEPT_STATE",sort=90)
+	protected Integer interceptState;//拦截状态
+	@ExcelField(title="ssl_server_side_latency",sort=91)
+	protected Integer sslServerSideLatency;//服务器侧ssl建立延迟
+	@ExcelField(title="ssl_client_side_latency",sort=92)
+	protected Integer sslClientSideLatency;//客户端侧ssl建立延迟
+	@ExcelField(title="ssl_server_side_version",dictType="SSL_VERSION",sort=93)
+	protected String sslServerSideVersion;//服务端侧ssl版本
+	@ExcelField(title="ssl_client_side_version",dictType="SSL_VERSION",sort=94)
+	protected String sslClientSideVersion;//客户端侧ssl版本
+	@ExcelField(title="ssl_cert_verify",dictType="SSL_CERT_VERIFY",sort=95)
+	protected Integer sslCertVerify;//证书校验结果
+	@ExcelField(title="stream_trace_id",sort=96)
+	protected String streamTraceId;//流的追踪ID
+	@ExcelField(title="ssl_error",sort=97)
+	protected String sslError;//ssl错误信息
+	@ExcelField(title="c2s_pkt_num",sort=98)
+	protected Integer c2sPktNum;//c2s包数
+	@ExcelField(title="s2c_pkt_num",sort=99)
+	protected Integer s2cPktNum;//s2c包数
+	@ExcelField(title="c2s_byte_num",sort=100)
+	protected Integer c2sByteNum;//c2s字节数
+	@ExcelField(title="s2c_byte_num",sort=101)
+	protected Integer s2cByteNum;//s2c字节数
+	@ExcelField(title="nas_ip",sort=102)
+	protected String nasIp;//ISN接入的IP
+	@ExcelField(title="framed_ip",sort=103)
+	protected String framedIp;//用户IP地址
+	@ExcelField(title="account",sort=104)
+	protected String account;//用户名
+	@ExcelField(title="packet_type",dictType="MESSAGE_TYPE",sort=105)
+	protected Integer packetType;//报文类型
+	
+	protected String dIp;
+	protected String sIp;
+	public String getProtocolName() {
+		return protocolName;
+	}
+	public void setProtocolName(String protocolName) {
+		this.protocolName = protocolName;
+	}
+	public String getAppName() {
+		return appName;
+	}
+	public void setAppName(String appName) {
+		this.appName = appName;
+	}
+	public String getdIp() {
+		return dIp;
+	}
+	public void setdIp(String dIp) {
+		this.dIp = dIp;
+	}
+	public String getsIp() {
+		return sIp;
+	}
+	public void setsIp(String sIp) {
+		this.sIp = sIp;
+	}
+	public String getAppProto() {
+		return appProto;
+	}
+	public void setAppProto(String appProto) {
+		this.appProto = appProto;
+	}
+	public String getUrl() {
+		return url;
+	}
+	public void setUrl(String url) {
+		this.url = url;
+	}
+	public String getReqLine() {
+		return reqLine;
+	}
+	public void setReqLine(String reqLine) {
+		this.reqLine = reqLine;
+	}
+	public String getResLine() {
+		return resLine;
+	}
+	public void setResLine(String resLine) {
+		this.resLine = resLine;
+	}
+	public String getCookie() {
+		return cookie;
+	}
+	public void setCookie(String cookie) {
+		this.cookie = cookie;
+	}
+	public String getReferer() {
+		return referer;
+	}
+	public void setReferer(String referer) {
+		this.referer = referer;
+	}
+	public String getUserAgent() {
+		return userAgent;
+	}
+	public void setUserAgent(String userAgent) {
+		this.userAgent = userAgent;
+	}
+	public String getContentLen() {
+		return contentLen;
+	}
+	public void setContentLen(String contentLen) {
+		this.contentLen = contentLen;
+	}
+	public String getContentType() {
+		return contentType;
+	}
+	public void setContentType(String contentType) {
+		this.contentType = contentType;
+	}
+	public String getSetCookie() {
+		return setCookie;
+	}
+	public void setSetCookie(String setCookie) {
+		this.setCookie = setCookie;
+	}
+	public String getReqHeader() {
+		return reqHeader;
+	}
+	public void setReqHeader(String reqHeader) {
+		this.reqHeader = reqHeader;
+	}
+	public String getRespHeader() {
+		return respHeader;
+	}
+	public void setRespHeader(String respHeader) {
+		this.respHeader = respHeader;
+	}
+	public String getReqBody() {
+		return reqBody;
+	}
+	public void setReqBody(String reqBody) {
+		this.reqBody = reqBody;
+	}
+	public String getRespBody() {
+		return respBody;
+	}
+	public void setRespBody(String respBody) {
+		this.respBody = respBody;
+	}
+//	public String getWebsite() {
+//		return website;
+//	}
+//	public void setWebsite(String website) {
+//		this.website = website;
+//	}
+	public String getHost() {
+		return host;
+	}
+	public void setHost(String host) {
+		this.host = host;
+	}
+	public String getDomain() {
+		return domain;
+	}
+	public void setDomain(String domain) {
+		this.domain = domain;
+	}
+	public String getCategory() {
+		return category;
+	}
+	public void setCategory(String category) {
+		this.category = category;
+	}
+	public String getIsp() {
+		return isp;
+	}
+	public void setIsp(String isp) {
+		this.isp = isp;
+	}
+	public Integer getPolicyId() {
+		return policyId;
+	}
+	public void setPolicyId(Integer policyId) {
+		this.policyId = policyId;
+	}
+	public String getStartTime() {
+		return startTime;
+	}
+	public void setStartTime(String startTime) {
+		this.startTime = startTime;
+	}
+	public String getEndTime() {
+		return endTime;
+	}
+	public void setEndTime(String endTime) {
+		this.endTime = endTime;
+	}
+	public String getServerIp() {
+		return serverIp;
+	}
+	public void setServerIp(String serverIp) {
+		this.serverIp = serverIp;
+	}
+	public String getClientIp() {
+		return clientIp;
+	}
+	public void setClientIp(String clientIp) {
+		this.clientIp = clientIp;
+	}
+	public String getServerPort() {
+		return serverPort;
+	}
+	public void setServerPort(String serverPort) {
+		this.serverPort = serverPort;
+	}
+	public String getClientPort() {
+		return clientPort;
+	}
+	public void setClientPort(String clientPort) {
+		this.clientPort = clientPort;
+	}
+	public String getServerLocation() {
+		return serverLocation;
+	}
+	public void setServerLocation(String serverLocation) {
+		this.serverLocation = serverLocation;
+	}
+	public String getClientLocation() {
+		return clientLocation;
+	}
+	public void setClientLocation(String clientLocation) {
+		this.clientLocation = clientLocation;
+	}
+	public String getClientAsn() {
+		return clientAsn;
+	}
+	public void setClientAsn(String clientAsn) {
+		this.clientAsn = clientAsn;
+	}
+	public String getServerAsn() {
+		return serverAsn;
+	}
+	public void setServerAsn(String serverAsn) {
+		this.serverAsn = serverAsn;
+	}
+	public String getSubscribeId() {
+		return subscribeId;
+	}
+	public void setSubscribeId(String subscribeId) {
+		this.subscribeId = subscribeId;
+	}
+	public Integer getConDurationMs() {
+		return conDurationMs;
+	}
+	public void setConDurationMs(Integer conDurationMs) {
+		this.conDurationMs = conDurationMs;
+	}
+	public String getReqBodyKey() {
+		return reqBodyKey;
+	}
+	public void setReqBodyKey(String reqBodyKey) {
+		this.reqBodyKey = reqBodyKey;
+	}
+	public String getResBodyKey() {
+		return resBodyKey;
+	}
+	public void setResBodyKey(String resBodyKey) {
+		this.resBodyKey = resBodyKey;
+	}
+	public String getVersion() {
+		return version;
+	}
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	public String getSni() {
+		return sni;
+	}
+	public void setSni(String sni) {
+		this.sni = sni;
+	}
+	public String getSan() {
+		return san;
+	}
+	public void setSan(String san) {
+		this.san = san;
+	}
+	public String getCn() {
+		return cn;
+	}
+	public void setCn(String cn) {
+		this.cn = cn;
+	}
+	public String getAppId() {
+		return appId;
+	}
+	public void setAppId(String appId) {
+		this.appId = appId;
+	}
+	public String getProtocolId() {
+		return protocolId;
+	}
+	public void setProtocolId(String protocolId) {
+		this.protocolId = protocolId;
+	}
+	public Integer getConLatencyMs() {
+		return conLatencyMs;
+	}
+	public void setConLatencyMs(Integer conLatencyMs) {
+		this.conLatencyMs = conLatencyMs;
+	}
+	public Integer getPinningst() {
+		return pinningst;
+	}
+	public void setPinningst(Integer pinningst) {
+		this.pinningst = pinningst;
+	}
+	public Integer getC2sPktNum() {
+		return c2sPktNum;
+	}
+	public void setC2sPktNum(Integer c2sPktNum) {
+		this.c2sPktNum = c2sPktNum;
+	}
+	public Integer getS2cPktNum() {
+		return s2cPktNum;
+	}
+	public void setS2cPktNum(Integer s2cPktNum) {
+		this.s2cPktNum = s2cPktNum;
+	}
+	public Integer getC2sByteNum() {
+		return c2sByteNum;
+	}
+	public void setC2sByteNum(Integer c2sByteNum) {
+		this.c2sByteNum = c2sByteNum;
+	}
+	public Integer getS2cByteNum() {
+		return s2cByteNum;
+	}
+	public void setS2cByteNum(Integer s2cByteNum) {
+		this.s2cByteNum = s2cByteNum;
+	}
+	public String getNasIp() {
+		return nasIp;
+	}
+	public void setNasIp(String nasIp) {
+		this.nasIp = nasIp;
+	}
+	public String getFramedIp() {
+		return framedIp;
+	}
+	public void setFramedIp(String framedIp) {
+		this.framedIp = framedIp;
+	}
+	public String getAccount() {
+		return account;
+	}
+	public void setAccount(String account) {
+		this.account = account;
+	}
+	public Integer getPacketType() {
+		return packetType;
+	}
+	public void setPacketType(Integer packetType) {
+		this.packetType = packetType;
+	}
+	public Integer getCompileId() {
+		return compileId;
+	}
+	public void setCompileId(Integer compileId) {
+		this.compileId = compileId;
+	}
+	public String getStartRecvTime() {
+		return startRecvTime;
+	}
+	public void setStartRecvTime(String startRecvTime) {
+		this.startRecvTime = startRecvTime;
+	}
+	public String getEndRecvTime() {
+		return endRecvTime;
+	}
+	public void setEndRecvTime(String endRecvTime) {
+		this.endRecvTime = endRecvTime;
+	}
+	public String getFoundTime() {
+		return foundTime;
+	}
+	public void setFoundTime(String foundTime) {
+		this.foundTime = foundTime;
+	}
+	public String getRecvTime() {
+		return recvTime;
+	}
+	public void setRecvTime(String recvTime) {
+		this.recvTime = recvTime;
+	}
+	public String getTransProto() {
+		return transProto;
+	}
+	public void setTransProto(String transProto) {
+		this.transProto = transProto;
+	}
+	public Integer getAddrType() {
+		return addrType;
+	}
+	public void setAddrType(Integer addrType) {
+		this.addrType = addrType;
+	}
+	public Integer getEntranceId() {
+		return entranceId;
+	}
+	public void setEntranceId(Integer entranceId) {
+		this.entranceId = entranceId;
+	}
+	public Integer getDeviceId() {
+		return deviceId;
+	}
+	public void setDeviceId(Integer deviceId) {
+		this.deviceId = deviceId;
+	}
+	public Integer getDirection() {
+		return direction;
+	}
+	public void setDirection(Integer direction) {
+		this.direction = direction;
+	}
+	public Integer getStreamDir() {
+		return streamDir;
+	}
+	public void setStreamDir(Integer streamDir) {
+		this.streamDir = streamDir;
+	}
+	public String getCapIp() {
+		return capIp;
+	}
+	public void setCapIp(String capIp) {
+		this.capIp = capIp;
+	}
+	public String getAddrList() {
+		return addrList;
+	}
+	public void setAddrList(String addrList) {
+		this.addrList = addrList;
+	}
+	public String getSceneFile() {
+		return sceneFile;
+	}
+	public void setSceneFile(String sceneFile) {
+		this.sceneFile = sceneFile;
+	}
+	public Integer getService() {
+		return service;
+	}
+	public void setService(Integer service) {
+		this.service = service;
+	}
+	public Integer getFunctionId() {
+		return functionId;
+	}
+	public void setFunctionId(Integer functionId) {
+		this.functionId = functionId;
+	}
+	public Integer getAction() {
+		return action;
+	}
+	public void setAction(Integer action) {
+		this.action = action;
+	}
+	public Integer getEncapType() {
+		return encapType;
+	}
+	public void setEncapType(Integer encapType) {
+		this.encapType = encapType;
+	}
+	public Integer getLinkId() {
+		return linkId;
+	}
+	public void setLinkId(Integer linkId) {
+		this.linkId = linkId;
+	}
+	public String getInnerSmac() {
+		return innerSmac;
+	}
+	public void setInnerSmac(String innerSmac) {
+		this.innerSmac = innerSmac;
+	}
+	public String getInnerDmac() {
+		return innerDmac;
+	}
+	public void setInnerDmac(String innerDmac) {
+		this.innerDmac = innerDmac;
+	}
+	public String getDate() {
+		return date;
+	}
+	public void setDate(String date) {
+		this.date = date;
+	}
+	public String getSeltype() {
+		return seltype;
+	}
+	public void setSeltype(String seltype) {
+		this.seltype = seltype;
+	}
+	public String getSearchFoundStartTime() {
+		return searchFoundStartTime;
+	}
+	public void setSearchFoundStartTime(String searchFoundStartTime) {
+		this.searchFoundStartTime = searchFoundStartTime;
+	}
+	public String getSearchFoundEndTime() {
+		return searchFoundEndTime;
+	}
+	public void setSearchFoundEndTime(String searchFoundEndTime) {
+		this.searchFoundEndTime = searchFoundEndTime;
+	}
+	public String getIsLogTotalSearch() {
+		return isLogTotalSearch;
+	}
+	public void setIsLogTotalSearch(String isLogTotalSearch) {
+		this.isLogTotalSearch = isLogTotalSearch;
+	}
+	public String getOrderBy() {
+		return orderBy;
+	}
+	public void setOrderBy(String orderBy) {
+		this.orderBy = orderBy;
+	}
+	public Integer getInterceptState() {
+		return interceptState;
+	}
+	public void setInterceptState(Integer interceptState) {
+		this.interceptState = interceptState;
+	}
+	public Integer getSslServerSideLatency() {
+		return sslServerSideLatency;
+	}
+	public void setSslServerSideLatency(Integer sslServerSideLatency) {
+		this.sslServerSideLatency = sslServerSideLatency;
+	}
+	public Integer getSslClientSideLatency() {
+		return sslClientSideLatency;
+	}
+	public void setSslClientSideLatency(Integer sslClientSideLatency) {
+		this.sslClientSideLatency = sslClientSideLatency;
+	}
+	public String getSslServerSideVersion() {
+		return sslServerSideVersion;
+	}
+	public void setSslServerSideVersion(String sslServerSideVersion) {
+		this.sslServerSideVersion = sslServerSideVersion;
+	}
+	public String getSslClientSideVersion() {
+		return sslClientSideVersion;
+	}
+	public void setSslClientSideVersion(String sslClientSideVersion) {
+		this.sslClientSideVersion = sslClientSideVersion;
+	}
+	public Integer getSslCertVerify() {
+		return sslCertVerify;
+	}
+	public void setSslCertVerify(Integer sslCertVerify) {
+		this.sslCertVerify = sslCertVerify;
+	}
+	public String getStreamTraceId() {
+		return streamTraceId;
+	}
+	public void setStreamTraceId(String streamTraceId) {
+		this.streamTraceId = streamTraceId;
+	}
+	public String getSslError() {
+		return sslError;
+	}
+	public void setSslError(String sslError) {
+		this.sslError = sslError;
+	}
+	public Integer getCfgId() {
+		return cfgId;
+	}
+	public void setCfgId(Integer cfgId) {
+		this.cfgId = cfgId;
+	}
+	public String getFields() {
+		return fields;
+	}
+	public void setFields(String fields) {
+		this.fields = fields;
+	}
+	
+	
+	
+}

src/main/java/com/nis/domain/maat/GroupReuseAddBean.java

@@ -44,7 +44,7 @@ public class GroupReuseAddBean implements Serializable{
 	@Expose
 	private Integer opAction;
 	@Expose
-	@SerializedName("commonGroupList")
+	@SerializedName("groupReuseList")
 	private List<GroupReuseCfg> groupReuseCfgList;
 
 	public String getVersion() {

src/main/java/com/nis/domain/maat/GroupReuseCfg.java

@@ -14,7 +14,7 @@ import com.nis.domain.maat.MaatCfg.StringCfg;
  *
  */
 public class GroupReuseCfg implements Serializable {
-	/*@Expose
+	@Expose
 	@SerializedName("service")
 	private Integer serviceId;
 	public Integer getServiceId() {
@@ -23,7 +23,7 @@ public class GroupReuseCfg implements Serializable {
 	public void setServiceId(Integer serviceId) {
 		this.serviceId = serviceId;
 	}
-*/	/**
+	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1830956100866313836L;

src/main/java/com/nis/domain/maat/MaatCfg.java

@@ -95,8 +95,6 @@ public class MaatCfg implements Serializable {
 	@Expose
 	@SerializedName("ipClientRangeList")
 	private List<IpCfg> areaIpRegionList;
-	@Expose
-	private List<GroupCfg> keepGroupList;
 	
 	public static class GroupCfg{
 		@Expose
@@ -106,8 +104,6 @@ public class MaatCfg implements Serializable {
 		@Expose
 		private Integer isValid;
 		@Expose
-		private Integer isCommonGroup;
-		@Expose
 		@SerializedName("opTime")
 		private Date auditTime;
 		public Integer getGroupId() {
@@ -134,12 +130,7 @@ public class MaatCfg implements Serializable {
 		public void setAuditTime(Date auditTime) {
 			this.auditTime = auditTime;
 		}
-		public Integer getIsCommonGroup() {
-			return isCommonGroup;
-		}
-		public void setIsCommonGroup(Integer isCommonGroup) {
-			this.isCommonGroup = isCommonGroup;
-		}
+		
 	}
 	public static class StringCfg{	
 		@Expose
@@ -688,13 +679,6 @@ public class MaatCfg implements Serializable {
 	public void setRequestId(Integer requestId) {
 		this.requestId = requestId;
 	}
-	
-	public List<GroupCfg> getKeepGroupList() {
-		return keepGroupList;
-	}
-	public void setKeepGroupList(List<GroupCfg> keepGroupList) {
-		this.keepGroupList = keepGroupList;
-	}
 	public void initDefaultValue() {
 		this.doLog=Constants.MAAT_CFG_DOLOG_DEFAULT;
 //		this.doBlackList=Constants.MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT;

src/main/java/com/nis/domain/maat/ManipulatActionParam.java

@@ -0,0 +1,140 @@
+package com.nis.domain.maat;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * 管控策略动作参数
+ */
+public class ManipulatActionParam implements Serializable{
+	
+	private static final long serialVersionUID = 7282481538239386968L;
+
+	@Expose
+	private String method;
+	
+	@Expose
+	private Integer code;
+	
+	@Expose
+	private String to;
+	
+	@Expose
+	private String message;
+	
+	@Expose
+	private Integer html_profile;
+	
+	@Expose
+	private List<ReplaceCfg> rules;
+	
+	public static class ReplaceCfg{
+		@Expose
+		private String search_in;
+		
+		@Expose
+		private String find;
+		
+		@Expose
+		private String replace_with;
+
+		public String getSearch_in() {
+			return search_in;
+		}
+
+		public void setSearch_in(String search_in) {
+			this.search_in = search_in;
+		}
+
+		public String getFind() {
+			return find;
+		}
+
+		public void setFind(String find) {
+			this.find = find;
+		}
+
+		public String getReplace_with() {
+			return replace_with;
+		}
+
+		public void setReplace_with(String replace_with) {
+			this.replace_with = replace_with;
+		}
+		
+	}
+	
+	@Expose
+	private Integer hijack_profile;
+	
+	@Expose
+	private Integer insert_profile;
+
+	public String getMethod() {
+		return method;
+	}
+
+	public void setMethod(String method) {
+		this.method = method;
+	}
+
+	public Integer getCode() {
+		return code;
+	}
+
+	public void setCode(Integer code) {
+		this.code = code;
+	}
+
+	public String getTo() {
+		return to;
+	}
+
+	public void setTo(String to) {
+		this.to = to;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+
+	public Integer getHtml_profile() {
+		return html_profile;
+	}
+
+	public void setHtml_profile(Integer html_profile) {
+		this.html_profile = html_profile;
+	}
+
+	public List<ReplaceCfg> getRules() {
+		return rules;
+	}
+
+	public void setRules(List<ReplaceCfg> rules) {
+		this.rules = rules;
+	}
+
+	public Integer getHijack_profile() {
+		return hijack_profile;
+	}
+
+	public void setHijack_profile(Integer hijack_profile) {
+		this.hijack_profile = hijack_profile;
+	}
+
+	public Integer getInsert_profile() {
+		return insert_profile;
+	}
+
+	public void setInsert_profile(Integer insert_profile) {
+		this.insert_profile = insert_profile;
+	}
+	
+}

src/main/java/com/nis/domain/maat/ToUpdateMaatBeanStatus.java

@@ -54,6 +54,8 @@ public class ToUpdateMaatBeanStatus implements Serializable{
 		@Expose
 		private Integer isValid;
 		@Expose
+		private Integer service;
+		@Expose
 		@SerializedName("opTime")
 		private Date auditTime;
 		public Integer getCompileId() {
@@ -74,6 +76,12 @@ public class ToUpdateMaatBeanStatus implements Serializable{
 		public void setAuditTime(Date auditTime) {
 			this.auditTime = auditTime;
 		}
+		public Integer getService() {
+			return service;
+		}
+		public void setService(Integer service) {
+			this.service = service;
+		}
 		
 	}
 	public String getVersion() {

src/main/java/com/nis/domain/report/BaseReport.java

@@ -9,6 +9,7 @@
 package com.nis.domain.report;
 
 import com.nis.domain.BaseEntity;
+import com.nis.util.excel.ExcelField;
 
 /**
  * @ClassName: BaseReportLog.java 
@@ -25,6 +26,7 @@ public class BaseReport<T> extends BaseEntity<T>{
 	 */
 	
 	private static final long serialVersionUID = -6190203013788730697L;
+	@ExcelField(title="config_log_total",sort=3)
 	protected Long sum;
 	protected Integer service;
 	protected String reportTime;

src/main/java/com/nis/domain/report/NtcAsnRecord.java

@@ -6,9 +6,7 @@ import com.nis.util.excel.ExcelField;
 public class NtcAsnRecord extends BaseLogEntity<NtcAsnRecord>{
 	
 	private static final long serialVersionUID = -4947912502754359817L;
-	@ExcelField(title="GBps",sort=10)
-	protected String GBps;
-	//@ExcelField(title="bps",sort=10)
+	@ExcelField(title="bps",sort=10)
 	protected String bps;
 	@ExcelField(title="pps",sort=9)
 	protected String pps;
@@ -27,13 +25,7 @@ public class NtcAsnRecord extends BaseLogEntity<NtcAsnRecord>{
 		this.searchAsnType = searchAsnType;
 	}
 	protected String searchAsnType;//1:d_asn;2:s_asn
-
-	public String getGBps() {
-		return bps;
-	}
-	public void setGBps(String gBps) {
-		GBps = this.getBps();
-	}
+	
 	public String getBps() {
 		return bps;
 	}

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

@@ -23,21 +23,6 @@ public class ConfigGroupInfo implements Serializable{
 	@ExcelField(title="cfg_id",sort=301)
 	private Integer compileId;
 	private Long asnId;
-	private Integer isAuditAll; //是否有策略选择了此公共组下发所有；
-	private Integer isUsed; //是否有策略选择了此公共组；
-	
-	public Integer getIsUsed() {
-		return isUsed;
-	}
-	public void setIsUsed(Integer isUsed) {
-		this.isUsed = isUsed;
-	}
-	public Integer getIsAuditAll() {
-		return isAuditAll;
-	}
-	public void setIsAuditAll(Integer isAuditAll) {
-		this.isAuditAll = isAuditAll;
-	}
 	
 	public Long getAsnId() {
 		return asnId;

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

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

src/main/java/com/nis/persistence/interceptor/ScheduleSelectInterceptor.java

@@ -0,0 +1,93 @@
+package com.nis.persistence.interceptor;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.plugin.Intercepts;
+import org.apache.ibatis.plugin.Invocation;
+import org.apache.ibatis.plugin.Plugin;
+import org.apache.ibatis.plugin.Signature;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
+import org.apache.log4j.Logger;
+
+import com.nis.domain.ScheduleCfg;
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.ServiceConfigTemplateUtil;
+/**
+ * 定时任务 拦截器
+ * 1、拦截 select 操作
+ * 2、判断是否 form 查询配置主表
+ * 3、如果是配置主表，查询对应的 scheduleCfg信息
+ * @author fang
+ *
+ */
+@Intercepts({@Signature(type = Executor.class, 
+		method = "query",
+		args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class})})
+public class ScheduleSelectInterceptor extends BaseInterceptor{
+	private static final long serialVersionUID = -265785145929843646L;
+	private static final Logger logger = Logger.getLogger(ScheduleSelectInterceptor.class);
+
+	@Override
+	@SuppressWarnings("all")
+	public Object intercept(Invocation invocation) throws Throwable {
+		final MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
+		final Executor executor = (Executor)invocation.getTarget();		
+		// select sql 查询结果
+		Object result = invocation.proceed();
+		if(result != null ) {
+			if(result instanceof Collection) {
+				Collection c = (Collection)result;
+//				if(c.size()==1) {//如果只查询一个 配置可以判定为是 form update 页面查询
+				if(c.size() >0) {//配置列表需要查询是否为定时任务，所以需要遍历
+					Iterator iterator = c.iterator();
+					while(iterator.hasNext()){
+						Object next = iterator.next();
+						if(next instanceof BaseCfg<?>) {
+							BaseCfg cfg = (BaseCfg)next;
+							//结果集的类名
+							String simpleName = next.getClass().getSimpleName();
+							//根据类名查找对应的 表名
+							String tableName = ServiceConfigTemplateUtil.getCfgTableNameByClassName(simpleName);
+							if(tableName != null) {//是配置主表
+								Configuration configuration = mappedStatement.getConfiguration();
+								MappedStatement scheduleStmt = configuration.getMappedStatement("com.nis.web.dao.SchedulerDao.findScheduleList");
+								ScheduleCfg sc = new ScheduleCfg();
+								sc.setTableName(tableName);
+								sc.setCfgId(cfg.getCfgId());
+								sc.setCompileId(cfg.getCompileId());
+								//executor.clearLocalCache();
+								List<ScheduleCfg> schedules = executor.query(scheduleStmt, sc, RowBounds.DEFAULT, Executor.NO_RESULT_HANDLER);
+								if(schedules != null&& schedules.size() > 0) {
+									cfg.setSchedule(schedules.get(0));
+								}
+								logger.debug(String.format("配置bean中赋值scheduleCfg,表名：%s,类名:%s,cfgId:%s,compileId:%s,schedules num:%s", tableName,simpleName,sc.getCfgId(),sc.getCompileId(),schedules==null?0:schedules.size()));
+							}
+						}else{
+							break;
+						}
+					}
+					
+				}
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public Object plugin(Object target) {
+		return Plugin.wrap(target, this);
+	}
+
+	@Override
+	public void setProperties(Properties properties) {
+		
+	}
+
+}

src/main/java/com/nis/persistence/interceptor/ScheduleUpdateInterceptor.java

@@ -0,0 +1,396 @@
+package com.nis.persistence.interceptor;
+
+import java.lang.reflect.Array;
+import java.sql.SQLException;
+import java.text.DateFormat;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.Properties;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.BoundSql;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.mapping.ParameterMapping;
+import org.apache.ibatis.plugin.Intercepts;
+import org.apache.ibatis.plugin.Invocation;
+import org.apache.ibatis.plugin.Plugin;
+import org.apache.ibatis.plugin.Signature;
+import org.apache.ibatis.reflection.MetaObject;
+import org.apache.ibatis.session.Configuration;
+import org.apache.ibatis.session.RowBounds;
+import org.apache.ibatis.type.TypeHandlerRegistry;
+import org.apache.log4j.Logger;
+import org.springframework.beans.BeanUtils;
+
+import com.alibaba.druid.sql.ast.statement.SQLUpdateSetItem;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement;
+import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
+import com.google.common.collect.Lists;
+import com.nis.domain.ScheduleCfg;
+import com.nis.domain.ScheduleExceInfo;
+import com.nis.domain.configuration.BaseCfg;
+import com.nis.util.ServiceConfigTemplateUtil;
+import com.nis.web.security.UserUtils;
+
+import jersey.repackaged.com.google.common.collect.Sets;
+/**
+ * 定时任务 拦截器
+ * 1、拦截insert,update,delete操作
+ * 2、判断是否是需要下发配置的表
+ * 3、如果是需要下发配置的表，则同时将数据保存到schedule_cfg表中，并调用定时任务
+ * @author fang
+ *
+ */
+@Intercepts({@Signature(
+		  type= Executor.class,
+		  method = "update",
+		  args = {MappedStatement.class,Object.class})})
+public class ScheduleUpdateInterceptor extends BaseInterceptor{
+	private static final long serialVersionUID = -265785145929843646L;
+	private static final Logger logger = Logger.getLogger(ScheduleUpdateInterceptor.class);
+
+	private static final String TABLE_NAME_INSERT_REG = "^\\s*insert\\s+into\\s+([\\w_-]+)\\s*\\(";
+	private static final Pattern TABLE_NAME_INSERT_PATTERN = Pattern.compile(TABLE_NAME_INSERT_REG, Pattern.CASE_INSENSITIVE);//大小写
+	
+	private static final String TABLE_NAME_UPDATE_REG = "^\\s*update\\s+([\\w_-]+)";
+	private static final Pattern TABLE_NAME_UPDATE_PATTERN = Pattern.compile(TABLE_NAME_UPDATE_REG, Pattern.CASE_INSENSITIVE);//大小写
+	
+	private static final String TABLE_NAME_DELETE_REG = "^\\s*delete\\s+from\\s+([\\w_-]+)";
+	private static final Pattern TABLE_NAME_DELETE_PATTERN = Pattern.compile(TABLE_NAME_DELETE_REG, Pattern.CASE_INSENSITIVE);//大小写
+	/**
+	 * 排除拦截的id
+	 */
+	private static final Set<String> EXCLUDE_MAPPER_IDS = Sets.newHashSet();
+	static {
+		EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.SchedulerDao.updateCfgTableStatus");
+		EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.basics.ServiceDictInfoDao");
+		EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.configuration.PxyObjKeyringDao.updatePxyObjTrustedCaCrl");
+		EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.configuration.CommonPolicyDao.auditCfgBatch");
+		EXCLUDE_MAPPER_IDS.add("com.nis.web.dao.configuration.CommonPolicyDao.deleteCfgBatch");
+	}
+	/**
+	 * is_valid 字段名
+	 */
+	private static final String IS_VALID_COLUMN = "is_valid";
+	/**
+	 * is_audit 字段名
+	 */
+	private static final String IS_AUDIT_COLUMN = "is_audit";
+	
+	@Override
+	@SuppressWarnings("all")
+	public Object intercept(Invocation invocation) throws Throwable {
+		final MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
+		final Executor executor = (Executor)invocation.getTarget();
+		Object parameter = invocation.getArgs()[1];//被拦截的 sql 参数
+		BoundSql boundSql = mappedStatement.getBoundSql(parameter);
+		Object result = invocation.proceed();//被拦截的 sql 操作 继续执行
+		String curProceedId = mappedStatement.getId();
+		//不需要拦截的操作直接返回结果
+		if(EXCLUDE_MAPPER_IDS.contains(curProceedId)) {
+			return result;
+		}
+		String tableName = null;//操作的表名
+		//mybatis 整个mapper 信息
+		Configuration configuration = mappedStatement.getConfiguration();
+		//被拦截的 sql语句
+		String sql = boundSql.getSql();
+		//所有需要拦截的表名
+		Set<String> tableNames = ServiceConfigTemplateUtil.getCompileTableName();
+		
+		switch (mappedStatement.getSqlCommandType()) {
+		case INSERT://新增配置
+			Matcher insertMatcher = TABLE_NAME_INSERT_PATTERN.matcher(sql);
+			tableName = insertMatcher.find()?insertMatcher.group(1):tableName;
+			if(tableName != null && tableNames.contains(tableName.toLowerCase())) {
+				insertCfg(executor,parameter, configuration,tableName);
+			}
+			break;
+		case UPDATE://更新配置
+			Matcher updateMatcher = TABLE_NAME_UPDATE_PATTERN.matcher(sql);
+			tableName = updateMatcher.find()?updateMatcher.group(1):tableName;
+			if(tableName != null && tableNames.contains(tableName.toLowerCase())) {
+				updateCfg(executor,boundSql, configuration,tableName);
+			}
+			break;
+		case DELETE://删除配置
+			Matcher deleteMatcher = TABLE_NAME_DELETE_PATTERN.matcher(sql);
+			tableName = deleteMatcher.find()?deleteMatcher.group(1):tableName;
+			if(tableName != null && tableNames.contains(tableName.toLowerCase())) {
+				deleteCfg(executor,parameter, configuration,tableName);
+			}
+			break;
+		default:
+			break;
+		}
+		logger.debug(sql);
+		return result;
+	}
+
+	@Override
+	public Object plugin(Object target) {
+		return Plugin.wrap(target, this);
+	}
+
+	
+	/**
+	 * @throws SQLException 
+	 * 
+	 */
+	@SuppressWarnings("all")
+	private void insertCfg(Executor executor,Object parameterObject,Configuration configuration,String tableName) throws SQLException {
+		List<BaseCfg> cfgList = Lists.newArrayList();
+		//确保 单个，批量都适用
+		if(parameterObject instanceof BaseCfg<?>) {//单个添加
+			BaseCfg<?> baseCfg = (BaseCfg<?>)parameterObject;
+			cfgList.add(baseCfg);
+		}else if(parameterObject instanceof Collection) {
+			Collection<BaseCfg<?>> bcCollection = (Collection<BaseCfg<?>>)parameterObject;
+			cfgList.addAll(bcCollection);
+		}else if(parameterObject.getClass().isArray()) {
+			int length = Array.getLength(parameterObject);
+			for(int i = 0;i< length;i++) {
+				BaseCfg<?> baseCfg = (BaseCfg<?>)Array.get(parameterObject, i);
+				cfgList.add(baseCfg);
+			}
+		}
+		//整理需要 insert 的 schedule_cfg 的数据
+		List<ScheduleCfg> scheduleList = Lists.newArrayList();
+		for(BaseCfg<?> baseCfg : cfgList) {
+			ScheduleCfg scList = copyScheduleCfgFromBaseCfg(baseCfg, tableName);
+			if(scList!=null){
+				//TODO 定时任务设置默认为isValid=0 isAudit=0，需要考虑允许用户新增isValid=1 isAudit=1的配置下发
+				scList.setIsValid(0);//设置默认值
+				scList.setIsAudit(0);//设置默认值
+				scheduleList.add(scList);
+			}			
+		}
+		
+		if(scheduleList.size() > 0) {
+			for(ScheduleCfg sc : scheduleList) {
+				MappedStatement statement = configuration.getMappedStatement("com.nis.web.dao.SchedulerDao.insert");
+				executor.update(statement, sc);
+			}
+		}
+	}
+	
+	/**
+	 * 
+	 */
+	@SuppressWarnings("all")
+	private void updateCfg(Executor executor,BoundSql boundSql,Configuration configuration,String tableName) throws SQLException {
+		/*
+		 * 条件1： is_valid=0,is_audit=0; 未生效之前修改，来自修改页面
+		 *1、首先将所有相关定时任务信息取消
+		 *2、 新增 定时任务信息
+		 */
+		Object parameterObject = boundSql.getParameterObject();
+		if(parameterObject instanceof BaseCfg) {
+			BaseCfg bc = (BaseCfg)parameterObject;
+			Integer isValid = bc.getIsValid();
+			Integer isAudit = bc.getIsAudit();
+			Integer compileId = bc.getCompileId();
+			Long cfgId = bc.getCfgId();
+			if(isValid == 0 && isAudit == 0) {
+				ScheduleCfg sc = new ScheduleCfg();
+				sc.setCompileId(compileId);
+				sc.setEditorId(bc.getEditorId());
+				sc.setEditTime(bc.getEditTime());
+				sc.setType(1);
+				sc.setCfgId(cfgId);
+				//根据 compileId 删除之前的
+				MappedStatement statement = configuration.getMappedStatement("com.nis.web.dao.SchedulerDao.deleteByCompileId");
+				executor.update(statement, sc);
+				//新增 更改的
+				ScheduleCfg schedule = copyScheduleCfgFromBaseCfg(bc, tableName);
+				if(schedule != null ) {
+					statement = configuration.getMappedStatement("com.nis.web.dao.SchedulerDao.insert");
+					executor.update(statement, schedule);
+					//配置信息新增，或取消之后重新修改，需要修改 exce_new表的状态
+					statement = configuration.getMappedStatement("com.nis.web.dao.SchedulerDao.updateScheduleExceNew");
+					ScheduleExceInfo exceNew = new ScheduleExceInfo();
+					exceNew.setCompileId(compileId);
+					exceNew.setIssueStatus(1);
+					exceNew.setIsIssue(1);//定时任务执行时需要下发配置
+					executor.update(statement, exceNew);
+				}
+				return;
+			}
+		}
+		//完整的sql语句，已经完成 ? 替换
+		String sql = showSql(configuration, boundSql);
+		log.debug(String.format("cfg update sql : " , sql));
+		//其它剩余基本判定为 修改状态的 update 
+		MySqlStatementParser parser = new MySqlStatementParser(sql);
+		MySqlUpdateStatement updateSqlStmt = (MySqlUpdateStatement)parser.parseStatement();
+		List<SQLUpdateSetItem> items = updateSqlStmt.getItems();
+		/* 分别获取 is_audit & is_valid 的值*/
+		Integer isValid = null;
+		Integer isAudit = null;
+		for(SQLUpdateSetItem item : items) {
+			if(IS_VALID_COLUMN.equalsIgnoreCase(item.getColumn().toString())) {
+				isValid = Integer.valueOf(item.getValue().toString());
+				continue;
+			}
+			if(IS_AUDIT_COLUMN.equalsIgnoreCase(item.getColumn().toString())) {
+				isAudit = Integer.valueOf(item.getValue().toString());
+				continue;
+			}
+			if(isValid != null && isAudit != null) {
+				break;
+			}
+		}
+		//isValid 和 isAudit 同时为空，目前发现有 取消来函的 update 操作有此情况
+		if(isValid == null && isAudit == null) {
+			return;
+		}
+		//获取当前的update 条件
+		String whereStr = updateSqlStmt.getWhere().toString();
+		StringBuilder whereSb = new StringBuilder();
+		whereSb.append(" and table_name = '");
+		whereSb.append(tableName);
+		whereSb.append("' and ( ");
+		whereSb.append(whereStr);
+		whereSb.append(" )");
+		//根据当前的 update 条件 查出所有符合条件的 schedule_cfg 数据
+		MappedStatement scheduleStmt = configuration.getMappedStatement("com.nis.web.dao.SchedulerDao.findScheduleList");
+		ScheduleCfg sc = new ScheduleCfg();
+		sc.setWhereStr(whereSb.toString());
+		List<ScheduleCfg> schedules = executor.query(scheduleStmt, sc, RowBounds.DEFAULT, Executor.NO_RESULT_HANDLER);
+		if(schedules != null && schedules.size() > 0) {//有符合条件的 定时任务
+			Set<Integer> compileSet = Sets.newHashSet();//保存操作的所有 compileId
+			Date now = new Date();//当前时间
+			//1、将符合条件的是  ScheduleCfg update del_flag  = 0
+			for(ScheduleCfg scfg : schedules) {
+				compileSet.add(scfg.getCompileId());
+				scfg.setEditorId(UserUtils.getUser().getId());
+				scfg.setEditTime(now);
+				MappedStatement statement = configuration.getMappedStatement("com.nis.web.dao.SchedulerDao.deleteByCompileId");
+				executor.update(statement, scfg);
+			}
+			//2、把原信息 重新保存，并修改 is_valid ,is_audit 状态
+			for(ScheduleCfg scfg : schedules) {
+				MappedStatement statement = configuration.getMappedStatement("com.nis.web.dao.SchedulerDao.insert");
+				scfg.setIsValid(isValid);
+				scfg.setIsAudit(isAudit);
+				scfg.setType(1);
+				executor.update(statement, scfg);
+			}
+			//手动 审核通过，立即生效时 已经下发，修改 exce_new 表的是否需要下发字段为 不需要 ： 0
+			if(isValid == 1 && isAudit == 1) {
+				for(Integer ci : compileSet) {
+					MappedStatement statement = configuration.getMappedStatement("com.nis.web.dao.SchedulerDao.findScheduleExceNew");
+					ScheduleExceInfo se = new ScheduleExceInfo();
+					se.setCompileId(ci);
+					se.setIsValid(isValid);
+					List<ScheduleExceInfo> seList = executor.query(statement, se, RowBounds.DEFAULT, Executor.NO_RESULT_HANDLER);
+					if(seList == null || seList.size() < 1) {//没有执行记录，新增一条
+						//配置信息新增，或取消之后重新修改，需要修改 exce_new表的状态
+						statement = configuration.getMappedStatement("com.nis.web.dao.SchedulerDao.insertScheduleExceNew");
+						ScheduleExceInfo exceNew = new ScheduleExceInfo();
+						exceNew.setCompileId(ci);
+						exceNew.setIssueStatus(1);
+						exceNew.setIsIssue(0);//已经下发，定时任务不需要下发
+						exceNew.setExceTime(new Date());
+						executor.update(statement, exceNew);
+					}else {
+						//配置信息新增，或取消之后重新修改，需要修改 exce_new表的状态
+						statement = configuration.getMappedStatement("com.nis.web.dao.SchedulerDao.updateScheduleExceNew");
+						ScheduleExceInfo exceNew = new ScheduleExceInfo();
+						exceNew.setCompileId(ci);
+						exceNew.setIssueStatus(1);
+						exceNew.setIsIssue(0);//已经下发，定时任务不需要下发
+						executor.update(statement, exceNew);
+					}
+					
+				}
+			}
+		}
+	}
+	
+	/**
+	 * 暂时没有发现有 删除操作
+	 */
+	@SuppressWarnings("all")
+	private void deleteCfg(Executor executor,Object parameterObject,Configuration configuration,String tableName) throws SQLException {
+		
+	}
+	
+	
+	
+	
+	/**
+	 * 从 basecfg 实体类中获取 schedule cfg
+	 * @param baseCfg
+	 * @param tableName
+	 * @return
+	 */
+	private ScheduleCfg copyScheduleCfgFromBaseCfg(BaseCfg<?> baseCfg,String tableName){
+		ScheduleCfg schedule = baseCfg.getSchedule();
+		if(schedule != null ) {
+			BeanUtils.copyProperties(baseCfg, schedule,new String[]{"userRegion1","userRegion2","userRegion3","userRegion4","userRegion5"});
+			schedule.setTableName(tableName);
+			schedule.setType(1);
+		}
+		return schedule;
+	}
+	
+	
+	/*如果参数是String，则添加单引号， 如果是日期，则转换为时间格式器并加单引号； 对参数是null和不是null的情况作了处理*/
+    private static String getParameterValue(Object obj) {
+        String value = null;
+        if (obj instanceof String) {
+            value = "'" + obj.toString() + "'";
+        } else if (obj instanceof Date) {
+            DateFormat formatter = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, Locale.getDefault());
+            value = "'" + formatter.format(new Date()) + "'";
+        } else {
+            if (obj != null) {
+                value = obj.toString();
+            } else {
+                value = "null";
+            }
+        }
+        return value;
+    }
+	
+	// 进行？的替换
+    public static String showSql(Configuration configuration, BoundSql boundSql) {
+        Object parameterObject = boundSql.getParameterObject();  // 获取参数
+        List<ParameterMapping> parameterMappings = boundSql.getParameterMappings();
+        String sql = boundSql.getSql().replaceAll("[\\s]+", " ");  // sql语句中多个空格都用一个空格代替
+        if (parameterMappings != null && parameterMappings.size() >0  && parameterObject != null) {
+            TypeHandlerRegistry typeHandlerRegistry = configuration.getTypeHandlerRegistry(); // 获取类型处理器注册器，类型处理器的功能是进行java类型和数据库类型的转换<br>　　　　　　　// 如果根据parameterObject.getClass(）可以找到对应的类型，则替换
+            if (typeHandlerRegistry.hasTypeHandler(parameterObject.getClass())) {
+                sql = sql.replaceFirst("\\?", Matcher.quoteReplacement(getParameterValue(parameterObject)));
+ 
+            } else {
+                MetaObject metaObject = configuration.newMetaObject(parameterObject);// MetaObject主要是封装了originalObject对象，提供了get和set的方法用于获取和设置originalObject的属性值,主要支持对JavaBean、Collection、Map三种类型对象的操作
+                for (ParameterMapping parameterMapping : parameterMappings) {
+                    String propertyName = parameterMapping.getProperty();
+                    if (metaObject.hasGetter(propertyName)) {
+                        Object obj = metaObject.getValue(propertyName);
+                        sql = sql.replaceFirst("\\?", Matcher.quoteReplacement(getParameterValue(obj)));
+                    } else if (boundSql.hasAdditionalParameter(propertyName)) {
+                        Object obj = boundSql.getAdditionalParameter(propertyName);  // 该分支是动态sql
+                        sql = sql.replaceFirst("\\?", Matcher.quoteReplacement(getParameterValue(obj)));
+                    }else{sql=sql.replaceFirst("\\?","缺失");}//打印出缺失，提醒该参数缺失并防止错位
+                }
+            }
+        }
+        return sql;
+    }
+	
+	
+	@Override
+	public void setProperties(Properties properties) {
+		// TODO Auto-generated method stub
+		
+	}
+
+}

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

@@ -0,0 +1,578 @@
+package com.nis.quartz;
+
+import java.text.ParseException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+import org.quartz.CalendarIntervalScheduleBuilder;
+import org.quartz.CalendarIntervalTrigger;
+import org.quartz.CronScheduleBuilder;
+import org.quartz.DateBuilder;
+import org.quartz.DisallowConcurrentExecution;
+import org.quartz.Job;
+import org.quartz.JobBuilder;
+import org.quartz.JobDataMap;
+import org.quartz.JobDetail;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.JobKey;
+import org.quartz.PersistJobDataAfterExecution;
+import org.quartz.ScheduleBuilder;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.SimpleScheduleBuilder;
+import org.quartz.SimpleTrigger;
+import org.quartz.Trigger;
+import org.quartz.TriggerBuilder;
+import org.quartz.TriggerKey;
+import org.quartz.impl.matchers.GroupMatcher;
+import org.quartz.impl.triggers.CalendarIntervalTriggerImpl;
+import org.quartz.impl.triggers.CronTriggerImpl;
+import org.quartz.spi.MutableTrigger;
+
+import com.nis.domain.ScheduleCfg;
+import com.nis.util.Constants;
+import com.nis.util.DateUtil;
+import com.nis.util.DateUtils;
+import com.nis.util.StringUtils;
+import com.nis.web.dao.SchedulerDao;
+import com.nis.web.service.SpringContextHolder;
+
+/**
+ * 定时任务 配置定时任务加载
+ * 1、每 n s 执行一次，每次读取 schedule_cfg 最新的数据
+ * 2、删除或新增 定时任务
+ * 3、单线程执行
+ * @author fang
+ *
+ */
+@DisallowConcurrentExecution
+@PersistJobDataAfterExecution
+public class ScheduleCfgJob implements Job {
+	private static final Logger log = Logger.getLogger(ScheduleCfgJob.class);
+
+	/**
+	 * 状态组，格式：statusGroup-compileId
+	 */
+	private static final String STATUS_GROUP = "statusGroup-";
+	private static final String STATUS_JOB = "STATUS-JOB";
+	/**
+	 * 生效标识：valid-cronexp
+	 */
+	private static final String VALID_KEY = "valid-";
+	/**
+	 * 失效标识：invalid-cronexp
+	 */
+	private static final String INVALID_KEY = "invalid-";
+	private static final JobKey STATUS_JOBKEY = JobKey.jobKey(STATUS_JOB, "statusGroup");
+	private static final JobDetail STATUS_JOBDETAIL = JobBuilder.newJob(ScheduleStatusJob.class)
+														.withIdentity(STATUS_JOBKEY)
+														.storeDurably(true)
+														.build();
+	
+	@Override
+	public void execute(JobExecutionContext context) throws JobExecutionException {
+		Scheduler scheduler = context.getScheduler();
+		SchedulerDao dao = SpringContextHolder.getBean(SchedulerDao.class);
+		JobDataMap dataMap = context.getJobDetail().getJobDataMap();
+		long scheduleCfgId = dataMap.get("scheduleCfgId") == null ? 0:dataMap.getLong("scheduleCfgId");
+		long limit = dataMap.get("limit") == null ? Constants.MAAT_JSON_SEND_SIZE:dataMap.getLong("limit");
+		log.info(String.format("定时配置任务开始执行，scheduleCfgId:%s,limit:%s",scheduleCfgId,limit ));
+		List<ScheduleCfg> allNewlySche = null;
+		int totalNum = 0;
+		do {
+			allNewlySche = dao.findNewlyCfg(scheduleCfgId, limit,1,1);
+			if(allNewlySche != null && allNewlySche.size() > 0) {
+				List<ScheduleCfg> allAddSche = new ArrayList<>();
+				totalNum += allNewlySche.size();
+				//先取消之前的定时配置
+				for(ScheduleCfg cfg : allNewlySche) {
+					//获取有效的任务
+					if(cfg.getDelFlag()==1) {
+						allAddSche.add(cfg);
+					}
+					Integer compileId = cfg.getCompileId();
+					try {
+						//取消之前所有的 trigger
+						GroupMatcher<TriggerKey> groupMatcher= GroupMatcher.triggerGroupEquals(STATUS_GROUP + compileId);
+						Set<TriggerKey> triggerKeys = scheduler.getTriggerKeys(groupMatcher);
+						if(triggerKeys != null && triggerKeys.size() > 0) {
+							for(TriggerKey tk : triggerKeys) {
+								scheduler.unscheduleJob(tk);
+							}
+							log.info(String.format("定时任务取消成功，compile:%s", compileId));
+						}
+					} catch (Exception e) {
+						log.error(String.format("定时任务取消异常，compileId:%s", compileId),e);
+					}
+				}
+				for(ScheduleCfg cfg : allAddSche) {
+					Integer compileId = cfg.getCompileId();
+					try {
+						//判断状态，重新添加最新的 trigger
+						Integer isValid = cfg.getIsValid();
+						Integer isAudit = cfg.getIsAudit();
+						//添加定时任务的条件
+						if((isValid == 1 && isAudit == 1) || (isValid == 0 && isAudit == 0)) {
+							//添加定时任务，包括valid 和 invalid
+							addJob(scheduler, cfg);
+							log.info(String.format("定时任务添加成功，compile:%s", compileId));
+						}
+					} catch (Exception e) {
+						log.error(String.format("定时任务更新异常，compileId:%s", compileId),e);
+					}
+				}
+				//最后 保存此次 最后的id
+				ScheduleCfg lastCfg = allNewlySche.get(allNewlySche.size() -1);
+				scheduleCfgId = lastCfg.getId();
+				dataMap.put("scheduleCfgId", scheduleCfgId);
+				log.info(String.format("加载定时任务，total num :%s", allNewlySche.size()));
+			}
+		} while (allNewlySche != null && allNewlySche.size() > 0);
+		log.info(String.format("定时配置任务结束执行，total num:%s",totalNum));
+	}
+
+
+	/**
+	 * 将定时任务信息添加到 定时器框架中调度
+	 * @param scheduler
+	 * @param cfg
+	 * @throws SchedulerException
+	 */
+	/*public static void addJob(Scheduler scheduler,ScheduleCfg cfg) throws SchedulerException {
+		Integer compileId = cfg.getCompileId();
+		String cronValid = cfg.getCronValid();
+		String cronInvalid = cfg.getCronInvalid();
+		Trigger validTrigger = createTrigger(cronValid, compileId, true, cfg);
+		Trigger invalidTrigger = createTrigger(cronInvalid, compileId, false, cfg);
+		boolean jobExist = scheduler.checkExists(STATUS_JOBKEY);
+		if(!jobExist) {//判断 job 是否存在，不存在添加
+			scheduler.addJob(STATUS_JOBDETAIL, false);
+		}
+		boolean checkExists = scheduler.checkExists(validTrigger.getKey());
+		if(!checkExists) {//判断 valid trigger 是否存在，不存在添加
+			scheduler.scheduleJob(validTrigger);
+		}else {
+			log.warn(String.format("Trigger already exists:%s ", validTrigger.getKey().toString()));
+		}
+		checkExists = scheduler.checkExists(invalidTrigger.getKey());
+		if(!checkExists) {//判断 invalid trigger 是否存在，不存在添加
+			scheduler.scheduleJob(invalidTrigger);
+		}else {
+			log.warn(String.format("Trigger already exists:%s ", invalidTrigger.getKey().toString()));
+		}
+	}*/
+	
+	
+	public static void addJob(Scheduler scheduler,ScheduleCfg cfg) throws SchedulerException {
+		List<Trigger> triList = createTrigger(cfg);
+		boolean jobExist = scheduler.checkExists(STATUS_JOBKEY);
+		if(!jobExist) {//判断 job 是否存在，不存在添加
+			scheduler.addJob(STATUS_JOBDETAIL, false);
+		}
+		for(Trigger tri : triList) {
+			boolean checkExists = scheduler.checkExists(tri.getKey());
+			if(!checkExists) {//判断 valid trigger 是否存在，不存在添加
+				log.debug(String.format("定时任务添加，%s", tri.getKey()));
+				scheduler.scheduleJob(tri);
+				log.info(String.format("定时任务添加成功，%s", tri.getKey()));
+			}else {
+				log.warn(String.format("Trigger already exists:%s ", tri.getKey().toString()));
+			}
+		}
+	}
+	
+	/**
+	 *  将页面配置的内容 转换成 trigger
+	 * @param cfg
+	 * @return
+	 */
+	public static List<Trigger> createTrigger(ScheduleCfg cfg){
+		String mode = cfg.getUserRegion1().toUpperCase();//定时任务运行模式：一次，每天，每周，每月
+		List<Trigger> triList = null;
+		switch (mode) {
+		case "ALWAYS"://单次运行，但只创建单次生效触发器
+			triList = createSimpleTrigger(cfg);
+			break;
+		case "SINGLE"://单次运行
+			triList = createSimpleTrigger(cfg);
+			break;
+		case "EVERYDAY"://每天运行  0 0 0 2/1 * ? ,不符合要求，定义每天都执行，然后在 代码判断 间隔时间
+			triList = createCalendarIntervalTrigger(cfg);
+			break;
+		case "EVERYWEEK"://每周运行
+			triList = createCalendarIntervalTrigger(cfg);
+			break;
+		case "EVERYMONTH"://每月运行
+			triList = createEveryMonthTrigger(cfg);
+			break;
+		default:
+			log.warn(String.format("unknown mode : %s ", mode));
+			break;
+		}
+		return triList;
+	}
+	
+	
+	
+	
+	/**
+	 * 将时间转换成 时分秒
+	 * @param time
+	 * @return
+	 */
+	public static List<Integer> parseTime(String time) {
+		if(StringUtils.isNoneBlank(time)) {
+			String[] split = time.split(":");
+			List<Integer> tl = new ArrayList<Integer>(3); 
+			for(String s : split) {
+				tl.add(Integer.valueOf(s));
+			}
+			return tl;
+		}
+		return null;
+	}
+	
+	public static Trigger createCronTrigger(String cron,Integer compileId,boolean isValid,ScheduleCfg cfg) {
+		String triggerName = isValid  ? (VALID_KEY + cron) : (INVALID_KEY + cron);
+		JobDataMap dataMap = new JobDataMap();
+		dataMap.put("isValid", isValid);
+		dataMap.put("cfg", cfg);
+		return TriggerBuilder.newTrigger()
+			.withIdentity(createTiggerKey(triggerName, STATUS_GROUP+compileId))
+			.withSchedule(CronScheduleBuilder.cronSchedule(cron))
+			.usingJobData(dataMap)
+			.forJob(STATUS_JOBDETAIL)
+			.build();
+	}
+
+	
+	/**
+	 *  一次执行
+	 * @param cfg
+	 * @return
+	 */
+	public static List<Trigger> createSimpleTrigger(ScheduleCfg cfg){
+		List<Trigger> triList = new ArrayList<Trigger>();
+		Integer compileId = cfg.getCompileId();
+		String cronValid = cfg.getCronValid();
+		String cronInvalid = cfg.getCronInvalid();
+		Date validDate = null;
+		Date invalidDate = null;
+		if(StringUtils.isNotBlank(cronValid)){
+			validDate = DateUtil.convertStringToDate(cronValid, Constants.COMMON_DATE_FORMAT);
+		}
+		if(StringUtils.isNotBlank(cronInvalid)){
+			invalidDate = DateUtil.convertStringToDate(cronInvalid, Constants.COMMON_DATE_FORMAT);
+		}
+		JobDataMap dataMap = new JobDataMap();
+		if(validDate!=null){//生效时间如果不为空，则创建定时生效触发器
+			dataMap.put("isValid", true);
+			dataMap.put("cfg", cfg);
+			String triName = VALID_KEY + cfg.getUserRegion1() + "_" + cronValid;
+			Trigger trigger = TriggerBuilder.newTrigger()
+					.withIdentity(createTiggerKey(triName, STATUS_GROUP+compileId))
+					.withSchedule(SimpleScheduleBuilder.simpleSchedule())
+					.usingJobData(dataMap)
+					.forJob(STATUS_JOBDETAIL)
+					.startAt(validDate)
+					.build();
+			triList.add(trigger);
+		}
+		if(invalidDate!=null){//失效时间如果不为空，则创建定时失效触发器
+			dataMap = new JobDataMap();
+			dataMap.put("isValid", false);
+			dataMap.put("cfg", cfg);
+			String triName = INVALID_KEY + cfg.getUserRegion1() + "_" + cronInvalid;
+			Trigger trigger = TriggerBuilder.newTrigger()
+					.withIdentity(createTiggerKey(triName, STATUS_GROUP+compileId))
+					.withSchedule(SimpleScheduleBuilder.simpleSchedule())
+					.usingJobData(dataMap)
+					.forJob(STATUS_JOBDETAIL)
+					.startAt(invalidDate)
+					.build();
+			triList.add(trigger);
+		}
+		return triList;
+	}
+	
+	
+	/**
+	 * 间隔 n 天 或 n 周执行
+	 * @param cfg
+	 * @return
+	 */
+	public static List<Trigger> createCalendarIntervalTrigger(ScheduleCfg cfg) {
+		List<Trigger> triList = new ArrayList<Trigger>();
+		Integer compileId = cfg.getCompileId();
+		String cronValid = cfg.getCronValid();
+		String cronInvalid = cfg.getCronInvalid();
+		String dayOrWeek = cfg.getUserRegion1();
+		Integer interval = Integer.valueOf(cfg.getUserRegion2());
+		List<Integer> validList = parseTime(cronValid);
+		List<Integer> invalidList = parseTime(cronInvalid);
+		Date validStartTime = DateBuilder.todayAt(validList.get(0), validList.get(1), validList.get(2));
+		Date invalidTime = DateBuilder.todayAt(invalidList.get(0), invalidList.get(1), invalidList.get(2));
+		CalendarIntervalScheduleBuilder intervalBuilder = null;
+		if("EVERYDAY".equalsIgnoreCase(dayOrWeek)) {
+			//开始时间+2分钟
+			Calendar validStartCal=Calendar.getInstance();
+			validStartCal.setTime(validStartTime);
+			validStartCal.add(Calendar.MINUTE, 2);
+			long validStartTimes=validStartCal.getTime().getTime();
+			//结束时间+2分钟
+			Calendar invalidCal=Calendar.getInstance();
+			invalidCal.setTime(invalidTime);
+			invalidCal.add(Calendar.MINUTE, 2);
+			long invalidTimes=invalidCal.getTime().getTime();
+			long currentTimes=new Date().getTime();
+			//开始时间设置为今天已过时，则将开始时间加上周期
+			if((currentTimes-validStartTimes) > 0) {
+				Calendar validStartCalNew=Calendar.getInstance();
+				validStartCalNew.setTime(validStartTime);
+				validStartCalNew.add(Calendar.DAY_OF_MONTH, interval);
+				validStartTime=validStartCalNew.getTime();
+			}
+			
+			//结束时间设置为今天已过时，则将开始时间加上周期
+			if((currentTimes-invalidTimes) > 0) {
+				Calendar invalidCalNew=Calendar.getInstance();
+				invalidCalNew.setTime(invalidTime);
+				invalidCalNew.add(Calendar.DAY_OF_MONTH, interval);
+				invalidTime=invalidCalNew.getTime();
+			}
+			
+			
+			intervalBuilder = CalendarIntervalScheduleBuilder.calendarIntervalSchedule().withIntervalInDays(interval);
+			//valid
+			JobDataMap dataMap = new JobDataMap();
+			dataMap.put("isValid", true);
+			dataMap.put("cfg", cfg);
+			String triName = VALID_KEY + dayOrWeek+"("+interval+")" + "_" + DateUtils.formatDate(validStartTime, Constants.COMMON_DATE_FORMAT);
+			Trigger validTri = TriggerBuilder.newTrigger()
+				.withIdentity(createTiggerKey(triName, STATUS_GROUP+compileId))
+				.withSchedule(intervalBuilder)
+				.usingJobData(dataMap)
+				.forJob(STATUS_JOBDETAIL)
+				.startAt(validStartTime)
+				.build();
+			triList.add(validTri);
+			
+			//invalid
+			dataMap = new JobDataMap();
+			dataMap.put("isValid", false);
+			dataMap.put("cfg", cfg);
+			triName = INVALID_KEY + dayOrWeek +"("+interval+")" + "_" + DateUtils.formatDate(invalidTime, Constants.COMMON_DATE_FORMAT);
+			validTri = TriggerBuilder.newTrigger()
+				.withIdentity(createTiggerKey(triName, STATUS_GROUP+compileId))
+				.withSchedule(intervalBuilder)
+				.usingJobData(dataMap)
+				.forJob(STATUS_JOBDETAIL)
+				.startAt(invalidTime)
+				.build();
+			triList.add(validTri);
+		}else if("EVERYWEEK".equalsIgnoreCase(dayOrWeek)) {
+			intervalBuilder = CalendarIntervalScheduleBuilder.calendarIntervalSchedule().withIntervalInWeeks(interval);
+			String[] weeks = cfg.getUserRegion3().split(",");
+			for(String week : weeks) {
+				if(StringUtils.isNoneBlank(week)) {
+					Date temp = closestAfterWeek(validStartTime, Integer.valueOf(week));
+					JobDataMap dataMap = new JobDataMap();
+					dataMap.put("isValid", true);
+					dataMap.put("cfg", cfg);
+					String triName = VALID_KEY + dayOrWeek +week+"("+interval+")" + "_" + DateUtils.formatDate(temp, Constants.COMMON_DATE_FORMAT);
+					Trigger validTri = TriggerBuilder.newTrigger()
+						.withIdentity(createTiggerKey(triName, STATUS_GROUP+compileId))
+						.withSchedule(intervalBuilder)
+						.usingJobData(dataMap)
+						.forJob(STATUS_JOBDETAIL)
+						.startAt(temp)
+						.build();
+					triList.add(validTri);
+					//invalid
+					dataMap = new JobDataMap();
+					dataMap.put("isValid", false);
+					dataMap.put("cfg", cfg);
+					temp = closestAfterWeek(invalidTime, Integer.valueOf(week));
+					triName = INVALID_KEY + dayOrWeek +week+"("+interval+")" + "_" + DateUtils.formatDate(temp, Constants.COMMON_DATE_FORMAT);
+					validTri = TriggerBuilder.newTrigger()
+						.withIdentity(createTiggerKey(triName, STATUS_GROUP+compileId))
+						.withSchedule(intervalBuilder)
+						.usingJobData(dataMap)
+						.forJob(STATUS_JOBDETAIL)
+						.startAt(temp)
+						.build();
+					triList.add(validTri);
+				}
+			}
+		}
+		return triList;
+	}
+	
+	/**
+	 * 每月 执行
+	 * @param cfg
+	 * @return
+	 */
+	public static List<Trigger> createEveryMonthTrigger(ScheduleCfg cfg){
+		String dayWeek = cfg.getUserRegion3();
+		String cronInvalid = cfg.getCronInvalid();
+		String cronValid = cfg.getCronValid();
+		StringBuilder cronSb = new StringBuilder();
+		Trigger trigger = null;
+		List<Integer> validList = parseTime(cronValid);//time 转换
+		List<Integer> invalidList = parseTime(cronInvalid);//time 转换
+		List<Trigger> triList = new ArrayList<Trigger>();
+		String userRegion4 = cfg.getUserRegion4().toUpperCase();
+		if("day".equalsIgnoreCase(dayWeek)) {//指定天
+			boolean hasL = userRegion4.contains("L");
+			StringBuilder chooseSb = new StringBuilder();
+			for(String str : userRegion4.split(",")) {
+				if(!"L".equalsIgnoreCase(str.trim())) {
+					chooseSb.append(",").append(str);
+				}
+			}
+			chooseSb.deleteCharAt(0);
+			cronSb.append(validList.get(2)).append(" ")//秒
+				.append(validList.get(1)).append(" ")//分
+				.append(validList.get(0)).append(" ")//小时
+				.append(chooseSb.toString()).append(" ")//日
+				.append(cfg.getUserRegion2()).append(" ")//月
+				.append("?").append(" ");//周
+			trigger = createCronTrigger(cronSb.toString(), cfg.getCompileId(), true, cfg);
+			triList.add(trigger);
+			cronSb.setLength(0);
+			cronSb.append(invalidList.get(2)).append(" ")//秒
+				.append(invalidList.get(1)).append(" ")//分
+				.append(invalidList.get(0)).append(" ")//小时
+				.append(chooseSb.toString()).append(" ")//日
+				.append(cfg.getUserRegion2()).append(" ")//月
+				.append("?").append(" ");//周
+			trigger = createCronTrigger(cronSb.toString(), cfg.getCompileId(), false, cfg);
+			triList.add(trigger);
+			if(hasL) {// 月的最后一天，quartz 不支持 1,L 这种指定，所以 L单独处理一下
+				cronSb.setLength(0);
+				cronSb.append(validList.get(2)).append(" ")//秒
+					.append(validList.get(1)).append(" ")//分
+					.append(validList.get(0)).append(" ")//小时
+					.append("L").append(" ")//日
+					.append(cfg.getUserRegion2()).append(" ")//月
+					.append("?").append(" ");//周
+				trigger = createCronTrigger(cronSb.toString(), cfg.getCompileId(), true, cfg);
+				triList.add(trigger);
+				cronSb.setLength(0);
+				cronSb.append(invalidList.get(2)).append(" ")//秒
+					.append(invalidList.get(1)).append(" ")//分
+					.append(invalidList.get(0)).append(" ")//小时
+					.append("L").append(" ")//日
+					.append(cfg.getUserRegion2()).append(" ")//月
+					.append("?").append(" ");//周
+				trigger = createCronTrigger(cronSb.toString(), cfg.getCompileId(), false, cfg);
+				triList.add(trigger);
+			}
+		}else if ("week".equalsIgnoreCase(dayWeek)) {//指定周，1#2: 第一周的周二，4L:最后一周的周四
+			for(String nthWeek : userRegion4.split(",")) {//第几周
+				for(String week : cfg.getUserRegion5().split(",")) {//星期几
+					cronSb.setLength(0);
+					cronSb.append(validList.get(2)).append(" ")//秒
+						.append(validList.get(1)).append(" ")//分
+						.append(validList.get(0)).append(" ")//小时
+						.append("?").append(" ")//日
+						.append(cfg.getUserRegion2()).append(" ");//月
+					if("L".equalsIgnoreCase(nthWeek)) {
+						cronSb.append(week).append("L");//周
+					}else {
+						cronSb.append(week).append("#").append(nthWeek);//周
+					}
+					trigger = createCronTrigger(cronSb.toString(), cfg.getCompileId(), true, cfg);
+					triList.add(trigger);
+					cronSb.setLength(0);
+					cronSb.append(invalidList.get(2)).append(" ")//秒
+						.append(invalidList.get(1)).append(" ")//分
+						.append(invalidList.get(0)).append(" ")//小时
+						.append("?").append(" ")//日
+						.append(cfg.getUserRegion2()).append(" ");//月
+					if("L".equalsIgnoreCase(nthWeek)) {
+						cronSb.append(week).append("L");//周
+					}else {
+						cronSb.append(week).append("#").append(nthWeek);//周
+					}
+					trigger = createCronTrigger(cronSb.toString(), cfg.getCompileId(), false, cfg);
+					triList.add(trigger);
+				}
+			}
+		}
+		return triList;
+	}
+	
+	
+	/**
+	 * 查找最近的 星期几 ，包括今天(如果今天的时间点已过，从明天开始算)
+	 * @param date
+	 * @param w 周一开始 1 -7 
+	 * @return
+	 */
+	public static Date closestAfterWeek(Date date,int w) {
+		//设置calC为开始时间+2分钟，判断calC时间是否已过，如果小于当前时间则直接从明天开始算
+		Calendar calC = Calendar.getInstance();
+		calC.setTime(date);
+		calC.add(Calendar.MINUTE, 2);
+		long currentDate=new Date().getTime();//当前时间
+		long weekStartDate=calC.getTime().getTime();//周任务开始时间+2分钟
+		
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(date);
+		//如果开始时间已过期，则从明天开始算
+		if((currentDate-weekStartDate) > 0) {
+			cal.add(Calendar.DAY_OF_MONTH, 1);
+		}
+		int i = cal.get(Calendar.DAY_OF_WEEK);//周日开始 1-7
+		i = (i==1)? 7: i-1;//转换为 周一到 周日 1-7
+		cal.add(Calendar.DAY_OF_MONTH, (i>w)?(7-(i-w)) : (w-i));
+		return cal.getTime();
+	}
+	
+	
+	public static TriggerKey createTiggerKey(String name,String group) {
+		TriggerKey key = new TriggerKey(name, group);
+		return key;
+	}
+
+	/**
+	 * jquery cron 生成的cron 表达式，quartz 不能直接使用，需要做些修改
+	 * @param cron
+	 * @return
+	 */
+	public static String modifyCronExp(String cron) {
+		String[] cronArr = cron.split("\\s");
+		if("*".equals(cronArr[4])) {
+			cronArr[4] = "?";
+		}else {
+			cronArr[3] = "*";
+			cronArr[2] = "?";
+		}
+		return "0 " + StringUtils.join(cronArr, " ");
+	}
+	
+	
+	public static void main(String[] args) {
+		
+		CronTriggerImpl cron = new CronTriggerImpl();
+		try {
+			String exp = "0 0 0 ? 1,2 1#4";
+			cron.setCronExpression(exp);
+			System.out.println(cron);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		
+		
+	}
+	
+}

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

@@ -0,0 +1,137 @@
+package com.nis.quartz;
+
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.ibatis.session.ExecutorType;
+import org.apache.ibatis.session.SqlSession;
+import org.apache.ibatis.session.SqlSessionFactory;
+import org.apache.log4j.Logger;
+import org.quartz.DisallowConcurrentExecution;
+import org.quartz.Job;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.PersistJobDataAfterExecution;
+
+import com.nis.util.IPUtil;
+import com.nis.util.StringUtil;
+import com.nis.web.dao.basics.AsnGroupInfoDao;
+import com.nis.web.dao.basics.AsnIpCfgDao;
+import com.nis.web.service.SpringContextHolder;
+
+/**
+ * 定时任务： 定时统计ASN 下IPv4和IPV6的个数
+ * 1、每 n s 执行一次(两个小时执行一次)
+ * 2、单线程执行
+ * @author ddm
+ *
+ */
+@DisallowConcurrentExecution
+@PersistJobDataAfterExecution
+public class ScheduleStatisticASNIPNumJob implements Job {
+	private static final Logger logger = Logger.getLogger(ScheduleStatisticASNIPNumJob.class);
+
+	@Override
+	public void execute(JobExecutionContext context) throws JobExecutionException {
+		AsnIpCfgDao asnIpCfgDao = SpringContextHolder.getBean(AsnIpCfgDao.class);
+		logger.info("定时统计ASN IP个数开始。。。。。。。。。。。。。。");
+		long start=System.currentTimeMillis();
+		Map<Integer,Map<String,Long>> asnNumerMap=new HashMap<>();
+		List<Object[]> asnIpList=new ArrayList<>();
+		asnIpList=asnIpCfgDao.findAllAsnIpCfgList();
+		
+		getAllASNIPNumber(asnIpList, asnNumerMap);
+		
+		updateAllASNIPNumber(asnNumerMap);
+		
+		long end=System.currentTimeMillis();
+		logger.info("定时统计ASN IP个数结束:耗时("+(end-start)+"/毫秒)。。。。。。。。。。。。。。");
+	}
+	
+	public void getAllASNIPNumber(List<Object[]> asnIpList,Map<Integer,Map<String,Long>> asnNumerMap){
+		logger.info("计算ASN IP开始：asn ip size:"+asnIpList.size()+"。。。。。。。。。。。。。。");
+		long start=System.currentTimeMillis();
+		if(!StringUtil.isEmpty(asnIpList)){
+			try {
+				for (Iterator iterator = asnIpList.iterator(); iterator.hasNext();) {
+					Map asnIpMap=(Map) iterator.next();
+					//groupId
+					Integer asnGroupId = (Integer)asnIpMap.get("asn_ip_group");
+					//ipType(4:v4,6:v6)
+					Integer ipType= (Integer)asnIpMap.get("ip_type");
+					//(1:mask,2:range,3:ip)
+					//Integer ipPattern= (Integer)asnIpMap.get("ip_pattern");
+					//dest_ip_address
+					String ipAddress= (String)asnIpMap.get("dest_ip_address");
+					long IPNumber=0;
+					if(ipType.equals(4)){
+						if(ipAddress.indexOf("/") > -1){
+							Integer mask=Integer.parseInt(ipAddress.split("/")[1]);
+							ipAddress=ipAddress.split("/")[0];
+							IPNumber=IPUtil.getIpNum(ipAddress, mask);
+						}else{
+							IPNumber=1;
+						}
+						//判断组是否已经存在
+						if(asnNumerMap.keySet().contains(asnGroupId)){
+							asnNumerMap.get(asnGroupId).put("v4", asnNumerMap.get(asnGroupId).get("v4")+IPNumber);
+							asnNumerMap.put(asnGroupId, asnNumerMap.get(asnGroupId));
+						}else{
+							Map<String, Long> map=new HashMap<>();
+							map.put("v4", IPNumber);
+							map.put("v6", 0l);
+							asnNumerMap.put(asnGroupId, map);
+						}
+					}else{
+						IPNumber=1;
+						//判断组是否已经存在
+						if(asnNumerMap.keySet().contains(asnGroupId)){
+							asnNumerMap.get(asnGroupId).put("v6", asnNumerMap.get(asnGroupId).get("v6")+IPNumber);
+							asnNumerMap.put(asnGroupId, asnNumerMap.get(asnGroupId));
+						}else{
+							Map<String, Long> map=new HashMap<>();
+							map.put("v4", 0l);
+							map.put("v6", IPNumber);
+							asnNumerMap.put(asnGroupId, map);
+						}
+					}
+				}
+			} catch (Exception e) {
+				logger.error("计算ASN IP个数失败",e);
+			}
+		}
+		
+		long end=System.currentTimeMillis();
+		logger.info("计算ASN IP个数结束:耗时("+(end-start)+"/毫秒)。。。。。。。。。。。。。。");
+	}
+	public void updateAllASNIPNumber(Map<Integer,Map<String,Long>> asnNumerMap) {
+		logger.info("修改ASN IP个数开始：asn size:"+asnNumerMap.size()+"。。。。。。。。。。。。。。");
+		long start=System.currentTimeMillis();
+		if(!StringUtil.isEmpty(asnNumerMap)){
+			int index=0;
+			SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
+			SqlSession batchSqlSession = null;
+			try {
+				batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, true);
+				for(Entry<Integer,Map<String,Long>> e: asnNumerMap.entrySet()) {
+					((AsnGroupInfoDao) batchSqlSession.getMapper(AsnGroupInfoDao.class)).updateIpNum(e.getValue().get("v4"),e.getValue().get("v6"),e.getKey());
+					batchSqlSession.commit();
+					index++;
+				}
+			}catch (Exception e) {
+				logger.error("修改ASN IP个数失败", e);
+			} finally {
+				if(batchSqlSession != null){
+					batchSqlSession.close();
+				}
+			}
+		}
+		long end=System.currentTimeMillis();
+		logger.info("修改ASN IP个数结束:耗时("+(end-start)+"/毫秒)。。。。。。。。。。。。。。");
+	}
+}

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

@@ -0,0 +1,82 @@
+package com.nis.quartz;
+
+import java.util.Date;
+
+import org.apache.log4j.Logger;
+import org.quartz.Job;
+import org.quartz.JobDataMap;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+
+import com.nis.domain.ScheduleCfg;
+import com.nis.util.Constants;
+import com.nis.util.DateUtil;
+import com.nis.util.DictUtils;
+import com.nis.web.dao.SchedulerDao;
+import com.nis.web.service.ScheduleService;
+import com.nis.web.service.SpringContextHolder;
+
+/**
+ * 定时任务 真正执行类
+ * 配置状态下发
+ * 从trigger 的 jobDataMap 中取出 相关数据：compile,isValid
+ * @author fang
+ *
+ */
+public class ScheduleStatusJob implements Job{
+	private static final Logger log = Logger.getLogger(ScheduleStatusJob.class);
+	
+	
+	@Override
+	public void execute(JobExecutionContext context) throws JobExecutionException {
+		
+		//全量同步状态
+		String currentStatus = DictUtils.getDictLabel("currrent_sync_status", "status","0");
+		//0:start:开始 	1:init:初始化	2:doing:进行中
+		
+		//全量同步过程中未执行的任务进入另一个job中，等待全量同步完成开始执行
+		if(currentStatus.equals("0") || currentStatus.equals("1")||currentStatus.equals("2")) {
+			//配置下发，并修改 配置表的状态，保存下发记录等
+			SchedulerDao schedulerDao = SpringContextHolder.getBean(SchedulerDao.class);
+			//从trigger中 获取 配置信息
+			JobDataMap jobDataMap = context.getTrigger().getJobDataMap();
+			boolean isValid = jobDataMap.getBoolean("isValid");
+
+			ScheduleCfg cfg = (ScheduleCfg)jobDataMap.get("cfg");
+			cfg.setId(null);//新入库一个任务
+			cfg.setType(2);//全量同步中未执行的任务
+			cfg.setUserRegion1("single"); //只执行一次
+			if(isValid) {
+				cfg.setCronValid("1900-01-01 01:01:01"); //无实际效果，仅仅为填充值
+				cfg.setCronInvalid("");
+			}else {
+				cfg.setCronValid("");
+				cfg.setCronInvalid("1900-01-01 01:01:01");//无实际效果，仅仅为填充值
+			}
+			schedulerDao.insert(cfg);
+			
+		}else {
+			//从trigger中 获取 配置信息
+			JobDataMap jobDataMap = context.getTrigger().getJobDataMap();
+			boolean isValid = jobDataMap.getBoolean("isValid");
+			ScheduleCfg cfg = (ScheduleCfg)jobDataMap.get("cfg");
+			Integer compileId = cfg.getCompileId();
+			log.debug(String.format("任务开始执行，compileId:%s,isValid:%s",compileId,isValid ));
+			//配置下发，并修改 配置表的状态，保存下发记录等
+			ScheduleService scheduleService = SpringContextHolder.getBean(ScheduleService.class);
+			try {
+				scheduleService.issueCompileInfo(cfg, isValid?1:0);
+			} catch (Exception e) {
+				e.printStackTrace();
+				log.error("定时任务"+cfg.getId()+"执行失败",e);
+			}finally {
+				log.debug(String.format("任务执行完成，compileId:%s,isValid:%s",compileId,isValid ));
+			}
+			
+		}
+		
+	}
+	
+}

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

@@ -0,0 +1,548 @@
+package com.nis.quartz;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.log4j.Logger;
+import org.quartz.CalendarIntervalScheduleBuilder;
+import org.quartz.CalendarIntervalTrigger;
+import org.quartz.CronScheduleBuilder;
+import org.quartz.DateBuilder;
+import org.quartz.DisallowConcurrentExecution;
+import org.quartz.Job;
+import org.quartz.JobBuilder;
+import org.quartz.JobDataMap;
+import org.quartz.JobDetail;
+import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
+import org.quartz.JobKey;
+import org.quartz.PersistJobDataAfterExecution;
+import org.quartz.ScheduleBuilder;
+import org.quartz.Scheduler;
+import org.quartz.SchedulerException;
+import org.quartz.SimpleScheduleBuilder;
+import org.quartz.SimpleTrigger;
+import org.quartz.Trigger;
+import org.quartz.TriggerBuilder;
+import org.quartz.TriggerKey;
+import org.quartz.impl.matchers.GroupMatcher;
+import org.quartz.impl.triggers.CalendarIntervalTriggerImpl;
+import org.quartz.impl.triggers.CronTriggerImpl;
+import org.quartz.spi.MutableTrigger;
+
+import com.nis.domain.ScheduleCfg;
+import com.nis.util.Constants;
+import com.nis.util.DateUtil;
+import com.nis.util.DateUtils;
+import com.nis.util.DictUtils;
+import com.nis.util.StringUtils;
+import com.nis.web.dao.SchedulerDao;
+import com.nis.web.service.SpringContextHolder;
+
+/**
+ * 定时任务 配置全量同步时未执行的定时任务加载
+ * 1、每 n s 执行一次，每次读取 schedule_cfg 最新的数据
+ * 2、删除或新增 定时任务
+ * 3、单线程执行
+ * @author ddm
+ *
+ */
+@DisallowConcurrentExecution
+@PersistJobDataAfterExecution
+public class ScheduleSyncCfgJob implements Job {
+	SimpleDateFormat sdf=new SimpleDateFormat(Constants.COMMON_DATE_FORMAT);
+	private static final Logger log = Logger.getLogger(ScheduleSyncCfgJob.class);
+
+	/**
+	 * 状态组，格式：statusGroup-compileId
+	 */
+	private static final String STATUS_GROUP = "syncGroup-";
+	private static final String STATUS_JOB = "SYNC-JOB";
+	/**
+	 * 生效标识：valid-cronexp
+	 */
+	private static final String VALID_KEY = "valid-";
+	/**
+	 * 失效标识：invalid-cronexp
+	 */
+	private static final String INVALID_KEY = "invalid-";
+	private static final JobKey STATUS_JOBKEY = JobKey.jobKey(STATUS_JOB, "syncGroup");
+	private static final JobDetail STATUS_JOBDETAIL = JobBuilder.newJob(ScheduleStatusJob.class)
+														.withIdentity(STATUS_JOBKEY)
+														.storeDurably(true)
+														.build();
+	
+	@Override
+	public void execute(JobExecutionContext context) throws JobExecutionException {
+		Scheduler scheduler = context.getScheduler();
+		SchedulerDao dao = SpringContextHolder.getBean(SchedulerDao.class);
+		JobDataMap dataMap = context.getJobDetail().getJobDataMap();
+		long scheduleCfgId = dataMap.get("scheduleCfgId") == null ? 0:dataMap.getLong("scheduleCfgId");
+		long limit = dataMap.get("limit") == null ? Constants.MAAT_JSON_SEND_SIZE:dataMap.getLong("limit");
+		log.info(String.format("Sync定时配置任务开始扫描，scheduleCfgId:%s,limit:%s",scheduleCfgId,limit ));
+		List<ScheduleCfg> newlyCfg = null;
+		int totalNum = 0;
+		
+		//全量同步当前状态 0:start:开始 	1:init:初始化	2:doing:进行中
+		String currentStatus = DictUtils.getDictLabel("currrent_sync_status", "status","0");
+		if(!(currentStatus.equals("0") || currentStatus.equals("1") || currentStatus.equals("2"))) {
+			do {
+				newlyCfg = dao.findNewlyCfg(scheduleCfgId, limit,2,null);
+				if(newlyCfg != null && newlyCfg.size() > 0) {
+					totalNum += newlyCfg.size();
+					for(ScheduleCfg cfg : newlyCfg) {//先取消之前的定时配置
+						Integer compileId = cfg.getCompileId();
+						try {
+							//取消之前所有的 trigger
+							GroupMatcher<TriggerKey> groupMatcher= GroupMatcher.triggerGroupEquals(STATUS_GROUP + compileId);
+							Set<TriggerKey> triggerKeys = scheduler.getTriggerKeys(groupMatcher);
+							if(triggerKeys != null && triggerKeys.size() > 0) {
+								for(TriggerKey tk : triggerKeys) {
+									scheduler.unscheduleJob(tk);
+								}
+								log.info(String.format("Sync定时任务取消成功，compile:%s", compileId));
+							}
+						} catch (Exception e) {
+							log.error(String.format("Sync定时任务取消异常，compileId:%s", compileId),e);
+						}
+					}
+					int index=0;
+					for(ScheduleCfg cfg : newlyCfg) {
+						Integer compileId = cfg.getCompileId();
+						try {
+							//判断状态，重新添加最新的 trigger
+							Integer isValid = cfg.getIsValid();
+							Integer isAudit = cfg.getIsAudit();
+							//添加定时任务的条件
+							if((isValid == 1 && isAudit == 1) || (isValid == 0 && isAudit == 0)) {
+								//添加定时任务，包括valid 和 invalid
+								addJob(scheduler, cfg,index);
+								log.info(String.format("Sync定时任务添加成功，compile:%s", compileId));
+							}
+						} catch (Exception e) {
+							log.error(String.format("Sync定时任务更新异常，compileId:%s", compileId),e);
+						}
+						index++;
+					}
+					//最后 保存此次 最后的id
+					ScheduleCfg lastCfg = newlyCfg.get(newlyCfg.size() -1);
+					scheduleCfgId = lastCfg.getId();
+					dataMap.put("scheduleCfgId", scheduleCfgId);
+					log.info(String.format("Sync加载定时任务，total num :%s", newlyCfg.size()));
+				}
+			} while (newlyCfg != null && newlyCfg.size() > 0);
+			log.info(String.format("Sync定时配置任务结束执行，total num:%s",totalNum));
+		}
+		log.info("全量同步中缓存的定时配置正在扫描（currentStatus："+currentStatus+"）");
+	}
+
+
+	/**
+	 * 将定时任务信息添加到 定时器框架中调度
+	 * @param scheduler
+	 * @param cfg
+	 * @throws SchedulerException
+	 */
+	/*public static void addJob(Scheduler scheduler,ScheduleCfg cfg) throws SchedulerException {
+		Integer compileId = cfg.getCompileId();
+		String cronValid = cfg.getCronValid();
+		String cronInvalid = cfg.getCronInvalid();
+		Trigger validTrigger = createTrigger(cronValid, compileId, true, cfg);
+		Trigger invalidTrigger = createTrigger(cronInvalid, compileId, false, cfg);
+		boolean jobExist = scheduler.checkExists(STATUS_JOBKEY);
+		if(!jobExist) {//判断 job 是否存在，不存在添加
+			scheduler.addJob(STATUS_JOBDETAIL, false);
+		}
+		boolean checkExists = scheduler.checkExists(validTrigger.getKey());
+		if(!checkExists) {//判断 valid trigger 是否存在，不存在添加
+			scheduler.scheduleJob(validTrigger);
+		}else {
+			log.warn(String.format("Trigger already exists:%s ", validTrigger.getKey().toString()));
+		}
+		checkExists = scheduler.checkExists(invalidTrigger.getKey());
+		if(!checkExists) {//判断 invalid trigger 是否存在，不存在添加
+			scheduler.scheduleJob(invalidTrigger);
+		}else {
+			log.warn(String.format("Trigger already exists:%s ", invalidTrigger.getKey().toString()));
+		}
+	}*/
+	
+	
+	public static void addJob(Scheduler scheduler,ScheduleCfg cfg,int expire) throws SchedulerException {
+		List<Trigger> triList = createTrigger(cfg,expire);
+		boolean jobExist = scheduler.checkExists(STATUS_JOBKEY);
+		if(!jobExist) {//判断 job 是否存在，不存在添加
+			scheduler.addJob(STATUS_JOBDETAIL, false);
+		}
+		for(Trigger tri : triList) {
+			boolean checkExists = scheduler.checkExists(tri.getKey());
+			if(!checkExists) {//判断 valid trigger 是否存在，不存在添加
+				log.debug(String.format("Sync定时任务添加，%s", tri.getKey()));
+				scheduler.scheduleJob(tri);
+				log.info(String.format("Sync定时任务添加成功，%s", tri.getKey()));
+			}else {
+				log.warn(String.format("Trigger（sync） already exists:%s ", tri.getKey().toString()));
+			}
+		}
+	}
+	
+	/**
+	 *  将页面配置的内容 转换成 trigger
+	 * @param cfg
+	 * @return
+	 */
+	public static List<Trigger> createTrigger(ScheduleCfg cfg,int expire){
+		String mode = cfg.getUserRegion1().toUpperCase();//定时任务运行模式：一次，每天，每周，每月
+		List<Trigger> triList = null;
+		switch (mode) {
+		case "ALWAYS"://单次运行，但只创建单次生效触发器
+			triList = createSimpleTrigger(cfg,expire);
+			break;
+		case "SINGLE"://单次运行
+			triList = createSimpleTrigger(cfg,expire);
+			break;
+		case "EVERYDAY"://每天运行  0 0 0 2/1 * ? ,不符合要求，定义每天都执行，然后在 代码判断 间隔时间
+			triList = createCalendarIntervalTrigger(cfg);
+			break;
+		case "EVERYWEEK"://每周运行
+			triList = createCalendarIntervalTrigger(cfg);
+			break;
+		case "EVERYMONTH"://每月运行
+			triList = createEveryMonthTrigger(cfg);
+			break;
+		default:
+			log.warn(String.format("unknown mode : %s ", mode));
+			break;
+		}
+		return triList;
+	}
+	
+	
+	
+	
+	/**
+	 * 将时间转换成 时分秒
+	 * @param time
+	 * @return
+	 */
+	public static List<Integer> parseTime(String time) {
+		if(StringUtils.isNoneBlank(time)) {
+			String[] split = time.split(":");
+			List<Integer> tl = new ArrayList<Integer>(3); 
+			for(String s : split) {
+				tl.add(Integer.valueOf(s));
+			}
+			return tl;
+		}
+		return null;
+	}
+	
+	public static Trigger createCronTrigger(String cron,Integer compileId,boolean isValid,ScheduleCfg cfg) {
+		String triggerName = isValid  ? (VALID_KEY + cron) : (INVALID_KEY + cron);
+		JobDataMap dataMap = new JobDataMap();
+		dataMap.put("isValid", isValid);
+		dataMap.put("cfg", cfg);
+		return TriggerBuilder.newTrigger()
+			.withIdentity(createTiggerKey(triggerName, STATUS_GROUP+compileId))
+			.withSchedule(CronScheduleBuilder.cronSchedule(cron))
+			.usingJobData(dataMap)
+			.forJob(STATUS_JOBDETAIL)
+			.build();
+	}
+
+	
+	/**
+	 *  创建全量同步时未执行的任务，每个任务均为单词任务
+	 * @param cfg
+	 * @return
+	 */
+	public static List<Trigger> createSimpleTrigger(ScheduleCfg cfg,int expire){
+		List<Trigger> triList = new ArrayList<Trigger>();
+		Integer compileId = cfg.getCompileId();
+		String cronValid = cfg.getCronValid();
+		String cronInvalid = cfg.getCronInvalid();
+		Date validDate = null;
+		Date invalidDate = null;
+		if(StringUtils.isNotBlank(cronValid)){
+			Calendar c = Calendar.getInstance();
+			c.add(Calendar.MINUTE, (expire+1));
+			validDate = c.getTime();
+			
+		}
+		if(StringUtils.isNotBlank(cronInvalid)){
+			Calendar c = Calendar.getInstance();
+			c.add(Calendar.MINUTE, (expire+2));
+			invalidDate = c.getTime();
+		}
+		JobDataMap dataMap = new JobDataMap();
+		if(validDate!=null){//生效时间如果不为空，则创建定时生效触发器
+			dataMap.put("isValid", true);
+			dataMap.put("cfg", cfg);
+			String triName = VALID_KEY + cfg.getUserRegion1() + "_" + cronValid;
+			Trigger trigger = TriggerBuilder.newTrigger()
+					.withIdentity(createTiggerKey(triName, STATUS_GROUP+compileId))
+					.withSchedule(SimpleScheduleBuilder.simpleSchedule())
+					.usingJobData(dataMap)
+					.forJob(STATUS_JOBDETAIL)
+					.startAt(validDate)
+					.build();
+			triList.add(trigger);
+		}
+		if(invalidDate!=null){//失效时间如果不为空，则创建定时失效触发器
+			dataMap = new JobDataMap();
+			dataMap.put("isValid", false);
+			dataMap.put("cfg", cfg);
+			String triName = INVALID_KEY + cfg.getUserRegion1() + "_" + cronInvalid;
+			Trigger trigger = TriggerBuilder.newTrigger()
+					.withIdentity(createTiggerKey(triName, STATUS_GROUP+compileId))
+					.withSchedule(SimpleScheduleBuilder.simpleSchedule())
+					.usingJobData(dataMap)
+					.forJob(STATUS_JOBDETAIL)
+					.startAt(invalidDate)
+					.build();
+			triList.add(trigger);
+		}
+		return triList;
+	}
+	
+	
+	/**
+	 * 间隔 n 天 或 n 周执行
+	 * @param cfg
+	 * @return
+	 */
+	public static List<Trigger> createCalendarIntervalTrigger(ScheduleCfg cfg) {
+		List<Trigger> triList = new ArrayList<Trigger>();
+		Integer compileId = cfg.getCompileId();
+		String cronValid = cfg.getCronValid();
+		String cronInvalid = cfg.getCronInvalid();
+		String dayOrWeek = cfg.getUserRegion1();
+		Integer interval = Integer.valueOf(cfg.getUserRegion2());
+		List<Integer> validList = parseTime(cronValid);
+		List<Integer> invalidList = parseTime(cronInvalid);
+		Date validStartTime = DateBuilder.todayAt(validList.get(0), validList.get(1), validList.get(2));
+		Date invalidTime = DateBuilder.todayAt(invalidList.get(0), invalidList.get(1), invalidList.get(2));
+		CalendarIntervalScheduleBuilder intervalBuilder = null;
+		if("EVERYDAY".equalsIgnoreCase(dayOrWeek)) {
+			intervalBuilder = CalendarIntervalScheduleBuilder.calendarIntervalSchedule().withIntervalInDays(interval);
+			//valid
+			JobDataMap dataMap = new JobDataMap();
+			dataMap.put("isValid", true);
+			dataMap.put("cfg", cfg);
+			String triName = VALID_KEY + dayOrWeek+"("+interval+")" + "_" + DateUtils.formatDate(validStartTime, Constants.COMMON_DATE_FORMAT);
+			Trigger validTri = TriggerBuilder.newTrigger()
+				.withIdentity(createTiggerKey(triName, STATUS_GROUP+compileId))
+				.withSchedule(intervalBuilder)
+				.usingJobData(dataMap)
+				.forJob(STATUS_JOBDETAIL)
+				.startAt(validStartTime)
+				.build();
+			triList.add(validTri);
+			//invalid
+			dataMap = new JobDataMap();
+			dataMap.put("isValid", false);
+			dataMap.put("cfg", cfg);
+			triName = INVALID_KEY + dayOrWeek +"("+interval+")" + "_" + DateUtils.formatDate(invalidTime, Constants.COMMON_DATE_FORMAT);
+			validTri = TriggerBuilder.newTrigger()
+				.withIdentity(createTiggerKey(triName, STATUS_GROUP+compileId))
+				.withSchedule(intervalBuilder)
+				.usingJobData(dataMap)
+				.forJob(STATUS_JOBDETAIL)
+				.startAt(invalidTime)
+				.build();
+			triList.add(validTri);
+		}else if("EVERYWEEK".equalsIgnoreCase(dayOrWeek)) {
+			intervalBuilder = CalendarIntervalScheduleBuilder.calendarIntervalSchedule().withIntervalInWeeks(interval);
+			String[] weeks = cfg.getUserRegion3().split(",");
+			for(String week : weeks) {
+				if(StringUtils.isNoneBlank(week)) {
+					Date temp = closestAfterWeek(validStartTime, Integer.valueOf(week));
+					JobDataMap dataMap = new JobDataMap();
+					dataMap.put("isValid", true);
+					dataMap.put("cfg", cfg);
+					String triName = VALID_KEY + dayOrWeek +week+"("+interval+")" + "_" + DateUtils.formatDate(temp, Constants.COMMON_DATE_FORMAT);
+					Trigger validTri = TriggerBuilder.newTrigger()
+						.withIdentity(createTiggerKey(triName, STATUS_GROUP+compileId))
+						.withSchedule(intervalBuilder)
+						.usingJobData(dataMap)
+						.forJob(STATUS_JOBDETAIL)
+						.startAt(temp)
+						.build();
+					triList.add(validTri);
+					//invalid
+					dataMap = new JobDataMap();
+					dataMap.put("isValid", false);
+					dataMap.put("cfg", cfg);
+					temp = closestAfterWeek(invalidTime, Integer.valueOf(week));
+					triName = INVALID_KEY + dayOrWeek +week+"("+interval+")" + "_" + DateUtils.formatDate(temp, Constants.COMMON_DATE_FORMAT);
+					validTri = TriggerBuilder.newTrigger()
+						.withIdentity(createTiggerKey(triName, STATUS_GROUP+compileId))
+						.withSchedule(intervalBuilder)
+						.usingJobData(dataMap)
+						.forJob(STATUS_JOBDETAIL)
+						.startAt(temp)
+						.build();
+					triList.add(validTri);
+				}
+			}
+		}
+		return triList;
+	}
+	
+	/**
+	 * 每月 执行
+	 * @param cfg
+	 * @return
+	 */
+	public static List<Trigger> createEveryMonthTrigger(ScheduleCfg cfg){
+		String dayWeek = cfg.getUserRegion3();
+		String cronInvalid = cfg.getCronInvalid();
+		String cronValid = cfg.getCronValid();
+		StringBuilder cronSb = new StringBuilder();
+		Trigger trigger = null;
+		List<Integer> validList = parseTime(cronValid);//time 转换
+		List<Integer> invalidList = parseTime(cronInvalid);//time 转换
+		List<Trigger> triList = new ArrayList<Trigger>();
+		String userRegion4 = cfg.getUserRegion4().toUpperCase();
+		if("day".equalsIgnoreCase(dayWeek)) {//指定天
+			boolean hasL = userRegion4.contains("L");
+			StringBuilder chooseSb = new StringBuilder();
+			for(String str : userRegion4.split(",")) {
+				if(!"L".equalsIgnoreCase(str.trim())) {
+					chooseSb.append(",").append(str);
+				}
+			}
+			chooseSb.deleteCharAt(0);
+			cronSb.append(validList.get(2)).append(" ")//秒
+				.append(validList.get(1)).append(" ")//分
+				.append(validList.get(0)).append(" ")//小时
+				.append(chooseSb.toString()).append(" ")//日
+				.append(cfg.getUserRegion2()).append(" ")//月
+				.append("?").append(" ");//周
+			trigger = createCronTrigger(cronSb.toString(), cfg.getCompileId(), true, cfg);
+			triList.add(trigger);
+			cronSb.setLength(0);
+			cronSb.append(invalidList.get(2)).append(" ")//秒
+				.append(invalidList.get(1)).append(" ")//分
+				.append(invalidList.get(0)).append(" ")//小时
+				.append(chooseSb.toString()).append(" ")//日
+				.append(cfg.getUserRegion2()).append(" ")//月
+				.append("?").append(" ");//周
+			trigger = createCronTrigger(cronSb.toString(), cfg.getCompileId(), false, cfg);
+			triList.add(trigger);
+			if(hasL) {// 月的最后一天，quartz 不支持 1,L 这种指定，所以 L单独处理一下
+				cronSb.setLength(0);
+				cronSb.append(validList.get(2)).append(" ")//秒
+					.append(validList.get(1)).append(" ")//分
+					.append(validList.get(0)).append(" ")//小时
+					.append("L").append(" ")//日
+					.append(cfg.getUserRegion2()).append(" ")//月
+					.append("?").append(" ");//周
+				trigger = createCronTrigger(cronSb.toString(), cfg.getCompileId(), true, cfg);
+				triList.add(trigger);
+				cronSb.setLength(0);
+				cronSb.append(invalidList.get(2)).append(" ")//秒
+					.append(invalidList.get(1)).append(" ")//分
+					.append(invalidList.get(0)).append(" ")//小时
+					.append("L").append(" ")//日
+					.append(cfg.getUserRegion2()).append(" ")//月
+					.append("?").append(" ");//周
+				trigger = createCronTrigger(cronSb.toString(), cfg.getCompileId(), false, cfg);
+				triList.add(trigger);
+			}
+		}else if ("week".equalsIgnoreCase(dayWeek)) {//指定周，1#2: 第一周的周二，4L:最后一周的周四
+			for(String nthWeek : userRegion4.split(",")) {//第几周
+				for(String week : cfg.getUserRegion5().split(",")) {//星期几
+					cronSb.setLength(0);
+					cronSb.append(validList.get(2)).append(" ")//秒
+						.append(validList.get(1)).append(" ")//分
+						.append(validList.get(0)).append(" ")//小时
+						.append("?").append(" ")//日
+						.append(cfg.getUserRegion2()).append(" ");//月
+					if("L".equalsIgnoreCase(nthWeek)) {
+						cronSb.append(week).append("L");//周
+					}else {
+						cronSb.append(week).append("#").append(nthWeek);//周
+					}
+					trigger = createCronTrigger(cronSb.toString(), cfg.getCompileId(), true, cfg);
+					triList.add(trigger);
+					cronSb.setLength(0);
+					cronSb.append(invalidList.get(2)).append(" ")//秒
+						.append(invalidList.get(1)).append(" ")//分
+						.append(invalidList.get(0)).append(" ")//小时
+						.append("?").append(" ")//日
+						.append(cfg.getUserRegion2()).append(" ");//月
+					if("L".equalsIgnoreCase(nthWeek)) {
+						cronSb.append(week).append("L");//周
+					}else {
+						cronSb.append(week).append("#").append(nthWeek);//周
+					}
+					trigger = createCronTrigger(cronSb.toString(), cfg.getCompileId(), false, cfg);
+					triList.add(trigger);
+				}
+			}
+		}
+		return triList;
+	}
+	
+	
+	/**
+	 * 查找最近的 星期几 ，包括今天
+	 * @param date
+	 * @param w 周一开始 1 -7 
+	 * @return
+	 */
+	public static Date closestAfterWeek(Date date,int w) {
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(date);
+		int i = cal.get(Calendar.DAY_OF_WEEK);//周日开始 1-7
+		i = (i==1)? 7: i-1;//转换为 周一到 周日 1-7
+		cal.add(Calendar.DAY_OF_MONTH, (i>w)?(7-(i-w)) : (w-i));
+		return cal.getTime();
+	}
+	
+	
+	public static TriggerKey createTiggerKey(String name,String group) {
+		TriggerKey key = new TriggerKey(name, group);
+		return key;
+	}
+
+	/**
+	 * jquery cron 生成的cron 表达式，quartz 不能直接使用，需要做些修改
+	 * @param cron
+	 * @return
+	 */
+	public static String modifyCronExp(String cron) {
+		String[] cronArr = cron.split("\\s");
+		if("*".equals(cronArr[4])) {
+			cronArr[4] = "?";
+		}else {
+			cronArr[3] = "*";
+			cronArr[2] = "?";
+		}
+		return "0 " + StringUtils.join(cronArr, " ");
+	}
+	
+	
+	public static void main(String[] args) {
+		
+		CronTriggerImpl cron = new CronTriggerImpl();
+		try {
+			String exp = "0 0 0 ? 1,2 1#4";
+			cron.setCronExpression(exp);
+			System.out.println(cron);
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+		
+		
+	}
+	
+}

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

@@ -7,6 +7,7 @@ import com.nis.domain.dashboard.SysIspInfo;
 import com.nis.domain.dashboard.codedic.CodeAppDic;
 import com.nis.domain.dashboard.codedic.CodeBehaviorTypeDic;
 import com.nis.domain.dashboard.codedic.CodeBrowserTypeDic;
+import com.nis.domain.dashboard.codedic.CodeDomainDic;
 import com.nis.domain.dashboard.codedic.CodeOsTypeDic;
 import com.nis.domain.dashboard.codedic.CodeProtocolTypeDic;
 import com.nis.domain.dashboard.codedic.CodeServiceTypeDic;
@@ -14,6 +15,7 @@ import com.nis.domain.dashboard.codedic.CodeWebServiceDic;
 import com.nis.web.dao.dashboard.codedic.CodeAppDicDao;
 import com.nis.web.dao.dashboard.codedic.CodeBehaviorTypeDicDao;
 import com.nis.web.dao.dashboard.codedic.CodeBrowserTypeDicDao;
+import com.nis.web.dao.dashboard.codedic.CodeDomainDicDao;
 import com.nis.web.dao.dashboard.codedic.CodeOsTypeDicDao;
 import com.nis.web.dao.dashboard.codedic.CodeProtocolTypeDicDao;
 import com.nis.web.dao.dashboard.codedic.CodeResult;
@@ -31,6 +33,7 @@ public class CodeDicUtils {
 	private final static CodeServiceTypeDicDao codeServiceTypeDicDao = SpringContextHolder.getBean(CodeServiceTypeDicDao.class);
 	private final static CodeWebServiceDicDao codeWebServiceDicDao = SpringContextHolder.getBean(CodeWebServiceDicDao.class);
 	private final static CodeSysIspInfoDicDao codeSysIspInfoDicDao = SpringContextHolder.getBean(CodeSysIspInfoDicDao.class);
+	private final static CodeDomainDicDao codeDomainDicDao = SpringContextHolder.getBean(CodeDomainDicDao.class);
 
 	
 	private static final String APP_CODE="appCode";
@@ -42,6 +45,7 @@ public class CodeDicUtils {
 	private static final String WEB_CODE="webCode";
 	
 	private static final String ISP_CODE="ispCode";
+	private static final String DOMAIN_CODE="domainCode";
 	/**
 	 * 适用于大屏图表标签显示
 	 */
@@ -178,6 +182,23 @@ public class CodeDicUtils {
 				}
 			}
 			return result;
+		}else if (name.equals(DOMAIN_CODE)) {
+//			List<CodeWebServiceDic> codeDicList = (List<CodeWebServiceDic>) CacheUtils.get(WEB_CODE);
+//			if(StringUtil.isEmpty(codeDicList)){
+//				codeDicList = codeWebServiceDicDao.getCodeDicList();
+//				CacheUtils.put(WEB_CODE, codeDicList);
+//			}
+			List<CodeDomainDic> codeDicList = codeDomainDicDao.getCodeDicList();
+			if(codeDicList!=null&&codeDicList.size()>0){
+				for (int i = 0; i < codeDicList.size(); i++) {
+					CodeResult codeResult = new CodeResult();
+					codeResult.setItem(codeDicList.get(i).getDomain());
+					codeResult.setCode(String.valueOf(codeDicList.get(i).getId()));
+					
+					result.add(codeResult);
+				}
+			}
+			return result;
 		}
 		return result;
 	}
@@ -194,6 +215,15 @@ public class CodeDicUtils {
 		}
 		return result;
 	}
+	/**
+	 * 用于显示日志isp运营商的信息
+	 * @param name
+	 * @return
+	 */
+	public static List<SysIspInfo> getIspListByIspNum(){
+		List<SysIspInfo> result = codeSysIspInfoDicDao.getIspListByIspNum();;
+		return result;
+	}
 	public static void main(String[] args) {
 		getCodeList(APP_CODE);
 	}

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

@@ -2,6 +2,7 @@ package com.nis.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -11,6 +12,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.SysDataDictionaryName;
+import com.nis.domain.basics.AsnGroupInfo;
 import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.basics.SysDictInfo;
 import com.nis.domain.configuration.BaseStringCfg;
@@ -18,6 +20,7 @@ import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.PxyObjTrustedCaCrl;
 import com.nis.domain.specific.SpecificServiceCfg;
 import com.nis.web.dao.SysDictDao;
+import com.nis.web.dao.basics.AsnGroupInfoDao;
 import com.nis.web.dao.basics.ServiceDictInfoDao;
 import com.nis.web.dao.basics.SysDictInfoDao;
 import com.nis.web.dao.configuration.PxyObjKeyringDao;
@@ -41,6 +44,7 @@ public class ConfigDictUtils {
 	private final static SpecificServiceCfgDao specificServiceCfgDao = SpringContextHolder.getBean(SpecificServiceCfgDao.class);
 	private final static WebsiteCfgDao websiteCfgDao = SpringContextHolder.getBean(WebsiteCfgDao.class);
 	private final static PxyObjKeyringDao pxyObjKeyringDao = SpringContextHolder.getBean(PxyObjKeyringDao.class);
+	private final static AsnGroupInfoDao asnGroupInfoDao = SpringContextHolder.getBean(AsnGroupInfoDao.class);
 
 	/**
 	 * 根据主键查询配置详情
@@ -203,4 +207,37 @@ public class ConfigDictUtils {
 		}
 		return crlFIle;
 	}
+	/**
+	 * 根据compileId获取配置内容
+	 * @param compileId
+	 * @return
+	 */
+	public static List<Integer> getASNIPNum(Integer groupId ) {
+		List<Integer> ipNum=new ArrayList<>();
+		try {
+			if(!StringUtil.isEmpty(groupId)){
+				List<Object[]> list=asnGroupInfoDao.getASNIPNum(groupId);
+				if(!StringUtil.isEmpty(list)){
+					int index=0;
+					for (Iterator iterator = list.iterator(); iterator.hasNext();) {
+						if(index==0){
+							Map map=(Map) iterator.next();
+							if(map != null){
+								ipNum.add(0, (Integer) map.get("v4_num"));
+								ipNum.add(1, (Integer) map.get("v6_num"));
+							}
+						}
+					}
+				}
+			}
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		if(ipNum ==null || ipNum.size()==0){
+			ipNum.add(0, 0);
+			ipNum.add(1, 0);
+		}
+		return ipNum;
+	}
 }

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

@@ -133,6 +133,7 @@ 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){
@@ -157,6 +158,7 @@ public class ConfigServiceUtil {
 			long end=System.currentTimeMillis();
 			logger.warn("get ids finish,cost:"+(end-start));
 		} catch (Exception e) {
+			logger.error("getId()",e);
 			throw e;
 		}finally {
 			if (response != null) {
@@ -188,6 +190,7 @@ 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){
@@ -200,6 +203,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("postMaatCfg()",e);
 			throw e;
 		}finally {
 			if (response != null) {
@@ -232,6 +236,7 @@ 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){
@@ -241,6 +246,8 @@ 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 {
 			if (response != null) {
@@ -275,6 +282,7 @@ 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){
@@ -284,6 +292,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>"+result);
 			}
 		} catch (Exception e) {
+			logger.error("postFileCfg()",e);
 			throw e;
 		} finally {
 			if (response != null) {
@@ -321,6 +330,7 @@ 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,6 +340,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("delete()",e);
 			throw e;
 		} finally {
 			if (response != null) {
@@ -356,7 +367,7 @@ public class ConfigServiceUtil {
 			}else if(type==2){
 				url = url+Constants.CALLBACK_CFG;
 			}else if(type==3) {
-				url = url+Constants.DELETE_COMMON_REIGON;
+				url = url+Constants.GROUP_REUSE_SOURCES;
 			}
 			//创建连接
 			WebTarget wt = ClientUtil.getWebTarger(url);
@@ -369,6 +380,7 @@ 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){
@@ -378,6 +390,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("put()",e);
 			throw e;
 		}finally {
 			if (response != null) {
@@ -400,9 +413,9 @@ public class ConfigServiceUtil {
 				url = url+Constants.MAAT_CFG;
 			}else if(type==2){
 				url = url+Constants.CALLBACK_CFG;
-			}/*else if(type==3) {
+			}else if(type==3) {
 				url = url+Constants.GROUP_REUSE_SOURCES;
-			}*/
+			}
 			logger.info("put url:"+url);
 			//创建连接
 			try {
@@ -411,9 +424,11 @@ 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) {
+			logger.error("patch()",e);
 			throw e;
 		} 
 		
@@ -444,6 +459,7 @@ 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){
@@ -451,9 +467,11 @@ public class ConfigServiceUtil {
 				JSONObject resObject = JSONObject.fromObject(result);
 				bean = (ToMaatResult) JSONObject.toBean(resObject,ToMaatResult.class);
 			}else{
+				logger.info("获取文件摘要响应结果"+result);
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("getFileDigest()",e);
 			throw e;
 		} finally {
 			if (response != null) {
@@ -463,43 +481,26 @@ public class ConfigServiceUtil {
 		return bean;
 	}
 	/**
-	 * 分组复用域配置新增,修改，删除
+	 * 分组复用域配置新增
 	 * @param params
 	 * @return
 	 * @throws MaatConvertException
 	 */
-	public static ToMaatResult auditCommonGroupRegionSources(String params,Integer action) throws MaatConvertException{
+	public static ToMaatResult postGroupReuseSources(String params) throws MaatConvertException{
 		ToMaatResult bean = null;
 		Response response=null;
 		try {
 			logger.warn("postGroupReuseSources start");
 			long start=System.currentTimeMillis();
 			String result = null;
-			String url = "";
-			if(action.equals(Constants.OPACTION_POST)){
-				url=Constants.SERVICE_URL+Constants.ADD_COMMON_REGION;
-			}
-			if(action.equals(Constants.OPACTION_PUT)){
-				url=Constants.SERVICE_URL+Constants.UPDATE_COMMON_REIGON;
-			}
-			if(action.equals(Constants.OPACTION_DELETE)){
-				url=Constants.SERVICE_URL+Constants.DELETE_COMMON_REIGON;
-			}
+			String url = Constants.SERVICE_URL+Constants.GROUP_REUSE_SOURCES;
 			//创建连接
 			WebTarget wt = ClientUtil.getWebTarger(url);
-			logger.info("auditCommonGroupRegionSources url:"+url);
+			logger.info("postGroupReuseSources url:"+url);
 			//获取响应结果
 			Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON);
 			try {
-				if(action.equals(Constants.OPACTION_POST)){
-					response=  header.post(Entity.entity(params, MediaType.APPLICATION_JSON));
-				}
-				if(action.equals(Constants.OPACTION_PUT)){
-					response=  header.put(Entity.entity(params, MediaType.APPLICATION_JSON));
-				}
-				if(action.equals(Constants.OPACTION_DELETE)){
-					response=  header.put(Entity.entity(params, MediaType.APPLICATION_JSON));
-				}
+				response=  header.post(Entity.entity(params, MediaType.APPLICATION_JSON));
 				if(response != null) {
 					result=response.readEntity(String.class);
 				}
@@ -515,8 +516,9 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 			long end=System.currentTimeMillis();
-			logger.warn("auditCommonGroupRegionSources end,cost:"+(end-start));
+			logger.warn("postGroupReuseSources end,cost:"+(end-start));
 		} catch (Exception e) {
+			logger.error("postGroupReuseSources()",e);
 			throw e;
 		} finally {
 			if (response != null) {
@@ -525,7 +527,6 @@ public class ConfigServiceUtil {
 		}
 		return bean;
 	}
-	
 	/**
 	 * 
 	 * getReport(配置日志总量统计查询)
@@ -576,6 +577,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("getReport()",e);
 			throw e;
 		} finally {
 			if (response != null) {
@@ -634,6 +636,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("getReport()",e);
 			throw e;
 		} finally {
 			if (response != null) {
@@ -696,6 +699,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("getReport()",e);
 			throw e;
 		} finally {
 			if (response != null) {
@@ -744,13 +748,24 @@ public class ConfigServiceUtil {
 				result= response.readEntity(String.class);
 				logger.info("cgi info:"+result);
 			}else{
-				if(response!= null) {
-					throw new MaatConvertException("<spring:message code=\"cgi_service_failed\"/>:"+response.readEntity(String.class));
-				}else {
-					throw new MaatConvertException("<spring:message code=\"cgi_service_failed\"/>");
+				Map<String, String> map = new HashMap<String, String>();
+				result= response.readEntity(String.class);
+				if(!StringUtil.isEmpty(result)){
+					map = (Map<String, String>) JSON.parse(result);
+					String error = map.get("error");
+					if (!StringUtil.isEmpty(error)) {
+						error=cgiError(error);
+						throw new MaatConvertException(error);
+					}else{
+						throw new MaatConvertException(null);
+					}
+				}else{
+					throw new MaatConvertException(null);
 				}
+				
 			}
 		} catch (Exception e) {
+			logger.error("getCGI()",e);
 			throw e;
 		} finally {
 			if (response != null) {
@@ -760,6 +775,28 @@ public class ConfigServiceUtil {
 		return result;
 	}
 	
+	
+	public  static String cgiError(String error){
+		String cgiError="";
+		String er=error.toLowerCase().trim();
+		String errors=Constants.CGI_ERROR;
+		if(!StringUtil.isEmpty(errors)){
+			String [] ers=errors.toLowerCase().split(",");
+			for (int i = 0; i < ers.length; i++) {
+				if(ers[i].trim().equals(er)){
+					cgiError=error;
+					break;
+				}
+			}
+		}
+		return cgiError;
+	}
+	
+	
+	
+	
+	
+	
 	/**
 	 * 配置全量更新指令下发
 	 * @param params
@@ -785,15 +822,16 @@ public class ConfigServiceUtil {
 				}
 			} catch (Exception e) {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
-			}  
+			} 
+			
+			bean = JSONObject.fromObject(result);
 			if(response != null && response.getStatus() == 200){
 				logger.info("get result success");
-				bean = JSONObject.fromObject(result);
 			}else{
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
-			e.printStackTrace();
+			logger.error("configSyncCmd()",e);
 			throw e;
 		}finally {
 			if (response != null) {
@@ -830,11 +868,13 @@ public class ConfigServiceUtil {
 			}  
 			if(response != null && response.getStatus() == 200){
 				logger.info("get result success");
+				//result="{\"status\": 201,\"businessCode\": 2001000,\"reason\":\"数据获取操作成功\",\"msg\": \"根据配置id获取对应的编译,组,域等信息成功\",\"fromuri\": \"/galaxy-service/service/cfg/v1/getAllKVByCompileId\",\"traceCode\": \"2019031211285044813363\",\"data\": [{\"service\":\"ntc\",\"status\":0,\"opTime\":\"2016-11-22 08:31:27\"}]}";
 				bean= JSONObject.fromObject(result);
 			}else{
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("configSyncStatus()",e);
 			throw e;
 		}finally {
 			if (response != null) {
@@ -881,6 +921,7 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("configSync()",e);
 			throw e;
 		}finally {
 			if (response != null) {
@@ -921,11 +962,13 @@ public class ConfigServiceUtil {
 				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+result);
 			}
 		} catch (Exception e) {
+			logger.error("configStatusUpdate()",e);
 			throw e;
 		} 
 		
 		return result;
 	}
+
 	public static void main(String[] args) {
 		try {
 //			getId(1,1);

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

@@ -8,14 +8,23 @@ import java.util.regex.Pattern;
 import com.google.gson.GsonBuilder;
 
 public final class Constants {
+	/**
+	 * json打印长度
+	 */
+	public static Integer JSON_PRINT_LENTH=Configurations.getIntProperty("json_print_length", 100000);
+	/**
+	 * obj group list group type
+	 */
+	public static Integer IP_OBJ_GROUP_TYPE=Configurations.getIntProperty("ip_obj_group_type", 5);
+	public static Integer URL_OBJ_GROUP_TYPE=Configurations.getIntProperty("url_obj_group_type", 7);
+	public static Integer SUBID_OBJ_GROUP_TYPE=Configurations.getIntProperty("subid_obj_group_type", 9);
+	public static Integer DOMAIN_OBJ_GROUP_TYPE=Configurations.getIntProperty("domain_obj_group_type", 8);
 	/**
 	 * 导入条数限制
 	 */
 	public static final int IMPORT_LIMIT=Configurations.getIntProperty("import_limit",10000);
 	public static final Object IMPORT_LOCK=new Object();
-	public static final String ADD_COMMON_REGION=Configurations.getStringProperty("addRegionToCommonGroup","");
-	public static final String UPDATE_COMMON_REIGON=Configurations.getStringProperty("updateRegionToCommonGroup","");
-	public static final String DELETE_COMMON_REIGON=Configurations.getStringProperty("deleteRegionToCommonGroup","");
+	public static final String GROUP_REUSE_SOURCES=Configurations.getStringProperty("groupReuseSources","groupReuseSources");
 	public static Integer APP_SPEC_SERVICE_CODE_MIN_VAL=Configurations.getIntProperty("app_spec_service_code_min_val", 300001);
 	public static Integer APP_SPEC_SERVICE_CODE_MAX_VAL=Configurations.getIntProperty("app_spec_service_code_max_val", 268435455);
 	public static String APP_CFG_USERREGION_SPLITOR=Configurations.getStringProperty("app_cfg_userregion_splitor", "&");
@@ -23,7 +32,7 @@ public final class Constants {
 	 * MaatConfig 默认值
 	 */
 	public static Integer MAAT_CFG_DOLOG_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_default", 2);
-	public static Integer MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_doblacklist_default", 1);
+	public static Integer MAAT_CFG_DOLOG_DOBLACKLIST_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_doblacklist_default", 0);
 	public static Integer MAAT_CFG_DOLOG_CONFIGPERCENT_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_configpercent_default", 100);
 	public static Integer MAAT_CFG_DOLOG_CONFIGOPTION_DEFAULT=Configurations.getIntProperty("maat_cfg_dolog_configoption_default", 1);
 	/**
@@ -187,6 +196,22 @@ public final class Constants {
 	 * DNS 策略组KEY
 	 */
 	public static final String CACHE_DNSGROUP_DICT = "dnsGroupDict";
+	/**
+	 * IP公共组缓存KEY
+	 */
+	public static final String CACHE_IPGROUP_DICT = "ipComGroupDict";
+	/**
+	 * URL公共组缓存KEY
+	 */
+	public static final String CACHE_URLGROUP_DICT = "urlComGroupDict";
+	/**
+	 * Domain公共组缓存KEY
+	 */
+	public static final String CACHE_DOMAINGROUP_DICT = "domainComGroupDict";
+	/**
+	 * ScriberId公共组缓存KEY
+	 */
+	public static final String CACHE_SCRIBERGROUP_DICT = "scriberComGroupDict";
 	/**
 	 *  词典数据分类
 	 */
@@ -324,56 +349,18 @@ 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);
 
 	/**
@@ -387,12 +374,6 @@ 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
 	 */
@@ -409,6 +390,7 @@ 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");
@@ -496,8 +478,6 @@ public final class Constants {
 	public static final String HTTP_URL_REGION = Configurations.getStringProperty("http_url_region","http_url"); 
 	public static final String VOIP_IP_REGION = Configurations.getStringProperty("voip_ip","av_voip_ip"); 
 	public static final String VOIP_ACCOUNT_REGION = Configurations.getStringProperty("voip_account","av_voip_account");
-	public static final String NTC_ASN_NUMBER = Configurations.getStringProperty("ntc_asn_number","NTC_ASN_NUMBER");
-	public static final String ASN_KEY = Configurations.getStringProperty("asn_key","AS");
 	public static final String MAAT_VERSION = Configurations.getStringProperty("maat_version","1.0");
 	public static final Integer INSERT_ACTION = Configurations.getIntProperty("insert_action",1);
 	public static final Integer UPDATE_ACTION = Configurations.getIntProperty("update_action",2);
@@ -723,6 +703,9 @@ public final class Constants {
 	public static final String TREND_TOTAL_REPORT=Configurations.getStringProperty("trendTotalReport","trendTotalReport");
 	public static final String TRAFFIC_APP_TREND=Configurations.getStringProperty("trafficAppTrend","trafficAppTrend");
 	public static final String APPCONN_RECORD_TOP100=Configurations.getStringProperty("appConnRecordTop100","appConnRecordTop100");
+	public static final String TRAFFIC_APP_PPS_TREND=Configurations.getStringProperty("trafficAppPpsTrend","trafficAppPpsTrend");
+	public static final String TRAFFIC_APP_BPS_TREND=Configurations.getStringProperty("trafficAppBpsTrend","trafficAppBpsTrend");
+	
 	/**
 	 * httpclient 工具超时时间设置
 	 */
@@ -741,8 +724,14 @@ public final class Constants {
 	public static final String CERT_FILE_PATH=Configurations.getStringProperty("cert_file_path", "");
 	//证书校验文件
 	public static final String CERT_VALIDATE_FILE=Configurations.getStringProperty("cert_validate_file", "x509");
+	public static final String CA_CERT_FILE=Configurations.getStringProperty("ca_cert_file", "cacert.sh");
+	public static final String CA_CERT_DIR=Configurations.getStringProperty("ca_cert_dir", "/home/cacert/");
 	//证书校验成功关键字
 	public static final String CERT_VALIDATE_SUCCESS_INFO=Configurations.getStringProperty("cert_validate_success_info", "x509");
+	//内置证书的isser
+	public static final String KEYRING_BUILT_IN_ISSER=Configurations.getStringProperty("keyring_built_in_isser", "||CN=Tango Secure Gateway CA, O=Maserati Solution||CN=Tango Secure Gateway CA UNTRUST, O=Maserati Solution||");
+	//内置证书的指纹
+	public static final String KEYRING_BUILT_IN_FINGERPRINT=Configurations.getStringProperty("keyring_built_in_fingerprint", "||ee23abb40085901c12f574d610153c008d49e6a0||3475833f1a9525b4ad7fbee06dfa3e4a8de0c1e0||");
 	/**
 	 * 一些正则的pattern，预先编译,避免多次编译
 	 */
@@ -818,4 +807,67 @@ public final class Constants {
 	 * 流量日志的HTTP泛收接口URL
 	 */
 	public static final String NTC_HTTP_RECORD_LOG = Configurations.getStringProperty("ntcHttpRecordLog","");
+	/**
+	 * 日期格式化
+	 */
+	public static final String COMMON_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
+	/**
+	 * 时间格式化
+	 */
+	public static final String COMMON_TIME_FORMAT = "HH:mm:ss";
+	/**
+	 * vpn cgi接口报错信息
+	 */
+	public static final String CGI_ERROR = Configurations.getStringProperty("cgiError","");
+	
+	/**
+	 * 配置保护名单字典key
+	 */
+	public static final String CACHE_PROTECTION_LIST_DICT = "protetionListDict";
+	/**
+	 * 管理员用户预警查询服务配置总量接口
+	 */
+	public static final String CONFIG_BY_SERVICE = Configurations.getStringProperty("getConfigByService","");
+	/**
+	 * 获取配置统计页面列表的配置总量接口
+	 */
+	public static final String NTC_PZ_COUNT_REPORT = Configurations.getStringProperty("ntcPzCountReport","");
+	/**
+	 * 查询的是流量统计菜单-配置统计中BandWidth统计的数据接口
+	 */
+	public static final String TRAFFIC_BANDWIDTH_TRANS_THREE_NEW=Configurations.getStringProperty("trafficBandwidthTransThreeNew","trafficBandwidthTransThreeNew");
+	 /**
+	 * 查询的是流量统计菜单-配置统计中RulesType统计的数据接口
+	 */
+	public static final String NTC_ACTION_ENTRANCE_REPORT_NEW=Configurations.getStringProperty("ntcActionEntranceReportNew","ntcActionEntranceReportNew");
+	/**
+	 * 查询的是流量统计菜单-配置统计中Protocol统计的数据接口
+	 */
+	public static final String TRAFFIC_PROTOCOL_STATISTIC_NEW=Configurations.getStringProperty("trafficProtocolStatisticNew","trafficProtocolStatisticNew");
+	/**
+	 * 查询的是流量统计菜单-配置统计中APP统计的数据接口
+	 */
+	public static final String TRAFFIC_APP_STATISTIC_NEW=Configurations.getStringProperty("trafficAppStatisticNew","trafficAppStatisticNew");
+	/**
+	 * 查询的是流量统计菜单-配置统计中Domains统计的数据接口
+	 */
+	public static final String TRAFFIC_DOMAIN_STATISTIC_NEW=Configurations.getStringProperty("trafficDomainStatisticNew","trafficDomainStatisticNew");
+	/**
+	 * 查询的是流量统计菜单-配置统计中ClientIP统计的数据接口
+	 */
+	public static final String TRAFFIC_SOURCE_IP_STATISTIC_NEW=Configurations.getStringProperty("trafficSourceIPStatisticNew","trafficSourceIPStatisticNew");
+	/**
+	 * 查询的是流量统计菜单-配置统计中ServerIP统计的数据接口
+	 */
+	public static final String TRAFFIC_DEST_IP_STATISTIC_NEW=Configurations.getStringProperty("trafficDestIPStatisticNew","trafficDestIPStatisticNew");
+	/**
+	 * 查询的是流量统计菜单-配置统计中SubscriberID统计的数据接口
+	 */
+	public static final String TRAFFIC_SUBSCRIBER_ID_STATISTIC_NEW=Configurations.getStringProperty("trafficSubscriberIDStatisticNew","trafficSubscriberIDStatisticNew");
+	/**
+	 * HTTP(S)操控日志接口
+	 */
+	public static final String POLICY_EVENT=Configurations.getStringProperty("policyevent","policyevent");
+
+
 }

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

@@ -1,10 +1,12 @@
 package com.nis.util;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
+import org.dom4j.Node;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
@@ -12,12 +14,14 @@ import com.nis.domain.FunctionRegionDict;
 import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.SysDataDictionaryName;
+import com.nis.domain.basics.CommonGroupInfo;
 import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.domain.basics.SysDictInfo;
 import com.nis.domain.configuration.DnsResStrategy;
 import com.nis.web.dao.FunctionRegionDictDao;
 import com.nis.web.dao.FunctionServiceDictDao;
 import com.nis.web.dao.SysDictDao;
+import com.nis.web.dao.basics.CommonGroupManageDao;
 import com.nis.web.dao.basics.PolicyGroupInfoDao;
 import com.nis.web.dao.basics.SysDictInfoDao;
 import com.nis.web.dao.configuration.DnsResStrategyDao;
@@ -40,6 +44,7 @@ public class DictUtils {
 	private final static FunctionServiceDictDao functionServiceDictDao = SpringContextHolder.getBean(FunctionServiceDictDao.class);
 	private final static DnsResStrategyDao dnsResStrategyDao = SpringContextHolder.getBean(DnsResStrategyDao.class);
 	private final static PolicyGroupInfoDao policyGroupInfoDao = SpringContextHolder.getBean(PolicyGroupInfoDao.class);
+	private final static CommonGroupManageDao commonGroupManageDao = SpringContextHolder.getBean(CommonGroupManageDao.class);
 	
 	public static Map<String, List<SysDataDictionaryItem>> getDictData() {
 		
@@ -96,6 +101,18 @@ public class DictUtils {
 		 }
 		return itemList;
 	}
+	public static Map<String,String> getDictMap(String key){
+		Map dictMap=new HashMap<String,String>();
+		List<SysDataDictionaryItem>  itemList = getDictData().get(key);
+		if (StringUtil.isEmpty(itemList)) {
+			return dictMap;
+		}else {
+			for(SysDataDictionaryItem item:itemList) {
+				dictMap.put(item.getItemCode(), item.getItemValue());
+			}
+		}
+		return dictMap;
+	}
 	
 	public static String getDictLabels(String dictKey, String itemCodes, String defaultValue){
 		
@@ -246,6 +263,24 @@ public class DictUtils {
 		
 		return allDictList;		
 	}
+	
+	/**
+	 * 功能业务字典，获取相应功能菜单对应的业务信息
+	 * @param functionId
+	 * @return
+	 */
+	public static List<FunctionServiceDict> getAllServiceList(){
+		List<FunctionServiceDict> serviceList = new ArrayList();
+		ServiceConfigTemplateUtil serviceTemplate = new ServiceConfigTemplateUtil();
+		List<Node> serviceNodeList= serviceTemplate.getServiceNodeList();
+		for (Node node : serviceNodeList) {
+			FunctionServiceDict service=new FunctionServiceDict();
+			service.setServiceId(Integer.valueOf(node.valueOf("@id")));
+			service.setServiceName(node.valueOf("@desc"));
+			serviceList.add(service);
+		}
+		return serviceList;		
+	}
 	/**
 	 * 功能配置域字典，获取相应功能菜单对应的配置域信息
 	 * @param functionId
@@ -369,4 +404,57 @@ public class DictUtils {
 		}
 		return null;		
 	}
+	
+	/**
+	 * 获取公共组字典缓存
+	 */
+	/*public static List<CommonGroupInfo> getCommonGroups(Integer groupType){
+		String dictKey = Constants.CACHE_IPGROUP_DICT;
+		if(groupType.equals(7)) {
+			dictKey = Constants.CACHE_URLGROUP_DICT;
+		}else if(groupType.equals(8)) {
+			dictKey = Constants.CACHE_DOMAINGROUP_DICT;
+		}else if(groupType.equals(9)) {
+			dictKey = Constants.CACHE_SCRIBERGROUP_DICT;
+		}
+		List<CommonGroupInfo> allDictList = (List<CommonGroupInfo>)CacheUtils.get(dictKey);
+		if(StringUtil.isEmpty(allDictList)){
+			allDictList = commonGroupManageDao.findCommonGroupInfosByType(groupType);
+			CacheUtils.put(dictKey, allDictList);
+		}
+		
+		return allDictList;		
+	}
+	public static CommonGroupInfo getCommonGroups(Integer groupId, Integer groupType){
+		List<CommonGroupInfo> allDictList = getCommonGroups(groupType);
+		if(StringUtil.isEmpty(allDictList)){
+		}else {
+			for(CommonGroupInfo group:allDictList) {
+				if(group.getServiceGroupId().equals(groupId)) {
+					return group;
+				}
+			}
+		}
+		return null;		
+	}*/
+	public static Map<Integer,Object> getObjGroupListServiceDicts(Integer functionId){
+		Map<Integer,Object> dictMap=new HashMap<>();
+		List<Map<String,Object>> templateList= ServiceConfigTemplateUtil.getServiceListByFunctionId(functionId);
+		StringBuffer buf=new StringBuffer();
+		for(Map<String,Object> temp:templateList){
+			if(temp.containsKey("serviceIds")){
+				String serviceIds= temp.get("serviceIds").toString();
+				buf.append(serviceIds).append(",");
+			}
+		}
+		List<FunctionServiceDict> serviceDicts=getFunctionServiceDictList();
+		for(FunctionServiceDict dict:serviceDicts){
+			for(String serviceId:buf.toString().split(",")){
+				if(StringUtils.isNotBlank(serviceId)&&dict.getServiceId().toString().equals(serviceId)){
+					dictMap.put(Integer.parseInt(serviceId),dict);
+				}
+			}
+		}
+		return dictMap;
+	}
 }

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

@@ -0,0 +1,759 @@
+package com.nis.util;
+
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.nis.domain.Nets;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ *
+ * <p>对IPV4进行处理工具类.</p>
+ * @author 中电积至有限公司 darnell
+ * @version 1.0 创建时间：2018-08-30
+ *
+ */
+public class IPUtil {
+
+
+    private static Logger logger = LoggerFactory.getLogger(IPUtil.class);
+    private static byte pos []= new byte []{(byte)128,64,32,16,8,4,2,1};
+    private static final Pattern IPV4Pattern = Pattern.
+            compile("\\b((?!\\d\\d\\d)\\d+|1\\d\\d|2[0-4]\\d|25[0-5])\\.((?!\\d\\d\\d)\\d+|1\\d\\d|2[0-4]\\d|25[0-5])\\.((?!\\d\\d\\d)\\d+|1\\d\\d|2[0-4]\\d|25[0-5])\\.((?!\\d\\d\\d)\\d+|1\\d\\d|2[0-4]\\d|25[0-5])\\b");
+    private static final Pattern IPV6_STD_PATTERN =
+            Pattern.compile(
+                    "^(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}$");
+
+    private static final Pattern IPV6_HEX_COMPRESSED_PATTERN =
+            Pattern.compile(
+                    "^((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)$");
+
+
+    /**
+     *
+     * <p>将10进制IP转为字符串，网络序。IP((0-255).(0-255).(0-255).(0-255))格式.
+     * ip10为字符串形式能给处理带来方便.
+     * </p>
+     * <pre>
+     * IpUtil.getIpString("3232235777") = "192.168.1.1"
+     * </pre>
+     * @see  #getIpDesimal(String)
+     * @param ip10 10进制IP
+     * @return 返回如<code>0.0.0.0</code>格式IP
+     */
+    public static String getIpString(String ip10) {
+        StringBuffer sb = new StringBuffer("");
+        if (ip10.indexOf("-") > -1) {
+
+            Integer intIP = Integer.parseInt(setStrEmpty(ip10));
+
+            sb.append(String.valueOf(intIP&0x000000FF));
+            sb.append(".");
+            sb.append(String.valueOf((intIP&0x0000FFFF)>>>8));
+            sb.append(".");//将高8位置0，然后右移16位
+            sb.append(String.valueOf((intIP&0x00FFFFFF)>>>16));
+            sb.append(".");
+            sb.append(String.valueOf(intIP>>>24&0xFF));//直接右移24位
+            return sb.toString();
+        } else {
+
+            Long longIP = Long.parseLong(setStrEmpty(ip10));
+            sb.append(String.valueOf(longIP&0x000000FF));
+            sb.append(".");
+            sb.append(String.valueOf((longIP&0x0000FFFF)>>>8));
+            sb.append(".");//将高8位置0，然后右移16位
+            sb.append(String.valueOf((longIP&0x00FFFFFF)>>>16));
+            sb.append(".");
+            sb.append(String.valueOf(longIP>>>24&0xFF));//直接右移24位
+            return sb.toString();
+        }
+    }
+
+    /**
+     *
+     * <p>将10进制IP转为字符串，主机序。IP((0-255).(0-255).(0-255).(0-255))格式.
+     * ip10为字符串形式能给处理带来方便.
+     * </p>
+     * <pre>
+     * IpUtil.getIpHostString("3232235777") = "192.168.1.1"
+     * </pre>
+     * @see  #getIpDesimal(String)
+     * @param ip10 10进制IP
+     * @return 返回如<code>0.0.0.0</code>格式IP
+     */
+    //将10进制整数形式转换成127.0.0.1形式的IP地址，按网络序
+    public static String getIpHostString(String ip10) {
+        StringBuffer sb = new StringBuffer(32);
+        if (ip10.indexOf("-") > -1) {
+
+            Integer intIP = Integer.parseInt(setStrEmpty(ip10));
+
+            sb.append(String.valueOf(intIP >>> 24));// 直接右移24位
+            sb.append(".");
+            sb.append(String.valueOf((intIP & 0x00FFFFFF) >>> 16)); // 将高8位置0，然后右移16位
+            sb.append(".");
+            sb.append(String.valueOf((intIP & 0x0000FFFF) >>> 8));
+            sb.append(".");
+            sb.append(String.valueOf(intIP & 0x000000FF));
+            return sb.toString();
+        } else {
+            Long longIP = Long.parseLong(setStrEmpty(ip10));
+
+            sb.append(String.valueOf(longIP >>> 24));// 直接右移24位
+            sb.append(".");
+            sb.append(String.valueOf((longIP & 0x00FFFFFF) >>> 16)); // 将高8位置0，然后右移16位
+            sb.append(".");
+            sb.append(String.valueOf((longIP & 0x0000FFFF) >>> 8));
+            sb.append(".");
+            sb.append(String.valueOf(longIP & 0x000000FF));
+
+            return sb.toString();
+        }
+    }
+
+
+    /**
+     * 判断一个IP地址是否属于某一个子网
+     *
+     * @param ip IP地址
+     * @param prefix 子网地址
+     * @param prefixLen 掩码长度
+     * @return true or false
+     */
+    public static boolean inPrefix(String ip, String prefix, int prefixLen) {
+        String binPrefix = toBinaryString(prefix);
+        if (binPrefix.length() > prefixLen) {
+            binPrefix = binPrefix.substring(0,prefixLen);
+        }
+
+        String binIP = toBinaryString(ip);
+        binIP = binIP.substring(0,prefixLen);
+        if (binIP.equals(binPrefix)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+
+    /**
+     * 获得两个IP间的范围，如192.168.0.128-192.168.2.256。
+     * 注意：本方法不做合法性检查！
+     *
+     * @param startIp 起始IP
+     * @param endIp 中止IP
+     * @return 范围内的IP地址数组
+     */
+    public static List<String> getIPRange(String startIp, String endIp) {
+
+        List<String> list = new ArrayList<String>();
+
+        try{
+
+            long start = getIpHostDesimal(startIp);
+            long end = getIpHostDesimal(endIp);
+
+            for (long i = start; i <= end; i++) {
+                list.add(getIpHostString(String.valueOf(i)));
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return list;
+    }
+
+
+
+    /**
+     * 验证IP为保留三个IP区域私有地址
+     * @param ip IPV4
+     * @return boolean true 私有地址 false 公有地址
+     */
+    public static boolean internalIp(String ip) {
+        byte[] addr = getAddress(ip);
+        return internalIp(addr);
+    }
+
+    private static boolean internalIp(byte[] addr) {
+        final byte b0 = addr[0];
+        final byte b1 = addr[1];
+        //10.x.x.x/8
+        final byte SECTION_1 = 0x0A;
+        //172.16.x.x/12
+        final byte SECTION_2 = (byte) 0xAC;
+        final byte SECTION_3 = (byte) 0x10;
+        final byte SECTION_4 = (byte) 0x1F;
+        //192.168.x.x/16
+        final byte SECTION_5 = (byte) 0xC0;
+        final byte SECTION_6 = (byte) 0xA8;
+        switch (b0) {
+            case SECTION_1:
+                return true;
+            case SECTION_2:
+                if (b1 >= SECTION_3 && b1 <= SECTION_4) {
+                    return true;
+                }
+            case SECTION_5:
+                switch (b1) {
+                    case SECTION_6:
+                        return true;
+                }
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * 获得子网的所有IP地址；如：192.168.0.1/24。
+     * 注意：本方法不做合法性检查！
+     * @param prefix 子网所属IP地址
+     * @param prefixLen 子网掩码
+     * @return List<String>
+     */
+    public static List<String> getIPRange(String prefix, int prefixLen) {
+        String binPrefix = toBinaryString(prefix);
+        if (binPrefix.length() > prefixLen) {
+            binPrefix = binPrefix.substring(0,prefixLen);
+        }
+        StringBuffer ip1 = new StringBuffer(binPrefix);
+        StringBuffer ip2 = new StringBuffer(binPrefix);
+        for (int i = ip1.length(); i < 32; i++) {
+            ip1.append('0');
+        }
+        for (int i = ip2.length(); i < 32; i++) {
+            ip2.append('1');
+        }
+
+        return getIPRange(toIPString(ip1.toString()),toIPString(ip2.toString()));
+    }
+
+
+    /**
+     *
+     * <p>根据标准ip段获取，该段子网掩码
+     * </p>
+     * @param startIP 起始ip，endIP 结束ip
+     * @return 返回如<code>子网掩码</code>格式IP
+     */
+    public static String getMask(String startIP,String endIP) {
+        byte start [] = getAddress(startIP);
+        byte end   [] = getAddress(endIP);
+        byte mask  [] = new byte [start.length];
+        boolean flag=false;
+        for(int i=0; i<start.length; i++){
+
+            mask[i]=(byte)~(start[i]^end[i]);
+
+            if (flag) {
+                mask[i]=0;
+            }
+            if(mask[i]!=-1){
+                mask[i]=getMask(mask[i]);
+                flag=true;
+            }
+        }
+        return toString(mask);
+    }
+
+
+
+    private static byte getMask(byte b) {
+        if (b==0) {
+            return b;
+        }
+        byte p = pos[0];
+        for(int i=0;i<8;i++){
+            if ((b&pos[i])==0) {
+                break;
+            }
+            p=(byte)(p>>1);
+        }
+        p=(byte)(p<<1);
+        return (byte)(b&p);
+    }
+
+
+    private static byte[] getAddress(String address) {
+        String subStr [] = address.split("\\.");
+        if(subStr.length!=4) {
+            throw new IllegalArgumentException("所传入的IP地址不符合IPv4的规范");
+        }
+        byte b [] = new byte [4];
+        for (int i=0;i<b.length;i++) {
+            b [i]=(byte)Integer.parseInt(subStr[i]);
+        }
+        return b;
+    }
+
+
+    /**
+     * 将IPv4形式掩码形式转为，整型掩码位数
+     * @param netmarks
+     * @return
+     */
+    public static int getNetMask(String netmarks)
+    {
+        if(!isMask(netmarks)){
+            throw(new RuntimeException("掩码格式错误！"));
+        }
+        StringBuffer sbf;
+        String str;
+        int inetmask=0,count=0;
+        String[] ipList=netmarks.split("\\.");
+        for(int n=0;n<ipList.length;n++)
+        {
+            sbf = toBin(Integer.parseInt(ipList[n]));
+            str=sbf.reverse().toString();
+            count=0;
+            for(int i=0;i<str.length();i++){
+                i=str.indexOf('1',i);
+                if(i==-1){break;}
+                count++;
+            }
+            inetmask+=count;
+        }
+        return inetmask;
+    }
+
+    /**
+     * 计算子网大小
+     * @param netmask
+     * @return
+     */
+    public static int getPoolMax(int netmask)
+    {
+        if(netmask<=0||netmask>=32)
+        {
+            return 0;
+        }
+        int bits=32-netmask;
+        return (int) Math.pow(2,bits) -2;
+    }
+
+    private static StringBuffer toBin(int x)
+    {
+        StringBuffer result=new StringBuffer();
+        result.append(x%2);
+        x/=2;
+        while(x>0){
+            result.append(x%2);
+            x/=2;
+        }
+        return result;
+    }
+
+
+
+
+
+    /**
+     * 根据起始IP地址和子网掩码计算终止IP
+     * @return String 子网的结束IP
+     */
+    public static String getEndIP(String StartIP,int netmask)
+    {
+        return getEndIP(StartIP,convertMask(netmask));
+    }
+    /**
+     * 根据起始IP地址和子网掩码计算终止IP
+     * @return String 子网的结束IP
+     */
+    public static String getEndIP(String StartIP, String netmask)
+    {
+        Nets nets = new Nets();
+        String[] start=Negation(StartIP,netmask).split("\\.");
+        nets.setStartIP(start[0]+"."+start[1]+"."+start[2]+"."+(Integer.valueOf(start[3])+1));
+        nets.setEndIP(TaskOR(Negation(StartIP,netmask),netmask));
+        nets.setNetMask(netmask);
+        return nets.getEndIP();
+    }
+
+    /**
+     * temp1根据temp2取反
+     */
+    private static String Negation(String StartIP,String netmask)
+    {
+        String[] temp1=StartIP.trim().split("\\.");
+        String[] temp2=netmask.trim().split("\\.");
+        int[] rets=new int[4];
+        for (int i =0;i<4;i++) {
+            rets[i]=Integer.parseInt(temp1[i])&Integer.parseInt(temp2[i]);
+        }
+        return rets[0]+"."+rets[1]+"."+rets[2]+"."+rets[3];
+    }
+    /**
+     * temp1根据temp2取或
+     */
+    private static String TaskOR(String StartIP,String netmask)
+    {
+        String[] temp1=StartIP.trim().split("\\.");
+        String[] temp2=netmask.trim().split("\\.");
+        int[] rets=new int[4];
+        for (int i =0;i<4;i++) {
+            rets[i]=255-(Integer.parseInt(temp1[i])^Integer.parseInt(temp2[i]));
+        }
+        //return rets[0]+"."+rets[1]+"."+rets[2]+"."+(rets[3]-1);
+        return rets[0]+"."+rets[1]+"."+rets[2]+"."+(rets[3]);
+    }
+
+
+
+    /**
+     * <p>将整型的掩码转换成IPv4型(30 -> 255.255.255.252).</p>
+     *
+     * @param mask 整型掩码.
+     * @return IPv4型掩码.
+     * @exception RuntimeException 掩码错误.
+     */
+    public static String convertMask(int mask)  {
+        if (mask > 32 || mask < 8) {
+            throw(new RuntimeException("掩码错误！应为8-32的整数。"));
+        }
+        return toIPString(maskToBinaryString(mask));
+    }
+
+
+    /**
+     * <p>将整型的掩码转换成反向IPv4型(30 -> 255.255.255.252).</p>
+     *
+     * @param mask 整型掩码.
+     * @return IPv4型反向掩码.
+     * @exception Exception 掩码错误.
+     */
+    public static String convertReverseMask(int mask) throws Exception {
+        if (mask > 32 || mask < 8) {
+            throw(new Exception("掩码错误！应为8-32的整数。"));
+        }
+        return toIPString(reverseMaskToBinaryString(mask));
+    }
+
+
+
+    /**
+     * 将整型掩码转换成二进制字符串
+     * @param mask 整型掩码
+     * @return 二进制型掩码.
+     */
+    private static String maskToBinaryString(int mask) {
+        StringBuffer str = new StringBuffer();
+
+        for(int i=1;i<=32;i++) {
+            if (i <= mask) {
+                str.append('1');
+            } else {
+                str.append('0');
+            }
+        }
+        return str.toString();
+    }
+
+
+    /**
+     * 将整型掩码转换成二进制字符串
+     * @param mask 整型掩码
+     * @return 反向二进制型掩码.
+     */
+    private static String reverseMaskToBinaryString(int mask) {
+        StringBuffer str = new StringBuffer();
+
+        for(int i=1;i<=32;i++) {
+            if (i <= mask) {
+                str.append('0');
+            } else {
+                str.append('1');
+            }
+        }
+        return str.toString();
+    }
+
+
+    /**
+     * 将二进制字符串转换成IPv4型字符串
+     * @param binary 二进制字符串
+     * @return IPv4型IP.
+     */
+    private static String toIPString(String binary) {
+        if (binary.length() < 32) {
+            for (int i=binary.length();i<32;i++) {
+                binary = "0" + binary;
+            }
+        }
+
+        String part1 = binary.substring(0,8);
+        String part2 = binary.substring(8,16);
+        String part3 = binary.substring(16,24);
+        String part4 = binary.substring(24);
+        return Integer.parseInt(part1,2) + "."
+                + Integer.parseInt(part2,2) + "."
+                + Integer.parseInt(part3,2) + "."
+                + Integer.parseInt(part4,2);
+    }
+    /**
+     * 获取子网的网络地址.
+     *
+     * @param ip IP地址.
+     * @param mask 掩码.
+     * @return 网络地址.
+     * @exception Exception IP地址错误或掩码错误.
+     */
+    public static String getSubNetIP(String ip, int mask) throws Exception {
+        if (!isIP(ip)) {
+            throw(new Exception("IP地址不合法！"));
+        }
+        String s1 = toBinaryString(ip);
+        String s2 = maskToBinaryString(mask);
+        return toIPString(Long.toBinaryString(Long.parseLong(s1,2)&Long.parseLong(s2,2)));
+    }
+
+    /**
+     * <p>将整型掩码转换成IPv4型的反码(30 -> 0.0.0.3).</p>
+     *
+     * @param mask 整型掩码.
+     * @return IPv4型反码.
+     * @exception Exception 掩码错误.
+     */
+    public static String reverseMask(int mask) throws Exception {
+        if (mask > 32 || mask < 8) {
+            throw(new Exception("掩码错误！应为8-32的整数。"));
+        }
+        String str = maskToBinaryString(mask);
+        str = str.replace('0','2');
+        str = str.replace('1','0');
+        str = str.replace('2','1');
+        return toIPString(str);
+    }
+
+    /**
+     * 将IPv4型字符串转换成长度为32的二进制字符串
+     * 需要加验证是否为IP
+     */
+    public static String toBinaryString(String ip) {
+        String[] array = ip.split("[.]");
+        String str = "";
+        for (int i=0; i<array.length; i++) {
+            String s = Integer.toBinaryString(Integer.parseInt(array[i]));
+            if (s.length() < 8) {
+                for (int j=s.length();j<8;j++) {
+                    s = "0" + s;
+                }
+            }
+            str += s;
+        }
+        return str;
+    }
+
+
+    /**
+     *
+     * <p>验证Ip是否符合规则.给定字符串,判断是否符合正则验证的ip格式.</p>
+     * <pre>例子说明:</pre>
+     * @param ip  ip字符
+     * @return <code>true</code> ip符合验证规则, <code>false</code> ip不符合验证规则.
+     */
+    public static boolean isIP(String ip) {
+        if (ip == null) {
+            return false;
+        }
+        Matcher mat = IPV4Pattern.matcher(ip);
+        return mat.matches();
+    }
+
+
+    public static boolean isIPv6StdAddress(final String input) {
+        return IPV6_STD_PATTERN.matcher(input).matches();
+    }
+
+    public static boolean isIPv6HexCompressedAddress(final String input) {
+        return IPV6_HEX_COMPRESSED_PATTERN.matcher(input).matches();
+    }
+
+    public static boolean isIPv6Address(final String input) {
+        return isIPv6StdAddress(input) || isIPv6HexCompressedAddress(input);
+    }
+
+    /**
+     *
+     * <p>在web方式下获取客户端IP地址.</p>
+     * <p>
+     * 使用该方法,需要在有javaee.jar扩展包前提下.
+     * </p>
+     * @param request HttpServletRequest请求对象
+     * @return  返回字符串IP地址
+     */
+    public static String getIpAddr(HttpServletRequest request) {
+        String ip = request.getHeader("X-Forwarded-For");
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("WL-Proxy-Client-IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_CLIENT_IP");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getHeader("HTTP_X_FORWARDED_FOR");
+        }
+        if (ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip)) {
+            ip = request.getRemoteAddr();
+        }
+        return ip;
+    }
+
+
+    /**
+     *
+     * <p>验证mask是否符合规则.给定字符串,判断是否符合正则验证的mask格式.</p>
+     * <pre>例子说明:</pre>
+     * @param mask  mask字符
+     * @return <code>true</code> mask符合验证规则, <code>false</code> mask不符合验证规则.
+     */
+    public static boolean isMask(String mask) {
+        if (mask == null) {
+            return false;
+        }
+        if(!isIP(mask)){
+            return false;
+        }
+        String[] ips = mask.split("\\.");
+        String binaryVal = "";
+        for (int i = 0; i < ips.length; i++)
+        {
+            String binaryStr = Integer.toBinaryString(Integer.parseInt(ips[i]));
+            Integer times = 8 - binaryStr.length();
+
+            for(int j = 0; j < times; j++)
+            {
+                binaryStr = "0" + binaryStr;
+            }
+            binaryVal += binaryStr;
+        }
+        if(binaryVal.indexOf("01")!=-1){
+            return false;
+        }
+        return true;
+    }
+
+
+    /**
+     *
+     * <p>将IP进制转换成十进制网络字节序</p>
+     * <p>
+     * IP是一个字符串，符合IP的规则(0-255).(0-255).(0-255).(0-255).
+     * 将ip转换成长整型的原因是：处理时间类型简单；入库节省空间,查询提高效率.
+     * </p>
+     * <pre>
+     * IpUtil.getIpDesimal("192.168.1.1") = 3232235777
+     * IpUtil.getIpDesimal("192.168.1.256") = -1 //不符合Ip规则
+     * </pre>
+     * @see #getIpString(String)
+     * @param ip 符合IP规则的字符串
+     * @return   <code>-1</code> 验证ip不合法,<code>ip</code> 计算ip返回长整型.
+     */
+    public static long getIpDesimal(String ip) {
+        long ip10 = 0;
+        if (!isIP(ip)) {
+            return -1; // ip 不合法
+        }
+        String[] ss = ip.trim().split("\\.");
+        for (int i = 0; i < 4; i++) {
+            ip10 += Math.pow(256, i) * Long.parseLong(ss[i]);
+        }
+
+        return ip10;
+    }
+
+
+    /**
+     *
+     * <p>将IP进制转换成十进制主机字节序</p>
+     * <p>
+     * IP是一个字符串，符合IP的规则(0-255).(0-255).(0-255).(0-255).
+     * 将ip转换成长整型的原因是：处理时间类型简单；入库节省空间,查询提高效率.
+     * </p>
+     * <pre>
+     * IpUtil.getIpHostDesimal("192.168.1.1") = 3232235777
+     * IpUtil.getIpHostDesimal("192.168.1.256") = -1 //不符合Ip规则
+     * </pre>
+     * @see #getIpString(String)
+     * @param ip 符合IP规则的字符串
+     * @return   <code>-1</code> 验证ip不合法,<code>ip</code> 计算ip返回长整型.
+     */
+
+    public static long getIpHostDesimal(String ip) {
+        long ip10 = 0;
+        if (!isIP(ip)) {
+            return -1; // ip 不合法
+        }
+        String[] ss = ip.trim().split("\\.");
+        for (int i = 0; i < 4; i++) {
+            ip10 += Math.pow(256, 3 - i) * Long.parseLong(ss[i]);
+        }
+
+        return ip10;
+    }
+
+
+
+    /**
+     *
+     * <p>获取IP/mask 包含IP数量，适合完整IPw网段</p>
+     * <p>
+     *
+     *
+     * </p>
+     * <pre>
+     *
+     *
+     * </pre>
+     * @param ip 符合IP规则的字符串
+     * @param mask 掩码格式
+     * @return   <code>-1</code> 验证ip不合法,<code>ip</code> 计算ip返回长整型.
+     */
+    public static long getIpNum(String ip, int mask) {
+        long num = 0;
+
+        if (isIP(ip)) {
+            String endIp = getEndIP(ip, mask);
+            num = getIpHostDesimal(endIp) -  getIpHostDesimal(ip) +1;
+
+        } else {
+            throw new IllegalArgumentException("所传入的IP地址不符合IPV4规范");
+        }
+
+        return num;
+    }
+
+
+
+
+    // 此方法用于判断数据为空就置为0
+    private static String setStrEmpty(String str) {
+        if ("".equals(str) || str == null) {
+            str = "0";
+        }
+        return str;
+    }
+
+
+    private static String toString(byte[] address) {
+        StringWriter sw = new StringWriter(16);
+        sw.write(Integer.toString(address[0]&0xFF));
+        for(int i=1;i<address.length;i++){
+            sw.write(".");
+            sw.write(Integer.toString(address[i]&0xFF));
+        }
+        return sw.toString();
+    }
+
+
+}

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

@@ -1,46 +1,66 @@
 package com.nis.util;
 
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
-import org.apache.commons.collections.map.CaseInsensitiveMap;
 import org.apache.log4j.Logger;
-import org.dom4j.Attribute;
 import org.dom4j.Element;
 import org.dom4j.Node;
 import org.dom4j.io.SAXReader;
 
+import com.beust.jcommander.internal.Sets;
 import com.nis.domain.FunctionServiceDict;
 
+import jersey.repackaged.com.google.common.collect.Lists;
+
+@SuppressWarnings("all")
 public class ServiceConfigTemplateUtil {
 
-	private Logger logger = Logger.getLogger(getClass());
+	private static final Logger logger = Logger.getLogger(ServiceConfigTemplateUtil.class);
 
-	private Node root;
+	private static Node root;
+	
+	static {
+		if(root == null) {//2018年12月28日11:37:50  fang  改为只加载一次，且方法改为 static
+			SAXReader reader = new SAXReader();
+			org.dom4j.Document document = null;
+			String configPath = "/service/service_config.xml";
+			InputStream is = null;
+			try {
+				is = ServiceConfigTemplateUtil.class.getResourceAsStream(configPath);
+				document = reader.read(is);
+				root = document.getRootElement();
+			} catch (Exception e) {
+				logger.error(e.getMessage());
+				e.printStackTrace();
+			} finally {
+				if(is != null ){
+					try {
+						is.close();
+					} catch (IOException e) { }
+				}
+			}
+		}
+	}
+	
 	/**
 	 * 配置文件内容
 	 * @return
 	 */
 	public ServiceConfigTemplateUtil(){
-		SAXReader reader = new SAXReader();
-		org.dom4j.Document document = null;
-		String configPath = "/service/service_config.xml";
-		try {
-			document = reader.read(ServiceConfigTemplateUtil.class.getResourceAsStream(configPath));
-			root = document.getRootElement();
-		} catch (Exception e) {
-			logger.error(e.getMessage());
-			e.printStackTrace();
-		}
+		
 	}
 	/**
 	 * 获取业务节点列表
 	 * @return
 	 */
-	public List<Node> getServiceNodeList(){
+	public static List<Node> getServiceNodeList(){
 		List<Node> nodes = root.selectNodes("service");
 		return nodes;
 	}
@@ -48,7 +68,7 @@ public class ServiceConfigTemplateUtil {
 	 * 获取业务列表
 	 * @return
 	 */
-	public List<Map<String,Object>> getServiceList(){
+	public static  List<Map<String,Object>> getServiceList(){
 		List<Map<String,Object>> list =new ArrayList();
 		List<Element> elements = root.selectNodes("service");
 		for(Element element:elements){
@@ -63,12 +83,47 @@ public class ServiceConfigTemplateUtil {
 		}
 		return list;
 	}
+	
+	/**
+	 * 
+	 * @return
+	 */
+	public static Set<String> getCompileTableName(){
+		Set<String> result = Sets.newHashSet();
+		List<Element> elements = root.selectNodes("service");
+		for(Element element:elements){
+			String ev = element.attribute("tableName").getStringValue();
+			if(StringUtils.isNotBlank(ev)) {
+				result.add(ev.toLowerCase());
+			}
+		}
+		return result;
+	}
+	
+	/**
+	 * 根据类名 获取对应的 表名
+	 * @param className
+	 * @return
+	 */
+	public static String getCfgTableNameByClassName(String className) {
+		if(className == null) return null;
+		List<Element> elements = root.selectNodes("service");
+		for(Element element:elements){
+			String ev = element.attribute("tableName").getStringValue();
+			String cn = element.attribute("className").getStringValue();
+			if(className.equalsIgnoreCase(cn)) {
+				return ev.toLowerCase();
+			}
+		}
+		return null;
+	}
+	
 	/**
 	 * 
 	 * @param functionId
 	 * @return
 	 */
-	public List<Map<String,Object>> getServiceListByFunctionId(Integer functionId){
+	public static List<Map<String,Object>> getServiceListByFunctionId(Integer functionId){
 		List<Map<String,Object>> list =new ArrayList();
 		if(!StringUtil.isEmpty(functionId)) {
 			List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(functionId);
@@ -133,7 +188,7 @@ public class ServiceConfigTemplateUtil {
 	 * 获取业务配置列表
 	 * @return
 	 */
-	public List<Map<String,Object>> getServiceCfgList(Element serviceNode){
+	public static  List<Map<String,Object>> getServiceCfgList(Element serviceNode){
 		List<Map<String,Object>> list = new ArrayList();
 		List<Element> elements = serviceNode.selectNodes("serviceCfg");
 		for(Element element:elements){
@@ -149,7 +204,7 @@ public class ServiceConfigTemplateUtil {
 	 * 获取用户自定义域列表
 	 * @return
 	 */
-	public List<Map<String,Object>> getUserRegionList(Element serviceNode){
+	public static  List<Map<String,Object>> getUserRegionList(Element serviceNode){
 		List<Map<String,Object>> list = new ArrayList();
 		List<Element> elements = serviceNode.selectNodes("userRegion");
 		for(Element element:elements){
@@ -167,7 +222,7 @@ public class ServiceConfigTemplateUtil {
 	 * @param attribute
 	 * @return
 	 */
-	public List getXmlParamListByTag(String tag,String attribute){
+	public static  List getXmlParamListByTag(String tag,String attribute){
 		List list =new ArrayList();
 		List<Element> elements = root.selectNodes(tag);
 		for(Element element:elements){
@@ -175,6 +230,24 @@ public class ServiceConfigTemplateUtil {
 		}
 		return list;
 	}
+	
+	public static Set<String> getAllTableName(){
+		//Set<String> tableName = getCompileTableName();
+		Set<String> result = Sets.newHashSet();
+		List<Map<String, Object>> serviceList = getServiceList();
+		for (Map<String, Object> serviceNode : serviceList) {
+			result.add(serviceNode.get("tableName").toString().trim());
+			List<Map<String,Object>> cfgList = (List<Map<String, Object>>) serviceNode.get("cfgList");
+			if(cfgList != null) {
+				for (Map<String, Object> map : cfgList) {
+					result.add(map.get("tableName").toString().trim());
+				}
+			}
+		}
+		
+		return result;
+	}
+	
 	public static void main(String[] args) {
 		try {
 			ServiceConfigTemplateUtil serviceTemplate = new ServiceConfigTemplateUtil();
@@ -196,6 +269,7 @@ public class ServiceConfigTemplateUtil {
 				
 			}
 
+
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();

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

@@ -268,6 +268,7 @@ public class ExcelCsv {
 		for (String key : keyList) {
 			List<E> list=dataMap.get(key);
 			List<List<String>> listT=new ArrayList<List<String>>();
+				
 			for (E e : list){
 				int colunm = 0;
 				List<String>  lisb=new ArrayList<String>();
@@ -286,8 +287,8 @@ public class ExcelCsv {
 							}
 						}
 						// If is dict, get dict label 
+						String valStr=val==null?"":val.toString();
 						if (StringUtils.isNotBlank(ef.dictType())){
-							String valStr=val==null?"":val.toString();
 							if("type".equals(ef.dictType()) || "attribute".equals(ef.dictType()) 
 									|| "label".equals(ef.dictType())){
 								// Get basic info
@@ -297,9 +298,53 @@ public class ExcelCsv {
 								String dict=DictUtils.getDictLabel(ef.dictType(), valStr, valStr);
 								//如果找不到字典国际化值，把字典本身作为默认值放进去，不然导出就是空了
 								val = msgProp.getProperty(dict,dict);
+								//业务配置-stream 阻断类型中   阻断 改为 封堵（丢弃）
+								if("block_type".equals(ef.title()) && dict.equals("action_reject")
+										&& (Reflections.invokeGetter(e, "serviceId").toString().equals("35")
+												|| Reflections.invokeGetter(e, "serviceId").toString().equals("33")
+												|| Reflections.invokeGetter(e, "serviceId").toString().equals("36"))){
+									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"))) {
+									dict="action_spoofing";
+									val = msgProp.getProperty(dict,dict);
+								}
+								//http(s) manipulate 导出action修改为Manipulate
+								if(ef.title().equals("block_type")
+										&& dict.equals("action_redirect")
+										&& (Reflections.invokeGetter(e, "serviceId").toString().equals("656"))) {
+									dict="action_manipulate";
+									val = msgProp.getProperty(dict,dict);
+								}
+								if(ef.title().equals("action")
+										&& dict.equals("action_redirect")) {
+									dict="action_manipulate";
+									val = msgProp.getProperty(dict,dict);
+								}
 							}
 							
 						}
+						
+						if(ef.title().equals("whether_area_block")&&!StringUtil.isEmpty(val)){
+							Integer whetherAreaBlock=Integer.parseInt(valStr);
+							if(whetherAreaBlock.equals(0)){
+								val = msgProp.getProperty("all","all");
+							}else if(whetherAreaBlock.equals(1)){
+								val = msgProp.getProperty("selective","selective");
+							}else{
+								val ="";
+							}
+						}
 						if(ef.title().equals("is_hex") && !StringUtil.isEmpty(val)){
 							Integer isHex=Integer.parseInt(val.toString());
 							if(isHex.equals(0) || isHex.equals(2)){
@@ -312,7 +357,7 @@ public class ExcelCsv {
 						}
 						if(ef.title().equals("is_case_insenstive") && !StringUtil.isEmpty(val)){
 							Integer isCaseSenstive=Integer.parseInt(val.toString());
-							if(isCaseSenstive.equals(0) || isCaseSenstive.equals(1)){
+							if(isCaseSenstive.equals(0)){
 								val = msgProp.getProperty("case_insenstive","case_insenstive");
 							}else if(isCaseSenstive.equals(1)){
 								val = msgProp.getProperty("case_senstive","case_senstive");

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

@@ -23,6 +23,7 @@ import java.util.Set;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.CellStyle;
@@ -39,15 +40,19 @@ 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;
 import com.nis.domain.FunctionRegionDict;
 import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.basics.SysDictInfo;
+import com.nis.domain.callback.ProxyFileTrafficMirrorCfg;
 import com.nis.domain.configuration.DnsResStrategy;
+import com.nis.domain.configuration.PxyObjKeyring;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.Encodes;
@@ -56,6 +61,8 @@ import com.nis.util.StringUtil;
 import com.nis.web.dao.basics.PolicyGroupInfoDao;
 import com.nis.web.dao.basics.SysDictInfoDao;
 import com.nis.web.dao.configuration.DnsResStrategyDao;
+import com.nis.web.dao.configuration.ProxyFileTrafficMirrorDao;
+import com.nis.web.dao.configuration.PxyObjKeyringDao;
 import com.nis.web.service.SpringContextHolder;
 
 /**
@@ -70,6 +77,8 @@ public class ExportExcel {
 	private static DnsResStrategyDao dnsResStrategyDao = SpringContextHolder.getBean(DnsResStrategyDao.class);
 	private static PolicyGroupInfoDao policyGroupInfoDao = SpringContextHolder.getBean(PolicyGroupInfoDao.class);
 	private static SysDictInfoDao sysDictInfoDao = SpringContextHolder.getBean(SysDictInfoDao.class);
+	private static PxyObjKeyringDao pxyObjKeyringDao = SpringContextHolder.getBean(PxyObjKeyringDao.class);
+	private static ProxyFileTrafficMirrorDao proxyFileDao = SpringContextHolder.getBean(ProxyFileTrafficMirrorDao.class);
 			
 	/**
 	 * 工作薄对象
@@ -264,6 +273,9 @@ 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++;
 		}
@@ -290,7 +302,7 @@ public class ExportExcel {
 			}
 		}
 		/*** HTTP(s)替换 搜索区域 ***/
-		if(("replace_zone".equals(headerStr)) && (region.getFunctionId().equals(209))){
+		if(("replace_zone".equals(headerStr)) && (region.getFunctionId().equals(209) || region.getAction().equals(80))){
 			commentStr="";
 			List<SysDataDictionaryItem> dict=DictUtils.getDictList("CONTROL_REPLACE_ZONE");
 			if(dict !=null && dict.size()>0){
@@ -453,6 +465,28 @@ public class ExportExcel {
 			}
 			
 		}
+		// IP、URL、Domain和ScriberId公共组
+		if("group_name".equals(headerStr)) {
+			commentStr="";
+			List<PolicyGroupInfo> list = null;
+			if(region.getFunctionId().equals(605)) {
+				list=policyGroupInfoDao.findPolicyGroupInfosByType(Constants.IP_OBJ_GROUP_TYPE);
+			}else if(region.getFunctionId().equals(606)) {
+				list=policyGroupInfoDao.findPolicyGroupInfosByType(Constants.URL_OBJ_GROUP_TYPE);
+			}else if(region.getFunctionId().equals(607)) {
+				list=policyGroupInfoDao.findPolicyGroupInfosByType(Constants.DOMAIN_OBJ_GROUP_TYPE);
+			}else if(region.getFunctionId().equals(608)) {
+				list=policyGroupInfoDao.findPolicyGroupInfosByType(Constants.SUBID_OBJ_GROUP_TYPE);
+			}
+			if(!StringUtil.isEmpty(list)){
+				for (PolicyGroupInfo policyGroupInfo : list) {
+					commentStr=commentStr+policyGroupInfo.getGroupName()+"\n";
+					index++;
+				}
+			}
+			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+			index++;
+		}
 		if("isp".equals(headerStr)) {
 			commentStr="";
 			List<Integer> itTypeList = new ArrayList<Integer>();
@@ -496,7 +530,7 @@ public class ExportExcel {
 			commentStr=commentStr+"▶"+msgProp.getProperty("required")+"\n";
 			index++;
 		}
-		if(("domain_name".equals(headerStr)) && (region.getFunctionId().equals(560))){
+		if("domain_name".equals(headerStr)){
 			commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n";
 			index++;
 			//1、非空
@@ -569,7 +603,393 @@ public class ExportExcel {
 			commentStr=commentStr+"▶"+msgProp.getProperty("ip_check")+"(IPv4)\n";
 			index++;
 		}
-			
+		/**********************************************************************pxy intercept************************************************************************************************************/
+		//pxy intercept
+		if("pxy_intercept_monit_keyring".equals(headerStr)) {
+			commentStr="";
+			List<PxyObjKeyring> certificateList=pxyObjKeyringDao.findList(null,1,1,"ip");
+			if(CollectionUtils.isNotEmpty(certificateList)) {
+				for (PxyObjKeyring certificate : certificateList) {
+					commentStr=commentStr+certificate.getCompileId()+"（"+certificate.getCfgDesc()+"）\n";
+					index++;
+				}
+			}
+			if(StringUtil.isEmpty(headerStr)){
+				headerStr="";
+				commentStr="";
+			}else{
+				commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+				index++;
+				index++;
+				commentStr=commentStr+"\n"+msgProp.getProperty("rule_desc_tip")+":\n";
+				index++;
+				/*//2、默认值说明
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":0\n";
+				index++;*/
+				index++;
+			}
+		}
+		//ev_cert
+		if("exclusions_ev_cert".equals(headerStr)) {
+			commentStr="";
+			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+			index++;
+			commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";
+			index++;
+			commentStr+=0+"（"+msgProp.getProperty("no")+"）\n";
+			index++;
+			if(StringUtil.isEmpty(headerStr)){
+				headerStr="";
+				commentStr="";
+			}else{
+				index++;
+				commentStr=commentStr+"\n"+msgProp.getProperty("rule_desc_tip")+":\n";
+				index++;
+				//2、默认值说明
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":0\n";
+				index++;
+				index++;
+			}
+		}
+		//cert_transparency
+		if("exclusions_cert_transparency".equals(headerStr)) {
+			commentStr="";
+			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+			index++;
+			commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";
+			index++;
+			commentStr+=0+"（"+msgProp.getProperty("no")+"）\n";
+			index++;
+			if(StringUtil.isEmpty(headerStr)){
+				headerStr="";
+				commentStr="";
+			}else{
+				index++;
+				commentStr=commentStr+"\n"+msgProp.getProperty("rule_desc_tip")+":\n";
+				index++;
+				//2、默认值说明
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":0\n";
+				index++;
+				index++;
+			}
+		}
+		//client_cert_req
+		if("exclusions_client_cert_req".equals(headerStr)) {
+			commentStr="";
+			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+			index++;
+			commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";
+			index++;
+			commentStr+=0+"（"+msgProp.getProperty("no")+"）\n";
+			index++;
+			if(StringUtil.isEmpty(headerStr)){
+				headerStr="";
+				commentStr="";
+			}else{
+				index++;
+				commentStr=commentStr+"\n"+msgProp.getProperty("rule_desc_tip")+":\n";
+				index++;
+				//2、默认值说明
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":1\n";
+				index++;
+				index++;
+			}
+		}
+		//pinning
+		if("exclusions_pinning".equals(headerStr)) {
+			commentStr="";
+			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+			index++;
+			commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";
+			index++;
+			commentStr+=0+"（"+msgProp.getProperty("no")+"）\n";
+			index++;
+			if(StringUtil.isEmpty(headerStr)){
+				headerStr="";
+				commentStr="";
+			}else{
+				index++;
+				commentStr=commentStr+"\n"+msgProp.getProperty("rule_desc_tip")+":\n";
+				index++;
+				//2、默认值说明
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":1\n";
+				index++;
+				index++;
+			}
+		}
+		//pinning
+		if("exclusions_protocol_errors".equals(headerStr)) {
+			commentStr="";
+			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+			index++;
+			commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";
+			index++;
+			commentStr+=0+"（"+msgProp.getProperty("no")+"）\n";
+			index++;
+			if(StringUtil.isEmpty(headerStr)){
+				headerStr="";
+				commentStr="";
+			}else{
+				index++;
+				commentStr=commentStr+"\n"+msgProp.getProperty("rule_desc_tip")+":\n";
+				index++;
+				//2、默认值说明
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":1\n";
+				index++;
+				index++;
+			}
+		}
+		//cn
+		if("cert_verify_approach_cn".equals(headerStr)) {
+			commentStr="";
+			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+			index++;
+			commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";
+			index++;
+			commentStr+=0+"（"+msgProp.getProperty("no")+"）\n";
+			index++;
+			if(StringUtil.isEmpty(headerStr)){
+				headerStr="";
+				commentStr="";
+			}else{
+				index++;
+				commentStr=commentStr+"\n"+msgProp.getProperty("rule_desc_tip")+":\n";
+				index++;
+				//2、默认值说明
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":1\n";
+				index++;
+				index++;
+			}
+		}
+		//issuer
+		if("cert_verify_approach_issuer".equals(headerStr)) {
+			commentStr="";
+			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+			index++;
+			commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";
+			index++;
+			commentStr+=0+"（"+msgProp.getProperty("no")+"）\n";
+			index++;
+			if(StringUtil.isEmpty(headerStr)){
+				headerStr="";
+				commentStr="";
+			}else{
+				index++;
+				commentStr=commentStr+"\n"+msgProp.getProperty("rule_desc_tip")+":\n";
+				index++;
+				//2、默认值说明
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":1\n";
+				index++;
+				index++;
+			}
+		}
+		//self-signed
+		if("cert_verify_approach_self_signed".equals(headerStr)) {
+			commentStr="";
+			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+			index++;
+			commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";
+			index++;
+			commentStr+=0+"（"+msgProp.getProperty("no")+"）\n";
+			index++;
+			if(StringUtil.isEmpty(headerStr)){
+				headerStr="";
+				commentStr="";
+			}else{
+				index++;
+				commentStr=commentStr+"\n"+msgProp.getProperty("rule_desc_tip")+":\n";
+				index++;
+				//2、默认值说明
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":1\n";
+				index++;
+				index++;
+			}
+		}
+		//expiration
+		if("cert_verify_approach_expiration".equals(headerStr)) {
+			commentStr="";
+			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+			index++;
+			commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";
+			index++;
+			commentStr+=0+"（"+msgProp.getProperty("no")+"）\n";
+			index++;
+			if(StringUtil.isEmpty(headerStr)){
+				headerStr="";
+				commentStr="";
+			}else{
+				index++;
+				commentStr=commentStr+"\n"+msgProp.getProperty("rule_desc_tip")+":\n";
+				index++;
+				//2、默认值说明
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":1\n";
+				index++;
+				index++;
+			}
+		}
+		//fail_method
+		if("cert_verify_fail_method".equals(headerStr)) {
+			commentStr="";
+			defaultValue="pass-through";
+			List<SysDataDictionaryItem> failMethods=DictUtils.getDictList("FAIL_METHOD");
+			if(CollectionUtils.isNotEmpty(failMethods)){
+				for (SysDataDictionaryItem failMethod : failMethods) {
+					commentStr=commentStr+failMethod.getItemCode()+"（"+msgProp.getProperty(failMethod.getItemValue(),failMethod.getItemValue())+"）"+"\n";
+					index++;
+				}
+				if(StringUtil.isEmpty(commentStr)){
+					headerStr="";
+					commentStr="";
+				}
+				if(StringUtil.isEmpty(defaultValue)){
+					defaultValue = region.getConfigDirection().split(",")[0];
+				}
+				
+			}
+			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+			index++;
+			commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n";
+			index++;
+			//1、默认值说明
+			if(!StringUtil.isEmpty(defaultValue)){
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":"+defaultValue+"\n";
+				index++;
+			}
+		}
+		//fail_method
+		if("ssl_ver_mirror_client".equals(headerStr)) {
+			commentStr="";
+			defaultValue="1";
+			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+			index++;
+			commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";
+			index++;
+			commentStr+=0+"（"+msgProp.getProperty("no")+"）\n";
+			index++;
+			commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n";
+			index++;
+			//1、默认值说明
+			if(!StringUtil.isEmpty(defaultValue)){
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":"+defaultValue+"\n";
+				index++;
+			}
+			commentStr=commentStr+"▶"+msgProp.getProperty("ssl_ver_mirror_client_on","if the mirror client option value is '1', the min SSL version and the max SSL version will be ignored")+"\n";
+			index++;
+		}
+		//min
+		if("ssl_ver_min".equals(headerStr)) {
+			commentStr="";
+			defaultValue="ssl3";
+			List<SysDataDictionaryItem> sslversions=DictUtils.getDictList("SSL_VERSION");
+			if(CollectionUtils.isNotEmpty(sslversions)){
+				for (SysDataDictionaryItem sslversion : sslversions) {
+					commentStr=commentStr+sslversion.getItemCode()+"（"+msgProp.getProperty(sslversion.getItemValue(),sslversion.getItemValue())+"）"+"\n";
+					index++;
+				}
+				if(StringUtil.isEmpty(commentStr)){
+					headerStr="";
+					commentStr="";
+				}
+			}
+			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+			index++;
+			commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n";
+			index++;
+			//1、默认值说明
+			if(!StringUtil.isEmpty(defaultValue)){
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":"+defaultValue+"\n";
+				index++;
+			}
+		}
+		//max
+		if("ssl_ver_max".equals(headerStr)) {
+			commentStr="";
+			defaultValue="tls13";
+			List<SysDataDictionaryItem> sslversions=DictUtils.getDictList("SSL_VERSION");
+			if(CollectionUtils.isNotEmpty(sslversions)){
+				for (SysDataDictionaryItem sslversion : sslversions) {
+					commentStr=commentStr+sslversion.getItemCode()+"（"+msgProp.getProperty(sslversion.getItemValue(),sslversion.getItemValue())+"）"+"\n";
+					index++;
+				}
+				if(StringUtil.isEmpty(commentStr)){
+					headerStr="";
+					commentStr="";
+				}
+				
+			}
+			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+			index++;
+			commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n";
+			index++;
+			//1、默认值说明
+			if(!StringUtil.isEmpty(defaultValue)){
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":"+defaultValue+"\n";
+				index++;
+			}
+		}
+		//allow_http2
+		if("ssl_ver_allow_http2".equals(headerStr)) {
+			commentStr="";
+			defaultValue="1";
+			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+			index++;
+			commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";
+			index++;
+			commentStr+=0+"（"+msgProp.getProperty("no")+"）\n";
+			index++;
+			commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n";
+			index++;
+			//1、默认值说明
+			if(!StringUtil.isEmpty(defaultValue)){
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":"+defaultValue+"\n";
+				index++;
+			}	
+			index++;
+		}
+		if("decrypt_mirror_enable".equals(headerStr)) {
+			commentStr="";
+			defaultValue="0";
+			commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+			index++;
+			commentStr+=1+"（"+msgProp.getProperty("yes")+"）\n";
+			index++;
+			commentStr+=0+"（"+msgProp.getProperty("no")+"）\n";
+			index++;
+			commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n";
+			index++;
+			//1、默认值说明
+			if(!StringUtil.isEmpty(defaultValue)){
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":"+defaultValue+"\n";
+				index++;
+			}
+			commentStr=commentStr+"▶"+msgProp.getProperty("decrypt_mirror_enable_on","if the enable option value is '1', the Mirror profile is needed")+"\n";
+			index++;
+		}
+		if("decrypt_mirror_mirror_profile".equals(headerStr)) {
+			commentStr="";
+			List<ProxyFileTrafficMirrorCfg> mirrorProfileList=proxyFileDao.findMirrorList(null,1,1);
+			if(CollectionUtils.isNotEmpty(mirrorProfileList)) {
+				for (ProxyFileTrafficMirrorCfg mirrorProfile : mirrorProfileList) {
+					commentStr=commentStr+mirrorProfile.getCompileId()+"（"+mirrorProfile.getCfgDesc()+"）\n";
+					index++;
+				}
+			}
+			if(StringUtil.isEmpty(headerStr)){
+				headerStr="";
+				commentStr="";
+			}else{
+				commentStr=msgProp.getProperty("select")+":\n"+commentStr;
+				index++;
+				index++;
+				commentStr=commentStr+"\n"+msgProp.getProperty("rule_desc_tip")+":\n";
+				index++;
+				/*//2、默认值说明
+				commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":0\n";
+				index++;*/
+				index++;
+			}
+		}
+		/**********************************************************************pxy intercept************************************************************************************************************/
 		if(region.getRegionType().equals(1)){//IP配置
 			//ip配置需要导入的信息：srcIp srcPort destIp destPort Protocol Direction
 			//确定需要导入的srcIp srcPort destIp destPort信息
@@ -583,25 +1003,28 @@ 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((","+region.getConfigIpPattern()+",").indexOf(",3,") > -1){
+								if((","+srcIpPattern+",").indexOf(",3,") > -1){
 									commentStr=commentStr+Constants.IPV4_DEFAULT_IP_VALUE+"（IPv4）"+"\n";
 									if(StringUtil.isEmpty(defaultValue)){
 										defaultValue=Constants.IPV4_DEFAULT_IP_VALUE;
 									}
 									index++;
 								}
-								if((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1){
+								if((","+srcIpPattern+",").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((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1){
+								if((","+srcIpPattern+",").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;
@@ -610,21 +1033,21 @@ public class ExportExcel {
 								}
 							}
 							if((","+region.getConfigIpType()+",").indexOf(",6,") > -1){
-								if((","+region.getConfigIpPattern()+",").indexOf(",3,") > -1){
+								if((","+srcIpPattern+",").indexOf(",3,") > -1){
 									commentStr=commentStr+Constants.IPV6_DEFAULT_IP_VALUE+"（IPv6）"+"\n";
 									if(StringUtil.isEmpty(defaultValue)){
 										defaultValue=Constants.IPV6_DEFAULT_IP_VALUE;
 									}
 									index++;
 								}
-								if((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1){
+								if((","+srcIpPattern+",").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((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1){
+								if((","+srcIpPattern+",").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;
@@ -673,12 +1096,12 @@ public class ExportExcel {
 										,msgProp.getProperty("serverip"))+"\n";
 								index++;
 								index++;
-								commentStr=commentStr+"▶"+String.format(msgProp.getProperty("the_same_ip_type_pattern"))+"\n";
+								commentStr=commentStr+"▶"+String.format(msgProp.getProperty("the_same_ip_type"))+"\n";
 								index++;
 								index++;
 							}
 							//4、IP Range 开始IP和结束IP必须在同一网段
-							if(((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1)){
+							if(((","+srcIpPattern+",").indexOf(",2,") > -1)){
 								commentStr=commentStr+"▶"+msgProp.getProperty("ip_range")+","+msgProp.getProperty("ip_range_bit_field")+"\n";
 								index++;
 								index++;
@@ -689,7 +1112,7 @@ public class ExportExcel {
 							}
 							
 							//6、IPv4 Mask 掩码范围16-32
-							if(((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1)){
+							if(((","+srcIpPattern+",").indexOf(",1,") > -1)){
 								if(((","+region.getConfigIpType()+",").indexOf(",4,") > -1)){
 									commentStr=commentStr+"▶"+msgProp.getProperty("ipv4_subnet_tip")+","+msgProp.getProperty("ipv4_mask_range_tip")+"\n";
 									index++;
@@ -705,24 +1128,25 @@ 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((","+region.getConfigIpPattern()+",").indexOf(",3,") > -1){
+							if((","+destIpPattern+",").indexOf(",3,") > -1){
 								commentStr=commentStr+Constants.IPV4_DEFAULT_IP_VALUE+"（IPv4）"+"\n";
 								if(StringUtil.isEmpty(defaultValue)){
 									defaultValue=Constants.IPV4_DEFAULT_IP_VALUE;
 								}
 								index++;
 							}
-							if((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1){
+							if((","+destIpPattern+",").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((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1){
+							if((","+destIpPattern+",").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;
@@ -731,21 +1155,21 @@ public class ExportExcel {
 							}
 						}
 						if((","+region.getConfigIpType()+",").indexOf(",6,") > -1){
-							if((","+region.getConfigIpPattern()+",").indexOf(",3,") > -1){
+							if((","+destIpPattern+",").indexOf(",3,") > -1){
 								commentStr=commentStr+Constants.IPV6_DEFAULT_IP_VALUE+"（IPv6）"+"\n";
 								if(StringUtil.isEmpty(defaultValue)){
 									defaultValue=Constants.IPV6_DEFAULT_IP_VALUE;
 								}
 								index++;
 							}
-							if((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1){
+							if((","+destIpPattern+",").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((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1){
+							if((","+destIpPattern+",").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;
@@ -778,12 +1202,12 @@ public class ExportExcel {
 									,msgProp.getProperty("serverip"))+"\n";
 							index++;
 							index++;
-							commentStr=commentStr+"▶"+String.format(msgProp.getProperty("the_same_ip_type_pattern"))+"\n";
+							commentStr=commentStr+"▶"+String.format(msgProp.getProperty("the_same_ip_type"))+"\n";
 							index++;
 							index++;
 						}
 						//4、IP Range 开始IP和结束IP必须在同一网段
-						if(((","+region.getConfigIpPattern()+",").indexOf(",2,") > -1)){
+						if(((","+destIpPattern+",").indexOf(",2,") > -1)){
 							commentStr=commentStr+"▶"+msgProp.getProperty("ip_range")+","+msgProp.getProperty("ip_range_bit_field")+"\n";
 							index++;
 							index++;
@@ -794,7 +1218,7 @@ public class ExportExcel {
 						}
 						
 						//6、IPv4 Mask 掩码范围16-32
-						if(((","+region.getConfigIpPattern()+",").indexOf(",1,") > -1)){
+						if(((","+destIpPattern+",").indexOf(",1,") > -1)){
 							if(((","+region.getConfigIpType()+",").indexOf(",4,") > -1)){
 								commentStr=commentStr+"▶"+msgProp.getProperty("ipv4_subnet_tip")+","+msgProp.getProperty("ipv4_mask_range_tip")+"\n";
 								index++;
@@ -820,17 +1244,20 @@ 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((","+region.getConfigPortPattern()+",").indexOf(",1,") > -1){
+						if((","+srcPortPattern+",").indexOf(",1,") > -1){
 							commentStr=commentStr+Constants.PORT_DEFAULT+"（Port）"+"\n";
 							if(StringUtil.isEmpty(defaultValue)){
 								defaultValue=Constants.PORT_DEFAULT;
 							}
 							index++;
 						}
-						if((","+region.getConfigPortPattern()+",").indexOf(",2,") > -1){
+						if((","+srcPortPattern+",").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;
@@ -856,11 +1283,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++;
@@ -895,16 +1322,17 @@ public class ExportExcel {
 					}
 				}
 				if("server_port".equals(headerStr)){
+					String destPortPattern=portPatterns[1];
 					if((","+region.getConfigIpPortShow()+",").indexOf(",4,") > -1){
 						commentStr="";
-						if((","+region.getConfigPortPattern()+",").indexOf(",1,") > -1){
+						if((","+destPortPattern+",").indexOf(",1,") > -1){
 							commentStr=commentStr+Constants.PORT_DEFAULT+"（Port）"+"\n";
 							if(StringUtil.isEmpty(defaultValue)){
 								defaultValue=Constants.PORT_DEFAULT;
 							}
 							index++;
 						}
-						if((","+region.getConfigPortPattern()+",").indexOf(",2,") > -1){
+						if((","+destPortPattern+",").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;
@@ -930,11 +1358,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++;
@@ -1113,9 +1541,9 @@ public class ExportExcel {
 							commentStr="";
 						}
 						if(StringUtil.isEmpty(defaultValue)){
-							defaultValue="0";
+							defaultValue = region.getConfigDirection().split(",")[0];
 						}
-						defaultValue = region.getFunctionId().equals(301)?"1":defaultValue;
+						
 					}
 				/*}*/
 				/*if(StringUtil.isEmpty(commentStr)){
@@ -1144,11 +1572,17 @@ public class ExportExcel {
 						headerStr="";
 						commentStr="";
 					}else{
-						for (String districtStr : region.getConfigDistrict().split(",")) {
-							commentStr=commentStr+districtStr+"\n";
+						if((region.getAction()!=null) && (region.getAction()==85 || region.getAction()==90)) {
+							commentStr=commentStr+"Content-Type"+"\n";
 							index++;
+							defaultValue="Content-Type";
+						}else {
+							for (String districtStr : region.getConfigDistrict().split(",")) {
+								commentStr=commentStr+districtStr+"\n";
+								index++;
+							}
+							defaultValue=region.getConfigDistrict().split(",")[0];
 						}
-						defaultValue=region.getConfigDistrict().split(",")[0];
 					}
 					if(StringUtil.isEmpty(commentStr)){
 						headerStr="";
@@ -1404,7 +1838,7 @@ public class ExportExcel {
 					commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n";
 					index++;
 					//2、默认值说明
-					if(region.getFunctionId().equals(200)) {
+					if(region.getFunctionId().equals(200) || region.getFunctionId().equals(607)) {
 						commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":1\n";
 					}else {
 						commentStr=commentStr+"▶"+msgProp.getProperty("default_value")+":0\n";
@@ -2233,7 +2667,9 @@ public class ExportExcel {
 	 * @return list 数据列表
 	 */
 	public <E> ExportExcel setDataList(Properties msgProp, Map<String,List> dataMap, Map<Object,Object> map){
+		long start=System.currentTimeMillis(),end=System.currentTimeMillis();
 		Set<String> keyList=dataMap.keySet();
+		Map<String,Map<String,String>> dictMaps=Maps.newConcurrentMap();
 		for (String key : keyList) {
 			List<E> list=dataMap.get(key);
 			for (E e : list){
@@ -2263,12 +2699,58 @@ public class ExportExcel {
 								val = getBasicInfo(ef.dictType(),map,valStr);
 							}else{
 								//字典数据已做国际化处理
-								String dict=DictUtils.getDictLabel(ef.dictType(), valStr, valStr);
+								String dict="";
+								if(dictMaps.containsKey(ef.dictType())) {
+									Map<String,String> dictM=dictMaps.get(ef.dictType());
+									dict=dictM.containsKey(valStr)?dictM.get(valStr):valStr;
+								}else {
+									Map<String,String> dictM=DictUtils.getDictMap(ef.dictType());
+									dictMaps.put(ef.dictType(), dictM);
+									dict=dictM.containsKey(valStr)?dictM.get(valStr):valStr;
+								}
+								//String dict=DictUtils.getDictLabel(ef.dictType(), valStr, valStr);
 								//如果找不到字典国际化值，把字典本身作为默认值放进去，不然导出就是空了
 								val = msgProp.getProperty(dict,dict);
+								//业务配置-stream 阻断类型中   阻断 改为 封堵（丢弃）
+								if("block_type".equals(ef.title()) && dict.equals("action_reject")
+										&& (Reflections.invokeGetter(e, "serviceId").toString().equals("35")
+												|| Reflections.invokeGetter(e, "serviceId").toString().equals("33")
+												|| Reflections.invokeGetter(e, "serviceId").toString().equals("36"))){
+									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"))) {
+									dict="action_spoofing";
+									val = msgProp.getProperty(dict,dict);
+								}
+								//http(s) manipulate 导出action修改为Manipulate
+								if(ef.title().equals("block_type")
+										&& dict.equals("action_redirect")
+										&& (Reflections.invokeGetter(e, "serviceId").toString().equals("656"))) {
+									dict="action_manipulate";
+									val = msgProp.getProperty(dict,dict);
+								}
+								if(ef.title().equals("action")
+										&& dict.equals("action_redirect")) {
+									dict="action_manipulate";
+									val = msgProp.getProperty(dict,dict);
+								}
 							}
 							
 						}
+						if(ef.title().equals("do_log")
+								&& (Reflections.invokeGetter(e, "serviceId").toString().equals("512"))) {
+							val = "";
+						}
 						if(ef.title().equals("whether_area_block")&&!StringUtil.isEmpty(val)){
 							Integer whetherAreaBlock=Integer.parseInt(valStr);
 							if(whetherAreaBlock.equals(0)){
@@ -2291,7 +2773,7 @@ public class ExportExcel {
 						}
 						if(ef.title().equals("is_case_insenstive") && !StringUtil.isEmpty(val)){
 							Integer isCaseSenstive=Integer.parseInt(val.toString());
-							if(isCaseSenstive.equals(0) || isCaseSenstive.equals(1)){
+							if(isCaseSenstive.equals(0)){
 								val = msgProp.getProperty("case_insenstive","case_insenstive");
 							}else if(isCaseSenstive.equals(1)){
 								val = msgProp.getProperty("case_senstive","case_senstive");
@@ -2318,6 +2800,8 @@ public class ExportExcel {
 				log.debug("Write success: ["+row.getRowNum()+"] "+sb.toString());
 			}
 		}
+		end=System.currentTimeMillis();
+		System.err.println("setDataList cost:"+(end-start));
 		return this;
 	}
 	/**
@@ -2443,13 +2927,14 @@ public class ExportExcel {
 	/**
 	 * 构造函数
 	 * @param msgProp 国际化配置
-	 * @param title sheet名称
-	 * @param cls 实体对象，通过annotation.ExportField获取标题
+	 * @param titleList sheet名称
+	 * @param clsMap 实体对象，通过annotation.ExportField获取标题
 	 * @param type 导出类型（1:导出数据；2：导出模板）
 	 * @param groups 导入分组
 	 * @return 
 	 */
 	public ExportExcel(Properties msgProp,List<String> titleList,Map<String,String> noExportMap,Map<String, Class<?>> clsMap, int type,String titleTime, int... groups){
+		long start=System.currentTimeMillis(),end=System.currentTimeMillis();
 		Map<String, List<String>> headerMap=new HashMap<String, List<String>>();
 		Map<String, List<String>> commentMap=new HashMap<String, List<String>>();
 		for (String title : titleList) {
@@ -2575,6 +3060,8 @@ public class ExportExcel {
 			annotationMap.put(title, annotationList);
 		}
 		initializeMultiSheet(msgProp,titleList, headerMap,commentMap,titleTime);
+		end=System.currentTimeMillis();
+		System.err.println("ExportExcel cost:"+(end-start));
 	}
 	
 	/**

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

@@ -12,7 +12,9 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import java.util.UUID;
 import java.util.concurrent.ArrayBlockingQueue;
@@ -20,6 +22,7 @@ import java.util.concurrent.BlockingQueue;
 
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.openxml4j.exceptions.OpenXML4JException;
@@ -420,19 +423,23 @@ public class ImportBigExcel extends XLSXCovertCSVReader{
 			throw new RuntimeException("regionDict is null!");
 		}
 		if(dataList.size()==0) {
-			throw new ServiceException(props.getProperty("noneData", "noneData"));
+			throw new ServiceException(props.getProperty("no_data", "no_data"));
 		}else if(this.hasImportLimit&&dataList.size()>(Constants.IMPORT_LIMIT+1)) {
 			throw new ServiceException(props.getProperty("import_limit_is", "The maximum import size is")+" "+Constants.IMPORT_LIMIT);
 		}
 		// Get excel data
 		BlockingQueue<E> _dataList =new ArrayBlockingQueue(dataList.size(),true);
-		for (int i = 0; i < dataList.size(); i++) {
-			E e = (E)cls.newInstance();
-			if(i<=headerNum) {
+		Map<String, Map<String, Object>> dictMap = new HashMap<String,Map<String, Object>>();
+		Object val1 = null;
+		for (int i = 0, len = dataList.size(); i < len; i++) {
+			List<Object> row=dataList.get(i);
+			//boolean flag = row.stream().allMatch(obj -> "".equals(obj));
+			if(i <= headerNum || row.size() == 0) {// 跳过第一行和空行
 				continue;
 			}
+			
+			E e = (E)cls.newInstance();
 			int column = 0;
-			List<Object> row=dataList.get(i);
 			StringBuilder sb = new StringBuilder();
 			for (Object[] os : annotationList){
 				Object val=row.get(column);
@@ -441,7 +448,23 @@ public class ImportBigExcel extends XLSXCovertCSVReader{
 					ExcelField ef = (ExcelField)os[0];
 					// If is dict type, get dict value
 					if (StringUtils.isNotBlank(ef.dictType())){
-						Object val1 = DictUtils.getDictCode(ef.dictType(), val.toString(), "");
+						// 缓存当前excel文件获取过的字典值
+						if(!dictMap.containsKey(ef.dictType())) {
+							val1 = DictUtils.getDictCode(ef.dictType(), val.toString(), "");
+							Map<String, Object> putMap = new HashMap<String,Object>();
+							putMap.put(val.toString(), val1);
+							dictMap.put(ef.dictType(), putMap);
+						}else {
+							Map<String, Object> map = dictMap.get(ef.dictType());
+							if(!map.containsKey(val.toString())) {
+								val1 = DictUtils.getDictCode(ef.dictType(), val.toString(), "");
+								map.put(val.toString(), val1);
+								dictMap.put(ef.dictType(), map);
+							}else {
+								val1 = map.get(val.toString());
+							}
+						}
+						
 						//没有获取到字典值的话会影响验证判断
 						if(val1!=null&&StringUtils.isNotBlank(val1.toString())) {
 							val=val1;
@@ -465,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 = String.valueOf(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/XLSXCovertCSVReader.java

@@ -8,7 +8,9 @@ import java.sql.SQLException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
@@ -32,6 +34,8 @@ import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 
+import com.nis.util.StringUtil;
+
   
 /** 
  * 使用CVS模式解决XLSX文件，可以有效解决用户模式内存溢出的问题 
@@ -102,12 +106,14 @@ public abstract class XLSXCovertCSVReader {
         // The last column printed to the output stream  
         private int lastColumnNumber = -1;  
         private List<Object> rowlist = new ArrayList<Object>();  
+        private Map<Integer,Object> rowMap = new HashMap<Integer, Object>();
         // Gathers characters as they are seen.  
         private StringBuffer value;  
 //        private String[] record;  
       //  private List<String[]> rows = new ArrayList<String[]>();  
         private boolean isCellNull = false;  
-  
+        
+        private int upRowId; // 记录上一行行号
         /** 
          * Accepts objects needed while parsing. 
          *  
@@ -128,6 +134,7 @@ public abstract class XLSXCovertCSVReader {
             this.nextDataType = xssfDataType.NUMBER;  
             this.formatter = new DataFormatter();  
             rowlist.clear();// 每次读取都清空行集合  
+            rowMap.clear();
         }  
   
         /* 
@@ -197,8 +204,23 @@ public abstract class XLSXCovertCSVReader {
                     if (this.formatString == null)  
                         this.formatString = BuiltinFormats  
                                 .getBuiltinFormat(this.formatIndex);  
-                }  
-            }  
+                }
+                
+            }else if("row".equals(name)) {
+            	// 获取行号
+            	String r = attributes.getValue("r"); 
+            	int index = Integer.parseInt(r);
+            	
+            	int gap = index - upRowId;
+                if(gap > 1) { // 存在空行
+                	while(gap > 1) {
+                		optRows(sheetIndex,lastColumnNumber,rowlist);
+                		gap--;
+                	}
+                	
+                }
+                upRowId = index;
+            } 
             lastContents = "";  
         }  
   
@@ -286,7 +308,10 @@ public abstract class XLSXCovertCSVReader {
                 if(!refnum.equals(preRefnum)){  
                     int len = countNullCell(refnum, preRefnum);  
                     for(int i=0;i<len;i++){  
-                        rowlist.add(curCol, "");  
+                        rowlist.add(curCol, ""); 
+                        if(!rowMap.containsKey(thisColumn)){
+                        	rowMap.put(thisColumn, "");
+                        }
                         curCol++;  
                     }  
                 }  
@@ -298,6 +323,7 @@ public abstract class XLSXCovertCSVReader {
                 }
 //                System.out.println("refnum="+refnum+"preRefnum="+preRefnum+"curCol="+curCol);
                 rowlist.add(curCol, thisVal); 
+                rowMap.put(thisColumn, thisVal);
                 rowData.add(new IndexValue(refnum,lastContents) );
                 curCol++;   
               //  record[thisColumn] = thisStr;  
@@ -323,16 +349,25 @@ public abstract class XLSXCovertCSVReader {
                     	
                         int len = countNullCell(maxRefnum, refnum);  
                         for(int i=0;i<=len;i++){  
-                            rowlist.add(curCol, "");  
+                            rowlist.add(curCol, ""); 
+                            if(!rowMap.containsKey(thisColumn)){
+                            	rowMap.put(thisColumn, "");
+                            }
                             curCol++;  
                         } 
                        int totalLen= countTotalCell(maxRefnum);
                        if(rowlist.size()<totalLen) {
                     	   List<Object> tempList=new ArrayList<>(totalLen);
-                    	   for(int i=0;i<(totalLen-rowlist.size());i++) {
-                    		   tempList.add("");
+                    	   //修改某一个单元格为空，字段映射顺序错乱问题
+                    	   for(int i=0;i<totalLen;i++) {
+                    		   if(!StringUtil.isEmpty(rowMap.get(i))){
+                    			   tempList.add(rowMap.get(i));
+                    		   }else{
+                    			   tempList.add(i,"");
+                    		   }
+                    		   
                     	   }
-                    	   tempList.addAll(rowlist);
+                    	   //tempList.addAll(rowlist);
                     	   rowlist= tempList;
                        }
                     }  
@@ -343,6 +378,7 @@ public abstract class XLSXCovertCSVReader {
                     	optRows(sheetIndex,lastColumnNumber,rowlist);
                     	
                     	rowlist.clear();
+                    	rowMap.clear();
 //                        rows.add(record.clone());  
                         isCellNull = false;  
 //                        for (int i = 0; i < record.length; i++) {  
@@ -352,6 +388,7 @@ public abstract class XLSXCovertCSVReader {
                 }  
                 rowlist.clear();
                 rowData.clear();
+                rowMap.clear();
                 curCol = 0;   
                 preRefnum = null;  
                 refnum = null;  

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

@@ -45,6 +45,7 @@ public class CheckAppFeatureComplexStringFormatThread implements Callable<String
 	public String call() throws Exception {
 		List<Object> dataList=Lists.newArrayList(Constants.MAAT_JSON_SEND_SIZE);
 		StringBuffer msg=new StringBuffer();
+		boolean error = false;
 		while(!srcQueue.isEmpty()) {
 			int size=srcQueue.drainTo(dataList,Constants.MAAT_JSON_SEND_SIZE);
 			if(regionDict.getRegionType().intValue()==3) {
@@ -57,10 +58,15 @@ public class CheckAppFeatureComplexStringFormatThread implements Callable<String
 					//msg=e.getMessage();
 					//msg.append(e.getMessage());
 					//break;
+					error = true;
 				}
 			}
 			dataList.clear();
 		}
+		if(error) {
+			msg.append("validate_error");
+		}
+		
 		return msg.toString();
 	}
 	public List<AppComplexFeatureCfg> checkAppComplexFeatureCfg(StringBuffer msg,

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

@@ -45,6 +45,7 @@ public class CheckComplexStringFormatThread implements Callable<String>{
 	public String call() throws Exception {
 		List<Object> dataList=Lists.newArrayList(Constants.MAAT_JSON_SEND_SIZE);
 		StringBuffer msg=new StringBuffer();
+		boolean error = false;
 		while(!srcQueue.isEmpty()) {
 			int size=srcQueue.drainTo(dataList,Constants.MAAT_JSON_SEND_SIZE);
 			if(regionDict.getRegionType().intValue()==3) {
@@ -57,10 +58,15 @@ public class CheckComplexStringFormatThread implements Callable<String>{
 					//msg=e.getMessage();
 					//msg.append(e.getMessage());
 					//break;
+					error = true;
 				}
 			}
 			dataList.clear();
 		}
+		if(error) {
+			msg.append("validate_error");
+		}
+		
 		return msg.toString();
 	}
 	public List<ComplexkeywordCfg> checkComplexStringCfg(StringBuffer msg,
@@ -85,6 +91,10 @@ public class CheckComplexStringFormatThread implements Callable<String>{
 			throw new RuntimeException("Found String region,but mulityKeywords is Empty");
 		}
 		String dirtrictP = regionDict.getConfigDistrict();
+		// 代理-操控业务hijack、insert
+		if("85".equals(regionDict.getAction()+"") || "90".equals(regionDict.getAction()+"")) {
+			dirtrictP = "Content-Type";
+		}
 		StringBuffer errTip = new StringBuffer();
 		Pattern pattern = Pattern.compile("\t|\r|\n|\b|\f");
 		for (int i = 0; i < list.size(); i++) {
@@ -121,7 +131,7 @@ public class CheckComplexStringFormatThread implements Callable<String>{
 					}
 				}
 				// 代理HTTP(s)阻断
-				if (regionDict.getFunctionId().equals(207)) {
+				if (regionDict.getFunctionId().equals(207) || "16".equals(regionDict.getAction()+"")) {
 					if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) {
 						baseStringCfg.setUserRegion1("404");
 					}
@@ -147,9 +157,9 @@ public class CheckComplexStringFormatThread implements Callable<String>{
                     
 				}
 				// 代理 HTTP(s)重定向
-				if (regionDict.getFunctionId().equals(208)) {
+				if (regionDict.getFunctionId().equals(208) || "48".equals(regionDict.getAction()+"")) {
 					if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) {
-						baseStringCfg.setUserRegion1("301");
+						baseStringCfg.setUserRegion1("302");
 					}
 					String userRegion1 = baseStringCfg.getUserRegion1();// 重定向应答码 
 					String userRegion2 = baseStringCfg.getUserRegion2();// 重定向URL 
@@ -182,7 +192,7 @@ public class CheckComplexStringFormatThread implements Callable<String>{
                     }
 				}
 				// 代理HTTP(s)替换
-				if (regionDict.getFunctionId().equals(209)) {
+				if (regionDict.getFunctionId().equals(209) || "80".equals(regionDict.getAction()+"")) {
 					if(StringUtils.isBlank(baseStringCfg.getUserRegion1())) {
 						baseStringCfg.setUserRegion1("http_resp_body");
 					}
@@ -375,45 +385,46 @@ public class CheckComplexStringFormatThread implements Callable<String>{
 									prop.getProperty("is_case_insenstive")) + ";");
 						}
 					}
-				} else {
-					if (isHex.intValue() != 0 && isHex.intValue() != 1) {
-						errInfo.append(
-								String.format(prop.getProperty("is_incorrect"), prop.getProperty("is_hex")) + ";");
-					}
-					if (isCaseInsenstive.intValue() != 0 && isCaseInsenstive.intValue() != 1) {
-						errInfo.append(
-								String.format(prop.getProperty("is_incorrect"), prop.getProperty("is_case_insenstive"))
-										+ ";");
-					}
-					if (hexP.indexOf("1") == -1 && isHex.intValue() == 1) {
-						errInfo.append(
-								String.format(prop.getProperty("is_incorrect"), prop.getProperty("is_hex")) + ";");
-					}
-					if (hexP.equals("1") && isHex.intValue() == 0) {
-						errInfo.append(
-								String.format(prop.getProperty("is_incorrect"), prop.getProperty("is_hex")) + ";");
-					}
-					if (hexP.indexOf("2") == -1 && isCaseInsenstive.intValue() == 1) {
-						errInfo.append(
-								String.format(prop.getProperty("is_incorrect"), prop.getProperty("is_case_insenstive"))
-										+ ";");
-					}
-					if (hexP.equals("2") && isCaseInsenstive.intValue() == 0) {
-						errInfo.append(
-								String.format(prop.getProperty("is_incorrect"), prop.getProperty("is_case_insenstive"))
-										+ ";");
-					}
-					// 关键字十六进制校验
-					if (hexP.indexOf("1") != -1 && isHex.intValue() == 1) {
-						boolean bl = Pattern.compile("^([0-9|a-f|A-F]*)$").matcher(keyword).matches();
-                    	if(!bl) {
-                    		errInfo.append(
-									prop.getProperty("key_word") + " '" + keyword + "' "+String.format(prop.getProperty("contains_non_hex_char")) + ";");
-                    	}
-					}
 				}
+				
 				isHex = baseStringCfg.getIsHex();
 				isCaseInsenstive = baseStringCfg.getIsCaseInsenstive();
+				if (isHex.intValue() != 0 && isHex.intValue() != 1) {
+					errInfo.append(
+							String.format(prop.getProperty("is_incorrect"), prop.getProperty("is_hex")) + ";");
+				}
+				if (isCaseInsenstive.intValue() != 0 && isCaseInsenstive.intValue() != 1) {
+					errInfo.append(
+							String.format(prop.getProperty("is_incorrect"), prop.getProperty("is_case_insenstive"))
+									+ ";");
+				}
+				if (hexP.indexOf("1") == -1 && isHex.intValue() == 1) {
+					errInfo.append(
+							String.format(prop.getProperty("is_incorrect"), prop.getProperty("is_hex")) + ";");
+				}
+				if (hexP.equals("1") && isHex.intValue() == 0) {
+					errInfo.append(
+							String.format(prop.getProperty("is_incorrect"), prop.getProperty("is_hex")) + ";");
+				}
+				if (hexP.indexOf("2") == -1 && isCaseInsenstive.intValue() == 1) {
+					errInfo.append(
+							String.format(prop.getProperty("is_incorrect"), prop.getProperty("is_case_insenstive"))
+									+ ";");
+				}
+				if (hexP.equals("2") && isCaseInsenstive.intValue() == 0) {
+					errInfo.append(
+							String.format(prop.getProperty("is_incorrect"), prop.getProperty("is_case_insenstive"))
+									+ ";");
+				}
+				// 关键字十六进制校验
+				if (hexP.indexOf("1") != -1 && isHex.intValue() == 1) {
+					boolean bl = Pattern.compile("^([0-9|a-f|A-F]*)$").matcher(keyword).matches();
+                	if(!bl) {
+                		errInfo.append(
+								prop.getProperty("key_word") + " '" + keyword + "' "+String.format(prop.getProperty("contains_non_hex_char")) + ";");
+                	}
+				}
+				
 				if (isHex != null && isCaseInsenstive != null) {
 					if (isHex.intValue() == 0 && isCaseInsenstive.intValue() == 0) {
 						baseStringCfg.setIsHexbin(0);

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

@@ -42,6 +42,7 @@ public class CheckDnsResStrategyFormatThread implements Callable<String>{
 	public String call() throws Exception {
 		List<Object> dataList=Lists.newArrayList(Constants.MAAT_JSON_SEND_SIZE);
 		StringBuffer msg=new StringBuffer();
+		boolean error = false;
 		while(!srcQueue.isEmpty()) {
 			int size=srcQueue.drainTo(dataList,Constants.MAAT_JSON_SEND_SIZE);
 			if(regionDict.getRegionType().intValue()==6) {
@@ -53,10 +54,15 @@ public class CheckDnsResStrategyFormatThread implements Callable<String>{
 					// TODO: handle exception
 					//msg=e.getMessage();
 					//break;
+					error = true;
 				}
 			}
 			dataList.clear();
 		}
+		if(error) {
+			msg.append("validate_error");
+		}
+		
 		return msg.toString();
 	}
 	public List<DnsResStrategy> checkDnsResStrategyCfg(StringBuffer msg,List<?> list)