Merge branch 'develop' of https://git.mesalab.cn/K18_NTCS_WEB/NTC.git

into develop

Conflicts:
	src/main/java/com/nis/domain/configuration/CfgIndexInfo.java
	src/main/resources/nis.properties
	src/main/webapp/WEB-INF/tags/sys/delRow.tag
	
	asn相关功能更改：
	IP ADDR：增加asn域
	1、新增IP
ADDR可选asn，如果asn未下发过（is_used=0），下发时asn的group需要标记为commonGroup（groupId为asn组织的groupId，regionId为asn的regionId）。
	2、如果所选的asn组(asn组织的groupId)已经下发过（is_used=1），则下发maat时，asn域不需要下发。
	3、策略取消时，如果有需要保留的公共组（commongRroupIds），需要将公共组的组号下发。
	ASN GROUP:
	1、新增asn，如果此asn的组织groupId已下发过（is_used=1），且此组织的groupId已被策略标记过全选（is_audit_all=1），则需要调用公共组域新增的接口，将新增的asn关键字下发。
	2、修改asn，如果此asn的组织groupId已下发过（is_used=1），则需要调用公共组域修改的接口，修改已经下发的asn关键字域。
	3、删除asn，如果此asn的组织groupId已下发过（is_used=1），则需要调用公共组域删除的接口，删除已经下发的asn关键字域。
	ASN IP CFG:
	1、新增asn ip，所选asn no的组首次下发（is_valid=0），需要将asn no的groupId标记为公共组；如果asn
no非首次下发（is_valid=1），直接调用公共组新增域的接口。
	2、修改
		生效状态asn ip修改，调用公共组修改域接口直接修改
	3、失效
		直接调用公共组删除域接口，失效asn ip域

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

