20190520线上部署sql内容以及20190508线上部署sql内容

日志导出最大调整为2万

README.md

@@ -1 +1,7 @@
-在公共分组功能逻辑完善之前，此分支为ntc界面系统的全集上线升级分支合并版。
+520上线功能：
+
+
+Source IP аddress / IP subnet / IP range 的配置 按 1月 29号的 demo实现
+
+系统需要支持配置的批量删除功能，一次删除的配置条数可达 1万 条 ，也需要支持一次
+删除所有规则

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

@@ -1,315 +0,0 @@
-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 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=54)
-	protected Integer destPortPattern;
-	@ExcelField(title="client_port",sort=55)
-	protected String srcPort;
-	@ExcelField(title="server_port",sort=56)
-	protected String destPort; 
-	protected Integer dnsStrategyId; 
-	@ExcelField(title="ir_type",dictType="IR_TYPE",sort=57)
-	protected Integer irType; 
-	@ExcelField(title="group_name",sort=58)
-	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 String getIndexTable() {
-		return indexTable;
-	}
-	public void setIndexTable(String indexTable) {
-		this.indexTable = indexTable;
-	}
-	public Integer getIndex() {
-		return index;
-	}
-	public void setIndex(Integer index) {
-		this.index = index;
-	}
-}

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

@@ -1,64 +0,0 @@
-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="http_url_cfg";
-	
-	@ExcelField(title="key_word",sort=3)
-    protected String  cfgKeywords;//url关键字配置
-	
-//    protected Integer  exprType;//表达式类型
-//    protected Integer  matchMethod;//匹配类型
-    protected Integer  isHexbin;//是否大小写敏感
-    protected String  ratelimit;//限速比例,0到1之间
-    @ExcelField(title="group_name",sort=108)
-    protected String  groupName;//公共组名称
-    
-    
-	
-	public String getCfgKeywords() {
-		return cfgKeywords;
-	}
-	public void setCfgKeywords(String cfgKeywords) {
-		this.cfgKeywords = cfgKeywords;
-	}
-//	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 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;
-	}
-    
-}

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

@@ -63,6 +63,10 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	protected String hColumns;//导出隐藏列
 	
 	protected String compileIdNew;// 查询 配置ID 范围
+	
+	//批量操作时，记录isAudit和isValid检索条件
+	protected String batchAuditValue;
+	protected String batchValidValue;
 
 	/**
 	 * 定时任务信息
@@ -72,15 +76,8 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	 * 定时任务信息，2019年1月18日18:54:53 修改
 	 */
 	protected ScheduleCfg schedule;
+	
 	private String commonGroupIds; //公共组织id(考虑一个compile存在多个asn组织的情况)
-	protected Integer groupType; //url组以及dns组相关功能使用
-	protected Integer udFlag; //url组以及dns组相关功能使用 过滤数据库数据标记
-	public Integer getGroupType() {
-		return groupType;
-	}
-	public void setGroupType(Integer groupType) {
-		this.groupType = groupType;
-	}
 	public String getCommonGroupIds() {
 		return commonGroupIds;
 	}
@@ -88,12 +85,8 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	public void setCommonGroupIds(String commonGroupIds) {
 		this.commonGroupIds = commonGroupIds;
 	}
-	public Integer getUdFlag() {
-		return udFlag;
-	}
-	public void setUdFlag(Integer udFlag) {
-		this.udFlag = udFlag;
-	}
+	
+	
 	
 	public String getExType() {
 		return exType;
@@ -1015,6 +1008,17 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	public void setSchedule(ScheduleCfg schedule) {
 		this.schedule = schedule;
 	}
-	
+	public String getBatchAuditValue() {
+		return batchAuditValue;
+	}
+	public String getBatchValidValue() {
+		return batchValidValue;
+	}
+	public void setBatchAuditValue(String batchAuditValue) {
+		this.batchAuditValue = batchAuditValue;
+	}
+	public void setBatchValidValue(String batchValidValue) {
+		this.batchValidValue = batchValidValue;
+	}
 	
 }

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

@@ -79,16 +79,9 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	protected String organization; //仅用于copy属性使用
 	protected String country; //仅用于copy属性使用
 	protected String detail; //仅用于copy属性使用
-	protected Integer groupId; //仅用于copy属性使用
 //	@ExcelField(title="log_total",sort=42)
 	private Long totalLogs;
 	
-	public Integer getGroupId() {
-		return groupId;
-	}
-	public void setGroupId(Integer groupId) {
-		this.groupId = groupId;
-	}
 	public String getOrganization() {
 		return organization;
 	}

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

@@ -14,9 +14,7 @@ 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.IpCommCfg;
 import com.nis.domain.basics.IpReuseIpCfg;
-import com.nis.domain.basics.UrlCommCfg;
 import com.nis.util.Constants;
 import com.nis.util.excel.ExcelField;
 
@@ -79,6 +77,7 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 	private P2pKeywordCfg p2pKeyword;
 	private List<P2pHashCfg> p2pHashList;
 	private List<P2pKeywordCfg> p2pKeywordList;
+	
 	private Integer sourceCompileId;
 	private String searchKeywords;// 列表关键字查询字段
 	
@@ -89,8 +88,8 @@ 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 CachePolicyUserRegion cachePolicyUserRegion;//缓存策略用户自定义域参数
 	
 	public static class CachePolicyUserRegion{
@@ -99,16 +98,9 @@ public class CfgIndexInfo extends BaseCfg<CfgIndexInfo> {
 			
 		}
 	}*/
-	
 	public String getOrganization() {
 		return organization;
 	}
-	public List<IpCommCfg> getIpCommGroupCfgList() {
-		return ipCommGroupCfgList;
-	}
-	public void setIpCommGroupCfgList(List<IpCommCfg> ipCommGroupCfgList) {
-		this.ipCommGroupCfgList = ipCommGroupCfgList;
-	}
 	public List<AsnKeywordCfg> getAsnKeywords() {
 		return asnKeywords;
 	}
@@ -419,11 +411,4 @@ 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;
-	}
-	
 }

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

@@ -1,53 +0,0 @@
-package com.nis.domain.configuration.template;
-
-import com.nis.util.excel.ExcelField;
-
-public class IpCommCfgTemplate extends IpAllTemplate{
-	@ExcelField(title="ip_group",align=2,sort=10)
-	private Integer groupId;
-
-	public Integer getGroupId() {
-		return groupId;
-	}
-
-	public void setGroupId(Integer groupId) {
-		this.groupId = groupId;
-	}
-
-	@Override
-	public String getSrcIpAddress() {
-		// TODO Auto-generated method stub
-		return super.getSrcIpAddress();
-	}
-
-	@Override
-	public String getSrcPort() {
-		// TODO Auto-generated method stub
-		return super.getSrcPort();
-	}
-
-	@Override
-	public String getDestPort() {
-		// TODO Auto-generated method stub
-		return super.getDestPort();
-	}
-
-	@Override
-	public Integer getProtocol() {
-		// TODO Auto-generated method stub
-		return super.getProtocol();
-	}
-
-	@Override
-	public Integer getDirection() {
-		// TODO Auto-generated method stub
-		return super.getDirection();
-	}
-
-	@Override
-	public Integer getDoLog() {
-		// TODO Auto-generated method stub
-		return super.getDoLog();
-	}
-	
-}

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

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

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

@@ -190,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){
@@ -235,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){
@@ -244,6 +246,7 @@ 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 {
@@ -279,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){
@@ -326,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){
@@ -375,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){
@@ -418,6 +424,7 @@ 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) {
@@ -452,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){

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

@@ -185,10 +185,6 @@ public final class Constants {
 	 * DNS 策略组KEY
 	 */
 	public static final String CACHE_DNSGROUP_DICT = "dnsGroupDict";
-	/**
-	 * IP 公共策略组KEY
-	 */
-	public static final String CACHE_IP_COMM_GROUP_DICT = "ipCommGroupDict";
 	/**
 	 *  词典数据分类
 	 */
@@ -367,6 +363,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");

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

@@ -401,24 +401,4 @@ public class DictUtils {
 		}
 		return null;		
 	}
-	public static List<PolicyGroupInfo> getIpCommGroups(){
-		List<PolicyGroupInfo> allDictList = (List<PolicyGroupInfo>)CacheUtils.get(Constants.CACHE_IP_COMM_GROUP_DICT);
-		if(StringUtil.isEmpty(allDictList)){
-			allDictList = policyGroupInfoDao.findPolicyGroupInfosByType(5);
-			CacheUtils.put(Constants.CACHE_IP_COMM_GROUP_DICT, allDictList);
-		}
-		return allDictList;		
-	}
-	public static PolicyGroupInfo getIpCommGroup(int groupId){
-		List<PolicyGroupInfo> allDictList = getIpCommGroups();
-		if(StringUtil.isEmpty(allDictList)){
-		}else {
-			for(PolicyGroupInfo group:allDictList) {
-				if(group.getServiceGroupId().intValue()==groupId) {
-					return group;
-				}
-			}
-		}
-		return null;		
-	}
 }

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

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

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

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

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

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

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

@@ -138,6 +138,7 @@ public class CheckIpFormatThread implements Callable<String>{
 			// doLog属性检验
 			this.validDoLog(baseIpCfg,errInfo);
 			
+			
 			// 特殊字段验证
 			// packet ip ratelimit
 			if (serviceDict!=null && serviceDict.getAction().intValue() == 64 && (serviceDict.getFunctionId().intValue() == 5 
@@ -577,26 +578,7 @@ public class CheckIpFormatThread implements Callable<String>{
 					}
 				}
 			}
-			if (regionDict.getFunctionId().equals(110)) {
-				if(baseIpCfg.getGroupId()==null) {
-					errInfo.append(
-							String.format(prop.getProperty("can_not_null"),prop.getProperty("ip_group","IP Group") + " ") + ";");
-				}else {
-					try {
-						Integer groupId=baseIpCfg.getGroupId();
-						PolicyGroupInfo group = DictUtils.getIpCommGroup(groupId);
-						if (group == null ) {
-							errInfo.append(
-									String.format(prop.getProperty("is_incorrect"), prop.getProperty("ip_group","IP Group"))
-									+ ";");
-						}
-					}catch (Exception e) {
-						// TODO: handle exception
-						errInfo.append(
-								String.format(prop.getProperty("is_in_wrong_format"),prop.getProperty("ip_group","IP Group") + " ") + ";");
-					}
-				}
-			}
+			
 			if (regionDict.getRegionType().equals(1)) {
 				boolean srcIpEmpty = false;
 				boolean destIpEmpty = false;
@@ -613,6 +595,23 @@ public class CheckIpFormatThread implements Callable<String>{
 						String subfix=baseIpCfg.getSrcIpAddress().split("-")[1];
 						baseIpCfg.setSrcIpAddress(prefix+"-"+prefix.substring(0, prefix.lastIndexOf(".")+1)+subfix);
 					}
+					//Tip:判断业务是否只展示源IP列,如果是,判断源IP是否是默认值,如果是默认值,提示源IP不能是默认值
+					if (configIpPortShow.indexOf("1") > -1 && configIpPortShow.indexOf("3") == -1) {// 源IP必填
+						String srcIpAddress = baseIpCfg.getSrcIpAddress();
+						Pattern ip4 = Constants.IPV4_IP_PATTERN;
+						Pattern ip6 = Constants.IPV6_IP_PATTERN;
+						Matcher ip4Matcher = ip4.matcher(srcIpAddress);
+						Matcher ip6Matcher = ip6.matcher(srcIpAddress);
+						if (ip4Matcher.matches() && srcIpAddress.startsWith("0.0.0.0")) {
+							errInfo.append(prop.getProperty("client_ip")+" "
+									+ String.format(prop.getProperty("can_not_be"), Constants.IPV4_DEFAULT_IP_VALUE)
+									+ ";");
+						} else if (ip6Matcher.matches() && srcIpAddress.startsWith("::")) {
+							errInfo.append(prop.getProperty("client_ip")+" "
+									+ String.format(prop.getProperty("can_not_be"), Constants.IPV6_DEFAULT_IP_VALUE)
+									+ ";");
+						}
+					}
 				}
 				if (StringUtils.isBlank(baseIpCfg.getDestIpAddress())) {
 					destIpEmpty = true;
@@ -624,6 +623,23 @@ public class CheckIpFormatThread implements Callable<String>{
 						String subfix=baseIpCfg.getDestIpAddress().split("-")[1];
 						baseIpCfg.setDestIpAddress(prefix+"-"+prefix.substring(0, prefix.lastIndexOf(".")+1)+subfix);
 					}
+					//Tip:判断业务是否只展示目的IP列,如果是,判断目的IP是否是默认值,如果是默认值,提示目的IP不能是默认值
+					if (configIpPortShow.indexOf("3") > -1 && configIpPortShow.indexOf("1") == -1) {// 目的IP必填
+						String destIpAddress = baseIpCfg.getDestIpAddress();
+						Pattern ip4 = Constants.IPV4_IP_PATTERN;
+						Pattern ip6 = Constants.IPV6_IP_PATTERN;
+						Matcher ip4Matcher = ip4.matcher(destIpAddress);
+						Matcher ip6Matcher = ip6.matcher(destIpAddress);
+						if (ip4Matcher.matches() && destIpAddress.startsWith("0.0.0.0")) {
+							errInfo.append(prop.getProperty("server_ip")+" "
+									+ String.format(prop.getProperty("can_not_be"), Constants.IPV4_DEFAULT_IP_VALUE)
+									+ ";");
+						} else if (ip6Matcher.matches() && destIpAddress.startsWith("::")) {
+							errInfo.append(prop.getProperty("server_ip")+" "
+									+ String.format(prop.getProperty("can_not_be"), Constants.IPV6_DEFAULT_IP_VALUE)
+									+ ";");
+						}
+					}
 				}
 				if (StringUtils.isBlank(baseIpCfg.getSrcPort())) {
 					srcPortEmpty = true;
@@ -685,6 +701,12 @@ public class CheckIpFormatThread implements Callable<String>{
 							}
 							baseIpCfg.setIpType(4);
 						}
+						//Tip:增加源IP和目的IP是否相等,如果相等,提示目的IP不能为空
+						if ((configIpPortShow.indexOf("3") > -1 && configIpPortShow.indexOf("1") > -1)
+								&& (baseIpCfg.getDestIpAddress().equals(baseIpCfg.getSrcIpAddress()))) {
+							errInfo.append(String.format(prop.getProperty("can_not_null"),
+									prop.getProperty("server_ip", "Server IP")) + ";");
+						}
 					}
 
 				} else if (srcIpEmpty) {// 源IP为空
@@ -726,6 +748,12 @@ public class CheckIpFormatThread implements Callable<String>{
 							}
 							baseIpCfg.setIpType(4);
 						}
+						//Tip:增加源IP和目的IP是否相等,如果相等,提示源的IP不能为空
+						if ((configIpPortShow.indexOf("3") > -1 && configIpPortShow.indexOf("1") > -1)
+								&& (baseIpCfg.getSrcIpAddress().equals(baseIpCfg.getDestIpAddress()))) {
+							errInfo.append(String.format(prop.getProperty("can_not_null"),
+									prop.getProperty("client_ip", "Client IP")) + ";");
+						}
 					}
 				} else {// 全不为空
 					String srcMatchType = this.validIPAddress("client_ip", errInfo, baseIpCfg.getSrcIpAddress(), ipType,
@@ -853,7 +881,7 @@ public class CheckIpFormatThread implements Callable<String>{
 					baseIpCfg.setDestPortPattern(1);
 				}
 				baseIpCfg.setDestPort(baseIpCfg.getDestPort().trim());
-				boolean validDestPort = this.validPort(errInfo, baseIpCfg.getSrcPort(),
+				boolean validDestPort = this.validPort(errInfo, baseIpCfg.getDestPort(),
 						srcPortPattern,"server_port");
 				
 				if (baseIpCfg.getProtocol()==null) {
@@ -920,6 +948,10 @@ public class CheckIpFormatThread implements Callable<String>{
 				// TODO 判断Direction的值
 				this.validDirection(errInfo, baseIpCfg.getDirection(), direction);
 			}
+			
+			//IP校验
+//			this.validSrcAndDescIp(baseIpCfg.getSrcIpAddress(), baseIpCfg.getDestIpAddress(), configIpPortShow,errInfo);
+			
 			if (errInfo.toString().length() > 0) {//
 				errTip.append(String.format(prop.getProperty("line"), baseIpCfg.getIndex()) + ",");
 				errTip.append(errInfo);

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

@@ -46,7 +46,6 @@ import com.nis.domain.Page;
 import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.basics.AsnGroupInfo;
 import com.nis.domain.basics.AsnIpCfg;
-import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.basics.SysDictInfo;
 import com.nis.domain.configuration.AppComplexFeatureCfg;
@@ -99,7 +98,6 @@ import com.nis.domain.configuration.template.HttpsReplaceIpTemplate;
 import com.nis.domain.configuration.template.HttpsReplaceTemplate;
 import com.nis.domain.configuration.template.IpAllNotDoLogTemplate;
 import com.nis.domain.configuration.template.IpAllTemplate;
-import com.nis.domain.configuration.template.IpCommCfgTemplate;
 import com.nis.domain.configuration.template.IpPayloadTemplate;
 import com.nis.domain.configuration.template.IpRateLimitTemplate;
 import com.nis.domain.configuration.template.IpSpoofingTemplate;
@@ -642,10 +640,6 @@ public class BaseController {
 				}
 			}
 		}
-		if(cfg.getGroupType()!=null) {
-			List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(),  cfg.getUdFlag());
-			model.addAttribute("policyGroupInfos", policyGroupInfos);
-		}
 	}
 
 	protected void initUpdateFormCondition(Model model, BaseCfg cfg) {
@@ -710,10 +704,6 @@ public class BaseController {
 		model.addAttribute("regionList", regionList);
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(cfg.getFunctionId());
 		model.addAttribute("serviceList", serviceList);
-		if(cfg.getGroupType()!=null) {
-			List<PolicyGroupInfo> policyGroupInfos = policyGroupInfoService.findPolicyGroupInfosByTypeforUD(cfg.getGroupType(),  cfg.getUdFlag());
-			model.addAttribute("policyGroupInfos", policyGroupInfos);
-		}
 	}
 
 	public List<AreaBean> getAreaIsps(String areaEffectiveIds, List<AreaBean> areaIspList, List<SysDictInfo> isps,
@@ -2437,9 +2427,7 @@ public class BaseController {
 					ei.loadInitParams(IpAllNotDoLogTemplate.class, msgProp, regionDict, serviceDict);
 			} else if((regionDict.getFunctionId().equals(63) || regionDict.getFunctionId().equals(407) || regionDict.getFunctionId().equals(408)) && serviceDict.getAction().equals(64)){ // Policies -> Stream
 				ei.loadInitParams(IpRateLimitTemplate.class, msgProp, regionDict, serviceDict);
-			}else if(regionDict.getFunctionId().equals(110)) { // IP白名单
-				ei.loadInitParams(IpCommCfgTemplate.class, msgProp, regionDict, serviceDict);
-			} else {
+			}else {
 				ei.loadInitParams(IpAllTemplate.class, msgProp, regionDict, serviceDict);
 			}
 		} else if (regionDict.getRegionType().equals(2)) {// 字符串类
@@ -2761,45 +2749,6 @@ public class BaseController {
 		
 		//全部审核通过，只查询当前条件下的所有未审核的配置 -批量审核通过/不通过
 		if(auditType.equals(1) || auditType.equals(2)) {
-			searchCfg.setIsValid(0);
-			searchCfg.setIsAudit(0);
-			searchAppCfg.setIsValid(0);
-			searchAppCfg.setIsAudit(0);
-			searchDigestCfg.setIsValid(0);
-			searchDigestCfg.setIsAudit(0);
-			searchFileSampleCfg.setIsValid(0);
-			searchFileSampleCfg.setIsAudit(0);
-			searchObjKeyringCfg.setIsValid(0);
-			searchObjKeyringCfg.setIsAudit(0);
-			searchTrustedCaCertCfg.setIsValid(0);
-			searchTrustedCaCertCfg.setIsAudit(0);
-			searchTrustedCaCrlCfg.setIsValid(0);
-			searchTrustedCaCrlCfg.setIsAudit(0);
-			searchDnsResStrategy.setIsValid(0);
-			searchDnsResStrategy.setIsAudit(0);
-			searchDnsIpCfg.setIsValid(0);
-			searchDnsIpCfg.setIsAudit(0);
-			searchIpPortCfg.setIsValid(0);
-			searchIpPortCfg.setIsAudit(0);
-			searchSignSampleCfg.setIsValid(0);
-			searchSignSampleCfg.setIsAudit(0);
-			searchDdosIpCfg.setIsValid(0);
-			searchDdosIpCfg.setIsAudit(0);
-			searchAppIpCfg.setIsValid(0);
-			searchAppIpCfg.setIsAudit(0);
-			searchAppHttpCfg.setIsValid(0);
-			searchAppHttpCfg.setIsAudit(0);
-			searchAppDomainCfg.setIsValid(0);
-			searchAppDomainCfg.setIsAudit(0);
-			searchAppTopicCfg.setIsValid(0);
-			searchAppTopicCfg.setIsAudit(0);
-			searchAppFeatureIndex.setIsValid(0);
-			searchAppFeatureIndex.setIsAudit(0);
-			searchAppSslCertCfg.setIsValid(0);
-			searchAppSslCertCfg.setIsAudit(0);
-			searchAsnIpCfg.setIsValid(0);
-			searchAsnIpCfg.setIsAudit(0);
-			
 			if(auditType.equals(1)) {
 				auditBatchCfg.setIsAudit(1);
 				auditBatchCfg.setIsValid(1);
@@ -2810,45 +2759,6 @@ public class BaseController {
 			auditBatchCfg.setAuditTime(new Date());
 			auditBatchCfg.setAuditorId(UserUtils.getUser().getId());
 		}else {
-		//全部取消通过，只查询当前条件下的所有审核通过的配置
-			searchCfg.setIsValid(1);
-			searchCfg.setIsAudit(1);
-			searchAppCfg.setIsValid(1);
-			searchAppCfg.setIsAudit(1);
-			searchDigestCfg.setIsValid(1);
-			searchDigestCfg.setIsAudit(1);
-			searchFileSampleCfg.setIsValid(1);
-			searchFileSampleCfg.setIsAudit(1);
-			searchObjKeyringCfg.setIsValid(1);
-			searchObjKeyringCfg.setIsAudit(1);
-			searchTrustedCaCertCfg.setIsValid(1);
-			searchTrustedCaCertCfg.setIsAudit(1);
-			searchTrustedCaCrlCfg.setIsValid(1);
-			searchTrustedCaCrlCfg.setIsAudit(1);
-			searchDnsResStrategy.setIsValid(1);
-			searchDnsResStrategy.setIsAudit(1);
-			searchDnsIpCfg.setIsValid(1);
-			searchDnsIpCfg.setIsAudit(1);
-			searchIpPortCfg.setIsValid(1);
-			searchIpPortCfg.setIsAudit(1);
-			searchSignSampleCfg.setIsValid(1);
-			searchSignSampleCfg.setIsAudit(1);
-			searchDdosIpCfg.setIsValid(1);
-			searchDdosIpCfg.setIsAudit(1);
-			searchAppIpCfg.setIsValid(1);
-			searchAppIpCfg.setIsAudit(1);
-			searchAppHttpCfg.setIsValid(1);
-			searchAppHttpCfg.setIsAudit(1);
-			searchAppDomainCfg.setIsValid(1);
-			searchAppDomainCfg.setIsAudit(1);
-			searchAppTopicCfg.setIsValid(1);
-			searchAppTopicCfg.setIsAudit(1);
-			searchAppFeatureIndex.setIsValid(1);
-			searchAppFeatureIndex.setIsAudit(1);
-			searchAppSslCertCfg.setIsValid(1);
-			searchAppSslCertCfg.setIsAudit(1);
-			searchAsnIpCfg.setIsValid(1);
-			searchAsnIpCfg.setIsAudit(1);
 			
 			auditBatchCfg.setIsAudit(3);
 			auditBatchCfg.setIsValid(0);
@@ -3308,11 +3218,42 @@ public class BaseController {
  		//批量审核通过时，如果没有携带isValid检索条件，返回界面需要将isValid置为null
 		if(!StringUtil.isEmpty(entity)) {
 			BaseCfg base=(BaseCfg)entity ;
-			if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
-				base.setIsValid(null);
-				BeanUtils.copyProperties(base, entity);
+			base.setBatchAuditValue("");
+			base.setBatchValidValue("");
+			//配置目标状态：1 1 生效,isAudit条件置为1，有selType条件,且不是isValid不改，没有sel改为isValid并且为1
+			if(base.getIsAudit()==1 && base.getIsValid()==1){
+				base.setIsAudit(1);
+				if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
+					base.setIsValid(null);
+				}else{
+					base.setIsValid(1);
+					base.setSeltype("isValid");
+				}
 			}
+			//配置目标状态：2 0 不通过,isAudit条件置为2，有selType条件,且不是isValid不改，没有sel改为isValid并且为0
+			if(base.getIsAudit()==2 && base.getIsValid()==0){
+				base.setIsAudit(2);
+				if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
+					base.setIsValid(null);
+				}else{
+					base.setIsValid(0);
+					base.setSeltype("isValid");
+				}
+			}
+			//配置目标状态：3 0 取消
+			if(base.getIsAudit()==3 && base.getIsValid()==0){
+				base.setIsAudit(3);
+				if(!StringUtil.isEmpty(base.getSeltype()) && !base.getSeltype().equals("isValid")) {
+					base.setIsValid(null);
+				}else{
+					base.setIsValid(0);
+					base.setSeltype("isValid");
+				}
+			}
+			
+			BeanUtils.copyProperties(base, entity);
 		}
+		
 		long end=System.currentTimeMillis();
 		logger.warn("配置批量生效/失效耗时："+(end-start));
 	}
@@ -3331,7 +3272,6 @@ public class BaseController {
 		page.setPageNo(1);
 		page.setLastPage(false);
 		
-		// 只有未审核的配置可删除
 		CfgIndexInfo searchCfg = new CfgIndexInfo();
 		AppPolicyCfg searchAppCfg=new AppPolicyCfg();
 		FileDigestCfg searchDigestCfg=new FileDigestCfg();
@@ -3354,104 +3294,70 @@ public class BaseController {
 		// 传递检索条件
 		if(entity != null  && (entity instanceof CfgIndexInfo)) {
 			BeanUtils.copyProperties(entity, searchCfg);
-			searchCfg.setIsValid(0);
-			searchCfg.setIsAudit(0);
 			searchCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppPolicyCfg)) {
 			BeanUtils.copyProperties(entity, searchAppCfg);
-			searchAppCfg.setIsValid(0);
-			searchAppCfg.setIsAudit(0);
 			searchAppCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof FileDigestCfg)) {
 			BeanUtils.copyProperties(entity, searchDigestCfg);
-			searchDigestCfg.setIsValid(0);
-			searchDigestCfg.setIsAudit(0);
 			searchDigestCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AvFileSampleCfg)) {
 			BeanUtils.copyProperties(entity, searchFileSampleCfg);
-			searchFileSampleCfg.setIsValid(0);
-			searchFileSampleCfg.setIsAudit(0);
 			searchFileSampleCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof DdosIpCfg)) {
 			BeanUtils.copyProperties(entity, searchDdosIpCfg);
-			searchDdosIpCfg.setIsValid(0);
-			searchDdosIpCfg.setIsAudit(0);
 			searchDdosIpCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppHttpCfg)) {
 			BeanUtils.copyProperties(entity, searchAppHttpCfg);
-			searchAppHttpCfg.setIsValid(0);
-			searchAppHttpCfg.setIsAudit(0);
 			searchAppHttpCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppHttpCfg)) {
 			BeanUtils.copyProperties(entity, searchAppHttpCfg);
-			searchAppHttpCfg.setIsValid(0);
-			searchAppHttpCfg.setIsAudit(0);
 			searchAppHttpCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppDomainCfg)) {
 			BeanUtils.copyProperties(entity, searchAppDomainCfg);
-			searchAppDomainCfg.setIsValid(0);
-			searchAppDomainCfg.setIsAudit(0);
 			searchAppDomainCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppTopicDomainCfg)) {
 			BeanUtils.copyProperties(entity, searchAppTopicCfg);
-			searchAppTopicCfg.setIsValid(0);
-			searchAppTopicCfg.setIsAudit(0);
 			searchAppTopicCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppSslCertCfg)) {
 			BeanUtils.copyProperties(entity, searchAppSslCertCfg);
-			searchAppSslCertCfg.setIsValid(0);
-			searchAppSslCertCfg.setIsAudit(0);
 			searchAppSslCertCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppIpCfg)) {
 			BeanUtils.copyProperties(entity, searchAppIpCfg);
-			searchAppIpCfg.setIsValid(0);
-			searchAppIpCfg.setIsAudit(0);
 			searchAppIpCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AppFeatureIndex)) {
 			BeanUtils.copyProperties(entity, searchAppFeatureIndex);
-			searchAppFeatureIndex.setIsValid(0);
-			searchAppFeatureIndex.setIsAudit(0);
 			searchAppFeatureIndex.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof DnsResStrategy)) {
 			BeanUtils.copyProperties(entity, searchDnsResStrategy);
-			searchDnsResStrategy.setIsValid(0);
-			searchDnsResStrategy.setIsAudit(0);
 			searchDnsResStrategy.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof DnsIpCfg)) {
 			BeanUtils.copyProperties(entity, searchDnsIpCfg);
-			searchDnsIpCfg.setIsValid(0);
-			searchDnsIpCfg.setIsAudit(0);
 			searchDnsIpCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof PxyObjKeyring)) {
 			BeanUtils.copyProperties(entity, searchObjKeyringCfg);
-			searchObjKeyringCfg.setIsValid(0);
-			searchObjKeyringCfg.setIsAudit(0);
 			searchObjKeyringCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof PxyObjTrustedCaCert)) {
 			BeanUtils.copyProperties(entity, searchTrustedCaCertCfg);
-			searchTrustedCaCertCfg.setIsValid(0);
-			searchTrustedCaCertCfg.setIsAudit(0);
 			searchTrustedCaCertCfg.setFunctionId(functionId);
 		}
 		if(entity != null  && (entity instanceof AsnIpCfg)) {
 			BeanUtils.copyProperties(entity, searchAsnIpCfg);
-			searchAsnIpCfg.setIsValid(0);
-			searchAsnIpCfg.setIsAudit(0);
 			searchAsnIpCfg.setFunctionId(functionId);
 		}
 		

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

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

src/main/java/com/nis/web/controller/basics/IpCommGroupController.java