@@ -30,8 +30,16 @@ public class AsnGroupInfo extends BaseCfg<AsnGroupInfo> implements Serializable{
 	@ExcelField(title="ASN",sort=305)
 	private Long asnId;
 	
+	private Integer isUsed;
+	private Integer regionId;
 	
-
+	
+	public Integer getIsUsed() {
+		return isUsed;
+	}
+	public void setIsUsed(Integer isUsed) {
+		this.isUsed = isUsed;
+	}
 	public Long getIssuedIPs() {
 		return issuedIPs;
 	}
@@ -127,6 +135,14 @@ public class AsnGroupInfo extends BaseCfg<AsnGroupInfo> implements Serializable{
 	public void setAsnId(Long asnId) {
 		this.asnId = asnId;
 	}
+	
+	
+	public Integer getRegionId() {
+		return regionId;
+	}
+	public void setRegionId(Integer regionId) {
+		this.regionId = regionId;
+	}
 
 	@Override
 	public String toString() {

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

@@ -17,13 +17,13 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
 	@Expose
 	private String ratelimit;
 	@Expose
-	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=3)
+	@ExcelField(title="ip_type",dictType="IP_TYPE",sort=6)
 	@SerializedName("ipType")
 	private Integer ipType;
-	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=6)
+	@ExcelField(title="ip_pattern",dictType="IP_PATTERN",sort=8)
 	private Integer ipPattern; 
 	private String srcIpAddress; 
-	@ExcelField(title="server_ip",sort=5)
+	@ExcelField(title="ip",sort=7)
 	private String destIpAddress; 
 	private Integer portPattern; 
 	private String srcPort; 
@@ -45,11 +45,11 @@ public class AsnIpCfg extends BaseCfg<AsnIpCfg> {
 	private Integer protocol ;
 	private Integer protocolId;
 	
-	@ExcelField(title="organization",sort=91)
+	@ExcelField(title="organization",sort=2)
 	private String organization;
-	@ExcelField(title="country",sort=92)
+	@ExcelField(title="country",sort=3)
 	private String country;
-	@ExcelField(title="detail",sort=93)
+	@ExcelField(title="detail",sort=3)
 	private String detail;
 	private String userregion1;
 	

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

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

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

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

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

@@ -53,6 +53,7 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
 	private String userRegion5;
 	private String configType;
 	
+	
 	@ExcelField(title="encrypted_tunnel_behavior",sort=5)
 	private String behaviorName;
 	@ExcelField(title="social_app",sort=5)
@@ -108,6 +109,9 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
 	@SerializedName("isHexbin")
 	private Integer isHexbin;
 	
+	@ExcelField(title="log_total",sort=31)
+	private Long totalLogs;
+	
 	private List<IpPortCfg> ipPortList;
 	private IpPortCfg ipPort;
 	private NtcSubscribeIdCfg ntcSubscribeIdCfg;
@@ -278,5 +282,13 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
 	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/AvFileSampleCfg.java

@@ -28,13 +28,23 @@ public class AvFileSampleCfg extends BaseCfg<AvFileSampleCfg> {
 	@ExcelField(title="harm_level",sort=21)
 	private Integer level;
 	@Expose
+	@ExcelField(title="cfg_id",sort=0)
 	@SerializedName("cfgId")
 	private Integer compileId;
 	private String srcPath;
 	private String samplePath;
 	private Integer isSampleCreated;
 	private String resultPath;
-
+	@ExcelField(title="log_total",sort=40)
+	private Long totalLogs;
+	
+	
+	public Long getTotalLogs() {
+		return totalLogs;
+	}
+	public void setTotalLogs(Long totalLogs) {
+		this.totalLogs = totalLogs;
+	}
 	public String getSrcPath() {
 		return srcPath;
 	}

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

@@ -75,10 +75,18 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	protected String organization; //仅用于copy属性使用
 	protected String country; //仅用于copy属性使用
 	protected String detail; //仅用于copy属性使用
+	@ExcelField(title="log_total",sort=31)
+	private Long totalLogs;
 	
 	public String getOrganization() {
 		return organization;
 	}
+	public Long getTotalLogs() {
+		return totalLogs;
+	}
+	public void setTotalLogs(Long totalLogs) {
+		this.totalLogs = totalLogs;
+	}
 	public void setOrganization(String organization) {
 		this.organization = organization;
 	}

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

@@ -92,7 +92,8 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	private Integer isAudit;
 	@ExcelField(title="do_log",dictType="DO_LOG",sort=27)
 	private Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT;
-	
+
+
 	/*private CachePolicyUserRegion cachePolicyUserRegion;//缓存策略用户自定义域参数
 	
 	public static class CachePolicyUserRegion{
@@ -101,6 +102,7 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 			
 		}
 	}*/
+	
 	public Integer getIsValid() {
 		return isValid;
 	}

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

@@ -29,7 +29,23 @@ public class DdosIpCfg extends BaseIpCfg {
 	private Long bpsThreadshold;// 即DDoS攻击保护动作触发阈值，每秒Bit数和每秒包数
 	@ExcelField(title="pps_threadshold",sort=43)
 	private Long ppsThreadshold;
-
+	@ExcelField(title="log_total",sort=32)
+	private Long totalLogs;	
+	@ExcelField(title="is_audit",dictType="AUDIT_STATUS",sort=20)
+	private Integer isAudit;
+	
+	public Integer getIsAudit() {
+		return isAudit;
+	}
+	public void setIsAudit(Integer isAudit) {
+		this.isAudit = isAudit;
+	}
+	public Long getTotalLogs() {
+		return totalLogs;
+	}
+	public void setTotalLogs(Long totalLogs) {
+		this.totalLogs = totalLogs;
+	}
 	public String getAntiddosProtocol() {
 		return antiddosProtocol;
 	}

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

@@ -37,6 +37,8 @@ public class FileDigestCfg extends BaseCfg<FileDigestCfg> {
 	private Integer cfdsLevel;
 	@ExcelField(title="file_url",sort=6)
 	private String fileUrl;
+	@ExcelField(title="log_total",sort=40)
+	private Long totalLogs;
 	
 	private NtcSubscribeIdCfg ntcSubscribeIdCfg;
 	private List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList;
@@ -89,5 +91,10 @@ public class FileDigestCfg extends BaseCfg<FileDigestCfg> {
 	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/IpReusePolicyCfg.java

@@ -40,6 +40,7 @@ public class IpReusePolicyCfg extends BaseCfg<IpReusePolicyCfg>{
 	private String srcIpAddress;
 	private String destIpAddress;
 	@Expose
+	@ExcelField(title="cfg_id",sort=0)
 	@SerializedName("configId")
 	private Integer compileId;
 	@Expose
@@ -47,7 +48,15 @@ public class IpReusePolicyCfg extends BaseCfg<IpReusePolicyCfg>{
 	private String areaEffectiveIds ;
 	@Expose
 	private Integer doLog = Constants.MAAT_CFG_DOLOG_DEFAULT;
+	@ExcelField(title="log_total",sort=31)
+	private Long totalLogs;
 	
+	public Long getTotalLogs() {
+		return totalLogs;
+	}
+	public void setTotalLogs(Long totalLogs) {
+		this.totalLogs = totalLogs;
+	}
 	public void setDoLog(Integer doLog) {
 		this.doLog = doLog;
 	}

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

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

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

@@ -21,6 +21,7 @@ public class ComplexStringAllTemplate extends BasicTemplate{
 	private Integer matchMethod ;
 	private Integer isHex;
 	private Integer isCaseInsenstive;
+	private Integer doLog;
 	
 	@ExcelField(title="config_describe",align=2,sort=1)
 	public String getCfgDesc() {
@@ -64,4 +65,12 @@ public class ComplexStringAllTemplate extends BasicTemplate{
 	public void setIsCaseInsenstive(Integer isCaseInsenstive) {
 		this.isCaseInsenstive = isCaseInsenstive;
 	}
+	
+	@ExcelField(title="do_log",dictType="DO_LOG",align=2,sort=2)
+	public Integer getDoLog() {
+		return doLog;
+	}
+	public void setDoLog(Integer doLog) {
+		this.doLog = doLog;
+	}
 }

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

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

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

@@ -16,7 +16,7 @@ import com.nis.util.excel.ExcelField;
 public class DnsComplexStringTemplate extends ComplexStringAllTemplate {
 	private Long dnsStrategyId;
 	
-	@ExcelField(title="policy_name",align=2,sort=2)
+	@ExcelField(title="policy_name",align=2,sort=3)
 	public Long getDnsStrategyId() {
 		return dnsStrategyId;
 	}

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

@@ -24,7 +24,7 @@ public class DnsIpTemplate extends IpAllTemplate {
 	
 	private Integer dnsStrategyId;
 	
-	@ExcelField(title="policy_name",align=2,sort=2)
+	@ExcelField(title="policy_name",align=2,sort=3)
 	public Integer getDnsStrategyId() {
 		return dnsStrategyId;
 	}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,78 @@
+package com.nis.domain.configuration.template;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * @Description: excel导入IP类配置
+ */
+public class IpAllNotDoLogTemplate extends BasicTemplate{
+
+	/**
+	 * @Fields serialVersionUID:TODO（用一句话描述这个变量表示什么）
+	 *
+	 * @since 1.0.0
+	 */
+	
+
+	
+	private String cfgDesc;
+	private String srcIpAddress; 
+	private String destIpAddress; 
+	private String srcPort; 
+	private String destPort;
+	private Integer protocol;
+	private Integer direction;
+	
+	@ExcelField(title="config_describe",align=2,sort=1)
+	public String getCfgDesc() {
+		return cfgDesc;
+	}
+	public void setCfgDesc(String cfgDesc) {
+		this.cfgDesc = cfgDesc;
+	}
+	@ExcelField(title="client_ip",align=2,sort=11)
+	public String getSrcIpAddress() {
+		return srcIpAddress;
+	}
+	public void setSrcIpAddress(String srcIpAddress) {
+		this.srcIpAddress = srcIpAddress;
+	}
+	@ExcelField(title="server_ip",align=2,sort=12)
+	public String getDestIpAddress() {
+		return destIpAddress;
+	}
+	public void setDestIpAddress(String destIpAddress) {
+		this.destIpAddress = destIpAddress;
+	}
+	
+	@ExcelField(title="client_port",align=2,sort=13)
+	public String getSrcPort() {
+		return srcPort;
+	}
+	public void setSrcPort(String srcPort) {
+		this.srcPort = srcPort;
+	}
+	@ExcelField(title="server_port",align=2,sort=14)
+	public String getDestPort() {
+		return destPort;
+	}
+	public void setDestPort(String destPort) {
+		this.destPort = destPort;
+	}
+	
+	@ExcelField(title="protocol",align=2,sort=15)
+	public Integer getProtocol() {
+		return protocol;
+	}
+	public void setProtocol(Integer protocol) {
+		this.protocol = protocol;
+	}
+	@ExcelField(title="direction",align=2,sort=16)
+	public Integer getDirection() {
+		return direction;
+	}
+	public void setDirection(Integer direction) {
+		this.direction = direction;
+	}
+
+}

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

@@ -31,6 +31,7 @@ public class IpAllTemplate extends BasicTemplate{
 	private String destPort;
 	private Integer protocol;
 	private Integer direction;
+	private Integer doLog;
 	
 	@ExcelField(title="config_describe",align=2,sort=1)
 	public String getCfgDesc() {
@@ -84,4 +85,11 @@ public class IpAllTemplate extends BasicTemplate{
 		this.direction = direction;
 	}
 	
+	@ExcelField(title="do_log",dictType="DO_LOG",align=2,sort=2)
+	public Integer getDoLog() {
+		return doLog;
+	}
+	public void setDoLog(Integer doLog) {
+		this.doLog = doLog;
+	}
 }

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

@@ -12,21 +12,21 @@ public class IpPayloadTemplate extends IpAllTemplate {
 	private String userRegion2;
 	private String userRegion3;
 	
-	@ExcelField(title="replace_zone",dictType="INTERCEPT_REPLACE_ZONE",align=2,sort=2)
+	@ExcelField(title="replace_zone",dictType="INTERCEPT_REPLACE_ZONE",align=2,sort=3)
 	public String getUserRegion1() {
 		return userRegion1;
 	}
 	public void setUserRegion1(String userRegion1) {
 		this.userRegion1 = userRegion1;
 	}
-	@ExcelField(title="replaced_content",align=2,sort=3)
+	@ExcelField(title="replaced_content",align=2,sort=4)
 	public String getUserRegion2() {
 		return userRegion2;
 	}
 	public void setUserRegion2(String userRegion2) {
 		this.userRegion2 = userRegion2;
 	}
-	@ExcelField(title="replace_content",align=2,sort=4)
+	@ExcelField(title="replace_content",align=2,sort=5)
 	public String getUserRegion3() {
 		return userRegion3;
 	}

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

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

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

@@ -0,0 +1,31 @@
+package com.nis.domain.configuration.template;
+
+import com.nis.util.excel.ExcelField;
+
+/**
+ * EXCEL IpSpoofing 导入模板
+ * @author dell
+ *
+ */
+public class IpSpoofingTemplate extends IpAllTemplate{
+	
+	private String userRegion1;
+	private String userRegion2;
+	
+	@ExcelField(title="spoofing",dictType="SPOOFING_IP_TYPE",align=2,sort=3)
+	public String getUserRegion1() {
+		return userRegion1;
+	}
+	public void setUserRegion1(String userRegion1) {
+		this.userRegion1 = userRegion1;
+	}
+	
+	@ExcelField(title="With",align=2,sort=4)
+	public String getUserRegion2() {
+		return userRegion2;
+	}
+	public void setUserRegion2(String userRegion2) {
+		this.userRegion2 = userRegion2;
+	}
+	
+}

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

@@ -30,6 +30,7 @@ public class IpWhitelistTemplate extends BasicTemplate{
 	private String destPort;
 	private Integer protocol;
 	private Integer direction;
+	private Integer doLog;
 	
 	@ExcelField(title="config_describe",align=2,sort=1)
 	public String getCfgDesc() {
@@ -84,4 +85,12 @@ public class IpWhitelistTemplate extends BasicTemplate{
 		this.direction = direction;
 	}
 	
+	@ExcelField(title="do_log",dictType="DO_LOG",align=2,sort=2)
+	public Integer getDoLog() {
+		return doLog;
+	}
+	public void setDoLog(Integer doLog) {
+		this.doLog = doLog;
+	}
+	
 }

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

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

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

@@ -20,6 +20,7 @@ public class StringAllTemplate extends BasicTemplate{
 	private Integer matchMethod ;
 	private Integer isHex;
 	private Integer isCaseInsenstive;
+	private Integer doLog;
 	
 	@ExcelField(title="config_describe",align=2,sort=1)
 	public String getCfgDesc() {
@@ -56,4 +57,12 @@ public class StringAllTemplate extends BasicTemplate{
 	public void setIsCaseInsenstive(Integer isCaseInsenstive) {
 		this.isCaseInsenstive = isCaseInsenstive;
 	}
+	
+	@ExcelField(title="do_log",dictType="DO_LOG",align=2,sort=2)
+	public Integer getDoLog() {
+		return doLog;
+	}
+	public void setDoLog(Integer doLog) {
+		this.doLog = doLog;
+	}
 }

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

@@ -0,0 +1,131 @@
+package com.nis.domain.log;
+
+import com.nis.util.excel.ExcelField;
+
+public class NtcSslRecordLog extends BaseLogEntity<NtcSslRecordLog> {
+
+	private static final long serialVersionUID = 533266057780162781L;
+
+	// @ExcelField(title = "log_id", sort = 8)
+	private String logId;
+
+	@ExcelField(title = "version", sort = 8)
+	private String version;// 版本号
+
+	@ExcelField(title = "SNI", sort = 9)
+	private String sni;// SNI
+
+	@ExcelField(title = "SAN", sort = 10)
+	private String san;// SAN
+
+	@ExcelField(title = "CN", sort = 11)
+	private String cn;// CN
+
+	// @ExcelField(title = "individual_cert_file", sort = 12)
+	private String individualCertFile;
+
+	// @ExcelField(title = "middle_cert_file", sort = 13)
+	private String middleCertFile;
+
+	// @ExcelField(title = "root_cert_file", sort = 14)
+	private String rootCertFile;
+
+	// @ExcelField(title = "chain_cert_file", sort = 15)
+	private String chainCertFile;
+
+	public String getLogId() {
+		return logId;
+	}
+
+	public void setLogId(String logId) {
+		this.logId = logId;
+	}
+
+	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 getIndividualCertFile() {
+		return individualCertFile;
+	}
+
+	public void setIndividualCertFile(String individualCertFile) {
+		this.individualCertFile = individualCertFile;
+	}
+
+	public String getMiddleCertFile() {
+		return middleCertFile;
+	}
+
+	public void setMiddleCertFile(String middleCertFile) {
+		this.middleCertFile = middleCertFile;
+	}
+
+	public String getRootCertFile() {
+		return rootCertFile;
+	}
+
+	public void setRootCertFile(String rootCertFile) {
+		this.rootCertFile = rootCertFile;
+	}
+
+	public String getChainCertFile() {
+		return chainCertFile;
+	}
+
+	public void setChainCertFile(String chainCertFile) {
+		this.chainCertFile = chainCertFile;
+	}
+
+	public static long getSerialversionuid() {
+		return serialVersionUID;
+	}
+
+	@Override
+	public String toString() {
+		return "NtcSslRecordLog [logId=" + logId + ", version=" + version + ", sni=" + sni + ", san=" + san + ", cn="
+				+ cn + ", individualCertFile=" + individualCertFile + ", middleCertFile=" + middleCertFile
+				+ ", rootCertFile=" + rootCertFile + ", chainCertFile=" + chainCertFile + ", 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/maat/GroupReuseAddBean.java

@@ -44,7 +44,7 @@ public class GroupReuseAddBean implements Serializable{
 	@Expose
 	private Integer opAction;
 	@Expose
-	@SerializedName("groupReuseList")
+	@SerializedName("commonGroupList")
 	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,6 +95,8 @@ public class MaatCfg implements Serializable {
 	@Expose
 	@SerializedName("ipClientRangeList")
 	private List<IpCfg> areaIpRegionList;
+	@Expose
+	private List<GroupCfg> keepGroupList;
 	
 	public static class GroupCfg{
 		@Expose
@@ -104,6 +106,8 @@ public class MaatCfg implements Serializable {
 		@Expose
 		private Integer isValid;
 		@Expose
+		private Integer isCommonGroup;
+		@Expose
 		@SerializedName("opTime")
 		private Date auditTime;
 		public Integer getGroupId() {
@@ -130,7 +134,12 @@ 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
@@ -679,6 +688,13 @@ 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/specific/ConfigGroupInfo.java

@@ -23,6 +23,21 @@ 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;