@@ -1,521 +0,0 @@
-package com.nis.web.controller.basics;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.BlockingQueue;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.jets3t.service.ServiceException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.beust.jcommander.internal.Lists;
-import com.nis.domain.FunctionRegionDict;
-import com.nis.domain.FunctionServiceDict;
-import com.nis.domain.Page;
-import com.nis.domain.basics.IpCommCfg;
-import com.nis.domain.basics.PolicyGroupInfo;
-import com.nis.domain.configuration.BaseIpCfg;
-import com.nis.domain.configuration.CfgIndexInfo;
-import com.nis.domain.configuration.IpPortCfg;
-import com.nis.domain.configuration.template.IpCommCfgTemplate;
-import com.nis.exceptions.MaatConvertException;
-import com.nis.util.Constants;
-import com.nis.util.DictUtils;
-import com.nis.util.StringUtil;
-import com.nis.util.excel.ImportBigExcel;
-import com.nis.web.controller.BaseController;
-import com.nis.web.security.UserUtils;
-import com.nis.web.service.basics.IpCommGroupCfgService;
-
-@Controller
-@RequestMapping(value = "${adminPath}/basics/ip")
-public class IpCommGroupController extends BaseController {
-
-	@Autowired
-	private IpCommGroupCfgService ipCommGroupCfgService;
-
-	@RequestMapping(value = { "/list" })
-	public String list(Model model, HttpServletRequest request, HttpServletResponse response,
-			@ModelAttribute("cfg") IpCommCfg entity) {
-		Page<IpCommCfg> page = ipCommGroupCfgService.findPage(new Page<IpCommCfg>(request, response, "r"),
-				entity);
-		model.addAttribute("page", page);
-		// initPageCondition(model);
-		List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
-		model.addAttribute("regionList", regionList);
-		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId());
-		model.addAttribute("serviceList", serviceList);
-		List<PolicyGroupInfo> policyGroupInfos=policyGroupInfoService.findPolicyGroupInfosByType(5);
-		model.addAttribute("policyGroupInfos", policyGroupInfos);
-		return "/basics/ipCommonGroupCfgList";
-	}
-
-	@RequestMapping(value = { "/addForm" })
-	public String addForm(Model model, HttpServletRequest request, HttpServletResponse response,
-			@ModelAttribute("cfg") CfgIndexInfo cfg, RedirectAttributes redirectAttributes) {
-
-		cfg.setGroupType(5);
-		initFormCondition(model, cfg);
-		model.addAttribute("_cfg", cfg);
-		return "/basics/ipCommGroupFormAdd";
-	}
-
-	@RequestMapping(value = { "/save" })
-	@RequiresPermissions(value = { "ip:common:config" })
-	public String save(Model model, HttpServletRequest request, HttpServletResponse response,
-			@ModelAttribute("cfg") CfgIndexInfo cfg, RedirectAttributes redirectAttributes) {
-
-		// System.out.println("URL分组");
-		try {
-			ipCommGroupCfgService.saveIpCommGroupCfg(cfg);
-		} catch (Exception e) {
-			logger.error("信息保存失败", e);
-			if (e instanceof MaatConvertException) {
-				addMessage(redirectAttributes, "error", e.getMessage());
-			} else {
-				addMessage(redirectAttributes, "error", "save_failed");
-			}
-		}
-
-		return "redirect:" + adminPath + "/basics/ip/list?functionId=" + cfg.getFunctionId();
-	}
-
-	@RequestMapping(value = { "/updateForm" })
-	public String updateForm(Model model, HttpServletRequest request, HttpServletResponse response, String ids,
-			@ModelAttribute("cfg") IpCommCfg cfg, RedirectAttributes redirectAttributes) {
-		cfg = ipCommGroupCfgService.get(Long.parseLong(ids));
-		// initUpdateFormCondition(model, cfg);
-		cfg.setGroupType(5);
-		initUpdateFormCondition(model, cfg);
-		// List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
-		// model.addAttribute("policyGroups", groupInfos);
-		model.addAttribute("_cfg", cfg);
-		return "/basics/ipCommGroupFormUpdate";
-	}
-
-	@RequestMapping(value = { "/update" })
-	@RequiresPermissions(value = { "ip:common:config" })
-	public String update(Model model, HttpServletRequest request, HttpServletResponse response,
-			@ModelAttribute("cfg") IpCommCfg cfg, RedirectAttributes redirectAttributes) {
-		try {
-			ipCommGroupCfgService.update(cfg);
-			addMessage(redirectAttributes, "success", "save_success");
-		} catch (Exception e) {
-			logger.error("信息保存失败", e);
-			addMessage(redirectAttributes, "error", "save_failed");
-		}
-
-		return "redirect:" + adminPath + "/basics/ip/list?functionId=" + cfg.getFunctionId();
-	}
-
-//	@RequestMapping(value = { "/audit" })
-//	@RequiresPermissions(value = { "ip:common:config" })
-//	public String audit(Model model, @ModelAttribute("cfg") IpCommCfg cfg, Integer isAudit, Integer isValid,
-//			String ids, Integer functionId, HttpServletRequest request, HttpServletResponse response,
-//			RedirectAttributes redirectAttributes) {
-//		// 选中配置审核
-//		if (!StringUtil.isEmpty(ids)) {
-//			List<IpCommCfg> ipGroupCfgs = ipCommGroupCfgService.getByIds(ids);
-//			List<IpCommCfg> temp = Lists.newArrayList();
-//			try {
-//				ipCommGroupCfgService.audit(ipGroupCfgs, isAudit, isValid);
-//			} catch (Exception e) {
-//				logger.error("审核失败", e);
-//				addMessage(redirectAttributes, "error", "audit_failed");
-//			} finally {
-//				temp.clear();
-//			}
-//			return "redirect:" + adminPath + "/basics/ip/list?functionId=" + cfg.getFunctionId();
-//		} else {// 全部审核
-//				// 条件下所有配置审核
-//			Page<IpCommCfg> searchPage = new Page<IpCommCfg>(request, response, "a");
-//			Page<IpCommCfg> auditPage = new Page<IpCommCfg>(request, response, "a");
-//			BeanUtils.copyProperties(searchPage, auditPage);
-//
-//			try {
-//				auditAll(auditPage, isValid, cfg);
-//				addMessage(redirectAttributes, "success", "audit_success");
-//			} catch (Exception e) {
-//				logger.error("配置下发失败：", e);
-//				if (e instanceof MaatConvertException) {
-//					addMessage(redirectAttributes, "error", "request_service_failed");
-//				} else {
-//					addMessage(redirectAttributes, "error", "audit_failed");
-//				}
-//
-//			}
-//
-//			return list(model, request, response, cfg);
-//		}
-//	}
-
-	@RequestMapping(value = { "/delete" })
-	@RequiresPermissions(value = { "ip:common:config" })
-	public String delete(Integer isValid, String ids, Integer functionId, RedirectAttributes redirectAttributes) {
-		try {
-			ipCommGroupCfgService.delete(ids);
-			addMessage(redirectAttributes, "success", "delete_success");
-		} catch (Exception e) {
-			logger.error("Delete failed", e);
-			if (e instanceof MaatConvertException) {
-				addMessage(redirectAttributes, "error", e.getMessage());
-			} else {
-				addMessage(redirectAttributes, "error", "delete_failed");
-			}
-		}
-
-		return "redirect:" + adminPath + "/basics/ip/list?functionId=" + functionId;
-	}
-
-	// ipComm配置导出
-	@RequestMapping(value = "/exportIpComm")
-	public void exportIpCommonCfg(Model model, HttpServletRequest request, HttpServletResponse response,
-			@ModelAttribute("cfg") IpCommCfg entity, String ids, RedirectAttributes redirectAttributes) {
-		try {
-			// export data info
-			List<String> titleList = new ArrayList<String>();
-			Map<String, Class<?>> classMap = new HashMap<String, Class<?>>();
-			Map<String, List> dataMap = new HashMap<String, List>();
-			Map<String, String> noExportMap = new HashMap<String, String>();
-			List<IpCommCfg> list = new ArrayList<IpCommCfg>();
-			if (!StringUtil.isEmpty(ids)) {
-				list = ipCommGroupCfgService.findByPage(ids);
-			} else {
-				Page<IpCommCfg> pageInfo = new Page<IpCommCfg>(request, response, "r");
-				pageInfo.setPageNo(1);
-				pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-				Page<IpCommCfg> page = ipCommGroupCfgService.findPage(pageInfo, entity);
-				list = page.getList();
-			}
-			//
-			titleList.add(entity.getMenuNameCode());
-			classMap.put(entity.getMenuNameCode(), IpPortCfg.class);
-			String cfgIndexInfoNoExport = ",block_type,do_log,action"
-					+ ",letter,whether_area_block,classification,attribute,label"
-					+ ",userregion1,userregion2,userregion3,userregion4,userregion5,src_ip_pattern,client_ip,src_port_pattern,client_port,dest_ip_pattern,dest_port_pattern,dest_port,";
-			// 时间过滤
-			if (entity.getSearch_create_time_start() == null) {
-				cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport;
-			}
-			if (entity.getSearch_edit_time_start() == null) {
-				cfgIndexInfoNoExport = ",edit_time" + cfgIndexInfoNoExport;
-			}
-			if (entity.getSearch_audit_time_start() == null) {
-				cfgIndexInfoNoExport = ",audit_time" + cfgIndexInfoNoExport;
-			}
-			if (!StringUtil.isEmpty(entity.gethColumns())) {
-				cfgIndexInfoNoExport = "," + entity.gethColumns() + "," + cfgIndexInfoNoExport;
-			}
-
-			noExportMap.put(entity.getMenuNameCode(), cfgIndexInfoNoExport);
-			dataMap.put(entity.getMenuNameCode(), list);
-			String timeRange = initTimeMap(entity);
-			noExportMap.put("timeRange", timeRange);
-
-			if ("csv".equals(entity.getExType())) {
-				this._exportCsv(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList,
-						classMap, dataMap, noExportMap);
-			} else {
-				this._export(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList,
-						classMap, dataMap, noExportMap);
-			}
-		} catch (Exception e) {
-			logger.error("IpCommGroupCfg export failed", e);
-			addMessage(redirectAttributes, "error", "export_failed");
-		}
-		// return "redirect:" + adminPath
-		// +"/ntc/iplist/list?functionId="+entity.getFunctionId();
-	}
-
-	/**
-	 * 批量审核
-	 * 
-	 * @param isAudit
-	 * @param isValid
-	 * @param ids
-	 * @param functionId
-	 * @param redirectAttributes
-	 * @return
-	 */
-//	@Override
-//	public void auditAll(Page page, Integer auditType, Object entity) throws Exception {
-//		long start = System.currentTimeMillis();
-//		page.setOrderBy("");
-//		page.setPageSize(Constants.MAAT_JSON_SEND_SIZE);
-//		page.setPageNo(1);
-//		page.setLastPage(false);
-//		// 携带审核状态信息的BaseCfg
-//		BaseCfg auditBatchCfg = new BaseCfg();
-//		// 携带审核条件的BaseCfg
-//		IpCommCfg searchIpCommGroupCfg = new IpCommCfg();
-//		BeanUtils.copyProperties(entity, auditBatchCfg);
-//		BeanUtils.copyProperties(entity, searchIpCommGroupCfg);
-//
-//		auditType = (Integer) Reflections.invokeGetter(entity, "isAudit");
-//
-//		// 全部审核通过，只查询当前条件下的所有未审核的配置 -批量审核通过/不通过
-//		if (auditType.equals(1) || auditType.equals(2)) {
-//
-//			searchIpCommGroupCfg.setIsValid(0);
-//			searchIpCommGroupCfg.setIsAudit(0);
-//
-//			if (auditType.equals(1)) {
-//				auditBatchCfg.setIsAudit(1);
-//				auditBatchCfg.setIsValid(1);
-//			} else {
-//				auditBatchCfg.setIsAudit(2);
-//				auditBatchCfg.setIsValid(0);
-//			}
-//			auditBatchCfg.setAuditTime(new Date());
-//			auditBatchCfg.setAuditorId(UserUtils.getUser().getId());
-//		} else {
-//			// 全部取消通过，只查询当前条件下的所有审核通过的配置
-//			searchIpCommGroupCfg.setIsValid(1);
-//			searchIpCommGroupCfg.setIsAudit(1);
-//
-//			auditBatchCfg.setIsAudit(3);
-//			auditBatchCfg.setIsValid(0);
-//			auditBatchCfg.setAuditTime(new Date());
-//			auditBatchCfg.setAuditorId(UserUtils.getUser().getId());
-//		}
-//
-//		ServiceConfigTemplateUtil serviceTemplate = new ServiceConfigTemplateUtil();
-//		Integer functionId = 0;
-//		if (auditBatchCfg != null && !StringUtil.isEmpty(auditBatchCfg.getFunctionId())) {
-//			functionId = auditBatchCfg.getFunctionId();
-//		}
-//		List<Map<String, Object>> serviceList = serviceTemplate.getServiceListByFunctionId(functionId);
-//		for (Map<String, Object> service : serviceList) {
-//			String tableNameXml = service.get("tableName").toString(); // 获取业务主配置表
-//			String serviceTypeXml = service.get("serviceType").toString(); // 业务类型 1maat 2callback
-//			String classNameXml = service.get("className").toString(); // 主配置Java类
-//			String serviceIdXml = service.get("id").toString(); // service字典表 service_id字段
-//			auditBatchCfg.setServiceId(Integer.valueOf(serviceIdXml));
-//			auditBatchCfg.setTableName(tableNameXml);
-//			searchIpCommGroupCfg.setServiceId(Integer.valueOf(serviceIdXml));
-//			searchIpCommGroupCfg.setTableName(tableNameXml);
-//
-//			if ("1".equals(serviceTypeXml)) {// maat类配置
-//				// 存放域配置类型 及 对应表名
-//				List<Map<String, Object>> cfgList = (List<Map<String, Object>>) service.get("cfgList");
-//				List<Map<String, Object>> userRegionList = (List<Map<String, Object>>) service.get("userRegionList");
-//				int cfgType = Integer.parseInt(service.get("cfgType").toString());
-//				if (auditBatchCfg.getIsAudit() == 1) {
-//					boolean hasData = true;
-//					
-//					while (hasData) {
-//						page.setPageNo(1);
-//						page.setLastPage(false);
-//						List list = ipCommGroupCfgService.findPage(page, searchIpCommGroupCfg).getList();
-//						if(CollectionUtils.isNotEmpty(list)){
-//							Map<Integer,List> groupIdMap=new HashMap();
-//							// 配置生效处理
-//							if(auditBatchCfg.getIsAudit().equals(1)) {
-//								hasData=commonPolicyService.auditReuseCommonConfigData(page, auditBatchCfg,groupIdMap,hasData);
-//								Map<Integer,List> groupIpMap=new HashMap();
-//								if(CollectionUtils.isNotEmpty(list)) {
-//									for (IpCommCfg obj : (List<IpCommCfg>)list) {
-//										BaseCfg baseCfg=(BaseCfg)obj;
-//										if(!StringUtil.isEmpty(obj.getGroupId())) {
-//											groupIdMap.get(obj.getGroupId()).add(baseCfg);
-//										}else {
-//											List newList=new ArrayList<>();
-//											newList.add(baseCfg);
-//											groupIdMap.put(obj.getGroupId(),newList);
-//										}
-//									}
-//								}
-//								
-//							}
-//							if(hasData) {
-//								page.setPageNo(1);
-//								page.setLastPage(false);
-//							}
-//						}else{
-//							hasData = false;
-//						}
-//					}
-//				}
-//			} else {
-//				throw new RuntimeException("wrong service type " + serviceTypeXml);
-//			}
-//		}
-//
-//		// 批量审核通过时，如果没有携带isValid检索条件，返回界面需要将isValid置为null
-//		if (!StringUtil.isEmpty(entity)) {
-//			BaseCfg base = (BaseCfg) entity;
-//			if (!StringUtil.isEmpty(base.getSeltype()) && base.getSeltype().equals("isValid")) {
-//				base.setIsValid(null);
-//				BeanUtils.copyProperties(base, entity);
-//			}
-//		}
-//		long end = System.currentTimeMillis();
-//		logger.warn("配置批量生效/失效耗时：" + (end - start));
-//	}
-	@RequestMapping(value = "import", method=RequestMethod.POST)
-	public String importIp(HttpServletRequest  request,HttpServletResponse response,RedirectAttributes redirectAttributes,
-			@RequestParam("files") MultipartFile[] files
-			,Integer serviceDictId
-			,Integer requestId
-			,String attribute
-			,String classify
-			,String regionDictIds
-			,String importPath) {
-		logger.warn("import start...");
-		long start=System.currentTimeMillis();
-		ImportBigExcel ei=null;
-		try {
-			FunctionServiceDict serviceDict = DictUtils.getFunctionServiceDict(serviceDictId);
-			StringBuffer errTip=new StringBuffer();
-				BlockingQueue<BaseIpCfg> ipPortCfgs =null;
-				//List<CfgIndexInfo> cfgIndexInfos = new ArrayList<CfgIndexInfo>();
-				for (int i = 0; i < files.length; i++) {
-					MultipartFile file = files[i];
-					ei = new ImportBigExcel(file, 0, 1);
-					FunctionRegionDict regionDict = DictUtils
-							.getFunctionRegionDict(Integer.parseInt(regionDictIds.split(",")[i]));
-					//加载模板
-					loadTemplate(ei,regionDict, serviceDict);
-					//------------------------------------check format start----------------------------
-					if (regionDict.getRegionType().equals(1)) {// IP
-						BlockingQueue<IpCommCfgTemplate> list = ei.getDataList(IpCommCfgTemplate.class );
-						ipPortCfgs=this.checkIpCfgMulity(errTip,serviceDict, regionDict, null,null, list);
-					} 
-					//删除文件
-					if(ei.getUploadFile()!=null&&ei.getUploadFile().exists()) {
-						ei.getUploadFile().delete();
-					}
-					//------------------------------------check format end----------------------------
-					Date date = new Date();
-					String isSend = request.getParameter("isSend")==null?"":request.getParameter("isSend");
-					
-					if (regionDict.getRegionType().equals(1)) {// IP
-							List<BaseIpCfg> _ipPortCfgs=Lists.newArrayList(Constants.MAAT_JSON_SEND_SIZE);
-							while(!ipPortCfgs.isEmpty()) {
-								ipPortCfgs.drainTo(_ipPortCfgs, Constants.MAAT_JSON_SEND_SIZE);
-								//List<Integer> regionIds=Lists.newArrayList();
-								//List<Integer> numRegionGroupIds=Lists.newArrayList();
-								//List<Integer> numRegionRegionIds=Lists.newArrayList();
-								/*if(!regionDict.getFunctionId().equals(405)) {//app ip compileId 从config_group_info中取
-									try {
-										 if(isSend.equals("1")) {
-											 regionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size());
-											 //需要获取数值域的id
-											 if(serviceDict!=null&&serviceDict.getProtocolId()!=null&&serviceDict.getProtocolId()>0) {
-												 numRegionGroupIds = ConfigServiceUtil.getId(2,_ipPortCfgs.size());
-												 numRegionRegionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size());
-											 }
-										 }
-									} catch (Exception e) {
-										e.printStackTrace();
-										logger.info("获取编译ID出错");
-										throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
-									}
-								}else {
-									try {
-										regionIds = ConfigServiceUtil.getId(3,_ipPortCfgs.size());
-									} catch (Exception e) {
-										e.printStackTrace();
-										logger.info("获取域ID出错");
-										throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:"+e.getMessage());
-									}
-								}*/
-								int ind=0;
-								for (BaseIpCfg cfg : _ipPortCfgs) {
-									cfg.setAction(serviceDict==null?null:serviceDict.getAction());
-									/*cfg.setAuditorId(UserUtils.getUser().getId());
-									cfg.setAuditTime(date);*/
-									cfg.setCfgRegionCode(regionDict.getConfigRegionCode());
-									cfg.setCfgType(regionDict.getConfigRegionValue());
-									cfg.setCreateTime(date);
-									cfg.setCreatorId(UserUtils.getUser().getId());
-									//cfg.setDoLog(2);
-									cfg.setFunctionId(regionDict.getFunctionId());
-									if(isSend.equals("1")) {
-										cfg.setIsAudit(Constants.AUDIT_YES);
-										cfg.setIsValid(Constants.VALID_YES);
-										cfg.setAuditorId(UserUtils.getUser().getId());
-										cfg.setAuditTime(date);
-										/*if(regionIds!=null&&regionIds.size()==_ipPortCfgs.size()) {
-										cfg.setRegionId(regionIds.get(ind));
-										}
-										if(serviceDict!=null&&serviceDict.getProtocolId()!=null) {
-											if(numRegionGroupIds!=null&&numRegionGroupIds.size()==_ipPortCfgs.size()) {
-												cfg.setNumberRegionGroupId(numRegionGroupIds.get(ind));
-											}
-											if(numRegionRegionIds!=null&&numRegionRegionIds.size()==_ipPortCfgs.size()) {
-												cfg.setNumberRegionRegionId(numRegionRegionIds.get(ind));
-											}
-										 }*/
-									}else {
-										cfg.setIsAudit(Constants.AUDIT_NOT_YET);
-										cfg.setIsValid(Constants.VALID_NO);
-									}
-									cfg.setIsAreaEffective(0);
-									cfg.setLable("0");
-									cfg.setRequestId(StringUtil.isEmpty(requestId) ? 0 : requestId);
-									cfg.setAttribute(attribute);
-									cfg.setClassify(classify);
-									cfg.setServiceId(serviceDict==null?null:serviceDict.getServiceId());
-									cfg.setTableName("ip_comm_cfg");
-									ind++;
-								}
-								ipCommGroupCfgService.saveAndSend(regionDict, serviceDict, _ipPortCfgs,isSend.equals("1"));
-								_ipPortCfgs.clear();
-						}
-						
-					}
-				}
-				if(errTip.toString().length()>0) {
-					addMessage(redirectAttributes,"error", errTip.toString());
-				}
-		} catch (Exception e) {
-			if(ei!=null) {
-				if(ei.getUploadFile().exists()) {
-					ei.getUploadFile().delete();
-				}
-			}
-			if(e instanceof MaatConvertException) {
-				addMessage(redirectAttributes,"error", "request_service_failed");
-			}else if(e instanceof ServiceException) {
-				addMessage(redirectAttributes,"error", e.getMessage());
-			}else if(e instanceof IndexOutOfBoundsException){
-				addMessage(redirectAttributes,"error", "template_error");
-			}else {
-				addMessage(redirectAttributes,"error",  "import_failed");
-			}
-			logger.error("import failed", e);
-		}
-		long end=System.currentTimeMillis();
-		logger.warn("import finish,cost:"+(end-start));
-			return "redirect:" + adminPath+ importPath;
-	}
-	@RequestMapping(value="ajaxGetGroups",method=RequestMethod.POST)
-	@ResponseBody
-	public Map<Integer,String> ajaxGetGroups(Model model,@RequestParam(required=true,value="groupIds")String groupIds){
-		Map<Integer,String> groupIdList=new HashMap<Integer,String>();
-		if(StringUtils.isNotBlank(groupIds)) {
-			List<PolicyGroupInfo> list=policyGroupInfoService.findPolicyByGroupInfoList(groupIds);
-			for(PolicyGroupInfo p:list) {
-				groupIdList.put(p.getGroupId(), p.getGroupName());
-			}
-		}
-		return groupIdList;
-	}
-}

src/main/java/com/nis/web/controller/basics/PolicyGroupController.java

@@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import com.alibaba.fastjson.JSON;
 import com.nis.domain.Page;
 import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.util.Constants;
@@ -123,19 +122,6 @@ public class PolicyGroupController extends BaseController {
 		}
 		return false;
 	}
-	@RequestMapping(value="ajaxGetPagedGroup",method=RequestMethod.POST)
-	@ResponseBody
-	public Page ajaxGetPagedGroup(HttpServletRequest request
-			, HttpServletResponse response,Model model,@RequestParam(required=true,value="type")Integer type,@RequestParam(required=true,value="pageNo")Integer pageNo,@RequestParam(required=true,value="pageSize")Integer pageSize){
-		
-		PolicyGroupInfo cfg=new PolicyGroupInfo();
-		cfg.setGroupType(type);
-		Page<PolicyGroupInfo> pageCondition = new Page<PolicyGroupInfo>(request, response,"r");
-		pageCondition.setPageNo(pageNo);
-		pageCondition.setPageSize(pageSize);
-		Page page = policyGroupInfoService.findPolicyGroupInfoList(pageCondition,cfg);
-		return page;
-	}
 	/**
 	 * 校验asn号是否已存在
 	 */

src/main/java/com/nis/web/controller/basics/UrlCommGroupController.java

@@ -1,251 +0,0 @@
-package com.nis.web.controller.basics;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
-
-import com.nis.domain.FunctionRegionDict;
-import com.nis.domain.FunctionServiceDict;
-import com.nis.domain.Page;
-import com.nis.domain.basics.UrlCommCfg;
-import com.nis.domain.configuration.CfgIndexInfo;
-import com.nis.exceptions.MaatConvertException;
-import com.nis.util.Constants;
-import com.nis.util.DictUtils;
-import com.nis.util.StringUtil;
-import com.nis.web.controller.BaseController;
-import com.nis.web.service.basics.UrlCommGroupService;
-
-@Controller
-@RequestMapping(value = "${adminPath}/basics/url")
-public class UrlCommGroupController extends BaseController{
-	
-	@Autowired
-	private UrlCommGroupService   urlCommGroupService;
-	
-	@RequestMapping(value = {"/list"})
-	public String list(Model model,HttpServletRequest  request
-			,HttpServletResponse response,@ModelAttribute("cfg")UrlCommCfg entity
-			){
-		Page<UrlCommCfg> page = urlCommGroupService.findPage(new Page<UrlCommCfg>(request, response,"r"), entity);
-		model.addAttribute("page", page);
-
-		List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
-		model.addAttribute("regionList", regionList);
-		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId());
-		model.addAttribute("serviceList", serviceList);
-		return "/basics/urlCommGroupList";
-	}
-	
-	@RequestMapping(value = {"/addForm"})
-	public String addForm(Model model,HttpServletRequest request
-			,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo cfg
-			,RedirectAttributes redirectAttributes){
-		
-		
-//		UrlCommGroupCfg urlCfg = new UrlCommGroupCfg();
-//		urlCfg.setCfgType("NTC_URL_REGION");
-//		cfg.setUrlCommGroupCfg(urlCfg);
-//		List<UrlCommGroupCfg> urlList = new ArrayList<UrlCommGroupCfg>();
-//		urlList.add(urlCfg);
-//		cfg.setUrlCommGroupList(urlList);
-//		initFormCondition(model, entity);
-		cfg.setGroupType(11);
-		initFormCondition(model,cfg);
-		//List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
-		//model.addAttribute("policyGroups", groupInfos);
-		
-		model.addAttribute("_cfg", cfg);
-		return "/basics/urlCommGroupFormAdd";
-	}
-	
-	@RequestMapping(value = {"/save"})
-	@RequiresPermissions(value={"http:url:config"})
-	public String save(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")CfgIndexInfo cfg,RedirectAttributes redirectAttributes){
-		
-//		System.out.println("URL分组");
-		try{
-			urlCommGroupService.saveUrlCommGroupCfg(cfg);
-		}catch(Exception e){
-			logger.error("信息保存失败",e);
-			if(e instanceof MaatConvertException) {
-				addMessage(redirectAttributes,"error",e.getMessage());
-			}else {
-				addMessage(redirectAttributes,"error","save_failed");
-			}
-		}
-		
-		return "redirect:" + adminPath +"/basics/url/list?functionId="+cfg.getFunctionId();
-	}
-	
-	@RequestMapping(value = {"/updateForm"})
-	public String updateForm(Model model,HttpServletRequest request
-			,HttpServletResponse response,String ids,@ModelAttribute("cfg")UrlCommCfg cfg
-			,RedirectAttributes redirectAttributes){
-		cfg = urlCommGroupService.get(Long.parseLong(ids));
-//		initUpdateFormCondition(model, cfg);
-		cfg.setGroupType(11);
-		initUpdateFormCondition(model,cfg);
-		//List<ConfigGroupInfo> groupInfos=configGroupInfoService.findAllList(4);
-		//model.addAttribute("policyGroups", groupInfos);
-		model.addAttribute("_cfg", cfg);
-		return "/basics/urlCommGroupFormUpdate";
-	}
-	@RequestMapping(value = {"/update"})
-	@RequiresPermissions(value={"http:url:config"})
-	public String update(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")UrlCommCfg cfg,RedirectAttributes redirectAttributes){
-		try{
-			urlCommGroupService.update(cfg);
-			addMessage(redirectAttributes,"success","save_success");
-		}catch(Exception e){
-			logger.error("信息保存失败",e);
-			addMessage(redirectAttributes,"error","save_failed");
-		}
-		
-		return "redirect:" + adminPath +"/basics/url/list?functionId="+cfg.getFunctionId();
-	}
-	
-	@RequestMapping(value = {"/audit"})
-	@RequiresPermissions(value={"http:url:config"})
-	public String audit(Model model,@ModelAttribute("cfg")UrlCommCfg cfg
-			,Integer isAudit
-			,Integer isValid
-			,String ids
-			,Integer functionId
-			, HttpServletRequest request
-			,HttpServletResponse response
-			,RedirectAttributes redirectAttributes) {
-		//选中配置审核
-		if(!StringUtil.isEmpty(ids)) {
-			List<UrlCommCfg> urlGroupCfgs=urlCommGroupService.getByIds(ids);
-//			Map<Long,List<UrlCommGroupCfg>> urlcfgMap=Maps.newHashMap();
-//			for(UrlCommGroupCfg urlCommCfg:urlGroupCfgs) {
-//				urlCommCfg.setIsAudit(isAudit);
-//				urlCommCfg.setIsValid(isValid);
-//				urlCommCfg.setAuditorId(UserUtils.getUser().getId());
-//				urlCommCfg.setAuditTime(new Date());
-//				urlCommCfg.setFunctionId(functionId);
-//				if(urlcfgMap.containsKey(Long.parseLong(urlCommCfg.getUserRegion3()))) {
-//					urlcfgMap.get(Long.parseLong(urlCommCfg.getUserRegion3())).add(urlCommCfg);
-//				}else {
-//					List<UrlCommGroupCfg> _urlCfgs=Lists.newArrayList();
-//					_urlCfgs.add(urlCommCfg);
-//					urlcfgMap.put(Long.parseLong(urlCommCfg.getUserRegion3()), _urlCfgs);
-//				}
-//			}
-			/********************每次下发一个组的region，保证事物********************/
-//			for (Long groupId : urlcfgMap.keySet()) {
-//				try {
-//					urlCommGroupService.audit(urlcfgMap.get(groupId),groupId,isValid);
-//				} catch (Exception e) {
-//					logger.error("配置下发失败：",e);
-//					if(e instanceof MaatConvertException) {
-//						addMessage(redirectAttributes,"error", "request_service_failed");
-//					}else {
-//						addMessage(redirectAttributes,"error", "audit_failed");
-//					}
-//					
-//				}
-//			}
-			for (UrlCommCfg urlCommGroup : urlGroupCfgs) {
-				try {
-					urlCommGroupService.audit(urlCommGroup,isAudit,isValid);
-				} catch (Exception e) {
-					logger.error("审核失败",e);
-					addMessage(redirectAttributes,"error","audit_failed");
-				}
-			}
-		}
-		return "redirect:" + adminPath +"/basics/url/list?functionId="+cfg.getFunctionId();
-	}
-	
-	@RequestMapping(value = {"/delete"})
-	@RequiresPermissions(value={"http:url:config"})
-	public String delete(Integer isValid
-			,String ids,Integer functionId
-			,RedirectAttributes redirectAttributes){
-			try{
-				urlCommGroupService.delete(ids);
-				addMessage(redirectAttributes,"success","delete_success");
-			}catch(Exception e){
-				logger.error("Delete failed",e);
-				if(e instanceof MaatConvertException) {
-					addMessage(redirectAttributes,"error",e.getMessage());
-				}else {
-					addMessage(redirectAttributes,"error","delete_failed");
-				}
-			}
-			
-		return "redirect:" + adminPath +"/basics/url/list?functionId="+functionId;
-	}
-	//urlComm配置导出
-	@RequestMapping(value = "/exportUrlComm")
-	public void exportAsnIp(Model model,HttpServletRequest  request,HttpServletResponse response,
-			@ModelAttribute("cfg")UrlCommCfg entity,String ids,RedirectAttributes redirectAttributes){
-		try {
-			//export data info
-			List<String> titleList=new ArrayList<String>();
-			Map<String, Class<?>> classMap=new HashMap<String, Class<?>>();
-			Map<String, List> dataMap=new HashMap<String, List>();
-			Map<String, String> noExportMap=new HashMap<String, String>();
-			List<UrlCommCfg> list = new ArrayList<UrlCommCfg>();
-			if (!StringUtil.isEmpty(ids)) {
-				list = urlCommGroupService.findByPage(ids);
-			} else {
-				Page<UrlCommCfg> pageInfo=new Page<UrlCommCfg>(request, response,"r");
-				pageInfo.setPageNo(1);
-				pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-				Page<UrlCommCfg> page = urlCommGroupService.findPage(pageInfo, entity);
-				list=page.getList();
-			}
-//				
-				titleList.add(entity.getMenuNameCode());
-				classMap.put(entity.getMenuNameCode(), UrlCommCfg.class);
-				String cfgIndexInfoNoExport=",block_type,do_log,action"
-						+ ",letter,whether_area_block,classification,attribute,label,expression_type,match_method"
-						+",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,asn_no,is_hex,is_case_insenstive,";
-				// 时间过滤
-				if (entity.getSearch_create_time_start() == null ) {
-					cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport;
-				}
-				if (entity.getSearch_edit_time_start() == null) {
-					cfgIndexInfoNoExport = ",edit_time" + cfgIndexInfoNoExport;
-				}
-				if (entity.getSearch_audit_time_start() == null) {
-					cfgIndexInfoNoExport = ",audit_time" + cfgIndexInfoNoExport;
-				}
-				if (!StringUtil.isEmpty(entity.gethColumns())) {
-					cfgIndexInfoNoExport = "," + entity.gethColumns() + "," + cfgIndexInfoNoExport;
-				}
-				
-				noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
-				dataMap.put(entity.getMenuNameCode(), list);
-				String timeRange = initTimeMap(entity);
-				noExportMap.put("timeRange", timeRange);
-				
-				if ("csv".equals(entity.getExType())) {
-					this._exportCsv(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList,
-							classMap, dataMap, noExportMap);
-				} else {
-					this._export(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList,
-							classMap, dataMap, noExportMap);
-				}
-		} catch (Exception e) {
-			logger.error("urlGroupConfig export failed",e);
-			addMessage(redirectAttributes,"error","export_failed");
-		}
-		//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
-	}
-}

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

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

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

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

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

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

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

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

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

@@ -55,7 +55,6 @@ import com.nis.domain.configuration.template.HttpsReplaceIpTemplate;
 import com.nis.domain.configuration.template.HttpsReplaceTemplate;
 import com.nis.domain.configuration.template.IpAllNotDoLogTemplate;
 import com.nis.domain.configuration.template.IpAllTemplate;
-import com.nis.domain.configuration.template.IpCommCfgTemplate;
 import com.nis.domain.configuration.template.IpPayloadTemplate;
 import com.nis.domain.configuration.template.IpRateLimitTemplate;
 import com.nis.domain.configuration.template.IpSpoofingTemplate;
@@ -477,11 +476,6 @@ public class IpController extends BaseController{
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpRateLimitTemplate.class, 2);
 				excel.setDataList(pro,classList,null).
 		    	write(request,response, fileName).dispose();
-			}else if(regionDict.getFunctionId().equals(110)){
-				List<IpCommCfgTemplate> classList=new ArrayList<IpCommCfgTemplate>();
-				ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpCommCfgTemplate.class, 2);
-				excel.setDataList(pro,classList,null).
-		    	write(request,response, fileName).dispose();
 			}else{
 				List<IpAllTemplate> classList=new ArrayList<IpAllTemplate>();
 				ExportExcel excel=new ExportExcel(serviceDict,regionDict,pro,null, IpAllTemplate.class, 2);

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

@@ -181,27 +181,6 @@ public class HttpRedirectPolicyController extends BaseController {
 		return "/cfg/proxy/control/httpRedirectForm";
 	}
 
-	@RequestMapping(value = { "commForm" })
-	@RequiresPermissions(value = { "control:httpBlock:config", "control:httpRedirect:config",
-			"control:httpReplace:config", "control:httpMinit:config",
-	"control:httpWhitelist:config" }, logical = Logical.OR)
-	public String commForm(Model model, HttpServletRequest request, HttpServletResponse response, String ids,
-			@ModelAttribute("cfg") CfgIndexInfo entity) {
-		if (StringUtils.isNotBlank(ids)) {
-			entity = httpRedirectCfgService.getCommCfg(Long.parseLong(ids), null);
-			
-			initUpdateFormCondition(model, entity);
-		} else {	
-			initFormCondition(model, entity);
-		}
-		// 获取所有的响应文件内容，阻断，或重定向时可以选择
-		List<ProxyFileStrategyCfg> allProxyFileStrategys = proxyFileStrategyService
-				.getProxyFileStrategyCfgList(new ProxyFileStrategyCfg());
-		model.addAttribute("_cfg", entity);
-		model.addAttribute("allProxyFileStrategys", allProxyFileStrategys);
-		return "/cfg/proxy/control/httpRedirectCommonForm";
-	}
-
 	@RequestMapping(value = { "saveOrUpdate" })
 	@RequiresPermissions(value = { "control:httpBlock:config", "control:httpRedirect:config",
 			"control:httpReplace:config", "control:httpMinit:config",

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

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

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

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

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

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

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

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

src/main/java/com/nis/web/dao/basics/IpCommGroupCfgDao.java

@@ -1,28 +0,0 @@
-package com.nis.web.dao.basics;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.nis.domain.basics.IpCommCfg;
-import com.nis.domain.basics.Varibles;
-import com.nis.web.dao.CrudDao;
-import com.nis.web.dao.MyBatisDao;
-@MyBatisDao
-public interface IpCommGroupCfgDao extends CrudDao<IpCommCfg>{
-	public List<IpCommCfg> findPage(IpCommCfg cfg);
-	public List<IpCommCfg> findByPage(@Param("ids")String ids);
-	public void delete(@Param("ids")String ids);
-	public void updateIssued(IpCommCfg cfg);
-	public List<IpCommCfg> getByIds(@Param("ids")String ids);
-	public List<IpCommCfg> findAllList(IpCommCfg cfg);
-	public List<Integer>  findOtherIps(@Param("groupId")Integer groupId,@Param("cfgId")Integer cfgId);
-	public List<Integer> countValidIPs(@Param("groups")String groups,@Param("ids")String ids);
-	public int insertBatch(List<IpCommCfg> list);
-	public Varibles getVaribles(@Param("name")String name);
-	public void ajaxDeleteAsnIp(@Param("ids")String ids);
-	public IpCommCfg getOne(IpCommCfg cfg);
-	public List<Object[]> findAllIpCommGroupCfgList();
-	public void insertIpCommGroupCfg(IpCommCfg ipPortCfg);
-	public int getGroupIdCount(int groupId);
-}

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

@@ -1,514 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.nis.web.dao.basics.IpCommGroupCfgDao">
-    <resultMap id="IpCommGroupCfgMap" type="com.nis.domain.basics.IpCommCfg">
-	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
-	    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
-	    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
-	    <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
-	    <result column="ip_type" property="ipType" jdbcType="INTEGER" />
-	    <result column="src_ip_pattern" property="srcIpPattern" jdbcType="INTEGER" />
-		<result column="dest_ip_pattern" property="destIpPattern" jdbcType="INTEGER" />
-	    <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
-	    <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
-	    <result column="port_pattern" property="portPattern" jdbcType="INTEGER" />
-	    <result column="src_port" property="srcPort" jdbcType="VARCHAR" />
-	    <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
-	    <result column="direction" property="direction" jdbcType="INTEGER" />
-	    <result column="protocol" property="protocol" jdbcType="INTEGER" />
-	    <result column="protocol_id" property="protocolId" jdbcType="INTEGER" />
-	    <result column="action" property="action" jdbcType="INTEGER" />
-	    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
-	    <result column="is_audit" property="isAudit" jdbcType="INTEGER" />
-	    <result column="creator_id" property="creatorId" jdbcType="INTEGER" />
-	    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-	    <result column="editor_id" property="editorId" jdbcType="INTEGER" />
-	    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
-	    <result column="auditor_id" property="auditorId" jdbcType="INTEGER" />
-	    <result column="audit_time" property="auditTime" jdbcType="TIMESTAMP" />
-	    <result column="service_id" property="serviceId" jdbcType="INTEGER" />
-	    <result column="request_id" property="requestId" jdbcType="INTEGER" />
-	    <result column="compile_id" property="compileId" jdbcType="INTEGER" />
-	    <result column="is_area_effective" property="isAreaEffective" jdbcType="INTEGER" />
-	    <result column="classify" property="classify" jdbcType="VARCHAR" />
-	    <result column="attribute" property="attribute" jdbcType="VARCHAR" />
-	    <result column="lable" property="lable" jdbcType="VARCHAR" />
-	    <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
-	    <result column="function_id" property="functionId" jdbcType="INTEGER" />
-	    <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
-	    <result column="region_id" property="regionId" jdbcType="INTEGER" />
-	    <result column="group_id" property="groupId" jdbcType="INTEGER" />
-	    <result column="user_region1" property="userRegion1" jdbcType="VARCHAR" />
-	    <result column="user_region2" property="userRegion2" jdbcType="VARCHAR" />
-	    <result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
-	    <result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
-	    <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
-    </resultMap>
-  	
-    <sql id="columns">
-	    r.cfg_id,r.cfg_desc,r.cfg_type,r.cfg_region_code,r.ip_type,r.src_ip_pattern,r.src_ip_address,r.dest_ip_pattern,r.dest_ip_address,
-	    r.src_port_pattern,r.src_port,r.dest_port_pattern,r.dest_port
-	    ,r.protocol,r.protocol_id,r.direction,r.action
-		,r.is_valid,r.is_audit,r.creator_id,r.create_time,r.editor_id
-		,r.edit_time,r.auditor_id,r.audit_time,r.service_id,r.request_id,
-		r.is_area_effective,r.classify,r.attribute,r.lable
-		,r.area_effective_ids,r.function_id,r.user_region1
-		,r.user_region2,r.user_region3,r.user_region4,r.user_region5,r.compile_id,r.region_id,r.group_id
-    </sql>
-    
-    <select id="findPage" resultMap="IpCommGroupCfgMap">
-    	select 
-    		<include refid="columns"></include>
-    		 <trim prefix="," prefixOverrides=",">
-				,s.name as creator_name,e.name as editor_name,u.name as auditor_name
-			</trim>
-    	from ip_comm_cfg r
-    	left join sys_user s on r.creator_id=s.id
-		left join sys_user e on r.editor_id=e.id
-		left join sys_user u on r.auditor_id=u.id
-    	<trim prefix="WHERE" prefixOverrides="AND |OR ">
-    		<if test="page !=null and page.where != null and page.where != ''">
-				AND ${page.where}
-			</if>
-    		<if test="cfgId != null">
-    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
-    		</if>
-	    	<if test="cfgDesc != null and cfgDesc != ''">
-	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
-	    	</if>
-	    	<if test="cfgRegionCode != null">
-	    		AND r.CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="cfgType != null and cfgType != ''">
-	    		AND r.CFG_TYPE like concat(concat('%',#{CFG_TYPE,jdbcType=VARCHAR}),'%') 
-	    	</if>
-	    	<if test="ipType != null">
-	    		AND r.IP_TYPE=#{ipType,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="srcIpPattern != null">
-	    		AND r.src_ip_pattern=#{srcIpPattern,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="destIpPattern != null">
-	    		AND r.dest_ip_pattern=#{destIpPattern,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="srcIpAddress != null and srcIpAddress != ''">
-	    		AND r.SRC_IP_ADDRESS=#{srcIpAddress,jdbcType=VARCHAR}
-	    	</if>
-	    	<if test="destIpAddress != null and destIpAddress != ''">
-	    		AND r.DEST_IP_ADDRESS=#{destIpAddress,jdbcType=VARCHAR}
-	    	</if>
-	    	<if test="srcPortPattern != null">
-	    		AND r.src_port_pattern=#{srcPortPattern,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="destPortPattern != null">
-	    		AND r.dest_port_pattern=#{destPortPattern,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="srcPort != null and srcPort !=''">
-	    		AND r.SRC_PORT=#{srcPort,jdbcType=VARCHAR}
-	    	</if>
-	    	<if test="destPort != null and destPort !=''">
-	    		AND r.DEST_PORT=#{destPort,jdbcType=VARCHAR}
-	    	</if>
-	    	<if test="direction != null">
-	    		AND r.DIRECTION=#{direction,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="protocol != null">
-	    		AND r.PROTOCOL=#{protocol,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="protocolId != null">
-	    		AND r.PROTOCOL_ID=#{protocolId,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="action != null">
-	    		AND r.ACTION=#{action,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="creatorName != null and creatorName !=''">
-	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="createTime != null and createTime !=''">
-	    		AND r.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
-	    	</if>
-	    	<if test="editorName != null and editorName !=''">
-	    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="editTime != null and editTime !='' ">
-	    		AND r.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
-	    	</if>
-	    	<if test="auditorName != null and auditorName !=''">
-	    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="auditTime != null and auditTime !=''">
-	    		AND r.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
-	    	</if>
-	    	<if test="serviceId != null">
-	    		AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="requestId != null">
-	    		AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="regionId != null">
-	    		AND r.region_id=#{regionId,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isAreaEffective != null">
-	    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="classify != null and classify !=''">
-	    		AND r.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="attribute != null and attribute !=''">
-	    		AND r.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="lable != null and lable !=''">
-	    		AND r.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="areaEffectiveIds != null and areaEffectiveIds !=''">
-	    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="functionId != null">
-	    		AND r.FUNCTION_ID=#{functionId,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="userRegion3 != null">
-	    		AND r.user_region3 like concat(concat('%',#{userRegion3,jdbcType=VARCHAR}),'%')
-	    	</if>
-    		
-	    	<!-- 数据范围过滤 -->
-			${sqlMap.dsf}
-	    </trim>
-	    <choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-				ORDER BY r.CFG_ID desc
-			</otherwise>
-		</choose>
-    </select>
-    
-    <select id="get" resultMap="IpCommGroupCfgMap">
-    	select 
-    		<include refid="columns"></include>
-    	from ip_comm_cfg r
-    	where r.cfg_id=#{cfgId}
-    </select>
-    <select id="getByIds" resultMap="IpCommGroupCfgMap">
-    	select 
-    		<include refid="columns"></include>
-    	from ip_comm_cfg r
-    	where r.cfg_id in (${ids}) and is_valid !=-1
-    </select>
-    <select id="getByAsnNo" resultMap="IpCommGroupCfgMap" parameterType="java.lang.Long" >
-    	select 
-    		<include refid="columns"></include>
-    	from ip_comm_cfg r where r.is_valid!=-1 and r.user_region1=#{asnId}
-   </select>
-  <insert id="insertIpCommGroupCfg" parameterType="com.nis.domain.basics.IpCommCfg" >
-  <selectKey resultType="java.lang.Long" order="AFTER" keyProperty="cfgId">
-    	SELECT LAST_INSERT_ID()
-    </selectKey>
-    insert into ip_comm_cfg (
-    CFG_DESC,
-    ACTION,
-    IS_VALID,
-    IS_AUDIT,
-    CREATOR_ID,
-    CREATE_TIME,
-    EDITOR_ID,
-    EDIT_TIME,
-    AUDITOR_ID,
-    AUDIT_TIME,
-   	SERVICE_ID,
-   	REQUEST_ID,
-   	REGION_ID,
-   	GROUP_ID,
-   	COMPILE_ID,
-   	IS_AREA_EFFECTIVE,
-   	CLASSIFY,
-    ATTRIBUTE,
-    LABLE,
-    AREA_EFFECTIVE_IDS,
-    FUNCTION_ID,
-    IP_TYPE,
-    SRC_IP_ADDRESS,
-    SRC_IP_PATTERN,
-    DEST_IP_PATTERN,
-    SRC_PORT_PATTERN,
-    DEST_PORT_PATTERN,
-    SRC_PORT,
-    PROTOCOL,
-    PROTOCOL_ID,
-    DIRECTION,
-    DEST_PORT,
-    DEST_IP_ADDRESS,
-    CFG_TYPE,
-    CFG_REGION_CODE,
-    USER_REGION1,
-    USER_REGION2,
-    USER_REGION3,
-    USER_REGION4,
-    USER_REGION5,
-    )values (
-   		#{cfgDesc,jdbcType=VARCHAR},
-   		#{action,jdbcType=INTEGER}, 
-    	#{isValid,jdbcType=INTEGER}, 
-    	#{isAudit,jdbcType=INTEGER}, 
-    	#{creatorId,jdbcType=INTEGER}, 
-   		#{createTime,jdbcType=TIMESTAMP},
-   		#{editorId,jdbcType=INTEGER},
-   		#{editTime,jdbcType=TIMESTAMP}, 
-   	 	#{auditorId,jdbcType=INTEGER},
-    	#{auditTime,jdbcType=TIMESTAMP},
-    	#{serviceId,jdbcType=INTEGER}, 
-    	#{requestId,jdbcType=INTEGER},
-    	#{regionId,jdbcType=INTEGER},
-    	#{groupId,jdbcType=INTEGER},
-    	#{compileId,jdbcType=INTEGER},
-    	#{isAreaEffective,jdbcType=INTEGER},
-    	#{classify,jdbcType=VARCHAR},
-    	#{attribute,jdbcType=VARCHAR},
-    	#{lable,jdbcType=VARCHAR},    
-   	 	#{areaEffectiveIds,jdbcType=VARCHAR},
-    	#{functionId,jdbcType=INTEGER},
-    	#{ipType,jdbcType=INTEGER},
-    	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
-    	#{srcPort,jdbcType=VARCHAR},
-    	#{protocol,jdbcType=INTEGER},
-    	#{protocolId,jdbcType=INTEGER},
-    	#{direction,jdbcType=INTEGER},
-    	#{destPort,jdbcType=VARCHAR},
-    	#{destIpAddress,jdbcType=VARCHAR},
-    	#{cfgType,jdbcType=VARCHAR},
-    	#{cfgRegionCode,jdbcType=INTEGER},
-    	#{userRegion1,jdbcType=VARCHAR},
-    	#{userRegion2,jdbcType=VARCHAR},
-    	#{userRegion3,jdbcType=VARCHAR},
-    	#{userRegion4,jdbcType=VARCHAR},
-    	#{userRegion5,jdbcType=VARCHAR}
-    )
-  </insert>
-  <insert id="insertForBatch" parameterType="com.nis.domain.basics.IpCommCfg" >
-    insert into ip_comm_cfg (
-    CFG_DESC,
-    ACTION,
-    IS_VALID,
-    IS_AUDIT,
-    CREATOR_ID,
-    CREATE_TIME,
-    EDITOR_ID,
-    EDIT_TIME,
-    AUDITOR_ID,
-    AUDIT_TIME,
-   	SERVICE_ID,
-   	REQUEST_ID,
-   	REGION_ID,
-   	GROUP_ID,
-   	COMPILE_ID,
-   	IS_AREA_EFFECTIVE,
-   	CLASSIFY,
-    ATTRIBUTE,
-    LABLE,
-    AREA_EFFECTIVE_IDS,
-    FUNCTION_ID,
-    IP_TYPE,
-    SRC_IP_ADDRESS,
-    SRC_IP_PATTERN,
-    DEST_IP_PATTERN,
-    SRC_PORT_PATTERN,
-    DEST_PORT_PATTERN,
-    SRC_PORT,
-    PROTOCOL,
-    PROTOCOL_ID,
-    DIRECTION,
-    DEST_PORT,
-    DEST_IP_ADDRESS,
-    CFG_TYPE,
-    CFG_REGION_CODE,
-    USER_REGION1,
-    USER_REGION2,
-    USER_REGION3,
-    USER_REGION4,
-    USER_REGION5
-    )values (
-   		#{cfgDesc,jdbcType=VARCHAR},
-   		#{action,jdbcType=INTEGER}, 
-    	#{isValid,jdbcType=INTEGER}, 
-    	#{isAudit,jdbcType=INTEGER}, 
-    	#{creatorId,jdbcType=INTEGER}, 
-   		#{createTime,jdbcType=TIMESTAMP},
-   		#{editorId,jdbcType=INTEGER},
-   		#{editTime,jdbcType=TIMESTAMP}, 
-   	 	#{auditorId,jdbcType=INTEGER},
-    	#{auditTime,jdbcType=TIMESTAMP},
-    	#{serviceId,jdbcType=INTEGER}, 
-    	#{requestId,jdbcType=INTEGER},
-    	#{regionId,jdbcType=INTEGER},
-    	#{groupId,jdbcType=INTEGER},
-    	#{compileId,jdbcType=INTEGER},
-    	#{isAreaEffective,jdbcType=INTEGER},
-    	#{classify,jdbcType=VARCHAR},
-    	#{attribute,jdbcType=VARCHAR},
-    	#{lable,jdbcType=VARCHAR},    
-   	 	#{areaEffectiveIds,jdbcType=VARCHAR},
-    	#{functionId,jdbcType=INTEGER},
-    	#{ipType,jdbcType=INTEGER},
-    	#{srcIpAddress,jdbcType=VARCHAR},
-    	#{srcIpPattern,jdbcType=INTEGER},#{destIpPattern,jdbcType=INTEGER},
-    	#{srcPortPattern,jdbcType=INTEGER},#{destPortPattern,jdbcType=INTEGER},
-    	#{srcPort,jdbcType=VARCHAR},
-    	#{protocol,jdbcType=INTEGER},
-    	#{protocolId,jdbcType=INTEGER},
-    	#{direction,jdbcType=INTEGER},
-    	#{destPort,jdbcType=VARCHAR},
-    	#{destIpAddress,jdbcType=VARCHAR},
-    	#{cfgType,jdbcType=VARCHAR},
-    	#{cfgRegionCode,jdbcType=INTEGER},
-    	#{userRegion1,jdbcType=VARCHAR},
-    	#{userRegion2,jdbcType=VARCHAR},
-    	#{userRegion3,jdbcType=VARCHAR},
-    	#{userRegion4,jdbcType=VARCHAR},
-    	#{userRegion5,jdbcType=VARCHAR}
-    )
-  </insert>
-    <update id="update" parameterType="com.nis.domain.basics.IpCommCfg" >
-    update ip_comm_cfg
-    <set >
-      <trim suffixOverrides=",">
-      <if test="cfgDesc != null and cfgDesc != ''" >
-        CFG_DESC = #{cfgDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="action != null" >
-        ACTION = #{action,jdbcType=INTEGER},
-      </if>
-      <if test="isValid != null" >
-        IS_VALID = #{isValid,jdbcType=INTEGER},
-      </if>
-      <if test="isAudit != null" >
-        IS_AUDIT = #{isAudit,jdbcType=INTEGER},
-      </if>
-      <if test="editorId != null" >
-        EDITOR_ID = #{editorId,jdbcType=INTEGER},
-      </if>
-       <if test="editTime != null  and editTime != ''" >
-      	EDIT_TIME = #{editTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="auditorId != null" >
-        AUDITOR_ID = #{auditorId,jdbcType=INTEGER},
-      </if>
-       <if test="auditTime != null  and auditTime != ''" >
-     	AUDIT_TIME = #{auditTime,jdbcType=TIMESTAMP},
-      </if>
-       <if test="regionId != null" >
-     	REGION_ID = #{regionId,jdbcType=TIMESTAMP},
-      </if>
-      <if test="requestId != null" >
-        REQUEST_ID = #{requestId,jdbcType=INTEGER},
-      </if>
-      <if test="isAreaEffective != null" >
-        IS_AREA_EFFECTIVE = #{isAreaEffective,jdbcType=INTEGER},
-      </if>
-      <if test="classify != null and classify != ''" >
-        CLASSIFY = #{classify,jdbcType=VARCHAR},
-      </if>
-      <if test="attribute != null and attribute != ''" >
-        ATTRIBUTE = #{attribute,jdbcType=VARCHAR},
-      </if>
-      <if test="lable != null and lable != ''" >
-        LABLE = #{lable,jdbcType=VARCHAR},
-      </if>
-      <if test="areaEffectiveIds != null" >
-        AREA_EFFECTIVE_IDS =  #{areaEffectiveIds,jdbcType=VARCHAR},
-      </if>
-      <if test="functionId != null" >
-        FUNCTION_ID =  #{functionId,jdbcType=INTEGER},
-      </if>
-      <if test="serviceId != null" >
-        SERVICE_ID =  #{serviceId,jdbcType=INTEGER},
-      </if>
-      <if test="ipType != null" >
-        IP_TYPE = #{ipType,jdbcType=INTEGER},
-      </if>
-      <if test="srcIpAddress != null and srcIpAddress != ''" >
-        SRC_IP_ADDRESS = #{srcIpAddress,jdbcType=VARCHAR},
-      </if>
-      <if test="srcIpPattern != null" >
-        SRC_IP_PATTERN = #{srcIpPattern,jdbcType=INTEGER},
-      </if>
-      <if test="destIpPattern != null" >
-        DEST_IP_PATTERN =#{destIpPattern,jdbcType=INTEGER},
-      </if>
-      <if test="srcPortPattern != null" >
-        SRC_PORT_PATTERN = #{srcPortPattern,jdbcType=INTEGER},
-      </if>
-      <if test="destPortPattern != null" >
-        DEST_PORT_PATTERN = #{destPortPattern,jdbcType=INTEGER},
-      </if>
-      <if test="srcPort != null and srcPort != ''" >
-        SRC_PORT = #{srcPort,jdbcType=VARCHAR},
-      </if>
-      <if test="protocol != null" >
-        PROTOCOL = #{protocol,jdbcType=INTEGER},
-      </if>
-      <if test="protocolId != null" >
-        PROTOCOL_ID = #{protocolId,jdbcType=INTEGER},
-      </if>
-      <if test="direction != null" >
-        DIRECTION = #{direction,jdbcType=INTEGER},
-      </if>
-      <if test="destPort != null and destPort != ''" >
-        DEST_PORT = #{destPort,jdbcType=VARCHAR},
-      </if>
-       <if test="destIpAddress != null and destIpAddress != ''" >
-        DEST_IP_ADDRESS = #{destIpAddress,jdbcType=VARCHAR},
-      </if>
-       <if test="cfgType != null and cfgType != ''" >
-        CFG_TYPE = #{cfgType,jdbcType=VARCHAR},
-      </if>
-       <if test="cfgRegionCode != null " >
-        CFG_REGION_CODE = #{cfgRegionCode,jdbcType=INTEGER},
-      </if>
-      <if test="userRegion1 != null and userRegion1 != ''" >
-        USER_REGION1 = #{userRegion1,jdbcType=VARCHAR},
-      </if>
-      <if test="userRegion2 != null and userRegion2 != ''" >
-        USER_REGION2 = #{userRegion2,jdbcType=VARCHAR},
-      </if>
-      <if test="userRegion3 != null and userRegion3 != ''" >
-        USER_REGION3 = #{userRegion3,jdbcType=VARCHAR},
-      </if>
-      <if test="userRegion4 != null and userRegion4 != ''" >
-        USER_REGION4 = #{userRegion4,jdbcType=VARCHAR},
-      </if>
-      <if test="userRegion5 != null and userRegion5 != ''" >
-        USER_REGION5 = #{userRegion5,jdbcType=VARCHAR},
-      </if>
-      <if test="groupId != null and groupId != ''" >
-        GROUP_ID = #{groupId,jdbcType=INTEGER},
-      </if>
-      <if test="regionId != null and regionId != ''" >
-        REGION_ID = #{regionId,jdbcType=INTEGER},
-      </if>
-      </trim>
-    </set>
-    <where>
-       	and cfg_id =  #{cfgId,jdbcType=INTEGER}
-    </where>
-  </update>
-  
-   <delete id="delete" parameterType="java.lang.String" >
-    delete from ip_comm_cfg where cfg_id in (${ids}) 
-   </delete>
-   <select id="getGroupIdCount" parameterType="java.lang.Integer" resultType="java.lang.Integer">
-   		SELECT  COUNT(cfg_id) groupCount from ip_comm_cfg 
-   		WHERE group_id= #{groupId} 
-   		and is_valid=1
-   </select>
-</mapper>

src/main/java/com/nis/web/dao/basics/PolicyGroupInfoDao.java

@@ -24,9 +24,6 @@ public interface PolicyGroupInfoDao extends CrudDao<PolicyGroupInfo> {
 	
 	Integer getGroupIdByGroupName(String groupName);
 	PolicyGroupInfo getGroupInfo(PolicyGroupInfo policyGroupInfo);
-	List<PolicyGroupInfo> findPolicyGroupInfosByTypeForUD(@Param("groupType")Integer groupType,@Param("flag")Integer flag);
-	List<PolicyGroupInfo> findLimitedPolicyGroupInfosByTypeForUD(@Param("groupType")Integer groupType,@Param("flag")Integer flag,@Param("limit")Integer limit);
+	
 	List<PolicyGroupInfo> findPolicyByGroupInfoList(@Param("ids")String ids);
-	void updateUdFlag(@Param("groupId")int groupId,@Param("udFlag")int udFlag,@Param("groupType")int groupType);
-	List<PolicyGroupInfo> findPolicyByServiceGroupInfoList(@Param("ids")String ids);
 }

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

@@ -266,45 +266,6 @@
 		WHERE 
 			r.group_id IN (${ids})
 	</select>
-    <select id="findPolicyByServiceGroupInfoList" resultMap="PolicyGroupInfoMap">
-		SELECT
-			<include refid="PolicyGroupInfoColumns"/>
-		<trim prefix="," prefixOverrides=",">
-			, s.name as creator_name
-			,e.name as editor_name
-		</trim>
-	    FROM 
-	    	policy_group_info r
-	    	left join sys_user s on r.creator_id=s.id
-			left join sys_user e on r.editor_id=e.id
-		WHERE 
-			r.service_group_id IN (${ids})
-	</select>
-  <select id="findPolicyGroupInfosByTypeForUD" resultMap="PolicyGroupInfoMap">
-		SELECT
-			<include refid="PolicyGroupInfoColumns"/>
-	    FROM policy_group_info r
-	    where r.is_valid=1 and r.group_type=#{groupType,jdbcType=INTEGER}
-	    <if test="flag!=null">
-	    and	ud_flag=#{flag}
-	    </if>
-	</select>
-  <select id="findLimitedPolicyGroupInfosByTypeForUD" resultMap="PolicyGroupInfoMap">
-		SELECT
-			<include refid="PolicyGroupInfoColumns"/>
-	    FROM policy_group_info r
-	    where r.is_valid=1 and r.group_type=#{groupType,jdbcType=INTEGER}
-	    <if test="flag!=null">
-	    and	ud_flag=#{flag}
-	    </if>
-	    <if test="flag!=null">
-	    limit #{limit}
-	    </if>
-	</select>
-  	<update id="updateUdFlag" parameterType="java.lang.Integer"> 
-    	UPDATE policy_group_info  SET ud_flag =#{udFlag}
-    	 WHERE service_group_id=#{groupId}
-    	 and group_type=#{groupType}
-    </update>
+  
   
 </mapper>

src/main/java/com/nis/web/dao/basics/UrlCommGroupDao.java

@@ -1,38 +0,0 @@
-package com.nis.web.dao.basics;
-
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
-import com.nis.domain.basics.UrlCommCfg;
-import com.nis.web.dao.CrudDao;
-import com.nis.web.dao.MyBatisDao;
-
-@MyBatisDao
-public interface UrlCommGroupDao  extends CrudDao<UrlCommCfg>{
-	
-	// 查询列表
-	public List<UrlCommCfg> findAllPageList(UrlCommCfg entity);
-	
-	public List<UrlCommCfg> findByPage(@Param("ids")String ids);
-	
-	public List<UrlCommCfg> findInfoByCfgId(@Param("cfgId")Long cfgId);
-	//新增
-	public int insertUrlCommGroupCfg(UrlCommCfg entity);
-	
-	public Integer findUrlUdFlag(@Param("groupId")Integer groupId);
-	
-	public int updateUrlUdFlag(@Param("groupId")Integer groupId,@Param("udFlag")Integer udFlag);
-	
-	//修改
-	public int update(UrlCommCfg entity);
-	
-	//删除
-	public int delete(@Param("ids")String ids);
-	
-	public List<UrlCommCfg> getByIds(@Param("ids")String ids);
-	
-	
-	public Integer getGroupIdCount(@Param("groupId")String groupId);
-	
-}

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

@@ -1,388 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.nis.web.dao.basics.UrlCommGroupDao">
-    <resultMap id="urlCommGroupCfgMap" type="com.nis.domain.basics.UrlCommCfg">
-	    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
-	    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
-	    <result column="cfg_keywords" property="cfgKeywords" jdbcType="VARCHAR" />
-	    <result column="action" property="action" jdbcType="INTEGER" />
-	    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
-	    <result column="is_audit" property="isAudit" jdbcType="INTEGER" />
-	    <result column="creator_id" property="creatorId" jdbcType="INTEGER" />
-	    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-	    <result column="editor_id" property="editorId" jdbcType="INTEGER" />
-	    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
-	    <result column="auditor_id" property="auditorId" jdbcType="INTEGER" />
-	    <result column="audit_time" property="auditTime" jdbcType="TIMESTAMP" />
-	    <result column="service_id" property="serviceId" jdbcType="INTEGER" />
-	    <result column="request_id" property="requestId" jdbcType="INTEGER" />
-	    <result column="compile_id" property="compileId" jdbcType="INTEGER" />
-	    <result column="is_area_effective" property="isAreaEffective" jdbcType="INTEGER" />
-	    <result column="classify" property="classify" jdbcType="VARCHAR" />
-	    <result column="attribute" property="attribute" jdbcType="VARCHAR" />
-	    <result column="lable" property="lable" jdbcType="VARCHAR" />
-	    <result column="expr_type" property="exprType" jdbcType="INTEGER" />
-	    <result column="match_method" property="matchMethod" jdbcType="INTEGER" />
-	    <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
-	    <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
-	    <result column="function_id" property="functionId" jdbcType="INTEGER" />
-	    <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
-	    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
-	    <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
-	    <result column="user_region1" property="userRegion1" jdbcType="VARCHAR" />
-	    <result column="user_region2" property="userRegion2" jdbcType="VARCHAR" />
-	    <result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
-	    <result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
-	    <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
-	    
-	    <result column="group_name" property="groupName" jdbcType="VARCHAR" />
-    </resultMap>
-  	
-  	<select id="findAllPageList" parameterType="com.nis.domain.basics.UrlCommCfg" resultMap="urlCommGroupCfgMap">
-  		SELECT
-			r.cfg_id,r.cfg_desc,r.cfg_keywords,r.action,r.is_valid,r.is_audit,r.creator_id,
-			r.create_time,r.editor_id,r.edit_time,r.auditor_id,r.audit_time,r.service_id,
-			r.request_id,r.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable,
-			r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,
-			r.cfg_region_code,r.cfg_type,r.ratelimit,r.user_region1,r.user_region2,
-			r.user_region3,r.user_region4,r.user_region5,
-			s.name AS creator_name,e.name AS editor_name,u.name AS auditor_name,c.group_name
-		FROM
-			http_url_cfg r
-		LEFT JOIN sys_user s ON r.creator_id = s.id
-		LEFT JOIN sys_user e ON r.editor_id = e.id
-		LEFT JOIN sys_user u ON r.auditor_id = u.id
-		LEFT JOIN policy_group_info c ON c.service_group_id=r.user_region3
-  		<trim prefix="WHERE" prefixOverrides="AND |OR ">
-    		<if test="page !=null and page.where != null and page.where != ''">
-				AND ${page.where}
-			</if>
-    		<if test="cfgId != null">
-    			AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
-    		</if>
-	    	<if test="cfgDesc != null and cfgDesc != ''">
-	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
-	    	</if>
-	    	<if test="cfgKeywords != null and cfgKeywords != ''">
-	    		AND r.cfg_keywords like concat(concat('%',#{cfgKeywords,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="cfgRegionCode != null">
-	    		AND r.CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="cfgType != null and cfgType != ''">
-	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
-	    	</if>
-	    	<if test="action != null">
-	    		AND r.ACTION=#{action,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="creatorName != null and creatorName !=''">
-	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="createTime != null and createTime !=''">
-	    		AND r.CREATE_TIME=#{createTime,jdbcType=TIMESTAMP}
-	    	</if>
-	    	<if test="editorName != null and editorName !=''">
-	    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="editTime != null and editTime !='' ">
-	    		AND r.EDIT_TIME=#{editTime,jdbcType=TIMESTAMP}
-	    	</if>
-	    	<if test="auditorName != null and auditorName !=''">
-	    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="auditTime != null and auditTime !=''">
-	    		AND r.AUDIT_TIME=#{auditTime,jdbcType=TIMESTAMP}
-	    	</if>
-	    	<if test="serviceId != null">
-	    		AND r.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="requestId != null">
-	    		AND r.REQUEST_ID=#{requestId,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isAreaEffective != null">
-	    		AND r.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="classify != null and classify !=''">
-	    		AND r.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="attribute != null and attribute !=''">
-	    		AND r.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="lable != null and lable !=''">
-	    		AND r.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="areaEffectiveIds != null and areaEffectiveIds !=''">
-	    		AND r.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
-	    	</if>
-	    	<if test="functionId != null">
-	    		AND r.FUNCTION_ID=#{functionId,jdbcType=INTEGER}
-	    	</if>
-	    	
-	    	<!-- 数据范围过滤 -->
-			${sqlMap.dsf}
-	    </trim>
-	    <choose>
-			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
-				ORDER BY ${page.orderBy}
-			</when>
-			<otherwise>
-				ORDER BY r.is_audit,r.create_time desc
-			</otherwise>
-		</choose>
-  	
-  	</select>
-  	
-  	
-  	
-  	<select id="findByPage" resultMap="urlCommGroupCfgMap">
-    	SELECT
-			r.cfg_id,r.cfg_desc,r.cfg_keywords,r.action,r.is_valid,r.is_audit,r.creator_id,
-			r.create_time,r.editor_id,r.edit_time,r.auditor_id,r.audit_time,r.service_id,
-			r.request_id,r.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable,
-			r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,
-			r.cfg_region_code,r.cfg_type,r.ratelimit,r.user_region1,r.user_region2,
-			r.user_region3,r.user_region4,r.user_region5,
-			s.name AS creator_name,e.name AS editor_name,u.name AS auditor_name
-		FROM
-			http_url_cfg r
-		LEFT JOIN sys_user s ON r.creator_id = s.id
-		LEFT JOIN sys_user e ON r.editor_id = e.id
-		LEFT JOIN sys_user u ON r.auditor_id = u.id
-    	where r.CFG_ID in (${ids})
-    </select>
-    
-    <select id="findInfoByCfgId"  resultMap="urlCommGroupCfgMap">
-    	SELECT
-			r.cfg_id,r.cfg_desc,r.cfg_keywords,r.action,r.is_valid,r.is_audit,r.creator_id,
-			r.create_time,r.editor_id,r.edit_time,r.auditor_id,r.audit_time,r.service_id,
-			r.request_id,r.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable,
-			r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,
-			r.cfg_region_code,r.cfg_type,r.ratelimit,r.user_region1,r.user_region2,
-			r.user_region3,r.user_region4,r.user_region5
-		FROM
-			http_url_cfg r
-    	where r.CFG_ID =#{cfgId}
-    
-    </select>
-    
-    <select id="get" resultMap="urlCommGroupCfgMap">
-    	SELECT
-			r.cfg_id,r.cfg_desc,r.cfg_keywords,r.action,r.is_valid,r.is_audit,r.creator_id,
-			r.create_time,r.editor_id,r.edit_time,r.auditor_id,r.audit_time,r.service_id,
-			r.request_id,r.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable,
-			r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,
-			r.cfg_region_code,r.cfg_type,r.ratelimit,r.user_region1,r.user_region2,
-			r.user_region3,r.user_region4,r.user_region5
-    	from http_url_cfg r
-    	where r.cfg_id=#{cfgId}
-    </select>
-    
-    <insert id="insertUrlCommGroupCfg" parameterType="com.nis.domain.basics.UrlCommCfg">
-    	insert into http_url_cfg (
-	     CFG_DESC,
-	     cfg_keywords,
-	     action,
-	     is_valid,
-	     is_audit,
-	    creator_id,
-	    create_time,
-	    editor_id,
-	    edit_time,
-	    auditor_id,
-	   	audit_time,
-	   	service_id,
-	   	request_id,
-	   	compile_id,
-	   	IS_AREA_EFFECTIVE,
-	   	CLASSIFY,
-	    ATTRIBUTE,
-	    LABLE,
-	    expr_type,
-	    match_method,    
-	    is_hexbin,
-	    area_effective_ids,
-	    function_id,
-	    cfg_region_code,
-	    cfg_type,
-	    ratelimit,
-	    user_region1,
-	    user_region2,
-	    user_region3,
-	    user_region4,
-	    user_region5
-	    )values (
-	   		#{cfgDesc,jdbcType=VARCHAR},
-	   		#{cfgKeywords,jdbcType=VARCHAR},
-	   		#{action,jdbcType=INTEGER}, 
-	    	#{isValid,jdbcType=INTEGER}, 
-	    	#{isAudit,jdbcType=INTEGER}, 
-	    	#{creatorId,jdbcType=INTEGER}, 
-	   		#{createTime,jdbcType=TIMESTAMP},
-	   		#{editorId,jdbcType=INTEGER},
-	   		#{editTime,jdbcType=TIMESTAMP}, 
-	   	 	#{auditorId,jdbcType=INTEGER},
-	    	#{auditTime,jdbcType=TIMESTAMP},
-	    	#{serviceId,jdbcType=INTEGER}, 
-	    	#{requestId,jdbcType=INTEGER},
-	    	#{compileId,jdbcType=INTEGER},
-	    	#{isAreaEffective,jdbcType=INTEGER},
-	    	#{classify,jdbcType=VARCHAR},
-	    	#{attribute,jdbcType=VARCHAR},
-	    	#{lable,jdbcType=VARCHAR},
-	    	#{exprType,jdbcType=INTEGER},
-	    	#{matchMethod,jdbcType=INTEGER},
-	    	#{isHexbin,jdbcType=INTEGER},
-	   	 	#{areaEffectiveIds,jdbcType=VARCHAR},
-	    	#{functionId,jdbcType=INTEGER},
-	    	#{cfgRegionCode,jdbcType=INTEGER},
-	    	#{cfgType,jdbcType=VARCHAR},
-	    	#{ratelimit,jdbcType=VARCHAR},
-	    	#{userRegion1,jdbcType=VARCHAR},
-	    	#{userRegion2,jdbcType=VARCHAR},
-	    	#{userRegion3,jdbcType=VARCHAR},
-	    	#{userRegion4,jdbcType=VARCHAR},
-	    	#{userRegion5,jdbcType=VARCHAR}
-    	)
-    </insert>
-    
-    <select id="findUrlUdFlag" parameterType="java.lang.Integer" resultType="java.lang.Integer">
-    	SELECT  ud_flag from policy_group_info  
-    	where  service_group_id=#{groupId} 
-    	and group_type=11
-    </select>
-    
-    <update id="updateUrlUdFlag" parameterType="java.lang.Integer"> 
-    	UPDATE policy_group_info  SET ud_flag =#{udFlag}
-    	 WHERE service_group_id=#{groupId}
-    	 and group_type=11
-    </update>
-    
-    <update id="update" parameterType="com.nis.domain.basics.UrlCommCfg" >
-    update http_url_cfg
-    <set >
-      <trim suffixOverrides=",">
-      <if test="cfgDesc != null and cfgDesc != ''" >
-        cfg_desc = #{cfgDesc,jdbcType=VARCHAR},
-      </if>
-      <if test="cfgKeywords != null and cfgKeywords != ''" >
-        cfg_keywords =  #{cfgKeywords,jdbcType=VARCHAR},
-      </if>
-      <if test="action != null" >
-        action = #{action,jdbcType=INTEGER},
-      </if>
-      <if test="isValid != null" >
-        is_valid = #{isValid,jdbcType=INTEGER},
-      </if>
-      <if test="isAudit != null" >
-        is_audit = #{isAudit,jdbcType=INTEGER},
-      </if>
-      <if test="editorId != null" >
-        editor_id = #{editorId,jdbcType=INTEGER},
-      </if>
-       <if test="editTime != null  and editTime != ''" >
-      	edit_time = #{editTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="auditorId != null" >
-        AUDITOR_ID = #{auditorId,jdbcType=INTEGER},
-      </if>
-       <if test="auditTime != null  and auditTime != ''" >
-     	AUDIT_TIME = #{auditTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="serviceId != null" >
-        service_id =  #{serviceId,jdbcType=INTEGER},
-      </if>
-      <if test="requestId != null" >
-        request_id = #{requestId,jdbcType=INTEGER},
-      </if>
-      <if test="compileId != null and compileId != ''" >
-        compile_id = #{compileId,jdbcType=INTEGER},
-      </if>
-      <if test="isAreaEffective != null" >
-        is_area_effective = #{isAreaEffective,jdbcType=INTEGER},
-      </if>
-      <if test="classify != null and classify != ''" >
-        classify = #{classify,jdbcType=VARCHAR},
-      </if>
-      <if test="attribute != null and attribute != ''" >
-        attribute = #{attribute,jdbcType=VARCHAR},
-      </if>
-      <if test="lable != null and lable != ''" >
-        lable = #{lable,jdbcType=VARCHAR},
-      </if>
-      <if test="exprType != null" >
-        expr_type = #{exprType,jdbcType=INTEGER},
-      </if>
-      <if test="matchMethod != null" >
-        match_method = #{matchMethod,jdbcType=INTEGER},
-      </if>
-      <if test="isHexbin != null" >
-        is_hexbin = #{isHexbin,jdbcType=INTEGER},
-      </if>
-      <if test="areaEffectiveIds != null" >
-        area_effective_ids =  #{areaEffectiveIds,jdbcType=VARCHAR},
-      </if>
-      <if test="functionId != null" >
-        function_id =  #{functionId,jdbcType=INTEGER},
-      </if>          
-       <if test="cfgType != null and cfgType != ''" >
-        cfg_type = #{cfgType,jdbcType=VARCHAR},
-      </if>
-       <if test="cfgRegionCode != null " >
-        cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER},
-      </if>
-       <if test="ratelimit != null and ratelimit != ''" >
-        ratelimit = #{ratelimit,jdbcType=VARCHAR},
-      </if>
-      <if test="userRegion1 != null and userRegion1 != ''" >
-        user_region1 = #{userRegion1,jdbcType=VARCHAR},
-      </if>
-      <if test="userRegion2 != null and userRegion2 != ''" >
-        user_region2 = #{userRegion2,jdbcType=VARCHAR},
-      </if>
-      <if test="userRegion3 != null and userRegion3 != ''" >
-        user_region3 = #{userRegion3,jdbcType=VARCHAR},
-      </if>
-      <if test="userRegion4 != null and userRegion4 != ''" >
-        user_region4 = #{userRegion4,jdbcType=VARCHAR},
-      </if>
-      <if test="userRegion5 != null and userRegion5 != ''" >
-        user_region5 = #{userRegion5,jdbcType=VARCHAR},
-      </if>
-      </trim>
-    </set>
-    <where>
-       	and cfg_id =  #{cfgId,jdbcType=INTEGER}
-    </where>
-  </update>
-    
-   <delete id="delete" parameterType="java.lang.String" >
-    	delete from http_url_cfg where cfg_id in (${ids}) 
-   </delete>
-   
-   <select id="getByIds" resultMap="urlCommGroupCfgMap">
-    	select 
-    		r.cfg_id,r.cfg_desc,r.cfg_keywords,r.action,r.is_valid,r.is_audit,r.creator_id,
-			r.create_time,r.editor_id,r.edit_time,r.auditor_id,r.audit_time,r.service_id,
-			r.request_id,r.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable,
-			r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,
-			r.cfg_region_code,r.cfg_type,r.ratelimit,r.user_region1,r.user_region2,
-			r.user_region3,r.user_region4,r.user_region5
-    	from http_url_cfg r
-    	where r.cfg_id in (${ids}) and is_valid !=-1
-    </select>
-   
-   <select id="getGroupIdCount" parameterType="java.lang.String" resultType="java.lang.Integer">
-   		SELECT  COUNT(cfg_id) groupCount from http_url_cfg 
-   		WHERE user_region3= #{groupId} 
-   		and is_valid=1
-   </select>
-</mapper>

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

@@ -620,8 +620,13 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="specServiceId != null">
-    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    	<if test="appCode != null">
+    			AND r.app_code=#{appCode,jdbcType=INTEGER}
+    		</if>
+    		<if test="appCode == null">
+    			<if test="specServiceId != null">
+	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    		</if>
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
@@ -721,21 +726,42 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="specServiceId != null">
-    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+    		<if test="appCode != null">
+    			AND r.app_code=#{appCode,jdbcType=INTEGER}
+    		</if>
+    		<if test="appCode == null">
+    			<if test="specServiceId != null">
+	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    		</if>
     		</if>
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -880,8 +906,13 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="specServiceId != null">
-    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    	<if test="appCode != null">
+    			AND r.app_code=#{appCode,jdbcType=INTEGER}
+    		</if>
+    		<if test="appCode == null">
+    			<if test="specServiceId != null">
+	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    		</if>
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{CFG_TYPE,jdbcType=VARCHAR}),'%') 
@@ -922,15 +953,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -1035,8 +1082,13 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="specServiceId != null">
-    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    	<if test="appCode != null">
+    			AND r.app_code=#{appCode,jdbcType=INTEGER}
+    		</if>
+    		<if test="appCode == null">
+    			<if test="specServiceId != null">
+	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    		</if>
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
@@ -1050,15 +1102,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -1138,8 +1206,13 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="specServiceId != null">
-    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    	<if test="appCode != null">
+    			AND r.app_code=#{appCode,jdbcType=INTEGER}
+    		</if>
+    		<if test="appCode == null">
+    			<if test="specServiceId != null">
+	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    		</if>
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
@@ -1150,15 +1223,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -1270,15 +1359,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -1377,8 +1482,13 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="specServiceId != null">
-    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    	<if test="appCode != null">
+    			AND r.app_code=#{appCode,jdbcType=INTEGER}
+    		</if>
+    		<if test="appCode == null">
+    			<if test="specServiceId != null">
+	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    		</if>
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
@@ -1572,8 +1682,13 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="specServiceId != null">
-    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    	<if test="appCode != null">
+    			AND r.app_code=#{appCode,jdbcType=INTEGER}
+    		</if>
+    		<if test="appCode == null">
+    			<if test="specServiceId != null">
+	    			AND r.spec_service_id=#{specServiceId,jdbcType=INTEGER}
+	    		</if>
     		</if>
     		<if test="cfgType != null and cfgType != ''">
 	    		AND r.CFG_TYPE like concat(concat('%',#{cfgType,jdbcType=VARCHAR}),'%') 
@@ -1587,15 +1702,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>

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

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

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

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

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

@@ -310,15 +310,31 @@
 	    	<if test="action != null">
 	    		AND r.ACTION=#{action,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="isValid != null">
-	    		AND r.IS_VALID=#{isValid,jdbcType=INTEGER}
-	    	</if>
-	    	<if test="isValid == null">
-	    		AND r.IS_VALID != -1
-	    	</if>
-	    	<if test="isAudit != null">
-	    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
-	    	</if>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchValidValue != null and batchValidValue != ''">
+					AND  r.IS_VALID in (${batchValidValue})
+				</when>
+				<otherwise>
+					<if test="isValid != null">
+			    		AND  r.IS_VALID=#{isValid,jdbcType=INTEGER}
+			    	</if>
+			    	<if test="isValid == null">
+			    		AND  r.IS_VALID != -1
+			    	</if>
+				</otherwise>
+			</choose>
+	    	<choose>
+	    		<!-- 判断是否批量操作 -->
+				<when test="batchAuditValue != null and batchAuditValue != ''">
+			    		AND r.IS_AUDIT in(${batchAuditValue})
+				</when>
+				<otherwise>
+					<if test="isAudit != null">
+			    		AND r.IS_AUDIT=#{isAudit,jdbcType=INTEGER}
+			    	</if>
+				</otherwise>
+			</choose>
 	    	<if test="creatorName != null and creatorName != ''">
 	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
 	    	</if>
@@ -2128,6 +2144,12 @@
     update ${tableName} set is_valid = #{isValid,jdbcType=INTEGER},
     <if test="isAudit != null">
     is_audit = #{isAudit,jdbcType=INTEGER},
+    </if>
+	<if test="auditTime !=null ">
+		audit_time = #{auditTime,jdbcType=TIMESTAMP},
+	</if>
+    <if test="auditorId != null" >
+      AUDITOR_ID = #{auditorId,jdbcType=INTEGER},
     </if>
     editor_id = #{editorId,jdbcType=INTEGER} , 
     edit_time = #{editTime,jdbcType=TIMESTAMP} 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -16,7 +16,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 
-import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.mapping.MappedStatement;
@@ -52,8 +51,6 @@ import com.nis.domain.SysRole;
 import com.nis.domain.SysUser;
 import com.nis.domain.basics.AsnGroupInfo;
 import com.nis.domain.basics.AsnIpCfg;
-import com.nis.domain.basics.IpCommCfg;
-import com.nis.domain.basics.UrlCommCfg;
 import com.nis.domain.callback.InlineIp;
 import com.nis.domain.callback.NtcDnsResStrategy;
 import com.nis.domain.callback.ProxyObjKeyring;
@@ -1452,67 +1449,12 @@ public abstract class BaseService {
 					List<IpCfg> cfgs = ipConvert(cfg, baseIpCfg);
 					maatIpList.addAll(cfgs);
 				}
-			} else if(ipCfgList.get(0) instanceof IpCommCfg) {
-				for (BaseCfg<?> _cfg : ipCfgList) {
-					IpCfg cfg = new IpCfg();
-					BaseIpCfg baseIpCfg = new BaseIpCfg();
-					IpCommCfg ipCommGroupCfg = (IpCommCfg) _cfg;
-					BeanUtils.copyProperties(ipCommGroupCfg, baseIpCfg);
-					BeanUtils.copyProperties(baseIpCfg, cfg);
-					if(groupId==null) {
-						cfg.setGroupId(ipCommGroupCfg.getGroupId());
-					}else {
-						cfg.setGroupId(groupId);
-					}
-					cfg.setRegionId(ipCommGroupCfg.getRegionId());
-					//user regions
-					//String userRegion = "APP_ID=" + appIpCfg.getAppCode();
-					//cfg.setUserRegion(userRegion);
-					cfg.setIsValid(isValid);
-					cfg.setAuditTime(opTime);
-					List<IpCfg> cfgs = ipConvert(cfg, baseIpCfg);
-					maatIpList.addAll(cfgs);
-				}
 			}
 		}
 		long end = System.currentTimeMillis();
 		logger.warn("convert data finish,cost:" + (end - start));
 		return maatIpList;
 	}
-	public List<StringCfg> groupReuseStringCfgAddRemoveConvert(List<? extends BaseCfg<?>> stringCfgList, Integer isValid,
-			Integer groupId) {
-		logger.warn("convert data start");
-		long start = System.currentTimeMillis();
-		Date opTime = new Date();
-		List<StringCfg> maatStringList = new ArrayList<>();
-		if (CollectionUtils.isNotEmpty(stringCfgList)) {
-			// 只用一次instanceof,取代循环中每次都用一次instanceof
-			if(stringCfgList.get(0) instanceof UrlCommCfg) {
-				for (BaseCfg<?> _cfg : stringCfgList) {
-					StringCfg cfg = new StringCfg();
-					BaseStringCfg baseStringCfg = new BaseStringCfg();
-					UrlCommCfg ipCommGroupCfg = (UrlCommCfg) _cfg;
-					BeanUtils.copyProperties(_cfg, baseStringCfg);
-					BeanUtils.copyProperties(baseStringCfg, cfg);
-					if(groupId==null) {
-						cfg.setGroupId(ipCommGroupCfg.getGroupId());
-					}else {
-						cfg.setGroupId(groupId);
-					}
-					cfg.setRegionId(ipCommGroupCfg.getRegionId());
-					//user regions
-					//String userRegion = "APP_ID=" + appIpCfg.getAppCode();
-					//cfg.setUserRegion(userRegion);
-					cfg.setIsValid(isValid);
-					cfg.setAuditTime(opTime);
-					maatStringList.add(cfg);
-				}
-			}
-		}
-		long end = System.currentTimeMillis();
-		logger.warn("convert data finish,cost:" + (end - start));
-		return maatStringList;
-	}
 	public MaatCfg convertMaatCfg(BaseCfg _cfg,Integer cfgType) {
 		MaatCfg maatCfg = new MaatCfg();
 		maatCfg.initDefaultValue();

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

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

src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java

@@ -1,250 +0,0 @@
-package com.nis.web.service.basics;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.ibatis.session.ExecutorType;
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.beust.jcommander.internal.Maps;
-import com.beust.jcommander.internal.Sets;
-import com.google.common.collect.Lists;
-import com.nis.domain.FunctionRegionDict;
-import com.nis.domain.FunctionServiceDict;
-import com.nis.domain.Page;
-import com.nis.domain.basics.AsnGroupInfo;
-import com.nis.domain.basics.AsnIpCfg;
-import com.nis.domain.basics.IpCommCfg;
-import com.nis.domain.configuration.BaseIpCfg;
-import com.nis.domain.configuration.CfgIndexInfo;
-import com.nis.domain.maat.GroupReuseAddBean;
-import com.nis.domain.maat.GroupReuseCfg;
-import com.nis.domain.maat.MaatCfg;
-import com.nis.domain.maat.ToMaatBean;
-import com.nis.domain.maat.ToMaatResult;
-import com.nis.domain.maat.MaatCfg.DigestCfg;
-import com.nis.domain.maat.MaatCfg.GroupCfg;
-import com.nis.domain.maat.MaatCfg.IpCfg;
-import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
-import com.nis.domain.maat.MaatCfg.StringCfg;
-import com.nis.util.ConfigServiceUtil;
-import com.nis.util.Constants;
-import com.nis.util.StringUtil;
-import com.nis.web.dao.basics.AsnGroupInfoDao;
-import com.nis.web.dao.basics.AsnIpCfgDao;
-import com.nis.web.dao.basics.IpCommGroupCfgDao;
-import com.nis.web.dao.basics.PolicyGroupInfoDao;
-import com.nis.web.security.UserUtils;
-import com.nis.web.service.BaseService;
-import com.nis.web.service.SpringContextHolder;
-@Service
-public class IpCommGroupCfgService extends BaseService {
-	@Autowired
-	private IpCommGroupCfgDao ipCommGroupCfgDao;
-	@Autowired
-	private PolicyGroupInfoDao policyGroupInfoDao;
-	/**
-	 * @param page
-	 * @param entity
-	 * @return
-	 */
-	public Page<IpCommCfg> findPage(Page<IpCommCfg> page, IpCommCfg entity) {
-		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
-		entity.setPage(page);
-		List<IpCommCfg> list=ipCommGroupCfgDao.findPage(entity);
-		page.setList(list);
-		return page;
-	}
-	
-	public List<IpCommCfg> findByPage(String ids) {
-		List<IpCommCfg> list=ipCommGroupCfgDao.findByPage(ids);
-		return list;
-	}
-	
-	public IpCommCfg get(Long id ) {
-		return ipCommGroupCfgDao.get(id);
-	}
-	
-	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void save(List<IpCommCfg> entitys) {
-		logger.warn("Start to save IP,size:"+entitys.size());
-		long start=System.currentTimeMillis();
-			for(IpCommCfg ipCfg:entitys) {
-				ipCommGroupCfgDao.insert(ipCfg);
-			}
-		long end=System.currentTimeMillis();
-		logger.warn("Save IP finish,cost:"+(end-start));
-	}
-	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void update(IpCommCfg entity){
-		ipCommGroupCfgDao.update(entity);
-	}
-
-	
-	public List<IpCommCfg> getByIds(String ids) {
-		if(ids==null) {
-			throw new RuntimeException("ids is null!");
-		}
-		return ipCommGroupCfgDao.getByIds(ids);
-	}
-
-	//新增 
-	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void saveIpCommGroupCfg(CfgIndexInfo entity) {
-		Date createTime=new Date();
-		if(CollectionUtils.isNotEmpty(entity.getIpCommGroupCfgList())) {
-			for (int i = 0; i < entity.getIpCommGroupCfgList().size(); i++) {
-				BeanUtils.copyProperties(entity, entity.getIpCommGroupCfgList().get(i), new String[]{"cfgId","userregion3"});
-				entity.getIpCommGroupCfgList().get(i).setRequestId(0);
-				entity.getIpCommGroupCfgList().get(i).setClassify("0");
-				entity.getIpCommGroupCfgList().get(i).setAttribute("0");
-				entity.getIpCommGroupCfgList().get(i).setLable("0");
-				entity.getIpCommGroupCfgList().get(i).setCreateTime(createTime);
-				entity.getIpCommGroupCfgList().get(i).setCreatorId(entity.getCurrentUser().getId());
-				entity.getIpCommGroupCfgList().get(i).setIsValid(Constants.VALID_NO);
-				entity.getIpCommGroupCfgList().get(i).setIsAudit(Constants.AUDIT_NOT_YET);
-				entity.getIpCommGroupCfgList().get(i).setGroupId(Integer.parseInt(entity.getUserRegion3()));
-				ipCommGroupCfgDao.insertForBatch(entity.getIpCommGroupCfgList().get(i));
-			}
-		}
-	}
-//	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-//	public void audit(List<IpCommCfg> ipCommGroupCfgs, Integer isAudit, Integer isValid) {
-//		// TODO Auto-generated method stub
-//		Set<Integer> groupIds=Sets.newHashSet();
-//		if(!StringUtil.isEmpty(ipCommGroupCfgs)){
-//			for(IpCommCfg cfg:ipCommGroupCfgs) {
-//				cfg.setIsValid(isValid);
-//				cfg.setIsAudit(isAudit);
-//				cfg.setAuditorId(UserUtils.getUser().getId());
-//				cfg.setAuditTime(new Date());
-//				groupIds.add(cfg.getGroupId());
-//				ipCommGroupCfgDao.update(cfg);
-//			}
-//		}
-//		//查询有效的Ip配置个数
-//		for(Integer groupId:groupIds) {
-//			Integer groupCount=ipCommGroupCfgDao.getGroupIdCount(groupId);
-//			if(groupCount>0){//udFlag 设置为1
-//				policyGroupInfoDao.updateUdFlag(groupId, 1,5);
-//			}else{//udFlag 设置为0
-//				policyGroupInfoDao.updateUdFlag(groupId, 0,5);
-//			}	
-//		}
-//		//下发配置时改变公共组udFlag标识
-//		send2Maat(ipCommGroupCfgs,isValid);
-//	}
-//	public void send2Maat(List<IpCommCfg> ipCommGroupCfgs,int isValid) {
-//		GroupReuseAddBean maatBean = new GroupReuseAddBean();		
-//		List<GroupReuseCfg> groupReuseList=new ArrayList<>();
-//		GroupReuseCfg groupReuseCfg=new GroupReuseCfg();
-//		List<IpCfg> ipRegionList = groupReuseCfgAddRemoveConvert(ipCommGroupCfgs,isValid,null);
-//		List<StringCfg> strRegionList = new ArrayList<>();
-//		List<NumBoundaryCfg> numRegionList = new ArrayList<>();
-//		groupReuseCfg.setIpRegionList(ipRegionList);
-//		groupReuseCfg.setStrRegionList(strRegionList);
-//		groupReuseCfg.setNumRegionList(numRegionList);
-//		groupReuseList.add(groupReuseCfg);
-//		maatBean.setGroupReuseCfgList(groupReuseList);
-//		maatBean.setAuditTime(new Date());
-//		maatBean.setCreatorName(UserUtils.getUser().getName());
-//		maatBean.setVersion(Constants.MAAT_VERSION);
-//		logger.warn("IP Common Region Send To Maat start");
-//		long start=System.currentTimeMillis();
-//		if(isValid==Constants.VALID_YES) {
-//			maatBean.setOpAction(Constants.INSERT_ACTION);
-//			//调用服务接口下发配置数据
-//			String json=gsonToJson(maatBean);
-//			if(ipCommGroupCfgs.size()<=100) {
-//				logger.info("ip 公共组域新增配置下发配置参数："+json);
-//			}else {
-//				logger.info("ip 公共组域新增配置下发region条数："+ipCommGroupCfgs.size());
-//			}
-//			//调用服务接口下发配置
-//			ToMaatResult result =ConfigServiceUtil.postGroupReuseSources(json);
-//			logger.info("ip 公共组域新增配置响应信息："+result.getMsg());
-//		}else {
-//			maatBean.setOpAction(Constants.UPDATE_ACTION);
-//			//调用服务接口下发配置数据
-//			String json=gsonToJson(maatBean);
-//			if(ipCommGroupCfgs.size()<=100) {
-//				logger.info("ip 公共组域删除配置下发配置参数："+json);
-//			}else {
-//				logger.info("ip 公共组域删除配置下发region条数："+ipCommGroupCfgs.size());
-//				
-//			}
-//			//调用服务接口下发配置
-//			ToMaatResult result = ConfigServiceUtil.put(json,3);
-//			logger.info("asn ip复用域删除配置响应信息："+result.getMsg());
-//		}
-//		long end=System.currentTimeMillis();
-//		logger.warn("IP Common Region Send To Maat finish,cost:"+(end-start));
-//	}
-	public void delete(String ids) {
-		// TODO Auto-generated method stub
-		if(ids==null) {
-			throw new RuntimeException("ids is null!");
-		}
-		ipCommGroupCfgDao.delete(ids);
-	}
-	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void saveAndSend(FunctionRegionDict regionDict, FunctionServiceDict serviceDict, List<BaseIpCfg> cfgs,
-			boolean send) {
-		// TODO Auto-generated method stub
-		logger.warn("Start to save IP,size:"+cfgs.size());
-		long start=System.currentTimeMillis();
-		SqlSessionFactory sqlSessionFactory=SpringContextHolder.getBean(SqlSessionFactory.class);
-		SqlSession batchSqlSession = null;
-		//需要通过新增域接口新增的ip集合
-		Map<Integer,Integer> groupCount=Maps.newHashMap();
-//		AsnCacheUtils.init(true);
-		List<IpCommCfg> ipCommCfgs=new ArrayList(cfgs.size());
-		try{
-			batchSqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH, false);
-			
-			for(BaseIpCfg cfg:cfgs) {
-				IpCommCfg ipCommCfg=new IpCommCfg();
-				BeanUtils.copyProperties(cfg, ipCommCfg);
-				ipCommCfgs.add(ipCommCfg);
-				((IpCommGroupCfgDao) batchSqlSession.getMapper(IpCommGroupCfgDao.class)).insertForBatch(ipCommCfg);
-//				if(send) {
-//					if(groupCount.containsKey(ipCommCfg.getGroupId())) {
-//						groupCount.put(ipCommCfg.getGroupId(), groupCount.get(ipCommCfg.getGroupId())+1);
-//					}else {
-//						groupCount.put(ipCommCfg.getGroupId(), 1);
-//					}
-//				}
-				
-			}
-//			if(send) {
-//				if(groupCount.size()>0) {
-//					for(Entry<Integer, Integer> groupId:groupCount.entrySet()) {
-//						policyGroupInfoDao.updateUdFlag(groupId.getKey(), 1,5);	
-//					}
-//					
-//					this.send2Maat(ipCommCfgs, Constants.VALID_YES);
-//				}
-//			}
-			batchSqlSession.commit();
-		}finally {
-			if(batchSqlSession != null){
-				batchSqlSession.close();
-			}
-		}
-		long end=System.currentTimeMillis();
-		logger.warn("Save IP finish,cost:"+(end-start));
-		cfgs.clear();
-		cfgs=null;
-	}
-	
-}

src/main/java/com/nis/web/service/basics/PolicyGroupInfoService.java

@@ -47,10 +47,6 @@ public class PolicyGroupInfoService extends BaseService{
 		List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyByGroupInfoList(ids);
 		return list;
 	}
-	public List<PolicyGroupInfo> findPolicyByServiceGroupInfoList(String ids) {
-		List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyByServiceGroupInfoList(ids);
-		return list;
-	}
 	
 	
 	public List<PolicyGroupInfo> findPolicyGroupInfos() {
@@ -88,7 +84,7 @@ public class PolicyGroupInfoService extends BaseService{
 			entity.setCreatorId(UserUtils.getUser().getId());
 			entity.setCreateTime(createTime);
 			//asn类型从综合服务获取groupId
-			if(4==entity.getGroupType().intValue()||5==entity.getGroupType().intValue()||6==entity.getGroupType().intValue()||7==entity.getGroupType().intValue()) {
+			if(4==entity.getGroupType().intValue()) {
 				int serviceGroupId=0;
 				List<Integer> groupIds= ConfigServiceUtil.getId(2,1);
 				if(groupIds.size()>0) {
@@ -177,15 +173,5 @@ public class PolicyGroupInfoService extends BaseService{
 	public PolicyGroupInfo getGroupInfo(PolicyGroupInfo policyGroupInfo){
 		return policyGroupInfoDao.getGroupInfo(policyGroupInfo);
 	}
-	/**
-	 * 公共组相关功能使用
-	 */
-	public List<PolicyGroupInfo> findPolicyGroupInfosByTypeforUD(Integer type,Integer flag) {
-		List<PolicyGroupInfo> list=policyGroupInfoDao.findPolicyGroupInfosByTypeForUD(type,flag);
-		return list;
-	}
-	public List<PolicyGroupInfo> findPolicyGroupInfosByTypeforUD(Integer type,Integer flag,Integer limit) {
-		List<PolicyGroupInfo> list=policyGroupInfoDao.findLimitedPolicyGroupInfosByTypeForUD(type,flag,limit);
-		return list;
-	}
+	
 }

src/main/java/com/nis/web/service/basics/UrlCommGroupService.java

@@ -1,153 +0,0 @@
-package com.nis.web.service.basics;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.ibatis.session.ExecutorType;
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.session.SqlSessionFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import com.nis.domain.Page;
-import com.nis.domain.basics.AsnGroupInfo;
-import com.nis.domain.basics.AsnIpCfg;
-import com.nis.domain.basics.UrlCommCfg;
-import com.nis.domain.configuration.BaseIpCfg;
-import com.nis.domain.configuration.CfgIndexInfo;
-import com.nis.domain.maat.GroupReuseAddBean;
-import com.nis.domain.maat.GroupReuseCfg;
-import com.nis.domain.maat.MaatCfg;
-import com.nis.domain.maat.ToMaatBean;
-import com.nis.domain.maat.ToMaatResult;
-import com.nis.domain.maat.MaatCfg.DigestCfg;
-import com.nis.domain.maat.MaatCfg.GroupCfg;
-import com.nis.domain.maat.MaatCfg.IpCfg;
-import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
-import com.nis.domain.maat.MaatCfg.StringCfg;
-import com.nis.util.ConfigServiceUtil;
-import com.nis.util.Constants;
-import com.nis.util.StringUtil;
-import com.nis.web.dao.CrudDao;
-import com.nis.web.dao.basics.UrlCommGroupDao;
-import com.nis.web.dao.configuration.IpCfgDao;
-import com.nis.web.security.UserUtils;
-import com.nis.web.service.CrudService;
-import com.nis.web.service.SpringContextHolder;
-
-@Service
-public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCommCfg>{
-	
-	@Autowired
-	private  UrlCommGroupDao   urlCommGroupDao;
-	
-	
-	public Page<UrlCommCfg> findPage(Page<UrlCommCfg> page, UrlCommCfg entity) {
-		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
-		entity.setPage(page);
-		List<UrlCommCfg> list=urlCommGroupDao.findAllPageList(entity);
-		for (int i = 0; i < list.size(); i++) {
-			String key=list.get(i).getCfgKeywords().replace("***and***", " ");
-			list.get(i).setCfgKeywords(key);
-		}
-		page.setList(list);
-		return page;
-	}
-	
-	
-	public List<UrlCommCfg> findByPage(String ids) {
-		List<UrlCommCfg> list=urlCommGroupDao.findByPage(ids);
-		return list;
-	}
-	
-
-	
-	public UrlCommCfg get(Long id ) {
-		return urlCommGroupDao.get(id);
-	}
-	
-	//新增 insertUrlCommGroupCfg
-	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void saveUrlCommGroupCfg(CfgIndexInfo entity) {
-		Date createTime=new Date();
-		if(entity.getUrlCommGroupList()!=null) {
-			for (int i = 0; i < entity.getUrlCommGroupList().size(); i++) {
-				BeanUtils.copyProperties(entity, entity.getUrlCommGroupList().get(i), new String[]{"cfgId"});
-				entity.getUrlCommGroupList().get(i).setRequestId(0);
-				entity.getUrlCommGroupList().get(i).setClassify("0");
-				entity.getUrlCommGroupList().get(i).setAttribute("0");
-				entity.getUrlCommGroupList().get(i).setLable("0");
-				entity.getUrlCommGroupList().get(i).setIsHexbin(0);
-				entity.getUrlCommGroupList().get(i).setCreateTime(createTime);
-				entity.getUrlCommGroupList().get(i).setCreatorId(entity.getCurrentUser().getId());
-				entity.getUrlCommGroupList().get(i).setIsValid(Constants.VALID_NO);
-				entity.getUrlCommGroupList().get(i).setIsAudit(Constants.AUDIT_NOT_YET);
-				if(entity.getUrlCommGroupList().get(i).getCfgKeywords().contains("***and***")){
-					entity.getUrlCommGroupList().get(i).setExprType(1);
-				}else{
-					entity.getUrlCommGroupList().get(i).setExprType(0);
-				}
-				urlCommGroupDao.insertUrlCommGroupCfg(entity.getUrlCommGroupList().get(i));
-			}
-//			//修改公共组的标识
-//			Integer udFlag=urlCommGroupDao.findUrlUdFlag(Integer.parseInt(entity.getUserRegion3()));
-//			if(udFlag == 0){
-//				urlCommGroupDao.updateUrlUdFlag(Integer.parseInt(entity.getUserRegion3()), 1);
-//			}
-		}
-	}
-	
-	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void update(UrlCommCfg entity){
-		Date editTime=new Date();
-		entity.setIsValid(0);
-		entity.setIsAudit(0);
-		entity.setEditTime(editTime);
-		entity.setEditorId(entity.getCurrentUser().getId());
-		if(entity.getCfgKeywords().contains("***and***")){
-			entity.setExprType(1);
-		}else{
-			entity.setExprType(0);
-		}
-		urlCommGroupDao.update(entity);
-	}
-	
-	
-	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void delete(String ids) {
-		
-		urlCommGroupDao.delete(ids);
-	}
-	
-	public List<UrlCommCfg> getByIds(String ids) {
-		if(ids==null) {
-			throw new RuntimeException("ids is null!");
-		}
-		return urlCommGroupDao.getByIds(ids);
-	}
-	
-	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void audit(UrlCommCfg urlGroupCfg,Integer isAudit,Integer isValid) {
-		 
-		if(!StringUtil.isEmpty(urlGroupCfg)){
-			urlGroupCfg.setIsValid(isValid);
-			urlGroupCfg.setIsAudit(isAudit);
-			urlGroupCfg.setAuditorId(UserUtils.getUser().getId());
-			urlGroupCfg.setAuditTime(new Date());
-					
-			urlCommGroupDao.update(urlGroupCfg);
-		}
-		//下发配置时改变公共组udFlag标识
-		//查询有效的url配置个数
-		Integer groupCount=urlCommGroupDao.getGroupIdCount(urlGroupCfg.getUserRegion3());
-		if(groupCount>0){//udFlag 设置为1
-			urlCommGroupDao.updateUrlUdFlag(Integer.parseInt(urlGroupCfg.getUserRegion3()), 1);
-		}else{//udFlag 设置为0
-			urlCommGroupDao.updateUrlUdFlag(Integer.parseInt(urlGroupCfg.getUserRegion3()), 0);
-		}	
-	}
-	
-}

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

@@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.google.common.collect.Lists;
 import com.nis.domain.Page;
+import com.nis.domain.SysDataDictionaryItem;
 import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.basics.Varibles;
 import com.nis.domain.configuration.AppByteCfg;
@@ -90,6 +91,32 @@ public class AppCfgService extends BaseService {
 	public Page<AppPolicyCfg> findAppPolicyList(Page<AppPolicyCfg> page, AppPolicyCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (entity.getFunctionId() == 63 && Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+				if (entity.getFunctionId() == 407 && Constants.SPECIFIC_SERVICE_CFG_TYPE_BASIC_PROTOCOL.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+				if (entity.getFunctionId() == 408 && Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
 		List<AppPolicyCfg> list = appCfgDao.findAppPolicyList(entity);
 		page.setList(list);
 		return page;
@@ -104,11 +131,59 @@ public class AppCfgService extends BaseService {
 	public Page<AppIpCfg> findAppIpList(Page<AppIpCfg> page, AppIpCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppIpCfg> list = appCfgDao.findAppIpList(entity);
 		page.setList(list);
 		return page;
 	}
 	public List<AppIpCfg> findAppIpList(AppIpCfg entity) {
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (entity.getFunctionId() == 63 && Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+				if (entity.getFunctionId() == 407 && Constants.SPECIFIC_SERVICE_CFG_TYPE_BASIC_PROTOCOL.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+				if (entity.getFunctionId() == 408 && Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppIpCfg> list = appCfgDao.findAppIpList(entity);
 		return list;
 	}
@@ -121,6 +196,26 @@ public class AppCfgService extends BaseService {
 	public Page<AppHttpCfg> findAppHttpList(Page<AppHttpCfg> page, AppHttpCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppHttpCfg> list = appCfgDao.findAppHttpList(entity);
 		page.setList(list);
 		return page;
@@ -134,6 +229,26 @@ public class AppCfgService extends BaseService {
 	public Page<AppDomainCfg> findAppDomainList(Page<AppDomainCfg> page, AppDomainCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppDomainCfg> list = appCfgDao.findAppDomainList(entity);
 		page.setList(list);
 		return page;
@@ -174,6 +289,26 @@ public class AppCfgService extends BaseService {
 	public Page<AppByteCfg> findAppByteList(Page<AppByteCfg> page, AppByteCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppByteCfg> list = appCfgDao.findAppByteList(entity);
 		page.setList(list);
 		return page;
@@ -182,6 +317,26 @@ public class AppCfgService extends BaseService {
 	public Page<AppSslCertCfg> findAppSslList(Page<AppSslCertCfg> page, AppSslCertCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppSslCertCfg> list = appCfgDao.findAppSslList(entity);
 		page.setList(list);
 		return page;
@@ -195,6 +350,26 @@ public class AppCfgService extends BaseService {
 	public Page<AppTcpCfg> findAppTcpList(Page<AppTcpCfg> page, AppTcpCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppTcpCfg> list = appCfgDao.findAppTcpList(entity);
 		page.setList(list);
 		return page;
@@ -391,7 +566,7 @@ public class AppCfgService extends BaseService {
 				if(entity.getFunctionId() == 408){
 					entity.setConfigType(Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR);
 				}
-				auditAppPolicyCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditAppPolicyCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}
@@ -654,7 +829,7 @@ public class AppCfgService extends BaseService {
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditAppDomainCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditAppDomainCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}
@@ -722,7 +897,7 @@ public class AppCfgService extends BaseService {
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditAppTopicDomainCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditAppTopicDomainCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}
@@ -2061,6 +2236,26 @@ public class AppCfgService extends BaseService {
 	public Page<AppHeaderCfg> findAppHeaderList(Page<AppHeaderCfg> page, AppHeaderCfg entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(), "r"));
 		entity.setPage(page);
+		
+		if(!StringUtil.isEmpty(entity.getSpecServiceId())){
+			// 查找社交应用的所有有效一级特定服务
+			SpecificServiceCfg appSpec = new SpecificServiceCfg();
+			for (SysDataDictionaryItem dict : DictUtils.getDictList("SPECIFIC_SERVICE_CFG_TYPE")) {
+				if (Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equals(dict.getItemValue())) {
+					appSpec.setCfgType(Integer.parseInt(dict.getItemCode()));
+					break;
+				}
+			}
+			appSpec.setIsValid(Constants.VALID_YES);
+			appSpec.setIsLeaf(0);
+			appSpec.setSpecServiceId(entity.getSpecServiceId());
+			List<SpecificServiceCfg> appList = specificServiceCfgDao.findAllSpecificServiceCfg(appSpec, null);
+			if (!StringUtil.isEmpty(appList)) {
+				SpecificServiceCfg app = appList.get(0);
+				entity.setAppCode(app.getSpecServiceCode());
+			}
+		}
+		
 		List<AppHeaderCfg> list = appCfgDao.findAppHeaderList(entity);
 		page.setList(list);
 		return page;
@@ -2230,4 +2425,5 @@ public class AppCfgService extends BaseService {
 		
 	}
 	
+	
 }

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

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

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

@@ -311,7 +311,7 @@ public class AvContentCfgService extends BaseService{
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditAvVoip(entity,entity.getIsAudit(), Constants.UPDATE_ACTION);
+				auditAvVoip(entity,entity.getIsAudit(), Constants.INSERT_ACTION);
 			}
 		}
 	}

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

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

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

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

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

@@ -274,73 +274,6 @@ public class CommonPolicyService extends CrudService<WebsiteCfgDao, CfgIndexInfo
 		}
 		return hasData;
 	}
-	/**
-	 * 公共分组通用配置
-	 * @param page
-	 * @param entity
-	 * @param auditMap
-	 * @param hasData
-	 * @return
-	 */
-	public boolean auditReuseCommonConfigData(
-			Page page,
-			BaseCfg entity,
-			Map<Integer, List> auditMap,
-			boolean hasData){
-		long start=System.currentTimeMillis();
-		long end=System.currentTimeMillis();
-		long totalSize=0;
-		
-		if(page.isLastPage()){
-			hasData = false;
-		}
-		List<Integer> regionIds = new ArrayList();
-		for(Entry<Integer, List> e:auditMap.entrySet()) {
-			List<BaseCfg> list=e.getValue();
-			for (BaseCfg baseCfg : list) {
-				regionIds.add(baseCfg.getRegionId());
-			}
-			totalSize=totalSize+list.size();
-			
-		}
-		start=System.currentTimeMillis();
-		logger.warn("复用配置批量失效-数据库状态变更：start()");
-		commonPolicyDao.auditCfgBatch( entity.getTableName(), entity,regionIds,null);
-		end=System.currentTimeMillis();
-		logger.warn("复用配置批量失效-数据库状态变更：end("+(end-start)+")");
-		
-		//已经下发过的,调用分组复用配置删除接口
-		if(!auditMap.isEmpty()) {
-			GroupReuseAddBean maatBean = new GroupReuseAddBean();		
-			List<GroupReuseCfg> groupReuseList=new ArrayList<>();
-			GroupReuseCfg groupReuseCfg=new GroupReuseCfg();
-			List<IpCfg> ipRegionList=new ArrayList<>();
-			for (Integer groupId : auditMap.keySet()) {
-				ipRegionList.addAll(groupReuseCfgAddRemoveConvert(auditMap.get(groupId),Constants.VALID_NO,groupId));
-			}
-			groupReuseCfg.setIpRegionList(ipRegionList);
-			groupReuseCfg.setStrRegionList(null);
-			groupReuseCfg.setNumRegionList(null);
-			groupReuseList.add(groupReuseCfg);
-			maatBean.setGroupReuseCfgList(groupReuseList);
-			maatBean.setAuditTime(new Date());
-			maatBean.setCreatorName(UserUtils.getUser().getName());
-			maatBean.setVersion(Constants.MAAT_VERSION);
-			maatBean.setOpAction(Constants.UPDATE_ACTION);
-			//调用服务接口下发配置数据
-			String json=gsonToJson(maatBean);
-			logger.warn("复用域配置批量取消（"+page.getPageNo()+"次）："+ipRegionList.size());
-			//logger.info("app协议IP域配置批量取消："+json);
-			//调用服务接口下发配置
-			logger.warn("复用配置批量失效-下发：start()");
-			start=System.currentTimeMillis();
-			ToMaatResult result = ConfigServiceUtil.put(json,3);
-			end=System.currentTimeMillis();
-			logger.warn("复用域配置批量取消响应信息："+result.getMsg());
-			logger.warn("复用配置批量失效-下发：end("+(end-start)+")");
-		}
-		return hasData;
-	}
 	/**
 	 * 回调类配置下发
 	 * @param className

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

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

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

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

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

@@ -537,7 +537,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditDomainCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditDomainCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}

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

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

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

@@ -78,10 +78,6 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 		entity.setNtcSubscribeIdCfgList(subscribeIdList);
 		return entity;
 	}
-	public CfgIndexInfo getCommCfg(Long cfgId,Integer compileId){
-		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId,compileId);
-		return entity;
-	}
 	
 	public Map<String, List> exportHttpCfg(CfgIndexInfo entity){
 		Map<String, List> dataMap=new HashMap<String, List>();
@@ -298,7 +294,7 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditHttpCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditHttpCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}

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

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

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

@@ -287,7 +287,7 @@ public class IpCfgService extends CrudService<IpCfgDao, BaseIpCfg> {
 			if (isValid == 1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditIpCfg(entity, entity.getIsAudit(), Constants.UPDATE_ACTION);
+				auditIpCfg(entity, entity.getIsAudit(), Constants.INSERT_ACTION);
 			}
 		}
 	}

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

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

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

@@ -374,7 +374,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditHttpCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditHttpCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}
@@ -828,7 +828,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditSslCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditSslCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}
@@ -987,7 +987,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			maatBean.setAuditTime(entity.getAuditTime());
 			maatBean.setCreatorName(entity.getCurrentUser().getName());
 			maatBean.setVersion(Constants.MAAT_VERSION);
-			maatBean.setOpAction(Constants.INSERT_ACTION);
+			maatBean.setOpAction(Constants.UPDATE_ACTION);
 			//调用服务接口取消配置
 			String json=gsonToJson(maatBean);
 			logger.info("ssl配置下发配置参数："+json);
@@ -1131,7 +1131,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			if(isValid==1) {
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
-				auditDnsCfg(entity, entity.getIsAudit(),Constants.UPDATE_ACTION);
+				auditDnsCfg(entity, entity.getIsAudit(),Constants.INSERT_ACTION);
 			}
 		}
 	}

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

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

src/main/resources/messages/message_en.properties

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

src/main/resources/messages/message_ru.properties

@@ -547,7 +547,7 @@ ftp_ip=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f
 dns_ip=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f DNS IP
 dns_domain=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0434\u043e\u043c\u0435\u043d\u0430 DNS
 action=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u0435
-has_prohibit_delete=\u0422\u043e\u043b\u044c\u043a\u043e \u043d\u0435\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u043d\u0430\u044f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0443\u0434\u0430\u043b\u0435\u043d\u0430
+has_prohibit_delete= только удаляет незаконченные настройки и отменяет проверку конфигурации
 has_prohibit_nopass=\u0422\u043e\u043b\u044c\u043a\u043e \u043d\u0435\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u043d\u0430\u044f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0430
 has_prohibit_pass=\u0422\u043e\u043b\u044c\u043a\u043e \u043d\u0435\u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u043d\u0430\u044f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0430
 multiple_keywords_tip=\u041c\u043e\u0436\u043d\u043e \u0432\u0432\u0435\u0441\u0442\u0438 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043a\u043b\u044e\u0447\u0435\u0432\u044b\u0445 \u0441\u043b\u043e\u0432,\u0440\u0430\u0437\u0434\u0435\u043b\u0438\u0442\u0435 \u0438\u0445 \u043a\u043b\u0430\u0432\u0438\u0448\u0435\u0439 "Enter".
@@ -1490,34 +1490,34 @@ GByte=GByte
 interval=\u041f\u0440\u043e\u043c\u0435\u0436\u0443\u0442\u043e\u043a
 month=\u041c\u0435\u0441\u044f\u0446\u044b
 day=\u0414\u043d\u0438
-week=weeks
+week=\u043d\u0435\u0434\u0435\u043b\u044c
 startTime=\u041d\u0430\u0447\u0430\u0442\u044c
 endTime=\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044c
 single=\u041e\u0434\u043d\u043e\u043a\u0440\u0430\u0442\u043d\u043e
 everyDay=\u0415\u0436\u0435\u0434\u043d\u0435\u0432\u043d\u043e
 everyWeek=\u0415\u0436\u0435\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u043e
 everyMonth=\u0415\u0436\u0435\u043c\u0435\u0441\u044f\u0447\u043d\u043e
-on=On
-is_schduler=Scheduler
-validate_error=Unexpected error occurred while validating
-v4_num=IPv4 Number
-v6_num=IPv6 Number
+on=\u041e\u0442\u043a\u0440\u044b\u0442\u044c
+is_schduler=\u041f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0449\u0438\u043a
+validate_error=\u041d\u0435\u043f\u0440\u0435\u0434\u0432\u0438\u0434\u0435\u043d\u043d\u0430\u044f \u043e\u0448\u0438\u0431\u043a\u0430 \u043f\u0440\u0438 \u043f\u0440\u043e\u0432\u0435\u0440\u043a\u0435
+v4_num=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e ipv4
+v6_num=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e ipv6
 always=\u041f\u043e\u0441\u0442\u043e\u044f\u043d\u043d\u043e
-schedule=Scheduler
-cancel_all=Cancel all configurations!
-pre_version=Previous Version
-approved_all=Approve all configurations!
-protection_list_manage=Protection List Manage
-effective=Effective
-admin_user_warn=Admin User Warn
-interface_total=Interface Total
-service_total=Service Total
-none_file_tip=Please Choose File!
+schedule=\u041f\u043b\u0430\u043d\u0438\u0440\u043e\u0432\u0449\u0438\u043a
+cancel_all=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0432\u0441\u0435 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438%21
+pre_version=\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0430\u044f \u0412\u0435\u0440\u0441\u0438\u044f
+approved_all=\u0423\u0442\u0432\u0440\u0435\u0434\u0438\u0442\u044c \u0432\u0441\u0435 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438%21
+protection_list_manage=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0421\u043f\u0438\u0441\u043a\u043e\u043c \u0417\u0430\u0449\u0438\u0442\u044b%21
+effective=\u0410\u043a\u0442\u0438\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435
+admin_user_warn=\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0435 \u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0410\u0434\u043c\u0438\u043d
+interface_total=\u041e\u0431\u0449\u0435\u0435 \u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0418\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0430
+service_total=\u041e\u0431\u0449\u0435\u0435 \u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0421\u0435\u0440\u0432\u0438\u0441\u0430
+none_file_tip=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0444\u0430\u0439\u043b%21
 the_same_ip_type=IP-\u0430\u0434\u0440\u0435\u0441 \u043A\u043B\u0438\u0435\u043D\u0442\u0430 \u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0434\u043E\u043B\u0436\u043D\u044B \u0438\u043C\u0435\u0442\u044C \u043E\u0434\u0438\u043D \u0438 \u0442\u043E\u0442 \u0436\u0435 \u0442\u0438\u043F.
-src_ip_pattern=Client IP Pattern
-dest_ip_pattern=Server IP Pattern
-src_port_pattern=Client Port Pattern
-dest_port_pattern=Server Port Pattern
+src_ip_pattern=\u0424\u043e\u0440\u043c\u0430\u0442 ip \u041a\u043b\u0438\u0435\u043d\u0442\u0430
+dest_ip_pattern=\u0424\u043e\u0440\u043c\u0430\u0442 ip \u0421\u0435\u0440\u0432\u0435\u0440\u0430
+src_port_pattern=\u0424\u043e\u0440\u043c\u0430\u0442 \u041f\u043e\u0440\u0442\u0430 \u041a\u043b\u0438\u0435\u043d\u0442\u0430
+dest_port_pattern=\u0424\u043e\u0440\u043c\u0430\u0442 \u041f\u043e\u0440\u0442\u0430 \u0421\u0435\u0440\u0432\u0435\u0440\u0430
 url_group_configuration=URL Group Configuration
 dns_keyword_group_configuration=DNS Keyword Group Configuration
 app_ip_correlation=APP IP Correlation
@@ -1527,6 +1527,7 @@ common_group=Common Group
 dns_keyword_group_manage=DNS Keyword Group Manage
 old_asn_group_manage=ASN Group
 url_group_manage=URL Group Manage
-range_cross=Found intersections between Server IP address and Client IP address
-app_ip_correlation=APP IP Correlation
-public_private_file_error=Public-private key mismatch
+range_cross=\u041d\u0430\u0439\u0434\u0435\u043d\u044b \u043f\u0435\u0440\u0435\u0441\u0435\u0447\u0435\u043d\u0438\u044f \u043c\u0435\u0436\u0434\u0443 ip-\u0430\u0434\u0440\u0435\u0441\u043e\u043c \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0438 ip-\u0430\u0434\u0440\u0435\u0441\u043e\u043c \u043a\u043b\u0438\u0435\u043d\u0442\u0430
+app_ip_correlation=\u041a\u043e\u0440\u0440\u0435\u043b\u044f\u0446\u0438\u044f ip-\u0430\u0434\u0440\u0435\u0441\u043e\u0432 \u041f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u0439
+public_private_file_error=\u041d\u0435\u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0438\u0435 \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u043e-\u043f\u0440\u0438\u0432\u0430\u0442\u043d\u043e\u0433\u043e \u043a\u043b\u044e\u0447\u0430.
+https_url_format_tip=URL(http[s]://xxx.xx)

src/main/resources/messages/message_zh_CN.properties

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

src/main/resources/nis.properties

@@ -182,8 +182,8 @@ ntcTotalReport=v1/ntcTotalReport
 trafficIpActiveFiveMinute=v1/trafficIpActiveFiveMinute
 trafficIpActiveOneHour=v1/trafficIpActiveOneHour
 
-client_connect_timeout=300000
-client_read_timeout=300000
+client_connect_timeout=500000
+client_read_timeout=500000
 log_time_interval=300000
 logsearch_menu_id=152
 #use elasticsearch or not#
@@ -485,7 +485,7 @@ ntcCollectRadiusLog=v1/ntcCollectRadiusLogs
 ntcConnRecordLog=v1/ntcConnRecordLogs
 ntcConnRecordPercent=v1/ntcConnRecordPercent
 #\u5bfc\u51fa\u6700\u5927\u6761\u6570
-maxLogExportSize=2000
+maxLogExportSize=20000
 pxy_crtl_subscribe_id_region=PXY_CTRL_SUBSCRIBE_ID
 ntc_subscribe_id_region=NTC_SUBSCRIBE_ID
 ntcAsnRecord=v1/ntcAsnRecord
@@ -519,4 +519,5 @@ trafficAppBpsTrend=v1/trafficAppBpsTrend
 #vpn cgi error info
 cgiError=cannot connect to vpnserver,Connection to the server has failed,Specified object can not be found,Too many users,User already exists,Too many created users,The destination server is not a VPN server,The connection has been interrupted,
 #\u83b7\u53d6\u670d\u52a1\u914d\u7f6e\u603b\u91cf\u63a5\u53e3
-getConfigByService=v1/getConfigByService
+getConfigByService=v1/getConfigByService
+delAllCfg=v1/delAllConfig

src/main/resources/service/service_config.xml

@@ -421,7 +421,6 @@
 	<service id="400" functionId="600" serviceType="1" cfgType="1" tableName="asn_ip_cfg" className="AppIpCfg"  desc="ASN IP特征">
     	<userRegion regionKey="ASN" regionColumn="userRegion1"  userRegionPosition="1"></userRegion>
 	</service>
-	<service id="401" functionId="110" serviceType="1" cfgType="1" tableName="ip_comm_cfg" className="IpCommCfg"  desc="IP公共分组域"></service>
 	 
 	
 </serviceList>

src/main/resources/sql/20190425/ip_common_config.sql

@@ -1,67 +0,0 @@
-/*
-SQLyog Professional v12.08 (64 bit)
-MySQL - 10.2.14-MariaDB : Database - ntc_test
-*********************************************************************
-*/
-
-
-/*!40101 SET NAMES utf8 */;
-
-/*!40101 SET SQL_MODE=''*/;
-
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-/*Table structure for table `ip_comm_cfg` */
-
-CREATE TABLE `ip_comm_cfg` (
-  `cfg_id` BIGINT(20) NOT NULL AUTO_INCREMENT COMMENT '主键，自增',
-  `cfg_desc` VARCHAR(128) DEFAULT NULL,
-  `ip_type` INT(11) NOT NULL COMMENT 'IPV4=4,IPV6=6',
-  `direction` INT(11) NOT NULL COMMENT '0双向，1单向，默认缺省为双向。',
-  `protocol` INT(11) NOT NULL COMMENT '6表示tcp,17表示udp，0表示任意',
-  `protocol_id` INT(11) NOT NULL COMMENT '非0时，maat规范需写入通用IP配置表与通用协议类型配置表 此表固定写0',
-  `action` INT(11) NOT NULL COMMENT '1:阻断，2：监测， 5： FD 白名单，6：监测白名单，7: FD 监测都白名单，应与业务ID所代表的逻辑相匹配，8-灰名单',
-  `is_valid` INT(11) NOT NULL COMMENT '0无效，1有效，-1删除\r\n1）	未审核时配置可删除\r\n2）	审核通过，此字段置1\r\n3）	取消审核通过，此字段置0',
-  `is_audit` INT(11) NOT NULL COMMENT '0未审核，1审核通过，2审核未通过，3取消审核通过\r\n1）	审核未通过，配置可修改\r\n2）	审核通过，配置不可删除，只能取消审核通过',
-  `creator_id` INT(11) NOT NULL COMMENT '取自sys_user.id',
-  `create_time` DATETIME NOT NULL,
-  `editor_id` INT(11) DEFAULT NULL COMMENT '取自sys_user.id',
-  `edit_time` DATETIME DEFAULT NULL,
-  `auditor_id` INT(11) DEFAULT NULL COMMENT '取自sys_user.id',
-  `audit_time` DATETIME DEFAULT NULL,
-  `service_id` INT(11) NOT NULL COMMENT '参考系统业务类型管理表',
-  `request_id` INT(11) NOT NULL COMMENT '取自request_info.id',
-  `compile_id` INT(11) NULL COMMENT '取自服务接口返回的maat配置的编译id，配置初始入库时获取。',
-  `is_area_effective` INT(11) NOT NULL COMMENT '0否，1是',
-  `classify` VARCHAR(128) DEFAULT NULL COMMENT '分类id，多个用英文逗号分隔',
-  `attribute` VARCHAR(128) DEFAULT NULL COMMENT '性质id，多个用英文逗号分隔',
-  `lable` VARCHAR(128) DEFAULT NULL COMMENT '标签id,多个用英文逗号分隔',
-  `area_effective_ids` VARCHAR(1024) DEFAULT NULL COMMENT '多个英文逗号分隔',
-  `function_id` INT(11) NOT NULL,
-  `cfg_region_code` INT(11) DEFAULT NULL,
-  `cfg_type` VARCHAR(64) DEFAULT NULL,
-  `src_ip_pattern` INT(11) DEFAULT NULL COMMENT '源ip格式',
-  `src_ip_address` VARCHAR(128) NOT NULL,
-  `src_port_pattern` INT(11) DEFAULT NULL COMMENT '源端口格式',
-  `src_port` VARCHAR(16) NOT NULL,
-  `dest_ip_address` VARCHAR(128) NOT NULL,
-  `dest_port` VARCHAR(16) NOT NULL,
-  `ratelimit` VARCHAR(10) DEFAULT NULL COMMENT '限速比例,0到1之间',
-  `user_region1` VARCHAR(1024) DEFAULT NULL COMMENT '预留自定义域1',
-  `user_region2` VARCHAR(1024) DEFAULT NULL COMMENT '预留自定义域2',
-  `user_region3` VARCHAR(1024) DEFAULT NULL COMMENT '预留自定义域3',
-  `user_region4` VARCHAR(1024) DEFAULT NULL COMMENT '预留自定义域4',
-  `user_region5` VARCHAR(1024) DEFAULT NULL COMMENT '预留自定义域5',
-  `cancel_request_id` INT(11) DEFAULT NULL COMMENT '取消审核来函',
-  `dest_ip_pattern` INT(11) DEFAULT NULL COMMENT '目的ip格式',
-  `dest_port_pattern` INT(11) DEFAULT NULL COMMENT '目的ip格式',
-  `region_id` INT(11) DEFAULT NULL COMMENT '域ID',
-  `group_id` INT(11) DEFAULT NULL COMMENT '组ID',
-  PRIMARY KEY (`cfg_id`)
-) ENGINE=INNODB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;

src/main/resources/sql/20190425/ip_group.sql

@@ -1,2 +0,0 @@
-INSERT INTO function_service_dict (function_id,protocol_id,ACTION,action_code,service_id,service_name,service_desc,is_valid,creator_id,create_time,region_code,is_import,sort) VALUES(110,0,1,'monit',400,'ip_group','ip_group',1,1,NULL,1,1,1);
-INSERT INTO function_region_dict (function_id,config_district,config_region_code,config_region_value,config_desc,is_valid,is_maat,region_type,creator_id,create_time,config_ip_type,config_ip_pattern,config_port_pattern,config_direction,config_protocol,config_ip_port_show,config_region_sort,is_import)VALUES(110,'',0,'ip_group_region','ip组IP',1,1,1,1,NOW(),'4,6','1,3;1,3','1;1',0,0,3,1,1);

src/main/resources/sql/deploymentsql/20190508help_document.sql

@@ -0,0 +1,612 @@
+-- ----------------------------
+-- Table structure for help_document
+-- ----------------------------
+DROP TABLE IF EXISTS `help_document`;
+CREATE TABLE `help_document` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `file_name` varchar(100) DEFAULT '',
+  `file_comment` text DEFAULT NULL,
+  `back_file_comment` text DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `INDEX_FILE_NAME` (`file_name`)
+) ENGINE=InnoDB AUTO_INCREMENT=45 DEFAULT CHARSET=utf8mb4;
+
+-- ----------------------------
+-- Records of help_document
+-- ----------------------------
+INSERT INTO `help_document` VALUES ('1', 'cache_policy.md', 'Cache Policy
+
+On National Proxy System, Individual Cache policy rules determine
+whether to cache or not based on traffic attributes, such as URL and
+Cookies. For cache action, the optimization parameters are:
+
+*A Cache key* -  is a unique string that lets the National Proxy System
+look for web content when requests hit them. It<49><74>s made up of a hostname,
+path, and cookie parts. By default, the Proxy use the entire URL as the
+cache key. Selecting the correct cache key will ensure maximum cache
+footprint and increase cache hits.
+
+*Ignore Query String in URL* -  in case the query strings doesn<73><6E>t
+actually indicate that the object need to be different then you could
+EXCLUDE them from the cache key. For example, after ignoring <20><>sqp<71><70> and
+<EFBFBD><EFBFBD>rs<EFBFBD><EFBFBD> of URL: <20><>https://example.com/pic.jpg?~~sqp=UAAI&rs=AOn4~~<7E><>.
+
+*Include Cookie Values* -  in case the server send different content for
+the same URL based on the cookie value, you can include that cookie
+value as a part of cache key. For example, the server may set a cookie
+at the client called "prefLang=ru" to record user preferred language,
+you could add "prefLang" to distinguish different web content.
+
+*Disable Revalidate* -  is an ON-OFF switch. The pragma-no-cache header
+in a client<6E><74>s request causes the proxy to re-fetch the entire object
+from the original server, even if the cached copy of the object is
+fresh. By default this option is switch OFF, which means a client<6E><74>s
+non-conditional request results in a conditional GET request sent to the
+original server if the object is already in cache. The conditional
+request allows the original server to return the 304 Not Modified
+response, if the content in cache is still fresh. Thereby, the
+server-side bandwidth and latency consumed are lesser as the full
+content is not retrieved again from the original server.
+
+*Cache Dynamic Content* -  is an ON-OFF switch. A URL is considered
+dynamic if it ends in <20><>.asp(x)<29><> or contains a question mark (?), a
+semicolon (;), or <20><>cgi<67><69>. *Ignore Query String* overrides this option
+(switch on).
+
+*Cache Cookied Content* -  is an ON-OFF switch. By default, the Proxy
+does NOT cache cookied content of any type. If this option is switch on,
+the system cache all cookied content except HTML.
+
+*Ignore Request no-cache Headers* -  is an ON-OFF switch. By default, the
+proxy strictly observes client Cache-Control: no-cache directives. As
+known as:
+
+i.  Authorization
+
+ii. WWW-Authenticate
+
+iii. Cache-Control: no-store
+
+iv. Cache-Control: no-cache
+
+If a requested object contains a no-cache header, then proxy forwards
+the request to the origin server even if it has a fresh copy in cache.
+You can configure proxy to ignore client no-cache directives such that
+it ignores no-cache headers from client requests and serves the object
+from its cache.
+
+*Ignore Response no-cache Headers* -  is an ON-OFF switch. By default, a
+response from an origin server with a no-cache header is not stored in
+the cache. As known as:
+
+i.  Cache-Control: no-store
+
+ii. Cache-Control: private
+
+iii. Set-Cookie
+
+iv. Cache-Control: no-cache
+
+v.  WWW-Authenticate
+
+vi. Expires header with a value of 0 (zero) or a past date.
+
+If you configure proxy to ignore no-cache headers, then proxy also
+ignores no-store headers. The default behavior of observing no-cache
+directives is appropriate in most cases.
+
+*Forcing Object Caching* -  is an ON-OFF switch. You can force Proxy to
+cache specific URLs (including dynamic URLs) for a specified duration,
+regardless of Cache-Control response headers.
+
+*Minimum Use* -  sets the number of times an item must be requested by
+clients before Proxy caches it. This is useful if the cache is
+constantly filling up, as it ensures that only the most frequently
+accessed items are added to the cache. By default, Proxy cache object at
+its first appearance. The counter resets in every 30 minutes. Note that
+the requests is counted independently on each processing unit.
+
+*Max Cache Object Size* -  sets the upper limit of an object size, larger
+object will not be cached. By default, Proxy does not cache object
+larger than 1 GB.
+
+*Cache Pinning Time* -  configures Proxy to keep certain objects in the
+cache for a specified time. You can use this option to ensure that the
+most popular objects are in cache when needed and to prevent cache
+manager from deleting important objects. Proxy observes Cache-Control
+headers and pins an object in the cache only if it is indeed cacheable.
+
+*Max Cache Size* -  sets the upper limit of the size of storage for a
+policy. By default, Proxy uses all available disk space. When the cache
+size reaches the limit, the cache manager removes the files that were
+least recently used to bring the cache size back under the limit.
+
+*Inactive Time* -  specifies how long an item can remain in the cache
+without being accessed. A file that has not been requested for this time
+is automatically deleted from the cache by the cache manager, regardless
+of whether or not it has expired.
+
+', null);
+INSERT INTO `help_document` VALUES ('2', 'control_policy.md', 'Control Policy
+
+On National Proxy System, Individual Control policy rules determine
+whether to allow, block, redirect or replace a session based on traffic
+attributes, such as URL, request header fields, request body keywords,
+response header fields, response body keywords, IP address, Subscribe ID
+and their combination. You could specify these attributes in the submenu
+of *Control Policy*.
+
+The attributes are detailed in following context:
+
+*URL* -  From proxy<78><79>s perspective, a HTTP URL consists of a hierarchical
+sequence of three components: URL = hostname/path[?query] . The URL path
+name can also be specified by the user in the local writing system. If
+not already encoded, it is converted to UTF-8, and any characters not
+part of the basic URL character set are escaped as hexadecimal using
+percent-encoding; for example, search keywords <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܧڧۡ<DAA7> in Google
+produces URL<52><4C>
+
+https://www.google.com/search?q=%D1%80%D1%83%D1%81%D1%81%D0%BA%D0%B8%D0%B9
+
+To perform policy action on above URL, you could input the whole URL in
+the input box. Or, you could input original keywords and let the Proxy
+do the decoding, e.g. <20><>google.com/search<63><68> & <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ܧڧۡ<DAA7>. Note that the
+scheme string MUST be excluded from the URL, it<69><74>s <20><>https://<2F><> in this
+case.
+
+NOTE Maximum HTTP/HTTPS URL length is 1023 characters
+
+*Request Header* -  is used to set conditions on request header fields.
+Header fields are colon-separated key-value pairs in clear-text string
+format, terminated by a carriage return (CR) and line feed (LF)
+character sequence. For example, <20><>user-agent: Mozilla/5.0 (Windows NT
+10.0; Win64; x64)<29><> is a header filed in request header. The *Matching
+District* is used to configure the field<6C><64>s key, if the key was
+presented, the Proxy will search in the value for *Keywords*.
+
+*Response Header* -  is used to set conditions on response header fields.
+Its configuration is similar to *Request Header*.
+
+*Request Body* -  is used to set conditions on request<73><74>s body message.
+The Proxy searches the pre-configured *Keywords* in it. You can
+configure non-ASCII or non-utf8 keywords by turn on HEX.
+
+*Response Body* -  is used to set conditions on response<73><65>s body message.
+Its configuration is similar to *Request Body*.
+
+You could select one of the five actions for above attributes, as known
+as:
+
+*Monitor* -  the Proxy produce a log to record matched HTTP session
+information.
+
+*Block* -  the Proxy terminate matched HTTP session with an error page
+and produce a log. You MUST specify a *Response Code* and a *Response
+Content* to generate an error page.
+
+*Redirect*<2A><>the Proxy redirect matched HTTP session to a predefined URL.
+Since redirection need to be performed before delivering response to
+client, condition of response body is not applicable in this action. You
+MUST configure the redirect response via *Response Code* and *Response
+URL*. The Response URL MUST start with a scheme (http:// or https://).
+You SHOULD NOT select **301** as *Response Code* unless you exactly know
+what you are doing. This action produces a log.
+
+*Replace*<2A><>the Proxy *Searches in* a given HTTP part to *Find* a given
+string, and *Replace* any matches *with* another given string. If no
+match was found, the session remained untouched. For performance
+concerns, condition of request body and response body is not available
+in this action. For example, you can configure the Proxy to search in
+the response body of URL <20><>www.example.com/index.html<6D><6C>, find every
+<EFBFBD><EFBFBD>string1<EFBFBD><EFBFBD> and replace with <20><>string2<67><32>. This action produces a log.
+
+*Whitelist*<2A><>the Proxy pass-through the matched sessions and produce no
+log.
+
+National Proxy will enforce policy check on traffic attributes, policies
+have been created that there will be some that overlap or are subsets of
+the parameters that the policies use to determine which policy should be
+matched against the traffic. The execute order of policy is <20><>first
+match, first served<65><64>. In case of an incoming traffic attribute matches
+one more policy, the priority order is *Whitelist \> Block \>
+Redirect \> Replace \> Monitor*, action with higher priority overrides
+others. If multiple policies of same action are matched, policy with
+bigger ID number is precedence.
+', null);
+INSERT INTO `help_document` VALUES ('3', 'intercept_policy.md', 'Intercept Policy
+
+An Intercept policy rule allows you to define traffic that you want the
+National Proxy to decrypt and to define traffic that you choose to
+exclude from decryption because the traffic is personal or because of
+local regulations. A connection is intercepted/optimized based on
+traffic attributes, such as IP address, domain name (via SNI matching)
+and Subscribe ID. You could specify these attributes in *IP Intercept*
+and *Domain Intercept*.
+
+Both *IP intercept* and *Domain Intercept* are subject two actions:
+
+*Intercept*<2A><>the National Proxy System intercepts network traffic for
+further control policy and cache policy checking. Interception requires
+certificates to establish the National Proxy as a trusted third party.
+National Proxy deployed in transparent mode, which means the users don`t
+have any proxy settings in their browser. When a connection is set to
+intercept, the proxy terminates the connection and initiates a new
+connection between client and server. If the connection is SSL
+encrypted, the original certificate is replaced with a substitute one.
+
+*Bypass*<2A><>the Proxy passes through the network connection without apply
+an optimization or policy checking. You can also use bypass action when
+excluding servers from SSL decryption for technical reasons (the site
+breaks decryption for reasons such as certificate pinning, unsupported
+ciphers, or mutual authentication). Apple Store, WhatsApp, Telegram,
+Microsoft Windows Update are common SSL pinning application. In case of
+traffic matches one more policy, bypass overrides intercept.
+
+When *Intercept Related Domains* is enabled, domains that share one
+certificates with the specified domain are considered as the same. For
+example, if the intercept facebook.com with I*ntercept Related Domain*
+option, then \*.xx.fbcdn.net, fb.com, .messenger.com and etc. are also
+intercepted. There may be side effects that intercept undesired websites
+that share one certificate. For example, two websites hosted in a same
+CDN provider (Content Delivery Network) or different products of one
+company.
+
+*Key ring* determines which certificate will be used to generate
+substitute certificate. You could configure key ring through *Proxy
+Policy Object* page. If no key ring is specified, proxy will use the
+default one.
+
+Intercept policy produces no log. You can find out if the interception
+is successful by checking if the certificate is issued by your
+pre-configured Root CA. You need a PC which traffic has already directed
+to the Proxy, and a web browser to test the policy. For Chrome and
+Microsoft Internet Explorer, you could click the lock icon on the
+address bar to view certificate. For Firefox, after you clicking the
+lock icon, click <20><>\><3E><> button to show connection details, click <20><>more
+information<EFBFBD><EFBFBD>, and then click <20><>view certificate<74><65>. If the browser warning
+that the connection is not secure, one possible reason is you haven<65><6E>t
+install/trust the root certificate yet.
+
+**Note:** You should exercise caution because web applications may not
+cooperate with SSL interception. Reasons that sites break decryption
+technically include pinned certificates, mutual authentication,
+incomplete certificate chains, unsupported ciphers, and non-standard SSL
+implementation. If a site uses an incomplete certificate chain, the
+National Proxy doesn<73><6E>t automatically fix the chain as a browser would.
+You need to manually download the missing sub-CA certificates and load
+and deploy them onto the proxy.', null);
+INSERT INTO `help_document` VALUES ('4', 'proxy_policy_object.md', 'Proxy Policy Object
+
+A policy object is a single object or a collective unit that groups
+discrete identities such as IP addresses, URLs, applications, or users.
+With policy objects that are a collective unit, you can reference the
+object in policy instead of manually selecting multiple objects one at a
+time. Typically, when creating a policy object, you group objects that
+require similar permissions in policy.
+
+1.  Key Ring
+
+On National Proxy System, Key Ring is a pair of private key and public
+certificate. You can also import a certificate chain containing multiple
+certificates. Key Ring is a policy object, you can reference it in
+*Intercept Policy*.
+
+There are three *Certificate Type:*
+
+*End-entity Certificate*<2A><> is used for web servers to identify
+themselves. The *Public Key File* MUST be .p12 format that contains
+entire certificate chain. The Private Key File could be .pem, .key or
+.p12 format. This certificate type is not applicable to *Domain
+Intercept* for it cannot be used to sign other certificates. *Expire
+After* parameter is also not applicable to end-entity certificate for
+the same reason.
+
+*Intermedia Certificate* -  is used to sign other certificates. An
+intermediate certificate must be signed by another intermediate
+certificate, or a root certificate. The *Public Key File* MUST be .p12
+format that contains entire certificate chain. The *Expire After*
+parameter indicates the expiration of the substitute certificate that
+was issued by this intermedia certificate.
+
+*Root Certificate* -  is used to sign other certificates. The *Public Key
+File* could be .der, .cer, .crt or .pem format. The *Expire After*
+parameter has the same meaning as Intermedia Certificate.
+
+*CRL* -  or Certificate Revocation List, is a list of digital
+certificates that have been revoked by the issuing certificate authority
+(CA) before their scheduled expiration date and should no longer be
+trusted. On Key Ring settings, CRL is an HTTP URL that point to a valid
+.crl file. Invalid URL or .crl file may produce certificate warnings on
+some browser, i.e. Internet Explorer 11.
+
+Specification of certificate formats:
+
+*.pem* <20>C (Privacy-enhanced Electronic Mail) Base64 encoded DER
+certificate, enclosed between "-----BEGIN CERTIFICATE-----" and
+"-----END CERTIFICATE-----"
+
+*.cer, .crt, .der* <20>C usually in binary DER form, but Base64-encoded
+certificates are common too (see .pem above)
+
+*.p12* <20>C PKCS\#12, may contain certificate(s) (public) and private keys
+(without password protected)
+
+1.  Trusted Certificate
+
+National Proxy System has a build-in trusted certificate authorities
+list. When the original certificate is issued by a certificate authority
+that not in the list, the proxy will issued the substitute certificate
+with an untrusted root certificate, and so consequently, the browser
+could identify unsecure connections.
+
+You can add a custom certificate authority to the trusted certificate
+authorities of the system.
+
+The certificate MUST be PEM format.
+
+Following are the National Proxy System<65><6D>s default trusted certificate
+authorities:
+
+ACCVRAIZ1
+
+Actalis Authentication Root CA
+
+AddTrust External CA Root
+
+AffirmTrust Commercial
+
+AffirmTrust Networking
+
+AffirmTrust Premium
+
+AffirmTrust Premium ECC
+
+Amazon Root CA 1
+
+Amazon Root CA 2
+
+Amazon Root CA 3
+
+Amazon Root CA 4
+
+Atos TrustedRoot 2011
+
+Autoridad de Certificacion Firmaprofesional CIF A62634068
+
+Baltimore CyberTrust Root
+
+Buypass Class 2 Root CA
+
+Buypass Class 3 Root CA
+
+CA Disig Root R2
+
+CFCA EV ROOT
+
+COMODO Certification Authority
+
+COMODO ECC Certification Authority
+
+COMODO RSA Certification Authority
+
+Certigna
+
+Certinomis - Root CA
+
+Class 2 Primary CA
+
+Certplus Root CA G1
+
+Certplus Root CA G2
+
+Certum Trusted Network CA
+
+Certum Trusted Network CA 2
+
+Chambers of Commerce Root - 2008
+
+AAA Certificate Services
+
+Cybertrust Global Root
+
+D-TRUST Root Class 3 CA 2 2009
+
+D-TRUST Root Class 3 CA 2 EV 2009
+
+DST Root CA X3
+
+Deutsche Telekom Root CA 2
+
+DigiCert Assured ID Root CA
+
+DigiCert Assured ID Root G2
+
+DigiCert Assured ID Root G3
+
+DigiCert Global Root CA
+
+DigiCert Global Root G2
+
+DigiCert Global Root G3
+
+DigiCert High Assurance EV Root CA
+
+DigiCert Trusted Root G4
+
+E-Tugra Certification Authority
+
+EC-ACC
+
+EE Certification Centre Root CA
+
+Entrust.net Certification Authority (2048)
+
+Entrust Root Certification Authority
+
+Entrust Root Certification Authority - EC1
+
+Entrust Root Certification Authority - G2
+
+GDCA TrustAUTH R5 ROOT
+
+GeoTrust Global CA
+
+GeoTrust Primary Certification Authority
+
+GeoTrust Primary Certification Authority - G2
+
+GeoTrust Primary Certification Authority - G3
+
+GeoTrust Universal CA
+
+GeoTrust Universal CA 2
+
+GlobalSign
+
+GlobalSign
+
+GlobalSign Root CA
+
+GlobalSign
+
+GlobalSign
+
+Global Chambersign Root - 2008
+
+Go Daddy Root Certificate Authority - G2
+
+Hellenic Academic and Research Institutions ECC RootCA 2015
+
+Hellenic Academic and Research Institutions RootCA 2011
+
+Hellenic Academic and Research Institutions RootCA 2015
+
+Hongkong Post Root CA 1
+
+ISRG Root X1
+
+IdenTrust Commercial Root CA 1
+
+IdenTrust Public Sector Root CA 1
+
+Izenpe.com
+
+LuxTrust Global Root 2
+
+Microsec e-Szigno Root CA 2009
+
+NetLock Arany (Class Gold) F?tan<61><6E>s<EFBFBD><73>tv<74><76>ny
+
+Network Solutions Certificate Authority
+
+OISTE WISeKey Global Root GA CA
+
+OISTE WISeKey Global Root GB CA
+
+OpenTrust Root CA G1
+
+OpenTrust Root CA G2
+
+OpenTrust Root CA G3
+
+QuoVadis Root Certification Authority
+
+QuoVadis Root CA 1 G3
+
+QuoVadis Root CA 2
+
+QuoVadis Root CA 2 G3
+
+QuoVadis Root CA 3
+
+QuoVadis Root CA 3 G3
+
+SSL.com EV Root Certification Authority ECC
+
+SSL.com EV Root Certification Authority RSA R2
+
+SSL.com Root Certification Authority ECC
+
+SSL.com Root Certification Authority RSA
+
+SZAFIR ROOT CA2
+
+SecureSign RootCA11
+
+SecureTrust CA
+
+Secure Global CA
+
+Sonera Class2 CA
+
+Staat der Nederlanden EV Root CA
+
+Staat der Nederlanden Root CA - G2
+
+Staat der Nederlanden Root CA - G3
+
+Starfield Root Certificate Authority - G2
+
+Starfield Services Root Certificate Authority - G2
+
+SwissSign Gold CA - G2
+
+SwissSign Silver CA - G2
+
+T-TeleSec GlobalRoot Class 2
+
+T-TeleSec GlobalRoot Class 3
+
+TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1
+
+TWCA Global Root CA
+
+TWCA Root Certification Authority
+
+TeliaSonera Root CA v1
+
+TrustCor ECA-1
+
+TrustCor RootCert CA-1
+
+TrustCor RootCert CA-2
+
+T<EFBFBD><EFBFBD>RKTRUST Elektronik Sertifika Hizmet Sa?lay?c?s? H5
+
+USERTrust ECC Certification Authority
+
+USERTrust RSA Certification Authority
+
+VeriSign Class 3 Public Primary Certification Authority - G4
+
+VeriSign Class 3 Public Primary Certification Authority - G5
+
+VeriSign Universal Root Certification Authority
+
+VeriSign Class 3 Public Primary Certification Authority - G3
+
+Visa eCommerce Root
+
+XRamp Global Certification Authority
+
+thawte Primary Root CA
+
+thawte Primary Root CA - G2
+
+thawte Primary Root CA - G3
+
+Microsoft Root Authority
+
+Microsoft Root Certificate Authority
+
+Microsoft Root Certificate Authority 2010
+
+Microsoft Root Certificate Authority 2011
+
+Baltimore CyberTrust Root
+
+', null);
+
+commit;
+
+

src/main/resources/sql/deploymentsql/20190508other_sql.sql

@@ -0,0 +1,191 @@
+CREATE TABLE `inner_protection_list` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `keyword` varchar(500) NOT NULL COMMENT '<EFBFBD>ؼ<EFBFBD><EFBFBD><EFBFBD>',
+  `target_type` varchar(128) DEFAULT '' COMMENT '<EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
+  `description` varchar(200) DEFAULT '',
+  `is_valid` int(2) NOT NULL DEFAULT 0 COMMENT '-1ɾ<31><C9BE> 1<><31>Ч',
+  `create_time` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+  `editor_id` int(11) DEFAULT NULL,
+  `creator_id` int(11) NOT NULL,
+  `edit_time` datetime DEFAULT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=108 DEFAULT CHARSET=utf8mb4;
+INSERT INTO `inner_protection_list` VALUES ('104', '.com', 'domainCheck', 'protection domain', '1', '2019-03-26 13:54:28', '1', '1', '2019-04-02 11:16:36');
+INSERT INTO `inner_protection_list` VALUES ('106', '.com', 'urlCheck', 'protection url', '1', '2019-03-27 11:08:24', '1', '1', '2019-04-02 11:21:52');
+commit;
+
+
+DROP PROCEDURE IF EXISTS `proc_statistics_config`;
+delimiter ;;
+CREATE DEFINER=`root`@`%` PROCEDURE `proc_statistics_config`()
+BEGIN
+
+	DECLARE ntime VARCHAR(40);/*<EFBFBD><EFBFBD>ǰʱ<EFBFBD><EFBFBD>*/
+
+	DECLARE otime VARCHAR(40);/*<EFBFBD>ϴ<EFBFBD>ͳ<EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>*/
+
+	DECLARE nRow VARCHAR(40);/*<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
+
+	DECLARE tabName VARCHAR(500);
+
+	DECLARE description VARCHAR(500);
+
+	DECLARE deleteSql VARCHAR(500);
+
+	DECLARE done INT;/*<EFBFBD>α<EFBFBD><EFBFBD><EFBFBD>ʶ*/
+
+	DECLARE flag INT;/*ѭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʶ*/
+
+	DECLARE t_error INT;/*<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʶ*/
+
+	DECLARE proc_log_table VARCHAR(100);/*<EFBFBD>洢<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD><EFBFBD>*/
+
+	DECLARE proc_name VARCHAR(100);/*<EFBFBD>洢<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
+
+	DECLARE icursor CURSOR FOR SELECT  tab_name FROM statistics_tables where is_valid=1;
+
+	DECLARE CONTINUE HANDLER FOR NOT found SET done=1;
+
+	DECLARE CONTINUE HANDLER FOR SQLEXCEPTION set t_error=1;
+
+	select max(statistic_time) into otime from cfg_num_statistics;
+
+	SET done=0;
+
+	SET t_error=0;
+
+	SET proc_log_table='proc_exec_log';
+
+	SET proc_name='proc_statistics_config';
+
+	SET ntime=DATE_FORMAT(SYSDATE(),'%Y-%m-%d %H:%i:%S');
+
+	OPEN icursor;
+
+		loop_iloop:LOOP
+
+			FETCH icursor INTO tabName;
+
+			SET description=tabName;
+
+			set @descriptionStart=concat(description,'<EFBFBD><EFBFBD>ͳ<EFBFBD><EFBFBD>start');
+
+			/*ͳ<EFBFBD>Ƶ<EFBFBD>ǰ<EFBFBD><EFBFBD><EFBFBD>ñ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݵ<EFBFBD>ͳ<EFBFBD>Ʊ<EFBFBD><EFBFBD><EFBFBD>start*/
+
+			set @v_log_sql1 := concat('insert into ',proc_log_table,'(proc_name,table_name,log_time,description) values(?,?,?,?)');
+
+			PREPARE  execs FROM @v_log_sql1;
+
+			EXECUTE   execs using proc_name,proc_log_table,ntime,@descriptionStart;
+
+			DEALLOCATE PREPARE execs;
+
+			COMMIT;
+
+
+			#20190328 <20><><EFBFBD>Ӷ<EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>is_audit=1 && (is_valid=1 || is_valid=0) <20><>Ϊapproved <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>cfg_state=4[is_valid=0 && is_audit=1],<2C><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˹<EFBFBD><CBB9>ģ<EFBFBD><C4A3><EFBFBD><EFBFBD><EFBFBD>cfg_state=1<><31><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͨ<EFBFBD><CDA8><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ч<EFBFBD>ģ<EFBFBD><C4A3><EFBFBD><EFBFBD><EFBFBD>չʾ<D5B9><CABE>approvedֵʵ<D6B5>ʰ<EFBFBD><CAB0><EFBFBD>cfg_state=4<><34>cfg_state=1
+			set @insert_statistics_sql := concat('insert into cfg_num_statistics(statistic_time,audit_time,function_id,service_id,action,compile_id,cfg_state) select  ','''',ntime,'''',',','audit_time,function_id,service_id,action,compile_id,if(is_valid=-1,-1,if(is_valid=1,1,if(is_audit=0,0,if(is_audit=1,4,if(is_audit=2,2,if(is_audit=3,3,0)))))) cfg_state from ',tabName);
+
+
+			PREPARE  execs FROM @insert_statistics_sql;
+
+			EXECUTE   execs;
+
+			DEALLOCATE PREPARE execs;
+
+			COMMIT;
+
+
+
+			set @descriptionEnd=concat(description,'<EFBFBD><EFBFBD>ͳ<EFBFBD><EFBFBD>end');
+
+			set @v_log_sql2 := concat('insert into ',proc_log_table,'(proc_name,table_name,log_time,description) values(?,?,?,?)');
+
+			PREPARE  execs FROM @v_log_sql2;
+
+			EXECUTE   execs using proc_name,proc_log_table,ntime,@descriptionEnd;
+
+			DEALLOCATE PREPARE execs;
+
+			COMMIT;
+
+			/*<EFBFBD>쳣<EFBFBD>˳<EFBFBD>loop*/
+			IF t_error=1 THEN
+				LEAVE loop_iloop;
+			END IF;
+
+			/*ѭ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˳<EFBFBD>loop*/
+			IF done=1 THEN
+
+				LEAVE loop_iloop;
+
+			ELSE
+
+				SET flag=0;
+
+			END IF;
+
+			IF flag=0 THEN
+
+				SET done=0;
+
+			END IF;
+
+		END LOOP loop_iloop;
+
+	CLOSE icursor;
+	 /*ȡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ͳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
+	SELECT count(statistic_time) INTO nRow from cfg_num_statistics where statistic_time=ntime;
+	
+
+	IF t_error=1 THEN    /*<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>쳣<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
+		delete from cfg_num_statistics where statistic_time=ntime;
+		COMMIT;
+	ELSEIF nRow > 0 THEN /*<EFBFBD>жϱ<EFBFBD><EFBFBD><EFBFBD>ͳ<EFBFBD><EFBFBD><EFBFBD>Ƿ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>¼<EFBFBD>룬<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ɾ<EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>ͳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ݣ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>û<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD>ͳ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>*/
+
+		delete from cfg_num_statistics where statistic_time=otime;
+		COMMIT;
+	END IF;
+	COMMIT;
+END
+;;
+delimiter ;
+
+#ִ<>д洢<D0B4><E6B4A2><EFBFBD><EFBFBD>
+call exec_procs();
+
+-- ------------
+-- <20><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>һ<EFBFBD><D2BB>type<70><65><EFBFBD>ԣ<EFBFBD><D4A3><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>޸ģ<DEB8><C4A3>޸<EFBFBD>ȫ<EFBFBD><C8AB>ͬ<EFBFBD><CDAC>״̬Ϊ3(<28><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>)
+-- ------------
+ALTER TABLE schedule_cfg ADD  type int(1) DEFAULT 1 COMMENT '1:<3A><>ʱ<EFBFBD><CAB1><EFBFBD><EFBFBD><EFBFBD><EFBFBD>2<EFBFBD><32>ȫ<EFBFBD><C8AB>ͬ<EFBFBD><CDAC>ʱδִ<CEB4>е<EFBFBD><D0B5><EFBFBD><EFBFBD><EFBFBD>';
+update schedule_cfg set type=1;
+update sys_data_dictionary_item t set t.item_value=3  where t.dictionary_id=142;
+
+-- ------------
+-- ϵͳ<CFB5><CDB3><EFBFBD><EFBFBD>-><3E><><EFBFBD><EFBFBD>Ա<EFBFBD>û<EFBFBD>Ԥ<EFBFBD><D4A4>
+-- ------------
+INSERT INTO `sys_menu` (`parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('2', '0,1,2,', 'admin_user_warn', 'admin user warn', '5060', '/sys/warn/userWarnList', '', '', '1', 'sys:warnList:view', '1', '2019-03-28 10:06:26', '1', '2019-03-28 11:36:42', '', '1', NULL, '0', '0', NULL);
+
+CREATE TABLE `sys_user_warn` (
+  `service_id` int(11) NOT NULL COMMENT 'ҵ<EFBFBD><EFBFBD>ID',
+  `service_desc` varchar(255) DEFAULT '' COMMENT 'ҵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
+  `interface_cfg_total` int(11) DEFAULT NULL COMMENT '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
+  `system_cfg_total` int(11) DEFAULT NULL COMMENT '<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>',
+  `time` datetime DEFAULT NULL COMMENT '<EFBFBD><EFBFBD><EFBFBD>ݲ<EFBFBD><EFBFBD><EFBFBD>ʱ<EFBFBD><EFBFBD>',
+  `remark` varchar(255) DEFAULT NULL COMMENT '<EFBFBD><EFBFBD>ע',
+  PRIMARY KEY (`service_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='<EFBFBD><EFBFBD><EFBFBD><EFBFBD>Ա<EFBFBD>û<EFBFBD>Ԥ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>';
+-- <20><><EFBFBD>ñ<EFBFBD><C3B1><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+INSERT INTO `sys_menu` (`parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES ('109', '0,1,109,', 'protection_list_manage', 'protection list manage', '5060', '/basics/innerProtectionList/list', '', 'fa fa-sticky-note-o', '1', 'basic:inner_protection_list:list', '1', '2019-03-25 15:28:34', '1', '2019-03-26 15:04:47', '', '1', NULL, '0', '0', NULL);
+	
+-- ------------
+-- <20><><EFBFBD>˲<EFBFBD><CBB2>·<EFBFBD><C2B7><EFBFBD><EFBFBD>ܣ<EFBFBD>ֻ<EFBFBD>н<EFBFBD><D0BD>˲˵<CBB2><CBB5><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>沢<EFBFBD>·<EFBFBD><C2B7>û<EFBFBD><C3BB>Ľ<EFBFBD>ɫ<EFBFBD><C9AB><EFBFBD>˽<EFBFBD>ɫ<EFBFBD>µ<EFBFBD><C2B5>û<EFBFBD><C3BB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ÿ<EFBFBD>ֱ<EFBFBD><D6B1><EFBFBD>·<EFBFBD><C2B7><EFBFBD><EFBFBD>˰汾ע<E6B1BE><D7A2><EFBFBD><EFBFBD>ɫ<EFBFBD><C9AB><EFBFBD>䣩
+-- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˲<EFBFBD><CBB2>·<EFBFBD><C2B7>˵<EFBFBD>
+-- ------------
+INSERT INTO `sys_menu`(`parent_id`, `parent_ids`, `code`, `name`, `sort`, `href`, `target`, `icon`, `is_show`, `permission`, `create_by`, `create_date`, `update_by`, `update_date`, `remarks`, `del_flag`, `menu_bg`, `quick_action`, `is_top`, `function_id`) VALUES (86, '0,1,86,', 'save_and_audit', 'save and audit', 5060, '', '', '', 0, 'save:audit:permission', '1', '2019-04-08 11:30:31', '1', '2019-04-08 11:47:16', 'save_and_audit', 1, NULL, 0, 0, NULL);
+-- <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˲<EFBFBD><CBB2>·<EFBFBD><C2B7><EFBFBD>ɫ
+INSERT INTO `sys_role`(`NAME`, `DATA_SCOPE`, `REMARK`, `STATUS`, `CREATE_TIME`, `ROLE_TYPE`) VALUES ('saveAndAudit', 1, '', 1, '2019-04-09 11:33:40', 'user');
+-- <20><><EFBFBD><EFBFBD>ΪsaveAndAudit<69><74>ɫ<EFBFBD><C9AB><EFBFBD><EFBFBD>save_and_audit<69>˵<EFBFBD><CBB5><EFBFBD>
+insert into  sys_privilege (PRIVILEGE_MASTER,PRIVILEGE_MASTER_VALUE,PRIVILEGE_ACCESS,PRIVILEGE_ACCESS_VALUE,PRIVILEGE_OPERATION )  select 'ROLE',r.id,1000,m.id,1 from sys_role r,sys_menu m where r.name='saveAndAudit' and m.code='save_and_audit'
+
+

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

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

src/main/webapp/WEB-INF/include/excel/importModal.jsp

@@ -122,7 +122,7 @@
 						</div>
 						<!-- 600 asn ip、 3：IP白名单、 405：APP协议IP、 403：APP域名特征、 563 APP Payload、 565 APP HTTP、 564 APP DNS、 566 APP SSL -->
 						<c:if test="${(cfg.functionId eq 600) || (cfg.functionId eq 3) || (cfg.functionId eq 405) || (cfg.functionId eq 403) || (cfg.functionId eq 563) || (cfg.functionId eq 565) || (cfg.functionId eq 564) || (cfg.functionId eq 566) ||
-										(cfg.functionId eq 560)||(cfg.functionId eq 110) }">
+										(cfg.functionId eq 560) }">
 							<div class="row hidden requestIdSel">
 						</c:if>
 						<c:if test="${(cfg.functionId ne 600) && (cfg.functionId ne 3) && (cfg.functionId ne 405) && (cfg.functionId ne 403) && (cfg.functionId ne 563) && (cfg.functionId ne 565) && (cfg.functionId ne 564) && (cfg.functionId ne 566) &&

src/main/webapp/WEB-INF/include/header.jsp

@@ -110,6 +110,3 @@
 <script src="${pageContext.request.contextPath}/static/pages/scripts/appNames.js" type="text/javascript"></script>
 
 <script src="${pageContext.request.contextPath}/static/global/plugins/clipboard.js" type="text/javascript"></script>
-<link href="${pageContext.request.contextPath}/static/global/plugins/select2/css/select2.css" rel="stylesheet" />
-<link href="${pageContext.request.contextPath}/static/global/plugins/select2/css/select2-bootstrap.min.css" rel="stylesheet" />
-<script src="${pageContext.request.contextPath}/static/global/plugins/select2/js/select2.js" type="text/javascript"></script>

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

@@ -164,6 +164,26 @@ function del(url){
 			}
 		}
 	}else{
+		var isAudit=$("#isAudit").val();
+		var isValid=$("#isValid").val();
+		
+		// 批量删除：is_audit 3/0/null &&  is_valid 0/null  此条件下允许（取反提示）
+		if(!((isAudit==null || isAudit=='' || isAudit==3 || isAudit==0 ) 
+				&& (isValid==null || isValid==''|| isValid==0))){
+			top.$.jBox.tip("<spring:message code='has_prohibit_delete'/>", "<spring:message code='info'/>");
+			return;
+		}
+		
+		if(isAudit==null || isAudit==''){
+			isAudit="3,0";
+		}
+		if(isValid==null || isValid==''){
+			isValid="0";
+		}
+		
+		url=url+"&batchAuditValue="+isAudit;
+		url=url+"&batchValidValue="+isValid;
+		
 		url = url+"&"
 		if(isBatch(url)) {
 			top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='delete_all'/>",function(v,h,f){
@@ -189,10 +209,10 @@ function update(url){
 		return;
 	} */
 	if($(checkboxes).filter(":checked").length==1){
-		/* if(cked.val()==1){
+		if(cked.val()==1){
 			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
 			return;
-		} *//*else if(cked.val()==3){
+		}/*else if(cked.val()==3){
 			 top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
 			return;
 		}*/
@@ -227,6 +247,24 @@ var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
 					doAll(checkboxes,url);
 		}
 	}else{
+		var isAudit=$("#isAudit").val();
+		var isValid=$("#isValid").val();
+		
+		// 审核通过：is_audit 0/null &&  is_valid 0  此条件下允许（取反提示）
+		if(!((isAudit==null || isAudit=='' || isAudit==0 ) 
+				&& (isValid==null  || isValid==''|| isValid==0))){
+			top.$.jBox.tip("<spring:message code='has_prohibit_pass'/>", "<spring:message code='info'/>");
+			return;
+		}
+		
+		if(isAudit==null || isAudit==''){
+			isAudit="0";
+		}
+		if(isValid==null || isValid==''){
+			isValid="0";
+		}
+		url=url+"&batchAuditValue="+isAudit;
+		url=url+"&batchValidValue="+isValid;
 		url = url+"&"
 		//配置批量下发
 		if(isBatch(url)){
@@ -255,6 +293,27 @@ function noPassOpt(url){
 		}
 		
 	}else{
+		
+		var isAudit=$("#isAudit").val();
+		var isValid=$("#isValid").val();
+		
+		// 审核不通过：is_audit 0/null &&  is_valid 0/null  此条件下允许（取反提示）
+		if(!((isAudit==null || isAudit=='' || isAudit==0 ) 
+				&& (isValid==null  || isValid==''|| isValid==0))){
+			top.$.jBox.tip("<spring:message code='has_prohibit_nopass'/>", "<spring:message code='info'/>");
+			return;
+		}
+		
+		if(isAudit==null || isAudit==''){
+			isAudit="0";
+		}
+		if(isValid==null || isValid==''){
+			isValid="0";
+		}
+		
+		url=url+"&batchAuditValue="+isAudit;
+		url=url+"&batchValidValue="+isValid;
+		
 		url = url+"&"
 		//配置批量审核（未通过）
 		if(isBatch(url)){
@@ -333,6 +392,24 @@ function cancelPassOpt(url){
 		}
 		
 	}else{
+		var isAudit=$("#isAudit").val();
+		var isValid=$("#isValid").val();
+		// 取消审核通过：is_audit 1/null &&  is_valid 0(定时任务)/1/null  此条件下允许（取反提示）
+		if(!((isAudit==null || isAudit=='' || isAudit==1 ) 
+				&& (isValid==null || isValid=='' || isValid==1 || isValid==0))){
+			top.$.jBox.tip("<spring:message code='hasnot_approved'/>", "<spring:message code='info'/>");
+			return;
+		}
+		
+		if(isAudit==null || isAudit==''){
+			isAudit="1";
+		}
+		if(isValid==null || isValid==''){
+			isValid="1,0";
+		}
+		url=url+"&batchAuditValue="+isAudit;
+		url=url+"&batchValidValue="+isValid;
+		
 		url = url+"&"
 		//配置批量取消
 		if(isBatch(url)){

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

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

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

@@ -37,6 +37,8 @@
 			$(".Wdate").attr("value",'');
 			$("#description").attr("value",'');
 			$("#searchForm")[0].reset();
+			$("#organization").val("");
+			$("#userRegion1").val("");
 		});
 		
 		if($("#exportType").val() != null && $("#exportType").val() != ""){
@@ -66,7 +68,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 		
 			<shiro:hasPermission name="asn:ip:config">
-				<button type="button" class="btn btn-primary"
+				<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/basics/asn/addForm?functionId=${cfg.functionId}'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>
@@ -77,7 +79,7 @@
 					</c:if>
 				</c:forEach>
 				<c:if test="${regionImport eq 'true'}">
-					<button type="button" class="btn btn-primary import" >
+					<button type="button" class="importId btn btn-primary import" >
 						<i class="fa fa-plus"></i>
 					<spring:message code="import"></spring:message></button>
 				</c:if>

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

@@ -38,7 +38,7 @@
 <body>
 	<div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/sys/dict/dictItemForm?dictionaryId=${sysDataDictionaryItem.dictionaryId }'">
+		<button type="button" class="addId btn btn-primary" onClick="javascript:window.location='${ctx}/sys/dict/dictItemForm?dictionaryId=${sysDataDictionaryItem.dictionaryId }'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"/></button>
 	</div>

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

@@ -1,368 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ include file="/WEB-INF/include/taglib.jsp"%>
-<html>
-<head>
-<title><spring:message code="ip_group_configuration"></spring:message></title>
-<script type="text/javascript">
-var defaultIpInfo;
-$(function(){
-	$("select[name$='protocol']").parents(".form-group").addClass("hidden");
-	$("select[name$='direction']").parents(".form-group").addClass("hidden");
-	defaultIpInfo=$(".ipInfo").clone();
-	$(".ipAdd").click();
-	$("#cfgFrom").validate({
-		errorPlacement: function(error,element){
-			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
-		},
-		submitHandler: function(form){
-			loading('onloading...');
-			form.submit();
-		},
-		errorContainer: "#messageBox",
-	});
-});
-//业务窗口打开
-var addContent = function(obj, contentClassName) {
-	var showDiv = $(obj).parent().parent().siblings("."+contentClassName).last();
-	if(showDiv.hasClass("hidden")){
-		$(showDiv).removeClass("hidden").removeClass(
-		"disabled");
-	}else{
-		var additional=defaultIpInfo.clone();
-		additional.removeClass("hidden").removeClass(
-		"disabled");
-		showDiv.after(additional);
-	}
-	var index=0;
-	$("."+contentClassName).each(function(){
-		reSort($(this),index);
-		index++;
-	});
-	$(".selectpicker").selectpicker("render");
-	//$(obj).addClass("hidden");
-	$("select[name$='ipType']").on("change",function(){
-		switchIpInfo(this);
-	});
-	$("select[name$='IpPattern']").on("change",function(){
-		switchIpInfo(this);
-	});
-}
-
-//业务窗口关闭
-var delContent = function(obj,contentClassName) {
-	if($("."+contentClassName).length==1){
-		top.$.jBox.tip("<spring:message code='one_more'/>");
-		return;
-	}
-	$(obj).parents("."+contentClassName).remove();
-	var index=0;
-	$("."+contentClassName).each(function(){
-		reSort($(this),index);
-		index++;
-	});
-}
-var reSort=function(obj,index){
-	$(obj).find("input,select").each(function(){
-		var name=$(this).attr("name");
-		if(name.indexOf("ipCommGroupCfgList[")>-1){
-			var namePrefix="ipCommGroupCfgList[";
-			var nameSubfix=name.substring(name.indexOf("]"));
-			var nameNew=namePrefix+index+nameSubfix;
-			if(nameNew!=name){
-				$(this).attr("name",nameNew);
-				$(this).parents(".form-group").find("div[for='"+name+"']").attr("for",nameNew);
-			}
-		}
-	})
-}
-</script>
-</head>
-<body>
-
-<div class="page-content">
-
-	<h3 class="page-title">
-		<spring:message code="ip_group_configuration"></spring:message>
-	</h3>
-	
-	<div class="row">
-		<div class="col-md-12">
-			<div class="portlet box blue">
-                  <div class="portlet-title">
-                     <div class="caption">
-                         <i class="fa fa-gift"></i>
-                        <spring:message code="add"></spring:message>
-					</div>
-                  </div>
-                  <div class="portlet-body form">
-                      <!-- BEGIN FORM-->
-                      <form id="cfgFrom" action="${ctx}/basics/ip/save" method="post" class="form-horizontal">
-                       	<input type="hidden" name="functionId" value="${_cfg.functionId}">
-                   		<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
-                   		<input type="hidden" id="compileId" name="compileId" value="0">
-                   		<input type="hidden" id="requestId" name="requestId" value="0">
-                   		<input type="hidden" name="isValid" value="${_cfg.isValid}">
-						<input type="hidden" name="isAudit" value="${_cfg.isAudit}">
-                   		<c:forEach items="${serviceList}" var="service">
-                   			<input type="hidden" id="serviceId" name="serviceId" value="${service.serviceId}">
-                   			<input type="hidden" id="action" name="action" value="${service.action}">
-                   		</c:forEach>
-                       	<!-- 配置域类型 -->
-                   		<c:forEach items="${regionList}" var="region">
-                   			<c:if test="${_cfg.functionId eq region.functionId}">
-                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
-                   				<input type="hidden" name="cfgRegionCode" 
-                   				 isMaat="${region.isMaat}"
-		                   		 serviceType="${region.configServiceType}"
-		                   		 ipPortShow="${region.configIpPortShow}"
-		                   		 ipType="${region.configIpType}"
-		                   		 srcIpPattern="${fn:split(region.configIpPattern,';')[0]}"
-		                   		 destIpPattern="${fn:split(region.configIpPattern,';')[1]}"
-		                   		 srcPortPattern="${fn:split(region.configPortPattern,';')[0]}"
-		                   		 destPortPattern="${fn:split(region.configPortPattern,';')[1]}"
-		                   		 direction="${region.configDirection}"
-		                   		 protocol="${region.configProtocol}"
-		                   		 regionType="${region.regionType}"
-                   				 value="${region.configRegionCode}">
-                   			</c:if>
-                   		</c:forEach>
-                          <div class="form-body">
-                              <div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
-								            <div class="col-md-6">
-								                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
-								            </div>
-								        </div>
-								    </div>
-								     <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_group"/></label>
-								            <div class="col-md-6">
-								            	 <select name="userRegion3" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
-									               		<option value="${_cfg.userRegion3}"><spring:message code="select"/></option>
-									               	<c:forEach items="${policyGroupInfos}" var="ipGroupInfo">
-									               			<option value="${ipGroupInfo.groupId}"
-									               				<c:if test="${_cfg.userRegion3 eq ipGroupInfo.groupId }">
-																selected
-																</c:if>
-									               			>${ipGroupInfo.groupName}</option>
-									               	</c:forEach>
-									              </select>
-								            </div>
-								            <div for="userRegion3"></div>
-								        </div>
-								    </div>
-								</div>
-							<h4 class="form-section">
-								<spring:message code="ip_group_configuration" />
-								<small> <span
-									class="glyphicon glyphicon-plus  ipAdd"
-									onClick="addContent(this,'ipInfo')" title="add"></span></small>
-							</h4>
-                           <div class="row ipInfo boxSolid hidden disabled">
-                           		<input type="hidden" name="ipCommGroupCfgList[0].protocolId" value="0">
-                           		<div class="row">
-									<div class="pull-right">
-										<span class="glyphicon glyphicon-remove pull-right" title="remove"
-											onClick="delContent(this,'ipInfo');" />
-									</div>
-								</div>
-								<div class="row  protocol">
-									<div class="col-md-6">
-										<div class="form-group ">
-											<label class="control-label col-md-3"><font color="red">*</font>
-												<spring:message code="protocol" /></label>
-											<div class="col-md-6">
-												<select name="ipCommGroupCfgList[0].protocol"
-													class="selectpicker show-tick form-control required">
-													<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
-														<option value="${protocolC.itemCode}" <c:if test="${_cfg.ipCommGroupCfgList[0].protocol==protocolC.itemCode || (_cfg.ipCommGroupCfgList[0].protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
-													</c:forEach>
-												</select>
-											</div>
-											<div for="ipCommGroupCfgList[0].protocol"></div>
-										</div>
-									</div>
-									<div class="col-md-6">
-										<div class="form-group">
-											<label class="control-label col-md-3"><font color="red">*</font>
-												<spring:message code="direction" /></label>
-											<div class="col-md-6">
-												<select name="ipCommGroupCfgList[0].direction"
-													class="selectpicker show-tick form-control required">
-													<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
-														<option value="${directionC.itemCode}" <c:if test="${_cfg.ipCommGroupCfgList[0].direction==directionC.itemCode || (_cfg.ipCommGroupCfgList[0].direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
-													</c:forEach>
-												</select>
-											</div>
-											<div for="ipCommGroupCfgList[0].direction"></div>
-										</div>
-									</div>
-								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
-								            <div class="col-md-6">
-								            	 <select name="ipCommGroupCfgList[0].ipType" class="selectpicker show-tick form-control required">
-								                   <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
-														<option value="${ipTypeC.itemCode}" 
-																<c:if test="${_cfg.ipCommGroupCfgList[0].ipType==ipTypeC.itemCode 
-																	|| (_cfg.ipCommGroupCfgList[0].ipType==null && ipTypeC.itemCode==4)}">
-																	selected
-																</c:if>
-																>
-														<spring:message code="${ipTypeC.itemValue}"/>
-														</option>
-							               			</c:forEach>
-								                 </select>
-								            </div>
-								            <div for="ipCommGroupCfgList[0].ipType"></div>
-								        </div>
-								    </div>
-								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="src_ip_pattern"/></label>
-								            <div class="col-md-6">
-								            	 <select name="ipCommGroupCfgList[0].srcIpPattern" class="selectpicker show-tick form-control required">
-								                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
-														<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.ipCommGroupCfgList[0].srcIpPattern==ipPatternC.itemCode || (_cfg.ipCommGroupCfgList[0].srcIpPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
-							              			</c:forEach>
-								                 </select>
-								            </div>
-								            <div for="ipCommGroupCfgList[0].srcIpPattern"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
-								        <div class="form-group ">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
-								            <div class="col-md-6">
-								                 <input class="form-control required ipCheck" type="text" name="ipCommGroupCfgList[0].srcIpAddress" value="${_cfg.ipCommGroupCfgList[0].srcIpAddress}">
-								            </div>
-								            <div for="ipCommGroupCfgList[0].srcIpAddress"></div>
-								        </div>
-								    </div>
-								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="src_port_pattern"/></label>
-								            <div class="col-md-6">
-								            	 <select name="ipCommGroupCfgList[0].srcPortPattern" class="selectpicker show-tick form-control required">
-								                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
-														<option value="${portPatternC.itemCode}" <c:if test="${_cfg.ipCommGroupCfgList[0].srcPortPattern==portPatternC.itemCode || (_cfg.ipCommGroupCfgList[0].srcPortPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
-							              			</c:forEach>
-								                 </select>
-								            </div>
-								            <div for="ipCommGroupCfgList[0].srcPortPattern"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
-								        <div class="form-group ">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
-								            <div class="col-md-6">
-								                 <input class="form-control required portCheck" type="text" name="ipCommGroupCfgList[0].srcPort" value="${_cfg.ipCommGroupCfgList[0].srcPort}">
-								            </div>
-								            <div for="ipCommGroupCfgList[0].srcPort"></div>
-								        </div>
-								    </div>
-								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
-								            <div class="col-md-6">
-								            	 <select name="ipCommGroupCfgList[0].destIpPattern" class="selectpicker show-tick form-control required">
-								                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
-														<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.ipCommGroupCfgList[0].destIpPattern==ipPatternC.itemCode || (_cfg.ipCommGroupCfgList[0].destIpPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
-							              			</c:forEach>
-								                 </select>
-								            </div>
-								            <div for="ipCommGroupCfgList[0].destIpPattern"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
-								        <div class="form-group ">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
-								            <div class="col-md-6">
-								                 <input class="form-control required ipCheck" type="text" name="ipCommGroupCfgList[0].destIpAddress" value="${_cfg.ipCommGroupCfgList[0].destIpAddress}">
-								            </div>
-								            <div for="ipCommGroupCfgList[0].destIpAddress"></div>
-								        </div>
-								    </div>
-								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="dest_port_pattern"/></label>
-								            <div class="col-md-6">
-								            	 <select name="ipCommGroupCfgList[0].destPortPattern" class="selectpicker show-tick form-control required">
-								                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
-														<option value="${portPatternC.itemCode}" <c:if test="${_cfg.ipCommGroupCfgList[0].destPortPattern==portPatternC.itemCode || (_cfg.ipCommGroupCfgList[0].destPortPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
-							              			</c:forEach>
-								                 </select>
-								            </div>
-								            <div for="ipCommGroupCfgList[0].destPortPattern"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
-								        <div class="form-group ">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
-								            <div class="col-md-6">
-								                 <input class="form-control required portCheck" type="text" name="ipCommGroupCfgList[0].destPort" value="${_cfg.ipCommGroupCfgList[0].destPort}">
-								            </div>
-								            <div for="ipCommGroupCfgList[0].destPort"></div>
-								        </div>
-								    </div>
-								</div>
-								
-								<%-- <div class="row">
-									<button type="button" class="btn btn-red-hollow center-block"
-										onClick="more(this);" data-click-times="0">
-										<spring:message code="show_more" />
-									</button>
-								</div> --%>
-							</div>
-                          </div>
-                          <div class="form-actions">
-                              <div class="row">
-                                  <div class="col-md-6">
-                                      <div class="row">
-                                          <div class="col-md-offset-3 col-md-8">
-                                              <c:set var="auditPermission" value="false"></c:set>
-												<!-- 拥有配置新增直接生效的功能权限 -->
-												<shiro:hasPermission name="save:audit:permission">
-													<c:set var="auditPermission" value="true"></c:set>
-												</shiro:hasPermission>
-												<c:choose>
-													<c:when test="${!(fns:getUser().isAdmin()) && auditPermission}">
-														<button id="audit" type="submit" class="btn green">
-														<spring:message code="submit" />
-													</button>
-													</c:when>
-													<c:otherwise>
-														<button id="save" type="submit" class="btn green">
-															<spring:message code="submit" />
-														</button>
-													</c:otherwise>
-												</c:choose>
-                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
-                                          </div>
-                                      </div>
-                                  </div>
-                                  <div class="col-md-6"> </div>
-                              </div>
-                          </div>
-                      </form>
-                      <!-- END FORM-->
-                  </div>
-              </div>
-		</div>
-	</div>
-</div>
-</body>
-</html>

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

@@ -1,327 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ include file="/WEB-INF/include/taglib.jsp"%>
-<html>
-<head>
-<title><spring:message code="ip_group_configuration"></spring:message></title>
-<script type="text/javascript">
-$(function(){
-	$("select[name='protocol']").parents(".form-group").addClass("hidden");
-	$("select[name='direction']").parents(".form-group").addClass("hidden");
-	$("#cfgFrom").validate({
-		errorPlacement: function(error,element){
-			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
-		},
-		submitHandler: function(form){
-			loading('onloading...');
-			form.submit();
-		},
-		errorContainer: "#messageBox",
-	});
-});
-</script>
-</head>
-<body>
-
-<div class="page-content">
-
-	<h3 class="page-title">
-		<spring:message code="ip_group_configuration"></spring:message>
-	</h3>
-	
-	<div class="row">
-		<div class="col-md-12">
-			<div class="portlet box blue">
-                  <div class="portlet-title">
-                     <div class="caption">
-                         <i class="fa fa-gift"></i>
-						<spring:message code="edit"></spring:message>
-					</div>
-                  </div>
-                  <div class="portlet-body form">
-                      <!-- BEGIN FORM-->
-                      <form id="cfgFrom" action="${ctx}/basics/ip/update" method="post" class="form-horizontal">
-                      	<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
-                       	<input type="hidden" name="compileId" value="${_cfg.compileId}">
-                       	<input type="hidden" name="functionId" value="${_cfg.functionId}">
-						<c:choose> 
-						   <c:when test="${_cfg.isAudit ne 1}"> 
-						   		<input type="hidden" name="isValid" value="0">
-								<input type="hidden" name="isAudit" value="0">
-						   </c:when> 
-						   <c:otherwise>  
-						   		<input type="hidden" name="isValid" value="${_cfg.isValid}">
-								<input type="hidden" name="isAudit" value="${_cfg.isAudit}">
-						   </c:otherwise> 
-						</c:choose> 
-						<input type="hidden" id="regionId" name="regionId" value="${_cfg.regionId}">
-                       	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
-                   		<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
-                   		<input type="hidden" id="requestId" name="requestId" value="${_cfg.requestId}">
-                   		<input type="hidden" id="protocolId" name="protocolId" value="${_cfg.protocolId}">
-                       	<!-- 配置域类型 -->
-                   		<c:forEach items="${regionList}" var="region">
-                   			<c:if test="${_cfg.functionId eq region.functionId}">
-                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
-                   				<input type="hidden" name="cfgRegionCode"
-                   				 isMaat="${region.isMaat}"
-						   		 serviceType="${region.configServiceType}"
-						   		 ipPortShow="${region.configIpPortShow}"
-						   		 ipType="${region.configIpType}"
-						   		 srcIpPattern="${fn:split(region.configIpPattern,';')[0]}"
-						   		 destIpPattern="${fn:split(region.configIpPattern,';')[1]}"
-						   		 srcPortPattern="${fn:split(region.configPortPattern,';')[0]}"
-						   		 destPortPattern="${fn:split(region.configPortPattern,';')[1]}"
-						   		 direction="${region.configDirection}"
-						   		 protocol="${region.configProtocol}"
-						   		 regionType="${region.regionType}"
-                   				 value="${region.configRegionCode}">
-                   			</c:if>
-                   		</c:forEach>
-                          <div class="form-body">
-                          <!-- desc and action -->
-                              <div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
-								            <div class="col-md-6">
-								                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
-								            </div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ipGroup"/></label>
-									            <div class="col-md-6">
-									            	 <%-- <input class="form-control required digits asnMustExists" type="text" name="${cfgName}.cfgKeywords" value="${cfg.cfgKeywords}" ctx="${ctx}"> --%>
-									            	 <select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
-										               		<option value="${_cfg.groupId}"><spring:message code="select"/></option>
-										               	<c:forEach items="${policyGroupInfos}" var="ipGroupInfo">
-										               			<option value="${ipGroupInfo.groupId}"
-										               				<c:if test="${_cfg.groupId eq ipGroupInfo.groupId }">
-																	selected
-																	</c:if>
-										               			>${ipGroupInfo.groupName}</option>
-										               	</c:forEach>
-										               </select>
-									            </div>
-									            <div for="groupId"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6 hidden">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><spring:message code="action"/></label>
-								            <div class="col-md-6">
-								            	<c:forEach items="${serviceList}" var="service"
-																		varStatus="satus">
-																		<label class="radio-inline"> <c:if
-																				test="${_cfg.functionId eq service.functionId}">
-																				<input type="radio" name="action"
-																					serviceId="${service.serviceId }"
-																					protocolId="${service.protocolId }"
-																					value="${service.action }" class="required action"
-																					<c:if test="${_cfg.action==service.action || (_cfg.action==null && satus.index==0)}">checked</c:if>>
-																					<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
-																						<c:if test="${dict.itemCode eq service.action }">
-																							<spring:message code="${dict.itemValue }"/>
-																						</c:if>
-																					</c:forEach>
-																			</c:if>
-																		</label>
-																	</c:forEach>
-								            </div>
-								            <div for="action"></div>
-								       </div>
-								   </div>
-								</div>
-                           <div class="row ipInfo">
-                           		<div class="row">
-									<div class="col-md-6">
-										<div class="form-group ">
-											<label class="control-label col-md-3"><font color="red">*</font>
-												<spring:message code="protocol" /></label>
-											<div class="col-md-6">
-												<select name="protocol"
-													class="selectpicker show-tick form-control required">
-													<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
-														<option value="${protocolC.itemCode}" <c:if test="${_cfg.protocol==protocolC.itemCode || (_cfg.protocol==null && protocolC.itemCode==0)}">selected</c:if>><spring:message code="${protocolC.itemValue}"/></option>
-													</c:forEach>
-												</select>
-											</div>
-											<div for="protocol"></div>
-										</div>
-									</div>
-									<div class="col-md-6">
-										<div class="form-group">
-											<label class="control-label col-md-3"><font color="red">*</font>
-												<spring:message code="direction" /></label>
-											<div class="col-md-6">
-												<select name="direction"
-													class="selectpicker show-tick form-control required">
-													<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
-														<option value="${directionC.itemCode}" <c:if test="${_cfg.direction==directionC.itemCode || (_cfg.direction==null && directionC.itemCode==0)}">selected</c:if>><spring:message code="${directionC.itemValue}"/></option>
-													</c:forEach>
-												</select>
-											</div>
-											<div for="direction"></div>
-										</div>
-									</div>
-								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
-								            <div class="col-md-6">
-								            	 <select name="ipType" class="selectpicker show-tick form-control required">
-								                   <c:forEach items="${fns:getDictList('WHITELIST_IPTYPE')}" var="ipTypeC">
-														<option value="${ipTypeC.itemCode}" 
-																<c:if test="${_cfg.ipType==ipTypeC.itemCode 
-																	|| (_cfg.ipType==null && ipTypeC.itemCode==4)}">
-																	selected
-																</c:if>
-																>
-														<spring:message code="${ipTypeC.itemValue}"/>
-														</option>
-							               			</c:forEach>
-								                 </select>
-								            </div>
-								            <div for="ipType"></div>
-								        </div>
-								    </div>
-								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="src_ip_pattern"/></label>
-								            <div class="col-md-6">
-								            	 <select name="srcIpPattern" class="selectpicker show-tick form-control required">
-								                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
-														<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.srcIpPattern==ipPatternC.itemCode || (_cfg.srcIpPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
-							              			</c:forEach>
-								                 </select>
-								            </div>
-								            <div for="ipPattern"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
-								        <div class="form-group ">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
-								            <div class="col-md-6">
-								                 <input class="form-control required ipCheck" type="text" name="srcIpAddress" value="${_cfg.srcIpAddress}">
-								            </div>
-								            <div for="srcIpAddress"></div>
-								        </div>
-								    </div>
-								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="src_port_pattern"/></label>
-								            <div class="col-md-6">
-								            	 <select name="srcPortPattern" class="selectpicker show-tick form-control required">
-								                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
-														<option value="${portPatternC.itemCode}" <c:if test="${_cfg.srcPortPattern==portPatternC.itemCode || (_cfg.srcPortPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
-							              			</c:forEach>
-								                 </select>
-								            </div>
-								            <div for="srcPortPattern"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
-								        <div class="form-group ">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
-								            <div class="col-md-6">
-								                 <input class="form-control required portCheck" type="text" name="srcPort" value="${_cfg.srcPort}">
-								            </div>
-								            <div for="srcPort"></div>
-								        </div>
-								    </div>
-								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="dest_ip_pattern"/></label>
-								            <div class="col-md-6">
-								            	 <select name="destIpPattern" class="selectpicker show-tick form-control required">
-								                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
-														<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.destIpPattern==ipPatternC.itemCode || (_cfg.destIpPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
-							              			</c:forEach>
-								                 </select>
-								            </div>
-								            <div for="ipPattern"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
-								        <div class="form-group ">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
-								            <div class="col-md-6">
-								                 <input class="form-control required ipCheck" type="text" name="destIpAddress" value="${_cfg.destIpAddress}">
-								            </div>
-								            <div for="destIpAddress"></div>
-								        </div>
-								    </div>
-								</div>
-								<div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="dest_port_pattern"/></label>
-								            <div class="col-md-6">
-								            	 <select name="destPortPattern" class="selectpicker show-tick form-control required">
-								                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
-														<option value="${portPatternC.itemCode}" <c:if test="${_cfg.destPortPattern==portPatternC.itemCode || (_cfg.destPortPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
-							              			</c:forEach>
-								                 </select>
-								            </div>
-								            <div for="destportPattern"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
-								        <div class="form-group ">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
-								            <div class="col-md-6">
-								                 <input class="form-control required portCheck" type="text" name="destPort" value="${_cfg.destPort}">
-								            </div>
-								            <div for="destPort"></div>
-								        </div>
-								    </div>
-								</div>
-							</div>
-                           <%--  <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> --%>
-                          </div>
-                          <div class="form-actions">
-                              <div class="row">
-                                  <div class="col-md-6">
-                                      <div class="row">
-                                          <div class="col-md-offset-3 col-md-8">
-                                              <c:set var="auditPermission" value="false"></c:set>
-												<!-- 拥有配置新增直接生效的功能权限 -->
-												<shiro:hasPermission name="save:audit:permission">
-													<c:set var="auditPermission" value="true"></c:set>
-												</shiro:hasPermission>
-												<c:choose>
-													<c:when test="${!(fns:getUser().isAdmin()) && auditPermission}">
-														<button id="audit" type="submit" class="btn green">
-														<spring:message code="submit" />
-													</button>
-													</c:when>
-													<c:otherwise>
-														<button id="save" type="submit" class="btn green">
-															<spring:message code="submit" />
-														</button>
-													</c:otherwise>
-												</c:choose>
-                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
-                                          </div>
-                                      </div>
-                                  </div>
-                                  <div class="col-md-6"> </div>
-                              </div>
-                          </div>
-                      </form>
-                      <!-- END FORM-->
-                  </div>
-              </div>
-		</div>
-	</div>
-</div>
-</body>
-</html>

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

@@ -1,363 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ include file="/WEB-INF/include/taglib.jsp"%>
-<html>
-<head>
-<title><spring:message code="ip_group_configuration"></spring:message></title>
-<script>
- 	$(document).ready(function() {
- 		//搜索框提示语初始化
-		if("${cfg.cfgDesc}"){
-			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.destIpAddress}"){
-			$("#intype").val("${cfg.destIpAddress}");
-		}else{
-			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
-		}
-		$("#seltype").change(function(){
-			$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
-		});
- 		//筛选功能初始化
-		filterActionInit();
-		$("#isAudit").change(function(){
-			page();
-		});
-		//reset
-		$("#resetBtn").on("click",function(){
-			$("select.selectpicker").each(function(){
-				$(this).selectpicker('val',$(this).find('option:first').val());
-				$(this).find("option").attr("selected",false);
-				$(this).find("option:first").attr("selected",true);
-			});
-			$(".Wdate").attr("value",'');
-			$("#description").attr("value",'');
-			$("#searchForm")[0].reset();
-		});
-		
-		if($("#exportType").val() != null && $("#exportType").val() != ""){
-			 if($("#intype").val() != null && $("#intype").val() != ""){
-				$("#exportValue").val($("#intype").val());
-		  } 
-		}
-		//修改form表单action
-	 	var importPath="/basics/ip/list?functionId=${cfg.functionId}"
-	 	$("#importForm1").attr("action","${ctx}/basics/ip/import?importPath="+importPath);
-	 	ajaxGroupName();
- 	});
- 	var edit=function(url){
- 		var cked = $('tbody tr td input.i-checks:checkbox:checked');
- 		if(cked.val()==1){
- 			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
- 			return;
- 		}
- 		if(cked.length==1){
- 			window.location = url+"&compileId="+cked.attr("id");
- 		}else{
- 			top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
- 			return;
- 		}
- 	}
- var ajaxGroupName=function(){
-	 var groupIds=[];
-	 $(".group").each(function(){
-				if(groupIds.join(",").indexOf($(this).text().trim())==-1){
-			groupIds.push($(this).text().trim());
-		}
-	 });
-	 $.ajax({
-			type:'post',
-			timeout:10000,//超时时间设置，查询接口时间过长超时
-			url:'${ctx}/basics/ip/ajaxGetGroups',
-			data:{"groupIds":groupIds.join(',')},
-			dataType:'json',
-			async:true,
-			success:function(data,textStatus){//处理返回结果
-				if(textStatus=="success"){
-					$(".group").each(function(){
-						var text=$(this);
-						$.each(data,function(key,values){
-							if(key==$(text).text()){
-								$(text).html(values);
-							}
-						});
-					})
-				}
-			}
-		});
- } 
-</script>
-</head>
-<body>
-
-<div class="page-content">
-	<div class="theme-panel hidden-xs hidden-sm">
-		
-			<shiro:hasPermission name="ip:common:config">
-				<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/basics/ip/addForm?functionId=${cfg.functionId}'">
-				<i class="fa fa-plus"></i>
-				<spring:message code="add"></spring:message></button>
-				<c:set var="regionImport" value="false"></c:set>
-				<c:forEach items="${regionList}" var="region" >
-					<c:if test="${(cfg.functionId eq region.functionId) && region.isImport eq 1}">
-						<c:set var="regionImport" value="true"></c:set>
-					</c:if>
-				</c:forEach>
-				<c:if test="${regionImport eq 'true'}">
-					<button type="button" class="btn btn-primary import" >
-						<i class="fa fa-plus"></i>
-					<spring:message code="import"></spring:message></button>
-				</c:if>
-			</shiro:hasPermission>
-	</div>
-
-	<h3 class="page-title">
-	<spring:message code="ip_group_configuration"></spring:message>
-	</h3>
-	<h5 class="page-header"></h5>
-		<div class="col-md-12">
-			<div class="portlet">
-				<div class="portlet-body">
-					<div class="row" >
-						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/basics/ip/list?functionId=${cfg.functionId}" method="post" class="form-search">
-							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
-							<input id="audit" name="audit" type="hidden" value="${audit}"/>
-							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
-							<input id="exportValue" type="hidden" value=""/>
-							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
-						callback="page();" />
-							<!-- 筛选按钮展开状态-->
-							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
-							<!-- 搜索内容与操作按钮栏 -->
-							<div class="col-md-12">
-								<%-- <div class="pull-left">
-									 <c:set var="state"><spring:message code='group'/></c:set>
-									<form:select path="isAudit" class="selectpicker select2 input-small">
-										<form:option value=""><spring:message code="all_states"/></form:option>
-										<form:option value="0"><spring:message code="created"></spring:message></form:option>
-										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
-										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
-									</form:select> 
-								</div> --%>
-								
-								<div class="pull-left">
-								
-									<div class="input-group">
-                                         <div class="input-group-btn">
-                                         
-                                        	<form:select path="seltype" class="selectpicker select2 input-small" >
-												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="destIpAddress"><spring:message code="IP"></spring:message></form:option>
-												<%-- <form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option> --%>
-											</form:select>
-									
-                                         </div>
-                                         
-                                         <input id="intype" class="form-control input-medium" type="text" value="">
-                                  		 <div class="input-group-btn">
-                                  		 	<form:select path="isValid" class="selectpicker select2 input-small" >
-													<form:option value=""><spring:message code="select"/></form:option>
-													<form:option value="1"><spring:message code="yes"/></form:option>
-													<form:option value="0"><spring:message code="no"/></form:option>
-											 </form:select>
-                                  		 </div>
-                                    </div> 
-								</div>
-								<div class="pull-left">
-									<form:select path="groupId" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-                       				 	<form:option value=""><spring:message code='ip_group'/></form:option>
-                       				 	<c:forEach items="${policyGroupInfos}" var="policyGroup">
-                       				 		<form:option value="${policyGroup.groupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
-                       				 	</c:forEach>
-                       				</form:select>
-								</div>
-								<div class="pull-left">
-									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
-									 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
-	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
-								</div>
-								 <div class="pull-right">
-							 		<shiro:hasPermission name="ip:common:config">
-							 			<sys:delRow url="${ctx}/basics/ip/updateForm?functionId=${cfg.functionId}" id="contentTable" label="update"></sys:delRow>
-                                        <sys:delRow url="${ctx}/basics/ip/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
-                                    </shiro:hasPermission>
-                                    
-                                    <div class="btn-group">
-	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-	                                            <i class="fa fa-wrench"></i> <spring:message code="export"></spring:message>
-	                                            <i class="fa fa-angle-down"></i>
-	                                        </button>
-	                                        <ul class="dropdown-menu pull-right"  style="min-width: 110px;" >
-	                                            <li><sys:delRow url="${ctx}/basics/ip/exportIpComm?functionId=${cfg.functionId }&exType=excel" searchUrl="${ctx}/basics/ip/list?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_excel"></sys:delRow></li>
- 												<li><sys:delRow url="${ctx}/basics/ip/exportIpComm?functionId=${cfg.functionId }&exType=csv" searchUrl="${ctx}/basics/ip/list?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_csv"></sys:delRow></li>
-				                            </ul>
-				                 	</div>
-                                    
-                                    
-							 		<%-- <shiro:hasPermission name="ip:common:config">
-	                                    <div class="btn-group">
-	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
-	                                            <i class="fa fa-angle-down"></i>
-	                                        </button>
-	                                        <ul class="dropdown-menu pull-right">
-	                                            <li><sys:delRow url="${ctx}/basics/ip/audit?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
-												<li><sys:delRow url="${ctx}/basics/ip/audit?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
-												<li><sys:delRow url="${ctx}/basics/ip/audit?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>            
-				                            </ul>
-				                         </div>
-                                   </shiro:hasPermission> --%>
-                                 	<a class="btn  btn-icon-only btn-default setfields tooltips" 
-                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
-                                             <i class="icon-wrench"></i>
-                                     </a>
-                                 </div>
-							</div>
-							<!-- /搜索内容与操作按钮栏 -->
-							
-							<!-- 筛选搜索内容栏默认隐藏-->
-							<div class="col-md-12 filter-action-select-panle hide" >
-								<div class="row">
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="config_time"/>：</label>
-											<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-									</div>
-									
-									<div class="col-md-2">
-										<div class="form-group">
-											<label>&nbsp;</label>
-											<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										
-										</div>
-									</div>
-									
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="edit_time"/>：</label>
-											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										
-										</div>
-									</div>
-									
-									<div class="col-md-2">
-										<div class="form-group">
-											<label>&nbsp;</label>
-											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										
-										</div>
-									</div>
-									
-									<%-- <div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="audit_time"/>：</label>
-											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										
-										</div>
-									</div>
-									
-									<div class="col-md-2">
-										<div class="form-group">
-											<label>&nbsp;</label>
-											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										
-										</div>
-									</div> --%>
-								</div>
-								
-							
-							</div> 
-							
-							<!-- /筛选搜索内容栏    结束-->
-						</form:form>
-					</div>
-					<sys:message content="${message}" type="${messageType }"/>
-					<div class="table-responsive">
-						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
-							<thead>
-								<tr>
-									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<%-- <th class="sort-column r.compile_id" style="display: none;"  column="cfg_id" ><spring:message code="cfg_id"/></th> --%>
-									<%-- <th><spring:message code="seq"/></th> --%>
-									<th column="config_describe" ><spring:message code="config_describe"/></th>
-									<%-- <th><spring:message code="group"/></th> --%>
-									<th class="sort-column r.user_region3" column="userregion3" ><spring:message code="ip_group"/></th>
-									<th column="ip_type" ><spring:message code="ip_type"/></th>
-									<th column="IP" ><spring:message code="IP"/></th>
-									<th column="ip_pattern" ><spring:message code="ip_pattern"/></th>
-									<%-- <th><spring:message code="is_audit"/></th> --%>
-									<%-- <th><spring:message code="log_total"/></th> --%>
-									<th column="valid_identifier" ><spring:message code="valid_identifier"/></th>
-									<th column="creator" ><spring:message code="creator"/></th>
-									<th column="config_time"  class="sort-column r.create_time"><spring:message code="config_time"/></th>
-									<th column="editor" ><spring:message code="editor"/></th>
-									<th column="edit_time" class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
-									<%-- <th><spring:message code="auditor"/></th>
-									<th class="sort-column r.audit_time"><spring:message code="audit_time"/></th> --%>
-									<%-- <th><spring:message code="operation"></spring:message></th> --%>
-								</tr>
-							</thead>
-							<tbody>
-								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
-									<tr>
-									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" isValid="${cfg.isValid}" value="${cfg.isAudit}"></td>
-									<%-- <td>${cfg.compileId }</td> --%>
-									<td>${cfg.cfgDesc }</td>
-									<td class="group">${cfg.groupId}</td>
-									<td>
-										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
-											<c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
-									<%-- <td>${cfg.destPort }</td> --%>
-									<td>
-										<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
-											<c:if test="${cfg.destIpPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
-				               			</c:forEach>
-									</td>
-									<%-- <td>
-										<c:choose>
-											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
-											
-										</c:choose>
-									</td> --%>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
-									<td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
-									<td>${cfg.creatorName }</td>
-									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-									<td>${cfg.editorName }</td>
-									<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-									<%-- <td>${cfg.auditorName }</td>
-									<td><fmt:formatDate value="${cfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td> --%>
-								
-								</tr>
-								</c:forEach>
-							</tbody>
-						</table>
-						<div class="page">${page}</div>
-					</div>
-				</div>
-			</div>
-		</div>
-</div>
-<!-- 模板导入，start -->
-<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
-</body>
-</html>

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

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

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

@@ -94,7 +94,7 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/basics/innerProtectionList/form'">
+		<button type="button" class="addId btn btn-primary" onClick="javascript:window.location='${ctx}/basics/innerProtectionList/form'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message>
 		</button>

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

@@ -106,7 +106,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 <%-- 		<button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/basics/serviceDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button>	 --%>
 			<shiro:hasPermission name="basics:${permission_type}:add">
-			 <button type="button" class="btn btn-primary" onClick="javascript:window.location='${ctx}/basics/serviceDictInfo/form?itType=${itType}'"><i class="fa fa-plus"></i><spring:message code="add"></spring:message></button>
+			 <button type="button" class="addId btn btn-primary" onClick="javascript:window.location='${ctx}/basics/serviceDictInfo/form?itType=${itType}'"><i class="fa fa-plus"></i><spring:message code="add"></spring:message></button>
 			</shiro:hasPermission>
 	</div>
 	

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

@@ -136,7 +136,7 @@
 	<div class="theme-panel hidden-xs hidden-sm">
 	<%-- <button type="button" class="btn btn-default" onclick="javascript:window.location='${ctx}/basics/sysDictInfo/list?itType=${itType}'"><spring:message code="refresh"></spring:message></button> --%>
 	<shiro:hasPermission name="basics:${permission_type}:add">
-		<button type="button" class="btn btn-primary"
+		<button type="button" class="addId btn btn-primary"
 			onClick="javascript:window.location='${ctx}/basics/sysDictInfo/form?itType=${itType}'">
 			<i class="fa fa-plus"></i>
 			<spring:message code="add"></spring:message></button>

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

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

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

@@ -1,452 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ include file="/WEB-INF/include/taglib.jsp"%>
-<html>
-<head>
-<title><spring:message code="url_group_configuration"></spring:message></title>
-<script type="text/javascript">
-var defaultIpInfo;
-var protectedList = [".com"];
-$(function(){
-	
-	defaultIpInfo=$(".strInfo").clone(true);
-	
-//	reSort($(defaultIpInfo),-1);
-	$(".asnIpAdd").click();
-	$("#cfgFrom").validate({
-		errorPlacement: function(error,element){
-			if($(element).parents().hasClass("tagsinput")){
-				$(element).parents(".col-md-6").next("div").append(error);
-			}else{
-				$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
-			}
-		},
-		submitHandler: function(form){
-			/* $("[name='country']").val($("[name='userRegion1'] option:selected").attr("country"));
-			$("[name='detail']").val($("[name='userRegion1']  option:selected").attr("detail"));
-			$("[name='asnIpGroup']").val($("[name='userRegion1']  option:selected").attr("asnIpGroup")); */
-			var flag = true;
-			/* $(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){
-				if($(this).val()==''){
-					$(this).parents(".form-group").find(
-							"div[for='"
-									+ $(this).attr("name")
-									+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
-					flag = false;
-				}
-			}); */
-			$(".tagsinput:visible").each(function(){
-				var text='';
-				$(this).find(".tag").each(function(){
-					text+=$(this).children("span").text().trim();
-				});
-				if(text.length < 4  || text.length > 1024){
-					$(this).parents(".col-md-6").next("div").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.keywordLength+"</label>");
-					if(flag){
-						flag=false;
-					}
-				}
-			});
-			if(flag){
-				loading('onloading...');
-				form.submit();
-			}else{
-				return;
-			}
-		},
-		errorContainer: "#messageBox",
-	});
-
-	
-});
-//业务窗口打开
-var addContent = function(obj, contentClassName) {
-	var showDiv = $(obj).parent().parent().siblings("."+contentClassName).last();
-	if(showDiv.hasClass("hidden")){
-		$(showDiv).removeClass("hidden").removeClass(
-		"disabled");
-	}else{
-		var additional=defaultIpInfo.clone();
-		additional.removeClass("hidden").removeClass(
-		"disabled");
-		showDiv.after(additional);
-	}
-	var index=0;
-	$("."+contentClassName).each(function(){
-		reSort($(this),index);
-//		$(".tags").attr("id","tags_"+index);
-		$("input[name='urlCommGroupList["+index+"].cfgKeywords']").attr("id","tags_"+index);
-		index++;
-	});
-	$(".selectpicker").selectpicker("render");
-	
-	 var flag1=0;
- 	$(".tagsinput").each(function(){
-		$(this).attr("id","tags_"+flag1+"_tagsinput");
-		if(flag1>0 && flag1==($(".tagsinput").length-1)){
-			$("#tags_"+flag1+"_tagsinput").remove();
-			inputToDiv();
-		}
-		flag1++;
-	});   
-}
-
-//业务窗口关闭
-var delContent = function(obj,contentClassName) {
-	if($("."+contentClassName).length==1){
-		top.$.jBox.tip("<spring:message code='one_more'/>");
-		return;
-	}
-	$(obj).parents("."+contentClassName).remove();
-	var index=0;
-	$("."+contentClassName).each(function(){
-		reSort($(this),index);
-		index++;
-	});
-	
-}
-var reSort=function(obj,index){
-	$(obj).find("input,select").each(function(){
-		var name=$(this).attr("name");
-		if(name != undefined){
-			if(name.indexOf("urlCommGroupList[")>-1){
-				var namePrefix="urlCommGroupList[";
-				var nameSubfix=name.substring(name.indexOf("]"));
-				var nameNew=namePrefix+index+nameSubfix;
-//				$(".tags").attr("id","tags_"+index);
-				if(nameNew!=name){
-					$(this).attr("name",nameNew);
-					$(this).parents(".form-group").find("div[for='"+name+"']").attr("for",nameNew);
-				}
-			}
-		}
-		
-	});
-}
-//input框标签化方法
-function inputToDiv(){
-	
-	var tagsInputSettings1="#tags";
-	var options;
-	var flag2=0;
-	$("input[name$='cfgKeywords']").each(function(){
-		var tagsId = $(this).attr("id");
-		var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0];	
-		var isTags = $(this).hasClass("tags");//有tags样式的关键字输入框才需处理
-		if(typeof(tagsId)!=='undefined' && tagsId.indexOf("tags_")!=-1 && isTags){
-			// 表达式类型初始
-			if($("input:radio[name='"+objNamePrefix+"exprType'][checked=checked]").val()==1){
-				options = $("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]");
-				$("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]").remove();
-			}else{
-				options = $("select[name='"+objNamePrefix+"matchMethod']").find("option[value!=0]");
-			}
-			//表单中如果有关键字内容可能输入多个关键字的情况，根据输入关键字个数确定表达式选中情况，不允许手动选中
-			if($("select[name='"+objNamePrefix+"district']").val()!="Payload"){//如果是app 的payload特征，可选择表达式
-				$("input:radio[name='"+objNamePrefix+"exprType']").attr("disabled",true);
-			}
-			
-			if(tagsId !="tags_0" && flag2>0 && flag2==($("input[name$='cfgKeywords']").length-1)){
-				tagsInputSettings1 = tagsInputSettings1+",#"+tagsId;
-			}
-			flag2++;
-		}
-		
-	});
-	$(tagsInputSettings1).tagsInput({
-   	   width:$(tagsInputSettings1).find(".form-control").width(),
-   	   defaultText:'please input keywords',
-   	   'delimiter':'***and***',//特殊字符串分隔与表达式的多关键词
-   	   maxCount:4,
-   	   onAddTag:function(tag,size){
-	   		var reg = new RegExp(/\t|\r|\n/);
-			/* if (tag.match(reg)) {
-				$(this).parent(".col-md-6").next("div").html("<label class='error'>"+$.validator.messages.hasInvisibleChar.replace("{0}","'"+tag+"'")+"</label>");
-			}else{
-				$(this).parent(".col-md-6").next("div").html("");
-			} */
-			//var keywordValue = "";
-   		   	var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0];
-				/*$("span[class='tag']").each(function(){
-					keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim();
-				});
-				$(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/
-   		   exprTypeChecked(objNamePrefix,size,options);
-   		    if($(this).hasClass("urlCheck")){
-   			   protectedListWarn($("#"+$(this).attr("id")+"_tagsinput"),$(this).val(),protectedList);
-   		   }  
-   	   },
-   	   onRemoveTag:function(tag,size){
-   		  // $(this).parent(".col-md-6").next("div").html("");
-   		   //var keywordValue = "";
-   		   var objNamePrefix = $(this).attr("name").split("cfgKeywords")[0];
-	   		/*$("span[class='tag']").each(function(){
-				keywordValue = keywordValue+"***iie***"+$(this).find("span").text().trim();
-			});
-			$(this).prev("input[name$='cfgKeywords']").val(keywordValue);*/
-   		    exprTypeChecked(objNamePrefix,size,options);
-   		     if($(this).hasClass("urlCheck")){
- 			   protectedListWarn($("#"+$(this).attr("id")+"_tagsinput"),$(this).val(),protectedList);
- 		   }  
-   	   }
-   });
-   $(".tagsinput").popover({
-		animation:true,
-		container:'body',
-		placement:'right',
-		html:true,
-		trigger:"hover",
-		title:"",
-		content:function(){
-			var content = $("#tagsinputTip").text();
-		    return content;
-		}
-	});
-
-}
-
-</script>
-</head>
-<body>
-<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
-<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
-<div class="page-content">
-
-	<h3 class="page-title">
-		<spring:message code="url_group_configuration"></spring:message>
-	</h3>
-	
-	<div class="row">
-		<div class="col-md-12">
-			<div class="portlet box blue">
-                  <div class="portlet-title">
-                     <div class="caption">
-                         <i class="fa fa-gift"></i>
-                        <spring:message code="add"></spring:message>
-					</div>
-                  </div>
-                  <div class="portlet-body form">
-                      <!-- BEGIN FORM-->
-                      <form id="cfgFrom" action="${ctx}/basics/url/save" method="post" class="form-horizontal">
-                       	<input type="hidden" name="functionId" value="${_cfg.functionId}">
-                   		<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
-                   		<input type="hidden" id="compileId" name="compileId" value="0">
-                   		<input type="hidden" id="requestId" name="requestId" value="0">
-                   		<input type="hidden" id="asnIpGroup" name="asnIpGroup" value="0">
-                   		<c:forEach items="${serviceList}" var="service">
-                   			<input type="hidden" id="serviceId" name="serviceId" value="${service.serviceId}">
-                   			<input type="hidden" id="action" name="action" value="${service.action}">
-                   		</c:forEach>
-                       	<!-- 配置域类型 -->
-                   		<c:forEach items="${regionList}" var="region">
-                   			<c:if test="${_cfg.functionId eq region.functionId}">
-                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
-                   				<input type="hidden" name="cfgRegionCode" 
-                   				 isMaat="${region.isMaat}"
-		                   		 serviceType="${region.configServiceType}"
-		                   		 ipPortShow="${region.configIpPortShow}"
-		                   		 ipType="${region.configIpType}"
-		                   		 srcIpPattern="${fn:split(region.configIpPattern,';')[0]}"
-						   		 destIpPattern="${fn:split(region.configIpPattern,';')[1]}"
-						   		 srcPortPattern="${fn:split(region.configPortPattern,';')[0]}"
-						   		 destPortPattern="${fn:split(region.configPortPattern,';')[1]}"
-		                   		 direction="${region.configDirection}"
-		                   		 protocol="${region.configProtocol}"
-		                   		 regionType="${region.regionType}"
-                   				value="${region.configRegionCode}">
-                   			</c:if>
-                   		</c:forEach>
-                        <div class="form-body">
-                          <!-- desc and action -->
-                              <div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
-								            <div class="col-md-6">
-								                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
-								            </div>
-								        </div>
-								    </div>
-								    
-								     <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="urlGroup"/></label>
-									            <div class="col-md-6">
-									            	 <select name="userRegion3" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
-										               		<option value=""><spring:message code="select"/></option>
-										               	<c:forEach items="${policyGroupInfos}" var="urlGroupInfo">
-										               			<option value="${urlGroupInfo.serviceGroupId}">${urlGroupInfo.groupName}</option>
-										               	</c:forEach>
-										               </select>
-									            </div>
-									            <div for="userRegion3"></div>
-								        </div>
-								    </div>
-								</div>
-								
-							<!-- desc and action -->
-							<h4 class="form-section">
-								<spring:message code="http_url_title" />
-								<small> <span
-									class="glyphicon glyphicon-plus  asnIpAdd"
-									onClick="addContent(this,'strInfo')" title="add"></span></small>
-							</h4>
-                           <div class="row strInfo boxSolid asnIp hidden disabled">
-                           		<!-- <input type="hidden" name="asnIpCfgs[0].protocolId" value="0"> -->
-                           		<div class="row">
-									<div class="pull-right">
-										<span class="glyphicon glyphicon-remove pull-right" title="remove"
-											onClick="delContent(this,'strInfo');" />
-									</div>
-								</div>
-								
-								<c:forEach items="${regionList}" var="region" varStatus="status">
-													<%-- <c:set var="cfgName" value="urlCommGroupList[-1]"></c:set> --%>
-													<%-- <input type="hidden" name="${cfgName}.sourceCompileId" value="${cfg.sourceCompileId }"> --%>
-													
-														<div class="row">
-														    <div class="col-md-6">
-																<div class="form-group">
-																	<label class="control-label col-md-3"><font color="red">*</font>
-																			<spring:message code="keywords" />
-																	</label>
-																			<!-- 此配置的关键词可以输入多个关键词 -->
-																			<c:if test="${region.configMultiKeywords eq 1}">
-																				<div class="col-md-6">
-																					<input class="form-control required tags <c:if test="${fn:containsIgnoreCase(region.configServiceType,'domain') }"> domainCheck </c:if> <c:if test="${fn:containsIgnoreCase(region.configServiceType,'url') }"> urlCheck </c:if>" type="text" id="tags_${status.index}"
-																						name="urlCommGroupList[-1].cfgKeywords"
-																						>
-																				</div>
-																			</c:if>
-																			<!-- 此配置的关键词不允许输入多个关键词 -->
-																			<c:if test="${(region.configMultiKeywords eq 0) or (empty region.configMultiKeywords)}">
-																				<div class="col-md-6">
-																					<input class="form-control required invisibleChar
-																						<c:if test="${fn:containsIgnoreCase(region.configServiceType,'domain') }"> domainCheck </c:if>
-																						<c:if test="${fn:containsIgnoreCase(region.configServiceType,'url') }"> urlCheck </c:if>
-																						" 
-																							type="text"
-																						name="urlCommGroupList[-1].cfgKeywords"
-																						>
-																				</div>
-																			</c:if>
-																			<div for="urlCommGroupList[-1].cfgKeywords"></div>
-																		</div>
-																</div>
-														</div>
-														<div class="row">
-															<div class="col-md-6 exprType">
-																<div class="form-group">
-																
-																	<label class="control-label col-md-3"><font color="red">*</font>
-																		<spring:message code="expression_type" /></label>
-																	<div class="col-md-6">
-																		<c:if test="${!empty region.configExprType}">
-																			<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}" varStatus="stat" >
-																				<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC" >
-																					<c:if test="${exprTypeC.itemCode eq exprType}">
-																						<label class="radio-inline"> 
-																							<input type="radio"
-																								name="urlCommGroupList[-1].exprType" value="${exprType }"
-																								class="required"
-																								<c:if test="${stat.index == 0 }"> checked </c:if>
-																								
-																							> 
-																							<spring:message	code="${exprTypeC.itemValue }" />
-																						</label>
-																					</c:if>
-																				</c:forEach>
-																			</c:forEach>
-																		</c:if>
-																		<c:if test="${empty region.configExprType}">
-																			<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
-																					<c:if test="${exprTypeC.itemCode eq 0}">
-																						<label class="radio-inline"> 
-																							<input type="radio"
-																								name="urlCommGroupList[-1].exprType" value="${exprTypeC.itemCode }"
-																								class="required" checked > 
-																							<spring:message	code="${exprTypeC.itemValue }" />
-																						</label>
-																					</c:if>
-																				</c:forEach>
-																		</c:if>
-																	</div>
-																	<div for="urlCommGroupList[-1].exprType"></div>
-																	
-																</div>
-															</div>
-														
-															<div class="col-md-6 matchMethod">
-																<div class="form-group ">
-																	<label class="control-label col-md-3"><font color="red">*</font>
-																		<spring:message code="match_method" /></label>
-																	<div class="col-md-6">
-																		<select name="urlCommGroupList[-1].matchMethod"
-																			class="selectpicker select2 form-control required ">
-																			<c:if test="${!empty region.configMatchMethod}">
-																				<c:forEach var="matchMethod" items="${fn:split(region.configMatchMethod,',')}">
-																					<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-																						<c:if test="${matchMethodC.itemCode eq matchMethod}">
-																							<option value="${matchMethodC.itemCode}" 
-																							>
-																							<spring:message code="${matchMethodC.itemValue}"/>
-																							</option>
-																						</c:if>
-																					
-																					</c:forEach> 
-																				</c:forEach>
-																			</c:if>
-																			<c:if test="${empty region.configMatchMethod}">
-																				<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-																						<c:if test="${matchMethodC.itemCode eq 0}">
-																							<option value="${matchMethodC.itemCode}" 
-																							selected
-																							>
-																							<spring:message code="${matchMethodC.itemValue}"/>
-																							</option>
-																						</c:if>
-																					
-																					</c:forEach> 
-																			</c:if>
-																		</select>
-																	</div>
-																	<div for="urlCommGroupList[-1].matchMethod"></div>
-																</div>
-															</div>
-														</div>
-														
-														
-												</c:forEach>	
-									</div>
-								
-							</div>
-								
-								<%-- <div class="row">
-									<button type="button" class="btn btn-red-hollow center-block"
-										onClick="more(this);" data-click-times="0">
-										<spring:message code="show_more" />
-									</button>
-								</div> --%>
-							
-                         
-                          <div class="form-actions">
-                              <div class="row">
-                                  <div class="col-md-6">
-                                      <div class="row">
-                                          <div class="col-md-offset-3 col-md-8">
-                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
-                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
-                                          </div>
-                                      </div>
-                                  </div>
-                                  <div class="col-md-6"> </div>
-                              </div>
-                          </div>
-                      </form>
-                      <!-- END FORM-->
-                  </div>
-              </div>
-		</div>
-	</div>
-</div>
-</body>
-</html>

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

@@ -1,300 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ include file="/WEB-INF/include/taglib.jsp"%>
-<html>
-<head>
-<title><spring:message code="url_group_configuration"></spring:message></title>
-<script type="text/javascript">
-$(function(){
-	$("#cfgFrom").validate({
-		errorPlacement: function(error,element){
-			if($(element).parents().hasClass("tagsinput")){
-				$(element).parents(".col-md-6").next("div").append(error);
-			}else{
-				$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
-			}
-		},
-		submitHandler: function(form){
-			/* $("[name='country']").val($("[name='userRegion1'] option:selected").attr("country"));
-			$("[name='detail']").val($("[name='userRegion1']  option:selected").attr("detail"));
-			$("[name='asnIpGroup']").val($("[name='userRegion1']  option:selected").attr("asnIpGroup")); */
-			var flag = true;
-			/* $(".boxSolid:visible").find("input[name$='cfgKeywords']").each(function(){
-				if($(this).val()==''){
-					$(this).parents(".form-group").find(
-							"div[for='"
-									+ $(this).attr("name")
-									+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
-					flag = false;
-				}
-			}); */
-			$(".tagsinput:visible").each(function(){
-				var text='';
-				$(this).find(".tag").each(function(){
-					text+=$(this).children("span").text().trim();
-				});
-				if(text.length < 4  || text.length > 1024){
-					$(this).parents(".col-md-6").next("div").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.keywordLength+"</label>");
-					if(flag){
-						flag=false;
-					}
-				}
-			});
-			if(flag){
-				loading('onloading...');
-				form.submit();
-			}else{
-				return;
-			}
-			
-		},
-		errorContainer: "#messageBox",
-	});
-
-});
-</script>
-</head>
-<body>
-<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
-<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
-<div class="page-content">
-
-	<h3 class="page-title">
-		<spring:message code="url_group_configuration"></spring:message>
-	</h3>
-	
-	<div class="row">
-		<div class="col-md-12">
-			<div class="portlet box blue">
-                  <div class="portlet-title">
-                     <div class="caption">
-                         <i class="fa fa-gift"></i>
-						<spring:message code="edit"></spring:message>
-					</div>
-                  </div>
-                  <div class="portlet-body form">
-                      <!-- BEGIN FORM-->
-                      <form id="cfgFrom" action="${ctx}/basics/url/update" method="post" class="form-horizontal">
-                      	<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
-                      	<input type="hidden" name="regionId" value="${_cfg.regionId}">
-                       	<input type="hidden" name="compileId" value="${_cfg.compileId}">
-                       	<input type="hidden" name="functionId" value="${_cfg.functionId}">
-                       	<input type="hidden" name="isValid" value="${_cfg.isValid}">
-                   		<input type="hidden" name="isAudit" value="${_cfg.isAudit}">
-                       	<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
-                   		<input type="hidden" id="isAreaEffective" name="isAreaEffective" value="0">
-                   		<input type="hidden" id="requestId" name="requestId" value="${_cfg.requestId}">
-                   		<%-- <input type="hidden" id="protocolId" name="protocolId" value="${_cfg.protocolId}">
-                   		<input type="hidden" id="asnIpGroup" name="asnIpGroup" value="${_cfg.asnIpGroup}"> --%>
-                       	<!-- 配置域类型 -->
-                   		<c:forEach items="${regionList}" var="region">
-                   			<c:if test="${_cfg.functionId eq region.functionId}">
-                   				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
-                   				<input type="hidden" name="cfgRegionCode"
-                   				 isMaat="${region.isMaat}"
-						   		 serviceType="${region.configServiceType}"
-						   		 ipPortShow="${region.configIpPortShow}"
-						   		 ipType="${region.configIpType}"
-						   		 srcIpPattern="${fn:split(region.configIpPattern,';')[0]}"
-						   		 destIpPattern="${fn:split(region.configIpPattern,';')[1]}"
-						   		 srcPortPattern="${fn:split(region.configPortPattern,';')[0]}"
-						   		 destPortPattern="${fn:split(region.configPortPattern,';')[1]}"
-						   		 direction="${region.configDirection}"
-						   		 protocol="${region.configProtocol}"
-						   		 regionType="${region.regionType}"
-                   				 value="${region.configRegionCode}">
-                   			</c:if>
-                   		</c:forEach>
-                           <div class="form-body">
-                          <!-- desc and action -->
-                              <div class="row">
-								    <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><spring:message code="config_describe"/></label>
-								            <div class="col-md-6">
-								                <input class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
-								            </div>
-								        </div>
-								    </div>
-								    
-								     <div class="col-md-6">
-								        <div class="form-group">
-								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="urlGroup"/></label>
-									            <div class="col-md-6">
-									            	 <%-- <input class="form-control required digits asnMustExists" type="text" name="${cfgName}.cfgKeywords" value="${cfg.cfgKeywords}" ctx="${ctx}"> --%>
-									            	 <select name="userRegion3" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
-										               		<option value="${_cfg.userRegion3}"><spring:message code="select"/></option>
-										               	<c:forEach items="${policyGroupInfos}" var="urlGroupInfo">
-										               			<option value="${urlGroupInfo.groupId}"
-										               				<c:if test="${_cfg.userRegion3 eq urlGroupInfo.serviceGroupId }">
-																	selected
-																	</c:if>
-										               			>${urlGroupInfo.groupName}</option>
-										               	</c:forEach>
-										               </select>
-									            </div>
-									            <div for="userRegion3"></div>
-								        </div>
-								    </div>
-								</div>
-								
-							<!-- desc and action -->
-							<h4 class="form-section">
-								<spring:message code="http_url_title" />
-								<!-- <small> <span
-									class="glyphicon glyphicon-plus  asnIpAdd"
-									onClick="addContent(this,'strInfo')" title="add"></span></small> -->
-							</h4>
-                           <!-- <div class="row strInfo boxSolid asnIp hidden disabled"> -->
-                           		<!-- <input type="hidden" name="asnIpCfgs[0].protocolId" value="0"> -->
-                           		<!-- <div class="row">
-									<div class="pull-right">
-										<span class="glyphicon glyphicon-remove pull-right" title="remove"
-											onClick="delContent(this,'strInfo');" />
-									</div>
-								</div> -->
-							<div class=" boxSolid ">
-								<div class="row" style="height: 15px;"></div>
-								<c:forEach items="${regionList}" var="region" varStatus="status">
-													<%-- <c:set var="cfgName" value="urlCommGroupList[-1]"></c:set> --%>
-													<%-- <input type="hidden" name="${cfgName}.sourceCompileId" value="${cfg.sourceCompileId }"> --%>
-													
-														<div class="row">
-														    <div class="col-md-6">
-																<div class="form-group">
-																	<label class="control-label col-md-3"><font color="red">*</font>
-																			<spring:message code="keywords" />
-																	</label>
-																			<!-- 此配置的关键词可以输入多个关键词 -->
-																			<c:if test="${region.configMultiKeywords eq 1}">
-																				<div class="col-md-6">
-																					<input class="form-control required tags <c:if test="${fn:containsIgnoreCase(region.configServiceType,'domain') }"> domainCheck </c:if> <c:if test="${fn:containsIgnoreCase(region.configServiceType,'url') }"> urlCheck </c:if>" type="text" id="tags_${tabName}${status.index}"
-																						name="cfgKeywords"
-																						value="${_cfg.cfgKeywords}">
-																				</div>
-																			</c:if>
-																			<!-- 此配置的关键词不允许输入多个关键词 -->
-																			<c:if test="${(region.configMultiKeywords eq 0) or (empty region.configMultiKeywords)}">
-																				<div class="col-md-6">
-																					<input class="form-control required invisibleChar
-																						<c:if test="${fn:containsIgnoreCase(region.configServiceType,'domain') }"> domainCheck </c:if>
-																						<c:if test="${fn:containsIgnoreCase(region.configServiceType,'url') }"> urlCheck </c:if>
-																						" 
-																							type="text"
-																						name="cfgKeywords"
-																						value="${_cfg.cfgKeywords}">
-																				</div>
-																			</c:if>
-																			<div for="cfgKeywords"></div>
-																		</div>
-																</div>
-														</div>
-														<div class="row">
-															<div class="col-md-6 exprType">
-																<div class="form-group">
-																
-																	<label class="control-label col-md-3"><font color="red">*</font>
-																		<spring:message code="expression_type" /></label>
-																	<div class="col-md-6">
-																		<c:if test="${!empty region.configExprType}">
-																			<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}" varStatus="stat" >
-																				<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC" >
-																					<c:if test="${exprTypeC.itemCode eq exprType}">
-																						<label class="radio-inline"> 
-																							<input type="radio"
-																								name="exprType" value="${exprType }"
-																								class="required"
-																								<%-- <c:if test="${stat.index == 0 }"> checked </c:if> --%>
-																								<c:if test="${_cfg.exprType eq exprType || (empty _cfg.exprType && exprType eq 0)}">
-																									checked
-																								</c:if>
-																							> 
-																							<spring:message	code="${exprTypeC.itemValue }" />
-																						</label>
-																					</c:if>
-																				</c:forEach>
-																			</c:forEach>
-																		</c:if>
-																		<c:if test="${empty region.configExprType}">
-																			<c:forEach items="${fns:getDictList('EXPRESSION_TYPE')}" var="exprTypeC">
-																					<c:if test="${exprTypeC.itemCode eq 0}">
-																						<label class="radio-inline"> 
-																							<input type="radio"
-																								name="exprType" value="${exprTypeC.itemCode }"
-																								class="required" checked > 
-																							<spring:message	code="${exprTypeC.itemValue }" />
-																						</label>
-																					</c:if>
-																				</c:forEach>
-																		</c:if>
-																	</div>
-																	<div for="exprType"></div>
-																	
-																</div>
-															</div>
-														
-															<div class="col-md-6 matchMethod">
-																<div class="form-group ">
-																	<label class="control-label col-md-3"><font color="red">*</font>
-																		<spring:message code="match_method" /></label>
-																	<div class="col-md-6">
-																		<select name="matchMethod"
-																			class="selectpicker select2 form-control required ">
-																			<c:if test="${!empty region.configMatchMethod}">
-																				<c:forEach var="matchMethod" items="${fn:split(region.configMatchMethod,',')}">
-																					<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-																						<c:if test="${matchMethodC.itemCode eq matchMethod}">
-																							<option value="${matchMethodC.itemCode}" 
-																							>
-																							<spring:message code="${matchMethodC.itemValue}"/>
-																							</option>
-																						</c:if>
-																					
-																					</c:forEach> 
-																				</c:forEach>
-																			</c:if>
-																			<c:if test="${empty region.configMatchMethod}">
-																				<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-																						<c:if test="${matchMethodC.itemCode eq 0}">
-																							<option value="${matchMethodC.itemCode}" 
-																							selected
-																							>
-																							<spring:message code="${matchMethodC.itemValue}"/>
-																							</option>
-																						</c:if>
-																					
-																					</c:forEach> 
-																			</c:if>
-																		</select>
-																	</div>
-																	<div for="matchMethod"></div>
-																</div>
-															</div>
-														</div>
-														
-														
-												</c:forEach>	
-									</div>
-								
-							</div>
-                          <div class="form-actions">
-                              <div class="row">
-                                  <div class="col-md-6">
-                                      <div class="row">
-                                          <div class="col-md-offset-3 col-md-8">
-                                              <button id="save" type="submit" class="btn green"><spring:message code="submit"/></button>
-                                              <button id="cancel" type="button" class="btn default"><spring:message code="cancel"/></button>
-                                          </div>
-                                      </div>
-                                  </div>
-                                  <div class="col-md-6"> </div>
-                              </div>
-                          </div>
-                      </form>
-                      <!-- END FORM-->
-                  </div>
-              </div>
-		</div>
-	</div>
-</div>
-</body>
-</html>

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

@@ -1,313 +0,0 @@
-<%@ page contentType="text/html;charset=UTF-8"%>
-<%@ include file="/WEB-INF/include/taglib.jsp"%>
-<html>
-<head>
-<title><spring:message code="url_group_configuration"></spring:message></title>
-<script>
- 	$(document).ready(function() {
- 		//搜索框提示语初始化
- 		if("${cfg.cfgDesc}"){
-			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.compileId}"){
-			$("#intype").val("${cfg.compileId}");
-		}else if("${cfg.cfgKeywords}"){
-			$("#intype").val("${cfg.cfgKeywords}");
-		}else{
-			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
-		}
-		$("#seltype").change(function(){
-			$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
-		});
- 		//筛选功能初始化
-		filterActionInit();
-		$("#isAudit").change(function(){
-			page();
-		});
-		//reset
-		$("#resetBtn").on("click",function(){
-			$("select.selectpicker").each(function(){
-				$(this).selectpicker('val',$(this).find('option:first').val());
-				$(this).find("option").attr("selected",false);
-				$(this).find("option:first").attr("selected",true);
-			});
-			$(".Wdate").attr("value",'');
-			$("#description").attr("value",'');
-			$("#searchForm")[0].reset();
-		});
-		
-		if($("#exportType").val() != null && $("#exportType").val() != ""){
-			 if($("#intype").val() != null && $("#intype").val() != ""){
-				$("#exportValue").val($("#intype").val());
-		  } 
-		}
- 	});
- 	var edit=function(url){
- 		var cked = $('tbody tr td input.i-checks:checkbox:checked');
- 		if(cked.val()==1){
- 			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
- 			return;
- 		}
- 		if(cked.length==1){
- 			window.location = url+"&compileId="+cked.attr("id");
- 		}else{
- 			top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
- 			return;
- 		}
- 	}
-</script>
-</head>
-<body>
-
-<div class="page-content">
-	<div class="theme-panel hidden-xs hidden-sm">
-			<shiro:hasPermission name="asn:ip:config">
-				<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/basics/url/addForm?functionId=${cfg.functionId}'">
-				<i class="fa fa-plus"></i>
-				<spring:message code="add"></spring:message></button>
-				
-					<button type="button" class="btn btn-primary import" >
-						<i class="fa fa-plus"></i>
-					<spring:message code="import"></spring:message></button>
-				
-			</shiro:hasPermission>
-	</div>
-
-	<h3 class="page-title">
-		<spring:message code="url_group_configuration"></spring:message> 
-		
-	</h3>
-	<h5 class="page-header"></h5>
-		<div class="col-md-12">
-			<div class="portlet">
-				<div class="portlet-body">
-					<div class="row" >
-						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/basics/url/list?functionId=${cfg.functionId}" method="post" class="form-search">
-							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
-							<input id="audit" name="audit" type="hidden" value="${audit}"/>
-							<input id="exportType" type="hidden" value="${cfg.seltype}"/>
-							<input id="exportValue" type="hidden" value=""/>
-							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
-							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
-						callback="page();" />
-							<!-- 筛选按钮展开状态-->
-							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
-							<!-- 搜索内容与操作按钮栏 -->
-							<div class="col-md-12">
-								<%-- <div class="pull-left">
-                       				 <form:select path="asnIpGroup" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
-                       				 	<form:option value=""><spring:message code='asn_ip_group'/></form:option>
-                       				 	<c:forEach items="${policyGroups}" var="policyGroup">
-                       				 	<form:option value="${policyGroup.groupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
-                       				 	</c:forEach>
-                       				 </form:select>
-	                       		</div> --%>
-								<div class="pull-left">
-									 <c:set var="state"><spring:message code='group'/></c:set>
-									<form:select path="isAudit" class="selectpicker select2 input-small">
-										<form:option value=""><spring:message code="all_states"/></form:option>
-										<form:option value="0"><spring:message code="created"></spring:message></form:option>
-										<form:option value="1"><spring:message code="approved"></spring:message></form:option>
-										<form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-										<form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
-									</form:select> 
-								</div>
-								
-								<div class="pull-left">
-								
-									<div class="input-group">
-                                         <div class="input-group-btn">
-                                         
-                                        	<form:select path="seltype" class="selectpicker select2 input-small" >
-												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
-												<form:option value="cfgKeywords"><spring:message code="URL"></spring:message></form:option>
-												<%-- <form:option value="action"><spring:message code="block_type"></spring:message></form:option> --%>
-												<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
-											</form:select>
-									
-                                         </div>
-                                         
-                                         <input id="intype" class="form-control input-medium" type="text" value="">
-                                  		 <div class="input-group-btn">
-                                  		 	<form:select path="isValid" class="selectpicker select2 input-small" >
-													<form:option value=""><spring:message code="select"/></form:option>
-													<form:option value="1"><spring:message code="yes"/></form:option>
-													<form:option value="0"><spring:message code="no"/></form:option>
-											 </form:select>
-                                  		 </div>
-                                    </div> 
-								</div>
-								<div class="pull-left">
-									 <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/>  </button>
-									 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
-	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
-								</div>
-								 <div class="pull-right">
-							 		<shiro:hasPermission name="http:url:config">
-							 			<sys:delRow url="${ctx}/basics/url/updateForm?functionId=${cfg.functionId}" id="contentTable" label="update"></sys:delRow>
-                                        <sys:delRow url="${ctx}/basics/url/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
-                                    </shiro:hasPermission>
-                                    
-                                    <div class="btn-group">
-	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-	                                            <i class="fa fa-wrench"></i> <spring:message code="export"></spring:message>
-	                                            <i class="fa fa-angle-down"></i>
-	                                        </button>
-	                                        <ul class="dropdown-menu pull-right"  style="min-width: 110px;" >
-	                                            <li><sys:delRow url="${ctx}/basics/url/exportUrlComm?functionId=${cfg.functionId }&exType=excel" searchUrl="${ctx}/basics/url/list?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_excel"></sys:delRow></li>
- 												<li><sys:delRow url="${ctx}/basics/url/exportUrlComm?functionId=${cfg.functionId }&exType=csv" searchUrl="${ctx}/basics/url/list?functionId=${cfg.functionId}" id="contentTable" maxRow="5" label="cfg_csv"></sys:delRow></li>
-				                            </ul>
-				                 	</div>
-                                    
-                                    
-							 		<shiro:hasPermission name="asn:ip:confirm">
-	                                    <div class="btn-group">
-	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-	                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
-	                                            <i class="fa fa-angle-down"></i>
-	                                        </button>
-	                                        <ul class="dropdown-menu pull-right">
-	                                            <li><sys:delRow url="${ctx}/basics/url/audit?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
-												<li><sys:delRow url="${ctx}/basics/url/audit?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
-												<li><sys:delRow url="${ctx}/basics/url/audit?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>            
-				                            </ul>
-				                         </div>
-                                   </shiro:hasPermission>
-                                 	<a class="btn  btn-icon-only btn-default setfields tooltips" 
-                                      		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
-                                             <i class="icon-wrench"></i>
-                                     </a>
-                                 </div>
-							</div>
-							<!-- /搜索内容与操作按钮栏 -->
-							
-							<!-- 筛选搜索内容栏默认隐藏-->
-							<div class="col-md-12 filter-action-select-panle hide" >
-								<div class="row">
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="config_time"/>：</label>
-											<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										</div>
-									</div>
-									
-									<div class="col-md-2">
-										<div class="form-group">
-											<label>&nbsp;</label>
-											<input name="search_create_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${cfg.search_create_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										
-										</div>
-									</div>
-									
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="edit_time"/>：</label>
-											<input name="search_edit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${cfg.search_edit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										
-										</div>
-									</div>
-									
-									<div class="col-md-2">
-										<div class="form-group">
-											<label>&nbsp;</label>
-											<input name="search_edit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${cfg.search_edit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										
-										</div>
-									</div>
-									
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="audit_time"/>：</label>
-											<input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										
-										</div>
-									</div>
-									
-									<div class="col-md-2">
-										<div class="form-group">
-											<label>&nbsp;</label>
-											<input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-											value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-										
-										</div>
-									</div>
-								</div>
-								
-							
-							</div> 
-							
-							<!-- /筛选搜索内容栏    结束-->
-						</form:form>
-					</div>
-					<sys:message content="${message}" type="${messageType }"/>
-					<div class="table-responsive">
-						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
-							<thead>
-								<tr>
-									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
-									<th class="sort-column r.compile_id" style="display: none;"  column="cfg_id" ><spring:message code="cfg_id"/></th>
-									
-									<th column="config_describe" ><spring:message code="config_describe"/></th>
-									<th class="sort-column cfg_keywords">URL<spring:message code="key_word"/></th>
-									<th><spring:message code="is_audit"/></th>
-									<th column="sort-column group_name" ><spring:message code="group_name"/></th>
-									<th column="valid_identifier" ><spring:message code="valid_identifier"/></th>
-									<th column="creator" ><spring:message code="creator"/></th>
-									<th column="config_time"  class="sort-column create_time"><spring:message code="config_time"/></th>
-									<th column="editor" ><spring:message code="editor"/></th>
-									<th column="edit_time" class="sort-column edit_time"><spring:message code="edit_time"/></th>
-									<th column="auditor"><spring:message code="auditor"/></th>
-									<th class="sort-column audit_time"><spring:message code="audit_time"/></th>
-									
-								</tr>
-							</thead>
-							<tbody>
-								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
-									<tr>
-									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" isValid="${cfg.isValid}" value="${cfg.isAudit}"></td>
-									<td>${cfg.compileId }</td>
-									<td>${cfg.cfgDesc }</td>
-									<td>${cfg.cfgKeywords }</td>
-									<td>
-										<c:choose>
-											<c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
-										</c:choose>
-									</td>
-									<td>${cfg.groupName }</td>
-									<td>
-										<c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-										<c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-										<c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
-									</td>
-									<td>${cfg.creatorName }</td>
-									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-									<td>${cfg.editorName }</td>
-									<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-									<td>${cfg.auditorName }</td>
-									<td><fmt:formatDate value="${cfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-								
-								</tr>
-								</c:forEach>
-							</tbody>
-						</table>
-						<div class="page">${page}</div>
-					</div>
-				</div>
-			</div>
-		</div>
-</div>
-<c:set var="importPath" value="/basics/url/list?functionId=${cfg.functionId}"/>
-<!-- 模板导入，start -->
-<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
-</body>
-</html>

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

@@ -60,7 +60,7 @@
  	<div class="theme-panel hidden-xs hidden-sm">
 		
 			<shiro:hasPermission name="asn:ip:config">
-				<button type="button" class="btn btn-primary"
+				<button type="button" class="addId btn btn-primary"
 				onClick="javascript:window.location='${ctx}/basics/vpn/addForm?functionId=${cfg.functionId}'">
 				<i class="fa fa-plus"></i>
 				<spring:message code="add"></spring:message></button>