From 2dbbd88f8b925b5161dc1e9d11008dd9ad3c3ee6 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 24 Aug 2018 20:36:01 +0800
Subject: [PATCH 01/39] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=96=B0=E6=A0=87=E7=AD=BE=E4=B9=8B=E5=90=8E=E7=AB=8B=E5=8D=B3?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp b/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp
index 7abd40592..4b138a307 100644
--- a/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp
@@ -265,7 +265,8 @@
 				//dataType:"json",
 				//contentType:"application/json; charset=utf-8",
 				success:function(data){
-					treeNode.groupId=data.data;
+					treeNode.id=data.id;
+					treeNode.groupId=data.groupId;
 					treeNode.specServiceCode=data.specServiceCode;
 					treeNode.user=data.addFlag;
 					var zTree = $.fn.zTree.getZTreeObj("tree");

From 5ab0a34638fa3b1449b8bf1607efece2c68ebf72 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Fri, 24 Aug 2018 20:40:16 +0800
Subject: [PATCH 02/39] =?UTF-8?q?FTP=E6=96=B0=E5=A2=9E=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
index e9ad09f89..059271b01 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
@@ -304,7 +304,7 @@
 												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 													<c:choose>
 														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
-															<div class="row boxSolid ${tabName}${status.index}">
+															<div class="row ${tabName}${status.index}">
 																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
 															<c:set var="isBreak" value="true" ></c:set>
@@ -313,14 +313,14 @@
 													</c:choose>
 												</c:forEach>
 												<c:if test="${!isBreak}">
-													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<div class="row ${tabName}${status.index} hidden disabled">
 														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
 													<c:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
 												</c:if>
 											</c:when>
 											<c:otherwise>
-												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+												<div class="rows ${tabName}${status.index} hidden disabled">
 													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 												</div>
 												<c:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>

From e5e0d47a27e9461b082e7988fe903f93cbb8a124 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 24 Aug 2018 20:55:20 +0800
Subject: [PATCH 03/39] =?UTF-8?q?ip=E7=99=BD=E5=90=8D=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0SUBSCRIBE=5FID=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ntc/WhiteListController.java              | 170 +++---
 .../nis/web/dao/configuration/IpCfgDao.java   |  14 +
 .../nis/web/dao/configuration/IpCfgDao.xml    | 334 ++++++++++-
 .../service/configuration/IpCfgService.java   | 234 +++++++-
 .../sql/update_function_region_dict_data.sql  |   9 +-
 src/main/webapp/WEB-INF/sitemesh3.xml         |   2 +
 .../WEB-INF/views/cfg/whitelist/ipCfgForm.jsp | 161 +++++
 .../WEB-INF/views/cfg/whitelist/ipForm.jsp    | 560 +++++++++++-------
 .../WEB-INF/views/cfg/whitelist/ipList.jsp    | 437 +++++++++-----
 .../WEB-INF/views/cfg/whitelist/ipSubList.jsp | 228 +++++++
 10 files changed, 1713 insertions(+), 436 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/views/cfg/whitelist/ipCfgForm.jsp
 create mode 100644 src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp

diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
index b1e23828b..826ca3a86 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
@@ -1,5 +1,6 @@
 package com.nis.web.controller.configuration.ntc;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -19,13 +20,15 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
-import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.HttpUrlCfg;
 import com.nis.domain.configuration.IpPortCfg;
+import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.domain.configuration.template.WhiteListIpTemplate;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.web.controller.configuration.CommonController;
+import com.nis.web.security.UserUtils;
 
 /**
  * 白名单
@@ -38,14 +41,87 @@ public class WhiteListController extends CommonController{
 	
 	@RequestMapping(value = {"ip/list"})
 	//@RequiresPermissions(value={"whitelist:ip:config","whitelist:ip:confirm","whitelist:ip:aduit"},logical=Logical.OR)
-	public String ipList(Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
-		cfg.setTableName(IpPortCfg.getTablename());
-		Page<BaseIpCfg> searchPage=new Page<BaseIpCfg>(request,response,"r");
-		Page<BaseIpCfg> page = ipCfgService.findPage(searchPage, cfg);
+	public String ipList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) {
+		Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");
+		Page<CfgIndexInfo> page = websiteCfgService.getWebsiteList(searchPage, cfg);
 		model.addAttribute("page", page);
 		initPageCondition(model,cfg);
 		return "/cfg/whitelist/ipList";
 	}
+	@RequestMapping(value = {"ajaxIpSubList"})
+	public String ajaxIpSubList(Model model,Long cfgId,Integer index) {
+		CfgIndexInfo cfg = ipCfgService.getIpPortCfg(cfgId);
+		List<String[]> tabList = new ArrayList();
+		if(cfg.getIpPortList()!=null){
+			String cfgType = null;
+			for(IpPortCfg ip:cfg.getIpPortList()){
+				if(!ip.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"1",ip.getCfgType()});
+					cfgType = ip.getCfgType();
+				}
+			}
+		}
+		if(cfg.getNtcSubscribeIdCfgList()!=null){
+			String cfgType = null;
+			for(NtcSubscribeIdCfg keyword:cfg.getNtcSubscribeIdCfgList()){
+				if(!keyword.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"2",keyword.getCfgType()});
+					cfgType = keyword.getCfgType();
+				}
+			}
+		}
+		model.addAttribute("_cfg", cfg);	
+		model.addAttribute("index", index);
+		model.addAttribute("tabList", tabList);
+		return "/cfg/whitelist/ipSubList";
+	}
+	@RequestMapping(value = {"ip/form"})
+	@RequiresPermissions(value={"whitelist:ip:config"})
+	public String ipForm(Model model,String ids,CfgIndexInfo entity) {
+		if(StringUtils.isNotBlank(ids)){
+			
+			entity = this.ipCfgService.getIpPortCfg(Long.parseLong(ids));
+			entity = this.websiteCfgService.getSslCfg(Long.parseLong(ids));
+			initUpdateFormCondition(model,entity);
+		}else{
+			initFormCondition(model,entity);
+		}
+		model.addAttribute("_cfg", entity);
+		return "/cfg/whitelist/ipForm";
+	}
+	@RequestMapping(value = {"ip/save"})
+	public String saveIpCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
+		ipCfgService.saveIpCfg(entity);
+		return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+entity.getFunctionId();
+	}
+	@RequestMapping(value = {"ip/audit"})
+	@RequiresPermissions("whitelist:ip:confirm")
+	public String auditIp(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
+		CfgIndexInfo entity = new CfgIndexInfo();
+		String[] idArray = ids.split(",");
+		for(String id :idArray){
+			entity = ipCfgService.getIpPortCfg(Long.parseLong(id));
+			entity.setIsAudit(isAudit);
+			entity.setIsValid(isValid);
+			entity.setAuditorId(UserUtils.getUser().getId());
+			entity.setAuditTime(new Date());
+			entity.setFunctionId(functionId);
+			try {
+				ipCfgService.auditIpCfg(entity,isAudit);
+			} catch (MaatConvertException e) {
+				e.printStackTrace();
+				logger.info("ip配置下发失败："+e.getMessage());
+				addMessage(redirectAttributes, e.getMessage());
+			}
+		}
+		return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+entity.getFunctionId();
+	}
+	@RequestMapping(value = {"updateIpValid"})
+	@RequiresPermissions(value={"whitelist:ip:config"})
+	public String updateIpCfgValid(Integer isValid,String ids,Integer functionId) {
+		ipCfgService.updateIpCfgValid(isValid,ids,functionId);
+		return "redirect:" + adminPath +"/ntc/website/sslList?functionId="+functionId;
+	}
 	@RequestMapping(value = {"domain/list"})
 	//@RequiresPermissions(value={"whitelist:domain:config","whitelist:domain:confirm","whitelist:domain:aduit"},logical=Logical.OR)
 	public String domainList(Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) {
@@ -56,25 +132,7 @@ public class WhiteListController extends CommonController{
 		initPageCondition(model,cfg);
 		return "/cfg/whitelist/domainList";
 	}
-	@RequestMapping(value = {"ip/form"})
-	@RequiresPermissions(value={"whitelist:ip:config"})
-	public String ipForm(Model model,String ids,BaseIpCfg entity) {
-		if(StringUtils.isNotBlank(ids)){
-			entity = ipCfgService.getIpCfgById(IpPortCfg.getTablename(),Long.parseLong(ids));
-		}
-		initFormCondition(model,entity);
-		if(entity.getCfgId()!=null){
-			model.addAttribute("_cfg", entity);
-		}else{
-			IpPortCfg cfg=new IpPortCfg();
-			cfg.initDefaultValueImpl();
-			cfg.setFunctionId(entity.getFunctionId());
-			cfg.setProtocolId(entity.getProtocolId());
-			model.addAttribute("_cfg", cfg);
-		}
-		
-		return "/cfg/whitelist/ipForm";
-	}
+	
 	@RequestMapping(value = {"domain/form"})
 	@RequiresPermissions(value={"whitelist:domain:config"})
 	public String domainForm(Model model,String ids,HttpUrlCfg entity) {
@@ -93,30 +151,6 @@ public class WhiteListController extends CommonController{
 		
 		return "/cfg/whitelist/domainForm";
 	}
-	@RequestMapping(value = {"ip/saveOrUpdate"})
-	public String saveOrUpdateIp(RedirectAttributes model, IpPortCfg cfg) {
-		cfg.setTableName(IpPortCfg.getTablename());
-		logger.info("saveOrUpdateIp loaded");
-		try{
-			Date date=new Date();
-			cfg.setIsValid(Constants.VALID_NO);
-			cfg.setIsAudit(Constants.AUDIT_NOT_YET);
-			if(cfg.getCfgId()==null){//新增
-				cfg.setCreatorId(cfg.getCurrentUser().getId());
-				cfg.setCreateTime(date);
-				ipCfgService.addIpCfg(cfg);
-			}else{//修改
-				cfg.setEditorId(cfg.getCurrentUser().getId());
-				cfg.setEditTime(new Date());
-				ipCfgService.updateIpCfg(cfg);
-			} 
-			addMessage(model,"save_success");
-		}catch(Exception e){
-			logger.error("保存失败",e);
-			addMessage(model,"save_failed");
-		}
-		return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+cfg.getFunctionId();
-	}
 	@RequestMapping(value = {"domain/saveOrUpdate"})
 	public String saveOrUpdateDomain(RedirectAttributes model, HttpUrlCfg cfg) {
 		cfg.setTableName(HttpUrlCfg.getTablename());
@@ -142,18 +176,6 @@ public class WhiteListController extends CommonController{
 		return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+cfg.getFunctionId();
 	}
 	
-	@RequestMapping(value = {"ip/delete"})
-	@RequiresPermissions("whitelist:ip:config")
-	public String deleteIp(String ids,Integer functionId,RedirectAttributes model) {
-		try{
-			ipCfgService.deleteIp(ids,null,functionId.intValue());
-			addMessage(model,"delete_success");
-		}catch(Exception e){
-			logger.error("删除失败", e);
-			addMessage(model,"delete_failed");
-		}
-		return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+functionId;
-	}
 	@RequestMapping(value = {"domain/delete"})
 	@RequiresPermissions("whitelist:domain:config")
 	public String deleteDomain(String ids,Integer functionId,RedirectAttributes model) {
@@ -166,33 +188,7 @@ public class WhiteListController extends CommonController{
 		}
 		return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+functionId;
 	}
-	@RequestMapping(value = {"ip/audit"})
-	@RequiresPermissions("whitelist:ip:confirm")
-	public String auditIp(String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) {
-		try{
-			for(String id:ids.split(",")){
-				Long.parseLong(id);
-			}
-			List<BaseIpCfg> beans=ipCfgService.getListByCfgId(IpPortCfg.getTablename(),cfg.getFunctionId().intValue(),ids);
-			Date date=new Date();
-			for(BaseIpCfg bean:beans){
-				bean.setTableName(IpPortCfg.getTablename());
-				bean.setAuditorId(bean.getCurrentUser().getId());
-				bean.setAuditTime(date);
-				bean.setIsAudit(cfg.getIsAudit());
-				bean.setIsValid(cfg.getIsValid());
-				ipCfgService.auditWhiteIp(bean);
-			}
-			addMessage(redirectAttributes,"audit_success");
-		}catch(MaatConvertException e){
-			logger.error("审核失败", e);
-			addMessage(redirectAttributes, e.getMessage());
-		}catch(Exception e){
-			logger.error("审核失败", e);
-			addMessage(redirectAttributes, "audit_failed");
-		}
-		return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+cfg.getFunctionId();
-	}
+	
 	@RequestMapping(value = {"domain/audit"})
 	@RequiresPermissions("whitelist:domain:confirm")
 	public String auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) {
diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
index 9f3e6ff00..eda34d006 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
@@ -4,7 +4,10 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
+import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.domain.configuration.CfgIndexInfo;
+import com.nis.domain.configuration.IpPortCfg;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.MyBatisDao;
 
@@ -31,4 +34,15 @@ public interface IpCfgDao extends CrudDao<BaseIpCfg>{
 	public int getIsAudit(BaseIpCfg entity);
 	public int deleteByCompileId(BaseIpCfg entity);
 	public int deleteByCompileIds(@Param("user")long user,@Param("tableName")String tableName,@Param("compileIds")String compileIds);
+	/******************************new ***********************************/
+	
+	public CfgIndexInfo getCfgIndexInfo(Long id);
+	public List<IpPortCfg> getIpPortList(CfgIndexInfo entity);
+	public void saveCfgIndex(CfgIndexInfo entity);
+	public void saveIpPortCfg(IpPortCfg entity);
+	public void updateCfgIndex(CfgIndexInfo entity);
+	public void deleteIpCfg(CfgIndexInfo entity);
+	public void updateCfgValid(BaseCfg entity);
+	public void auditCfg(BaseCfg entity);
+	
 }
diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
index b5b9e3a01..90e496f8b 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
@@ -43,13 +43,77 @@
     <result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
     <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
   </resultMap>
-  <resultMap id="BaseIpMapWithUser" type="com.nis.domain.configuration.BaseIpCfg" extends="BaseIpMap" >
+   <resultMap id="BaseIpMapWithUser" type="com.nis.domain.configuration.BaseIpCfg" extends="BaseIpMap" >
     <result column="creator_name" property="creatorName" jdbcType="VARCHAR" />
     <result column="auditor_name" property="auditorName" jdbcType="VARCHAR" />
     <result column="editor_name" property="editorName" jdbcType="VARCHAR" />
     <result column="group_name" property="groupName" jdbcType="VARCHAR" />
+  </resultMap> 
+  <!--new -->
+  <resultMap id="CfgIndexInfoMap" type="com.nis.domain.configuration.CfgIndexInfo" >
+    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
+    <result column="cfg_desc" property="cfgDesc" 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="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
+    <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="dns_strategy_id" property="dnsStrategyId" jdbcType="INTEGER" />
+    <result column="dns_strategy_name" property="dnsStrategyName" jdbcType="VARCHAR" />
+    <result column="do_log" property="doLog" 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>
+  <resultMap id="ipPortMap" type="com.nis.domain.configuration.IpPortCfg" >
+    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
+    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
+    <result column="ip_type" property="ipType" jdbcType="INTEGER" />
+    <result column="ip_pattern" property="ipPattern" jdbcType="INTEGER" />
+    <result column="dest_ip_address" property="destIpAddress" jdbcType="VARCHAR" />
+    <result column="src_ip_address" property="srcIpAddress" jdbcType="VARCHAR" />
+    <result column="dest_port" property="destPort" jdbcType="VARCHAR" />
+    <result column="src_port" property="srcPort" jdbcType="VARCHAR" />
+    <result column="port_pattern" property="portPattern" jdbcType="INTEGER" />
+    <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="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
+    <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
   </resultMap>
-  
   <sql id="BaseIpCfg_Column_List_with_id" >
     CFG_ID, CFG_DESC,CFG_REGION_CODE,CFG_TYPE, IP_TYPE, IP_PATTERN, SRC_IP_ADDRESS,DEST_IP_ADDRESS, PORT_PATTERN,SRC_PORT,DEST_PORT,
     DIRECTION,PROTOCOL,PROTOCOL_ID,ACTION,IS_VALID,IS_AUDIT,
@@ -127,6 +191,22 @@
   	#{userRegion4,jdbcType=VARCHAR},
   	#{userRegion5,jdbcType=VARCHAR}
   </sql>
+  <!-- new  -->
+  <sql id="ConfigIndex_Column" >
+    a.CFG_ID,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT,
+    a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
+    a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
+    a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.dns_strategy_id,a.user_region1,
+    a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log
+  </sql>
+  <sql id="IpCfg_Column" >
+    a.cfg_id,a.cfg_desc,a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+    ,a.protocol,a.protocol_id,a.direction,a.cfg_type,a.action,a.dest_port,a.dest_ip_address
+	,a.is_valid,a.is_audit,a.creator_id,a.create_time,a.editor_id
+	,a.edit_time,a.auditor_id,a.audit_time,a.service_id,a.request_id,
+	a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable
+	,a.area_effective_ids,a.function_id,a.cfg_region_code
+  </sql>
   <select id="getById" resultMap="BaseIpMap" parameterType="java.lang.Long" >
     SELECT 
     <include refid="BaseIpCfg_Column_List_with_id" />
@@ -671,4 +751,254 @@
 		left join policy_group_info po on r.dns_strategy_id=po.group_id
 		WHERE r.CFG_ID in (${ids}) AND r.FUNCTION_ID=#{functionId,jdbcType=INTEGER} 
   </select>
+  <!-- new -->
+  <select id="getCfgIndexInfo" resultMap="CfgIndexInfoMap" parameterType="java.lang.Long">
+		 SELECT 
+	    <include refid="ConfigIndex_Column" />
+	    FROM cfg_index_info a where cfg_id=#{cfgId}
+  </select>
+  <select id="getIpPortList" resultMap="ipPortMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
+		 SELECT 
+	     <include refid="IpCfg_Column" />
+	    FROM ip_port_cfg a where compile_id=#{compileId}  and function_id=#{functionId}
+  </select>
+  <!-- insert cfgIndexInfox -->
+  <insert id="saveCfgIndex" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
+    <selectKey resultType="java.lang.Long" order="AFTER" keyProperty="cfgId">
+    	SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into cfg_index_info(
+     CFG_DESC,
+     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,
+    AREA_EFFECTIVE_IDS,
+    function_id,
+    dns_strategy_id,
+    user_region1,
+    user_region2,
+    user_region3,
+    user_region4,
+    user_region5,
+    do_log
+    )values (
+   		#{cfgDesc,jdbcType=VARCHAR},
+   		#{action,jdbcType=INTEGER}, 
+    	0,
+    	0,
+    	#{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},    
+   	 	#{areaEffectiveIds,jdbcType=VARCHAR},
+    	#{functionId,jdbcType=INTEGER},
+    	#{dnsStrategyId,jdbcType=INTEGER},
+    	#{userRegion1,jdbcType=VARCHAR},
+    	#{userRegion2,jdbcType=VARCHAR},
+    	#{userRegion3,jdbcType=VARCHAR},
+    	#{userRegion4,jdbcType=VARCHAR},
+    	#{userRegion5,jdbcType=VARCHAR},
+    	#{doLog,jdbcType=INTEGER}
+    )
+  </insert>
+  <!-- insert ip_port_cfg表信息 -->
+  <insert id="saveIpPortCfg" parameterType="com.nis.domain.configuration.IpPortCfg" >
+    <selectKey resultType="java.lang.Long" order="AFTER" keyProperty="cfgId">
+    	SELECT LAST_INSERT_ID()
+    </selectKey>
+    insert into ip_port_cfg (
+     CFG_DESC,
+     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,
+    AREA_EFFECTIVE_IDS,
+    function_id,
+    ip_type,
+    src_ip_address,
+    ip_pattern,
+    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}, 
+    	0,
+    	0,
+    	#{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},    
+   	 	#{areaEffectiveIds,jdbcType=VARCHAR},
+    	#{functionId,jdbcType=INTEGER},
+    	#{ipType,jdbcType=INTEGER},
+    	#{srcIpAddress,jdbcType=VARCHAR},
+    	#{ipPattern,jdbcType=INTEGER},
+    	#{portPattern,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="updateCfgIndex" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
+    update cfg_index_info
+    <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="doLog != null" >
+        do_log = #{doLog,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="creatorId != null" >
+        creator_id = #{creatorId,jdbcType=INTEGER},
+      </if>
+      <if test="createTime != null and createTime != ''" >
+        create_time = #{createTime,jdbcType=TIMESTAMP},
+      </if>
+      <if test="editorId != null" >
+        editor_id = #{editorId,jdbcType=INTEGER},
+      </if>
+      edit_time = #{editTime,jdbcType=TIMESTAMP},
+      <if test="serviceId != null" >
+        service_id = #{serviceId,jdbcType=INTEGER},
+      </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>
+        user_region1 = #{userRegion1,jdbcType=VARCHAR},
+        user_region2 = #{userRegion2,jdbcType=VARCHAR},
+        user_region3 = #{userRegion3,jdbcType=VARCHAR},
+        user_region4 = #{userRegion4,jdbcType=VARCHAR},
+        user_region5 = #{userRegion5,jdbcType=VARCHAR},
+        dns_strategy_id =  #{dnsStrategyId,jdbcType=INTEGER},
+      </trim>
+    </set>
+    where cfg_id = #{cfgId,jdbcType=BIGINT}
+  </update>
+  <delete id="deleteIpCfg" >
+  	delete from ip_port_cfg where compile_id=#{compileId} and function_id=#{functionId}
+  </delete>
+  <update id="updateCfgValid" parameterType="com.nis.domain.configuration.BaseCfg">
+    update ${tableName} set is_valid = #{isValid,jdbcType=INTEGER},
+    editor_id = #{editorId,jdbcType=INTEGER} , 
+    edit_time = #{editTime,jdbcType=TIMESTAMP} 
+    <trim prefix="WHERE" prefixOverrides="AND |OR ">
+		<if test="cfgId !=null ">
+		AND cfg_id = #{cfgId,jdbcType=BIGINT}
+		</if>
+		<if test="compileId !=null ">
+		AND compile_id = #{compileId,jdbcType=INTEGER}
+		</if>
+		and function_id=#{functionId,jdbcType=INTEGER}
+	</trim>
+  </update>
+  <update id="auditCfg" parameterType="com.nis.domain.configuration.BaseCfg">
+    update ${tableName} set is_audit = #{isAudit,jdbcType=INTEGER},
+    auditor_id = #{auditorId,jdbcType=INTEGER}, 
+    audit_time = #{auditTime,jdbcType=TIMESTAMP} 
+    <if test="isValid != null" >
+        ,is_valid = #{isValid,jdbcType=INTEGER}
+      </if>
+    <trim prefix="WHERE" prefixOverrides="AND |OR ">
+			<if test="cfgId !=null ">
+			AND cfg_id = #{cfgId,jdbcType=BIGINT}
+			</if>
+			<if test="compileId !=null ">
+			AND compile_id = #{compileId,jdbcType=INTEGER}
+			</if>
+			and function_id=#{functionId,jdbcType=INTEGER}
+	</trim>
+  </update>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
index c6f75eb7b..e5642736c 100644
--- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
@@ -17,7 +17,9 @@ import com.nis.domain.FunctionRegionDict;
 import com.nis.domain.callback.InlineIp;
 import com.nis.domain.configuration.AreaIpCfg;
 import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.IpPortCfg;
+import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.domain.maat.MaatCfg;
 import com.nis.domain.maat.MaatCfg.DigestCfg;
 import com.nis.domain.maat.MaatCfg.GroupCfg;
@@ -34,6 +36,8 @@ import com.nis.util.DictUtils;
 import com.nis.util.StringUtil;
 import com.nis.web.dao.configuration.AreaIpCfgDao;
 import com.nis.web.dao.configuration.IpCfgDao;
+import com.nis.web.dao.configuration.StringCfgDao;
+import com.nis.web.security.UserUtils;
 import com.nis.web.service.CrudService;
 
 /**
@@ -46,6 +50,8 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 	@Autowired
 	protected IpCfgDao ipCfgDao;
 	@Autowired
+	protected StringCfgDao stringCfgDao;
+	@Autowired
 	protected AreaIpCfgDao areaIpCfgDao;
 	/**
 	 * 
@@ -90,6 +96,124 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 		}
 		
 	} 
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void saveIpCfg(CfgIndexInfo entity){
+		//设置区域运营商信息
+		setAreaEffectiveIds(entity);
+		
+		entity.setIsValid(0);
+		entity.setIsAudit(0);
+		
+		if(entity.getCfgId()==null){
+			Integer compileId = 0;
+			try {
+				List<Integer> idList = ConfigServiceUtil.getId(1, 1);
+				if(idList!=null && idList.size()>0){
+					compileId = idList.get(0);
+				}
+			} catch (MaatConvertException e) {
+				logger.info("获取编译ID出错");
+				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
+			}
+			entity.setCompileId(compileId);
+			entity.setCreateTime(new Date());
+			entity.setCreatorId(entity.getCurrentUser().getId());
+			ipCfgDao.saveCfgIndex(entity);
+			if(entity.getIpPortList()!=null){
+				for(IpPortCfg cfg:entity.getIpPortList()){
+					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+					ipCfgDao.saveIpPortCfg(cfg);
+				}
+			}
+			if(entity.getNtcSubscribeIdCfgList()!=null){
+				for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
+					if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
+						BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+						stringCfgDao.saveSubscribeIdCfg(cfg);
+					}
+				}
+			}
+			//保存区域IP信息
+			if(entity.getAreaCfg()!=null){
+				for(AreaIpCfg cfg:entity.getAreaCfg()){
+					cfg.initDefaultValue();
+					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+					areaIpCfgDao.saveAreaIpCfg(cfg);
+				}
+			}
+			
+		}else{
+			ipCfgDao.updateCfgIndex(entity);
+			//无效子配置后，再新增子配置
+			ipCfgDao.deleteIpCfg(entity);
+			stringCfgDao.deleteSubscribeIdCfgByCfgIndexInfo(entity);
+			AreaIpCfg area = new AreaIpCfg();
+			area.setCompileId(entity.getCompileId());
+			area.setFunctionId(entity.getFunctionId());
+			areaIpCfgDao.deleteAreaIpCfg(area);
+			entity.setCreateTime(new Date());
+			entity.setCreatorId(entity.getCurrentUser().getId());
+			if(entity.getIpPortList()!=null){
+				for(IpPortCfg cfg:entity.getIpPortList()){
+					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+					ipCfgDao.saveIpPortCfg(cfg);
+				}
+			}
+			if(entity.getNtcSubscribeIdCfgList()!=null){
+				for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
+					if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
+						BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+						stringCfgDao.saveSubscribeIdCfg(cfg);
+					}
+				}
+			}
+			//保存区域IP信息
+			if(entity.getAreaCfg()!=null){
+				for(AreaIpCfg cfg:entity.getAreaCfg()){
+					cfg.initDefaultValue();
+					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgDesc","cfgRegionCode","cfgType"});
+					areaIpCfgDao.saveAreaIpCfg(cfg);
+				}
+			}
+		}
+	}
+	public void updateIpCfgValid(Integer isValid,String ids,Integer functionId){
+		CfgIndexInfo entity = new CfgIndexInfo();
+		String[] idArray = ids.split(",");
+		for(String id :idArray){
+			entity.setCfgId(Long.parseLong(id));
+			entity.setIsValid(isValid);
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(new Date());
+			entity.setTableName(CfgIndexInfo.getTablename());
+			entity.setFunctionId(functionId);
+			ipCfgDao.updateCfgValid(entity);
+			//查询子配置
+			entity = this.getIpPortCfg(Long.parseLong(id));
+			if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
+				IpPortCfg cfg = new IpPortCfg();
+				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+				cfg.setTableName(IpPortCfg.getTablename());
+				ipCfgDao.updateCfgValid(cfg);
+			}
+			if(entity.getNtcSubscribeIdCfgList()!=null && entity.getNtcSubscribeIdCfgList().size()>0)
+			{
+				NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
+				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+				cfg.setTableName(NtcSubscribeIdCfg.getTablename());
+				ipCfgDao.updateCfgValid(cfg);
+			}
+			//保存区域IP信息
+			if(entity.getAreaCfg()!=null && entity.getAreaCfg().size()>0){
+				AreaIpCfg cfg = new AreaIpCfg();
+				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+				cfg.setTableName(AreaIpCfg.getTablename());
+				ipCfgDao.updateCfgValid(cfg);
+			}
+			
+		}
+		
+	}
 	/**
 	 * 
 	 * updateIpCfg(更新IP类配置)
@@ -369,7 +493,107 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 			}
 		}
 	}
-	
+	public void auditIpCfg(CfgIndexInfo entity,Integer isAudit) throws MaatConvertException{
+		//修改数据库审核状态信息
+		entity.setTableName(CfgIndexInfo.getTablename());
+		ipCfgDao.auditCfg(entity);
+		
+		ToMaatBean maatBean = new ToMaatBean();		
+		MaatCfg maatCfg = new MaatCfg();
+		List<MaatCfg> configCompileList = new ArrayList();
+		List<GroupCfg> groupRelationList = new ArrayList();
+		List<IpCfg> ipRegionList = new ArrayList();
+		List<StringCfg> strRegionList = new ArrayList();
+		List<NumBoundaryCfg> numRegionList = new ArrayList();
+		List<DigestCfg> digestRegionList = new ArrayList();
+		List<IpCfg> areaIpRegionList = new ArrayList();
+		
+		//查询子配置并修改审核状态
+		entity = this.getIpPortCfg(entity.getCfgId());
+		if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
+			IpPortCfg cfg = new IpPortCfg();
+			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+			cfg.setTableName(IpPortCfg.getTablename());
+			ipCfgDao.auditCfg(cfg);
+			if(isAudit==1){
+				Map<String,List> map = cfgConvert(ipRegionList,entity.getIpPortList(),1,entity,groupRelationList);
+				groupRelationList=map.get("groupList");
+				ipRegionList=map.get("dstList");
+				if(map.get("numRegionList")!=null){
+					numRegionList.addAll(map.get("numRegionList"));
+				}
+			}
+		}
+		if(entity.getNtcSubscribeIdCfgList()!=null && entity.getNtcSubscribeIdCfgList().size()>0){
+			NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
+			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+			cfg.setTableName(NtcSubscribeIdCfg.getTablename());
+			ipCfgDao.auditCfg(cfg);
+			if(isAudit==1){
+				Map<String,List> map = cfgConvert(strRegionList,entity.getNtcSubscribeIdCfgList(),2,entity,groupRelationList);
+				groupRelationList=map.get("groupList");
+				strRegionList=map.get("dstList");
+			}
+		}
+		//保存区域IP信息
+		List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
+		if(!StringUtil.isEmpty(areaIpCfgList)){
+			AreaIpCfg cfg = new AreaIpCfg();
+			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+			cfg.setTableName(AreaIpCfg.getTablename());
+			ipCfgDao.auditCfg(cfg);
+			if(isAudit==1){
+				Map<String,List> map = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
+				groupRelationList=map.get("groupList");
+				areaIpRegionList=map.get("dstList");
+			}
+		}
+		//构造提交综合服务参数格式，一条配置提交一次综合服务
+		if(isAudit==1){
+			maatCfg.initDefaultValue();
+			BeanUtils.copyProperties(entity, maatCfg);
+			maatCfg.setAction(entity.getAction());
+			maatCfg.setAuditTime(entity.getAuditTime());
+			maatCfg.setIpRegionList(ipRegionList);
+			maatCfg.setStrRegionList(strRegionList);
+			maatCfg.setNumRegionList(numRegionList);
+			maatCfg.setDigestRegionList(digestRegionList);
+			maatCfg.setGroupRelationList(groupRelationList);
+			maatCfg.setGroupNum(groupRelationList.size());
+			maatCfg.setAreaIpRegionList(areaIpRegionList);
+			maatCfg.setIsValid(entity.getIsValid());
+			
+			configCompileList.add(maatCfg);
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setCreatorName(entity.getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.INSERT_ACTION);
+			//调用服务接口下发配置数据
+			String json=gsonToJson(maatBean);
+			logger.info("ip配置下发配置参数："+json);
+			//调用服务接口下发配置
+			ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+			logger.info("ip配置下发响应信息："+result.getMsg());
+
+		}else if(isAudit==3){
+			maatCfg.setCompileId(entity.getCompileId());
+			maatCfg.setServiceId(entity.getServiceId());
+			maatCfg.setIsValid(0);//无效
+			configCompileList.add(maatCfg);
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(entity.getAuditTime());
+			maatBean.setCreatorName(entity.getCurrentUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.UPDATE_ACTION);
+			//调用服务接口取消配置
+			String json=gsonToJson(maatBean);
+			logger.info("ip配置下发配置参数："+json);
+			//调用服务接口下发配置
+			ToMaatResult result = ConfigServiceUtil.put(json,1);
+			logger.info("ip配置取消配置响应信息："+result.getMsg());
+		}
+	}
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public void deleteIp(String ids,String compileIds,int functionId){
 		if(StringUtils.isNotBlank(compileIds)){
@@ -431,6 +655,14 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 	public BaseIpCfg getIpCfgById(BaseIpCfg baseIpCfg){
 		return ipCfgDao.getById(baseIpCfg.getTableName(), baseIpCfg.getCfgId());
 	}
+	public CfgIndexInfo getIpPortCfg(Long cfgId){
+		CfgIndexInfo entity = ipCfgDao.getCfgIndexInfo(cfgId);
+		List<IpPortCfg> ipPortList = ipCfgDao.getIpPortList(entity);
+		List<NtcSubscribeIdCfg> subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
+		entity.setIpPortList(ipPortList);
+		entity.setNtcSubscribeIdCfgList(subscribeIdList);
+		return entity;
+	}
 	public BaseIpCfg getIpCfgById(String tableName,long id){
 		return ipCfgDao.getById(tableName, id);
 	}
diff --git a/src/main/resources/sql/update_function_region_dict_data.sql b/src/main/resources/sql/update_function_region_dict_data.sql
index 87237ab84..70ca7e31a 100644
--- a/src/main/resources/sql/update_function_region_dict_data.sql
+++ b/src/main/resources/sql/update_function_region_dict_data.sql
@@ -1,3 +1,9 @@
+#ip地址白名单
+INSERT INTO function_region_dict (config_service_type,config_multi_keywords,config_expr_type,config_hex,config_match_method
+,function_id,config_region_code,config_region_value,config_desc,is_valid,is_maat,region_type,config_region_sort)
+VALUES('subscribe_id',1,'0,1','0,1,2','0,1,2,3',3,2,'WHITE_LIST_SUBSCRIBE_ID','全局IP白名单SUBSCRIBE配置',1,1,2,2);
+UPDATE function_service_dict SET region_code='1,2' WHERE function_id=3 AND ACTION=128
+UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0' WHERE dict_id=7;
 #ip地址
 UPDATE function_service_dict SET region_code=1 WHERE function_id=5 AND ACTION IN(16,1);
 UPDATE function_service_dict SET region_code=2 WHERE function_id=5 AND ACTION IN(32,96);
@@ -21,9 +27,6 @@ UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,4
 #APP IP
 UPDATE function_service_dict SET region_code=1 WHERE function_id=405 AND ACTION IN(1);
 UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0,6,17' WHERE dict_id=62;
-#IP白名单
-UPDATE function_service_dict SET region_code=1 WHERE function_id=3 AND ACTION IN(128);
-UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0,6,17' WHERE dict_id=7;
 #http ip
 UPDATE function_service_dict SET region_code='1,2,3,4,5,6' WHERE function_id=8 AND ACTION IN(16,1);
 UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=14;
diff --git a/src/main/webapp/WEB-INF/sitemesh3.xml b/src/main/webapp/WEB-INF/sitemesh3.xml
index 8c4b7a6ea..d323a8666 100644
--- a/src/main/webapp/WEB-INF/sitemesh3.xml
+++ b/src/main/webapp/WEB-INF/sitemesh3.xml
@@ -32,6 +32,8 @@
   <mapping path="/nis/encryptedtunnelbehav/ajax*" exclue="true"/>
   <mapping path="/nis/ntc/av/ajax*" exclue="true"/>
   <mapping path="/nis/proxy/intercept/ajax*" exclue="true"/>
+  <mapping path="/nis/ntc/whitelist/ip/ajax*" exclue="true"/>
+  <mapping path="/nis/ntc/whitelist/domain/ajax*" exclue="true"/>
   <!-- 对同一路径，启用多个装饰器 -->
   <mapping>
     <path>/articles/*</path>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipCfgForm.jsp
new file mode 100644
index 000000000..2c1113912
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipCfgForm.jsp
@@ -0,0 +1,161 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title></title>
+<script type="text/javascript">
+</script>
+</head>
+<%-- <c:forEach items="${regionList}" var="regionDistrict">
+	<c:if
+		test="${ipPort.functionId eq regionDistrict.functionId and regionDistrict.regionType eq 1}"> --%>
+		<!-- regionDistrict.regionType==1表示IP类配置 -->
+		<input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }">
+		<input type="hidden" name="${cfgName}.cfgRegionCode" 
+		 isMaat="${region.isMaat}"
+   		 serviceType="${region.configServiceType}"
+   		 ipPortShow="${region.configIpPortShow}"
+   		 ipType="${region.configIpType}"
+   		 ipPattern="${region.configIpPattern}"
+   		 portPattern="${region.configPortPattern}"
+   		 direction="${region.configDirection}"
+   		 protocol="${region.configProtocol}"
+   		 regionType="${region.regionType}"
+		value="${region.configRegionCode }">
+	<%-- </c:if>
+</c:forEach> --%>
+<input type="hidden" name="${cfgName}.protocolId" id="protocolId" value="">
+<div class="row">
+	<div class="pull-right">
+		<span class="glyphicon glyphicon-remove pull-right" title="remove"
+			onClick="delContent('${tabName}${status.index}','${tabName}Add');" />
+	</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="${cfgName}.ipType"
+					class="selectpicker show-tick form-control required">
+					<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
+						<option value="${ipTypeC.itemCode}" <c:if test="${ipPort.ipType==ipTypeC.itemCode || (ipPort.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>><spring:message code="${ipTypeC.itemValue}"/></option>
+					</c:forEach>
+				</select>
+			</div>
+			<div for="${cfgName}.ipType"></div>
+		</div>
+	</div>
+	<c:if test="${region.configRegionValue eq 'NTC_P2P_IP'}">
+	<div class="col-md-6">
+		<div class="form-group">
+			<label class="control-label col-md-3"><font color="red">*</font><spring:message code="p2p_ip_config_type"/></label>
+			<div class="col-md-6">
+				<select name=userRegion1 class="selectpicker show-tick form-control required">
+				<option value=""><spring:message code="select"/></option>
+				<c:forEach items="${fns:getDictList('P2P_IP_TYPE')}" var="ipType">
+						<option value="${ipType.itemCode}" <c:if test="${_cfg.ipPortList[0].userRegion1==ipType.itemCode}">selected</c:if> ><spring:message code="${ipType.itemValue}"/></option>
+				</c:forEach>
+				</select>
+			</div>
+			<div for="userRegion1"></div>
+		 </div>
+	</div>
+	</c:if>
+</div>
+<div class="row ip">
+	<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="${cfgName}.ipPattern"
+					class="selectpicker show-tick form-control required">
+					<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+						<option value="${ipPatternC.itemCode}" <c:if test="${ipPort.ipPattern==ipPatternC.itemCode || (ipPort.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
+					</c:forEach>
+				</select>
+			</div>
+			<div for="${cfgName}.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="${cfgName}.srcIpAddress"
+					value="${ipPort.srcIpAddress}">
+			</div>
+			<div for="${cfgName}.srcIpAddress"></div>
+		</div>
+	</div>
+</div>
+<div class="row hidden port">
+	<div class="col-md-6">
+		<div class="form-group">
+			<label class="control-label col-md-3"><font color="red">*</font>
+				<spring:message code="port_pattern" /></label>
+			<div class="col-md-6">
+				<select name="${cfgName}.portPattern"
+					class="selectpicker show-tick form-control required">
+					<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
+						<option value="${portPatternC.itemCode}" <c:if test="${ipPort.portPattern==portPatternC.itemCode || (ipPort.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
+					</c:forEach>
+				</select>
+			</div>
+			<div for="${cfgName}.portPattern"></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="${cfgName}.srcPort"
+					value="${ipPort.srcPort}">
+			</div>
+			<div for="${cfgName}.srcPort"></div>
+		</div>
+	</div>
+</div>
+<div class="row hidden destPort">
+	<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="${cfgName}.destIpAddress"
+					value="${ipPort.destIpAddress}">
+			</div>
+			<div for="${cfgName}.destIpAddress"></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="${cfgName}.destPort"
+					value="${ipPort.destPort}">
+			</div>
+			<div for="${cfgName}.destPort"></div>
+		</div>
+	</div>
+</div>
+<input type="hidden" name="${cfgName}.protocol" value="0">
+<input type="hidden" name="${cfgName}.direction" value="0">
+<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>
+<br>
+
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
index 89b9651af..9b126f6a3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
@@ -2,224 +2,374 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <html>
 <head>
-<title><spring:message code="ip_whitelist"></spring:message></title>
+<title><spring:message code="${cfgName}"></spring:message></title>
+
+<style type="text/css">
+.boxSolid {
+	border: 1px solid #eeeeee
+}
+</style>
 <script type="text/javascript">
-$(function(){
-	switchIpInfo($("select[name$='ipType']"),"ipType");
-	$(".action").on("change",function(){
-		$("#serviceId").val($(this).attr("serviceId"));
-	});
-	$("#ipCfgFrom").validate({
-		errorPlacement: function(error,element){
-			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
-		},
-		submitHandler: function(form){
-			loading('<spring:message code="onloading"/>');
-			form.submit();
-		},
-		errorContainer: "#messageBox",
-	});
-});
+	$(document)
+			.ready(
+					function() {
+						/*initCommIpVal();
+						 $("#cancel").on("click", function() {
+							window.history.back();
+						});*/
+						$(".protocol").addClass("hidden");
+						$(".action").on("change", function() {
+							$("#serviceId").val($(this).attr("serviceId"));
+							$("#protocolId").val($(this).attr("protocolId"));
+							switchAction($(this).val());
+						}); 
+						$("#serviceId").val($(".action:checked").attr("serviceId"));
+						$("#protocolId").val($(".action:checked").attr("protocolId"));
+						$("#cfgFrom").validate(
+								{
+									errorPlacement : function(error, element) {
+										$(element).parents(".form-group").find(
+												"div[for='"
+														+ element.attr("name")
+														+ "']").append(error);
+									},
+									submitHandler : function(form) {
+										//loading('onloading...');
+										var flag = true;
+										var subscribeId=0;
+										//存在隐藏的subscribeId，不算进域配置
+										if($(".boxSolid.hidden").hasClass("subscribeId")){
+											subscribeId=1;
+										}
+										//代表所有业务都隐藏了，提示必须增加一种业务数据
+										if(($(".boxSolid").length-1) ==($(".boxSolid.hidden").length-subscribeId)){
+											top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+											return;
+										}
+										//代表所有区域都隐藏了，提示必须增加个区域信息
+										if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){
+											if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click();
+											if($("#areaIp").hasClass("hidden")) $("#areaIsp").find(".glyphicon-plus").click();
+											top.$.jBox.tip("<spring:message code='one_more_area'/>", "<spring:message code='info'/>");
+											return;
+										}
+										$(".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;
+											}
+										});
+										//keywords非空校验完成校验二进制字符串
+										$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
+											var isHexbin=$(this).val();
+											if(isHexbin == 1){ //十六进制 
+												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(keywords != ''){
+													if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+														$(this).parents(".boxSolid").find(
+																"div[for='"
+																		+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+																		+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
+														flag = false;
+													}
+												}						
+											}
+										});
+										var flag1=validateInvisibleCharTag();
+										if(flag){
+											flag=flag1;
+										}
+										if(flag){
+											//将disable属性的元素删除
+											$(".disabled").each(function(){
+												$(this).remove();
+											});
+											$("input[name$='exprType']").attr("disabled",false);
+											loading('onloading...');
+											form.submit();
+										}else{
+											return;
+										}
+										
+									},
+									errorContainer : "#messageBox",
+								});
+						//业务内容增加
+						/* $("span[title='add']").on("click", function() {
+							$(".ipPort0").removeClass("hidden");
+						}); */
+
+					});
+
+	//业务窗口打开
+	var addContent = function(obj, contentClassName) {
+		var showDiv = $(obj).parent().parent().next();
+		$(showDiv).removeClass("hidden").removeClass(
+				"disabled");
+		/* $("."+contentClassName+"0").find("input,select").each(function(){
+			$(this).removeAttr("disabled");
+		}); */
+		$(obj).addClass("hidden");
+	}
+
+	//业务窗口关闭
+	var delContent = function(contentClassName, addBtnClassName) {
+		$("." + contentClassName).addClass("hidden").addClass("disabled");
+		/* $("."+contentClassName).find("input,select").each(function(){
+			$(this).attr("disabled","true");
+		}); */
+		$("." + addBtnClassName).removeClass("hidden");
+	}
 </script>
 </head>
 <body>
-<div class="page-content">
-	<h3 class="page-title">
-		<spring:message code="ip_whitelist"></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>
-                        <c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
-						<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
+	<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="ip_whitelist"></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>
+							<c:if test="${empty _cfg.cfgId}">
+								<spring:message code="add"></spring:message>
+							</c:if>
+							<c:if test="${not empty _cfg.cfgId}">
+								<spring:message code="edit"></spring:message>
+							</c:if>
+						</div>
 					</div>
-                  </div>
-                  <div class="portlet-body form">
-                      <!-- BEGIN FORM-->
-                      <form id="ipCfgFrom" action="${ctx}/ntc/whitelist/ip/saveOrUpdate" method="post" class="form-horizontal">
-                          <div class="form-body row">
-                            <input type="hidden" name="cfgId" value="${_cfg.cfgId}">
-                            <input type="hidden" name="compileId" value="${_cfg.compileId}">
-                            <input type="hidden" name="protocolId" value="${_cfg.protocolId}">
-                            <input type="hidden" name=requestId value="0">
-                            <input type="hidden" name="functionId" value="${_cfg.functionId}">
-                            <input type="hidden" name="protocol" value="0">
+					<div class="portlet-body form">
+						<!-- BEGIN FORM-->
+						<form id="cfgFrom" action="${ctx}/ntc/whitelist/ip/save"
+							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}">
+							<input type="hidden" name="protocol" value="0">
 							<input type="hidden" name="direction" value="0">
-							<input type="hidden" name="isAreaEffective" value="0">
-							<c:if test="${fn:length(serviceList)==1}">
-			            	<c:forEach items="${serviceList}" var="service">
-			            		 <input type="hidden" name="${cfgName}.configServiceType" value="${region.configServiceType}">
-                				<input type="hidden" name="action" protocolId="${service.protocolId}" regionCode="${service.regionCode}" value="${service.action }">
-			            	    <input type="hidden" id="serviceId" name="serviceId" value="${service.serviceId}">
-			            	</c:forEach>
-							</c:if>
-							<c:if test="${fn:length(serviceList)>1}">
-							 <input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
-							</c:if>
-                            <!-- 配置域类型 -->
-                   			<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}"
-			                   		 ipPattern="${region.configIpPattern}"
-			                   		 portPattern="${region.configPortPattern}"
-			                   		 direction="${region.configDirection}"
-			                   		 protocol="${region.configProtocol}"
-			                   		 regionType="${region.regionType}"
-			                   		 value="${region.configRegionCode}">
-	                   			</c:if>
-                   			</c:forEach>
-                   			<h3 class="form-section"><spring:message code="block_config"/></h3>
-							<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" id="cfgDesc" name="cfgDesc" value="${_cfg.cfgDesc}">
-							            </div>
-							            <div for="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_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="ipType">
-												<option value="${ipType.itemCode}" <c:if test="${_cfg.ipType==ipType.itemCode}">selected</c:if> >${ipType.itemValue}</option>
-					                			</c:forEach>
-							                 </select>
-							            </div>
-							            <div for="ipType"></div>
-							        </div>
-							    </div>
-							</div>
-							<div class="row ip">
-							    <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="ipPattern" class="selectpicker show-tick form-control required">
-							                  <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
-												<option value="${ipPatternC.itemCode}" <c:if test="${_cfg.ipPattern==ipPatternC.itemCode || (_cfg.ipPattern==null && ipPatternC.itemCode==3)}">selected</c:if>><spring:message code="${ipPatternC.itemValue}"/></option>
-											  </c:forEach>
-							                 </select>
-							                 <%-- <input class="form-control" type="text"  value="${_cfg.ipType}"> --%>
-							            </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 hidden port">
-								<div class="col-md-6">
-							        <div class="form-group">
-							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
-							            <div class="col-md-6">
-							            	 <select name="portPattern" class="selectpicker show-tick form-control required">
-							                   <c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
-													<option value="${portPatternC.itemCode}" <c:if test="${_cfg.portPattern==portPatternC.itemCode || (_cfg.portPattern==null && portPatternC.itemCode==1)}">selected</c:if>><spring:message code="${portPatternC.itemValue}"/></option>
-												</c:forEach>
-							                 </select>
-							            </div>
-							            <div for="portPattern"></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 hidden destPort">
-								<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 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 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>
-							<c:if test="${fn:length(serviceList)>1}">
+							<input type="hidden" name="requestId" value="0">
+							<input type="hidden" name="doLog" value="0" >
+							<input type="hidden" name="isAreaEffective" value="0" >
+							<input type="hidden" id="serviceId" name="serviceId"
+								value="${_cfg.serviceId}">
+
+							<div class="form-body">
+
+
 								<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="action"/></label>
-								            <div class="col-md-6">
-								            	<c:if test="${fn:length(serviceList)>1}">
-								            	<c:forEach items="${serviceList}" var="service">
-								                	<label class="radio-inline">
-								                		<c:if test="${_cfg.functionId eq service.functionId}">
-								                			<input type="radio" name="action" serviceId="${service.serviceId }" value="${service.action }" class="required action"
-										            			<c:if test="${_cfg.action==service.action}">checked</c:if>>
-										            			<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+									<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"><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 }"
+																regionCode="${service.regionCode }"
+																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>
-								            	</c:if>
-								            	
-								            </div>
-								            <div for="action"></div>
-								        </div>
-								    </div>
+														</c:if>
+													</label>
+												</c:forEach>
+											</div>
+											<div for="action"></div>
+										</div>
+									</div>
 								</div>
-							</c:if>
-                          </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>
+								<!-- dolog begin-->
+								<%--
+								<div class="row doLog">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+														<c:choose>
+															<c:when test="${dict.itemCode eq _cfg.doLog}">
+																<label class="radio-inline">
+															<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:when>
+															<c:otherwise>
+																<label class="radio-inline">
+																	<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:otherwise>
+														</c:choose>
+													
+											</c:forEach>
+										</div>
+									</div>
+								</div>
+								 --%>
+								<!-- dolog end-->
+								<c:set var="ipCfgIndex" value="0"></c:set>
+								<c:set var="strCfgIndex" value="0"></c:set>
+								<c:set var="subscribeIdIndex" value="0"></c:set>
+								<c:forEach items="${regionList}" var="region" varStatus="status">
+									<c:if test="${region.regionType eq 1 }">
+										<!--ip info-->
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+										<h4 class="form-section">
+											<spring:message code="${region.configRegionValue}" />
+											<small> <span
+												class="glyphicon glyphicon-plus  ${tabName}Add"
+												onClick="addContent(this,'${tabName}')" title="add"></span></small>
+										</h4>
+										<c:set var="cfgName" value="ipPortList[${ipCfgIndex}]"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+										<c:choose>
+											<c:when test="${fn:length(_cfg.ipPortList)>0 and ipCfgIndex<fn:length(_cfg.ipPortList) }">
+												<c:forEach items="${_cfg.ipPortList}" var="ipPort">
+												<c:if test="${region.configRegionValue eq ipPort.cfgType }">
+													<div class="row boxSolid ${tabName}${status.index}">
+														<%@include file="/WEB-INF/views/cfg/whitelist/ipCfgForm.jsp"%>
+													</div>	
+													<c:set var="ipCfgIndex" value="${ipCfgIndex+1}"></c:set>		
+												</c:if>
+												</c:forEach>
+											</c:when>
+											<c:otherwise>
+												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<%@include file="/WEB-INF/views/cfg/whitelist/ipCfgForm.jsp"%>
+												</div>
+												<c:set var="ipCfgIndex" value="${ipCfgIndex+1 }"></c:set>
+											</c:otherwise>
+										</c:choose>
+									<!--/ip info-->
+									</c:if>
+									<c:if test="${region.regionType eq 2 }">
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+										<h4 class="form-section">
+											<spring:message code="${region.configRegionValue}" />
+											<small> <span
+												class="glyphicon glyphicon-plus ${tabName}Add"
+												onClick="addContent(this,'${tabName}')" title="add"></span></small>
+										</h4>
+										<c:if test="${region.configServiceType eq 'subscribe_id' }">
+											<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIdIndex}]"></c:set>
+										</c:if>
+										<c:if test="${region.configServiceType ne 'subscribe_id' }">
+											<c:set var="cfgName" value="sslList[${strCfgIndex}]"></c:set>
+										</c:if>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+										<c:choose>
+											<c:when test="${fn:length(_cfg.sslList)>0}">
+												<c:set var="isBreak" value="false" ></c:set>
+												<c:forEach items="${_cfg.sslList}" var="cfg">
+													<c:choose>
+														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
+															<div class="row boxSolid ${tabName}${status.index}">
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+															</div>
+															<c:set var="isBreak" value="true" ></c:set>
+															<c:if test="${region.configServiceType ne 'subscribe_id' }">
+																<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+															</c:if>
+														</c:when>
+													</c:choose>
+												</c:forEach>
+												<c:if test="${!isBreak}">
+													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+													</div>
+															<c:if test="${region.configServiceType ne 'subscribe_id' }">
+																<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+															</c:if>
+												</c:if>
+											</c:when>
+											<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
+												<c:set var="isBreak" value="false" ></c:set>
+												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
+													<c:choose>
+														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
+															<div class="row boxSolid subscribeId ${tabName}${status.index}">
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+															</div>
+															<c:set var="isBreak" value="true" ></c:set>
+																<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+														</c:when>
+													</c:choose>
+												</c:forEach>
+												<c:if test="${!isBreak}">
+													<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+													</div>
+													<c:if test="${region.configServiceType eq 'subscribe_id' }">
+																<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+															</c:if>
+												</c:if>
+											</c:when>
+											<c:otherwise>
+												<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+												</div>
+												<c:if test="${region.configServiceType eq 'subscribe_id' }">
+													<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+												</c:if>
+												<c:if test="${region.configServiceType ne 'subscribe_id' }">
+													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+												</c:if>
+											</c:otherwise>
+										</c:choose>
+									</c:if>
+								</c:forEach>
+								<br>
+								<%--@include file="/WEB-INF/include/form/areaInfo.jsp"--%>
+								<br>
+								<%--@include file="/WEB-INF/include/form/basicInfo.jsp"--%>
+								<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>
+
+
+							</div>
+						</form>
+						<%-- END FORM--%>
+					</div>
+				</div>
+			</div>
 		</div>
 	</div>
-</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
index 6ddcf1470..eae562de0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
@@ -2,27 +2,22 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <html>
 <head>
-<title><spring:message code="ip_whitelist"></spring:message></title>
+<title><spring:message code="${cfgName}"></spring:message></title>
+
 <script>
-	$(document).ready(function() {
+	 $(document).ready(function() {
 		//搜索框提示语初始化
-		if("${cfg.srcIpAddress}"){
-			$("#intype").val("${cfg.srcIpAddress}");
-		} else if("${cfg.destIpAddress}"){
-			$("#intype").val("${cfg.destIpAddress}");
-		} else if("${cfg.srcPort}"){
-			$("#intype").val("${cfg.srcPort}");
-		} else if("${cfg.destPort}"){
-			$("#intype").val("${cfg.destPort}");
-		} else if("${cfg.cfgDesc}"){
+		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		} else{
+		}else if("${cfg.compileId}"){
+			$("#intype").val("${cfg.compileId}");
+		}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();
@@ -35,52 +30,83 @@
 				$(this).find("option:first").attr("selected",true);
 			});
 			$(".Wdate").attr("value",'');
+			$("#level").attr("value",'');
 			$("#searchForm")[0].reset();
 		});
-	});
+		//异步获取voip相关信息
+		$("span[id^=open]").click(function(){
+			var openId=$(this).attr("id");
+			var closeId=$(this).attr("id").replace("open","close");
+			var index=$(this).attr("id").replace("open","");
+			$("#"+openId).hide();
+			$("#"+closeId).show();
+			//var compileId=$(this).attr("compileId");
+			var cfgId=$(this).attr("cfgId");
+			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+				$("#"+openId).parent().parent().next("tr").show();
+			}else{
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/ntc/whitelist/ajaxIpSubList',
+					data:{"cfgId":cfgId,"index":index},
+					dataType:"html",
+					success:function(data){
+						var subTab="<tr class='child'>"+
+					 	"<td style='border-right: 1px solid #FFFFFF;'>"+
+					 		"<input type='checkbox' hidden='hidden'/>"+
+					 	"</td>"+
+					 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+						var html="";
+						html+="<div class='row'>";
+						html = html+data;
+						subTab=subTab+html;
+						subTab+="</td>";
+						subTab+="</tr>";
+						$("#"+openId).parent().parent().after(subTab);
+						$("div[name='tabTitle"+index+"']").get(0).click();
+					}
+				});
+			}
+			
+		});
+		
+		$("span[id^=close]").on("click",function(){
+			var closeId=$(this).attr("id");
+			var openId=$(this).attr("id").replace("close","open");
+			$("#"+closeId).hide();
+			$("#"+openId).show();
+			$("#"+closeId).parent().parent().next("tr").hide();
+		}); 
+	}); 
 </script>
+
 </head>
 <body>
 
 <div class="page-content">
-<c:set var="urlPrefix" value="/ntc/whitelist/ip"/>
-	<!-- 模板导入，start -->
-	 <%@include file="/WEB-INF/include/excel/importIp.jsp" %>
-	<!-- 模板导入，end -->
 	<div class="theme-panel hidden-xs hidden-sm">
-		<%-- <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'"><spring:message code="refresh"></spring:message></button> --%>
 		<shiro:hasPermission name="whitelist:ip:config">
 			<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/ntc/whitelist/ip/form?functionId=${cfg.functionId}'">
+				onClick="javascript:window.location='${ctx}/ntc/whitelist/ip/form?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
-			<spring:message code="add"></spring:message></button>
-			<!-- 导入功能按钮 -->
-			<div class="btn-group">
-				<button type="button" class="btn btn-default dropdown-toggle green" data-toggle="dropdown">
-				    <i class="fa fa-wrench"></i> <spring:message code="import"></spring:message>
-				    <i class="fa fa-angle-down"></i>
-				</button>
-				<ul class="dropdown-menu pull-right">
-					<c:forEach items="${regionList}" var="region" varStatus="status">
-						<li><a href="javascript:;" onClick="toImport('${region.configRegionCode}','${region.configRegionValue}');">
-		  				<i class="fa fa-upload"></i><spring:message code="${region.configRegionValue}"/></a></li>
-					</c:forEach>   
-				</ul>
-			</div> 
+		<spring:message code="add"></spring:message></button>
 		</shiro:hasPermission>
 	</div>
+
 	<h3 class="page-title">
 		<spring:message code="ip_whitelist"></spring:message>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
-	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/whitelist/ip/list" method="post" class="form-search">
+						<sys:message content="${message}"/>
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/whitelist/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="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}"
@@ -90,67 +116,131 @@
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
 								<div class="pull-left">
+									<c:set var="state"><spring:message code='state'/></c:set>
 									<form:select path="isAudit" class="selectpicker select2 input-small">
 										<form:option value=""><spring:message code="all_states"/></form:option>
-										<c:forEach items="${fns:getDictList('AUDIT_STATUS')}" var="auditC">
-									       <form:option value="${auditC.itemCode}"><spring:message code="${auditC.itemValue}"></spring:message></form:option>
-							            </c:forEach>
+										<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="srcIpAddress"><spring:message code="client_ip"></spring:message></form:option>
-													<form:option value="destIpAddress"><spring:message code="server_ip"></spring:message></form:option>
-													<form:option value="srcPort"><spring:message code="client_port"></spring:message></form:option>
-													<form:option value="destPort"><spring:message code="server_port"></spring:message></form:option>
-													<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-												</form:select>
-												
-                                            </div>
-                                            
-                                            <input id="intype" class="form-control input-medium" type="text" value="">
-                                     
-                                        </div> 
-	                               </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="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
+												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
+												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
+												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+											</form:select>
+									
+                                         </div>
+                                         
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                  
+                                    </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>
+									 <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="whitelist:ip:config">
-									 		<sys:delRow url="${ctx}/ntc/whitelist/ip/form?functionId=${cfg.functionId}" id="contentTable" label="update"></sys:delRow>
-	                                        <sys:delRow url="${ctx}/ntc/whitelist/ip/delete?functionId=${cfg.functionId}" id="contentTable" label="delete"></sys:delRow>
-                                        	<sys:delRow url="${ctx}/ntc/whitelist/ip/export?functionId=${cfg.functionId}" id="contentTable" label="export" maxRow="${page.maxExportSize}"></sys:delRow>
-                                        </shiro:hasPermission>
-                                   		<shiro:hasPermission name="whitelist: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}/ntc/whitelist/ip/audit?isAudit=1&isValid=1&functionId=${cfg.functionId}" id="contentTable" label="approved"></sys:delRow></li>
-													<li><sys:delRow url="${ctx}/ntc/whitelist/ip/audit?isAudit=2&isValid=0&functionId=${cfg.functionId}" id="contentTable" label="unapproved"></sys:delRow></li>
-													<li><sys:delRow url="${ctx}/ntc/whitelist/ip/audit?isAudit=3&isValid=0&functionId=${cfg.functionId}" id="contentTable" label="cancelPass"></sys:delRow></li>            
-	                                            </ul>
-	                                        </div>
-                                        </shiro:hasPermission>
-                        			
+							 		<shiro:hasPermission name="whitelist:ip:config">
+							 			<sys:delRow url="${ctx}/ntc/whitelist/ip/form" id="contentTable" label="update"></sys:delRow>
+                                        <sys:delRow url="${ctx}/ntc/whitelist/updateIpValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
+                                    </shiro:hasPermission>
+                               		<shiro:hasPermission name="whitelist: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}/ntc/whitelist/ip/audit?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/ntc/whitelist/ip/audit?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/ntc/whitelist/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-3">
+											
+										<div class="form-group">
+	                                            <label class="control-label"><spring:message code='request_number'/></label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="requestId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${requestInfos}" var="requestInfo" >
+														<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+		                                        
+                                        <div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='type'/></label>
+	                                            <form:select path="classify" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fls}" var="fl" >
+													<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+											</div>
+                                          
+                                        </div>
+					
+										<div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='attribute'/></label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="attribute" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${xzs}" var="xz" >
+														<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+		                                        
+                                        <div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='label'/></label>
+	                                            <form:select path="lable" class="selectpicker  form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${lables}" var="lable" >
+														<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+									
+								</div>
+								
 								<div class="row">
 									<div class="col-md-2">
 										<div class="form-group">
@@ -168,6 +258,7 @@
 										
 										</div>
 									</div>
+									
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="edit_time"/>：</label>
@@ -176,6 +267,7 @@
 										
 										</div>
 									</div>
+									
 									<div class="col-md-2">
 										<div class="form-group">
 											<label>&nbsp;</label>
@@ -184,6 +276,7 @@
 										
 										</div>
 									</div>
+									
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="audit_time"/>：</label>
@@ -192,6 +285,7 @@
 										
 										</div>
 									</div>
+									
 									<div class="col-md-2">
 										<div class="form-group">
 											<label>&nbsp;</label>
@@ -201,86 +295,153 @@
 										</div>
 									</div>
 								</div>
-							</div>
+								
+							
+							</div> 
+							
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
 					<div class="table-responsive">
-						<sys:message content="${message}"/>
 						<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><spring:message code="seq"/></th> --%>
-									<th exportColumn="config_describe"><spring:message code="config_describe"/></th>
-									<th exportColumn="ip_type"><spring:message code="ip_type"/></th>
-									<th exportColumn="ip_pattern"><spring:message code="ip_pattern"/></th>
-									<th exportColumn="port_pattern"><spring:message code="port_pattern"/></th>
-									<th exportColumn="client_ip"><spring:message code="client_ip"/></th>
-									<th exportColumn="client_port"><spring:message code="client_port"/></th>
-									<th exportColumn="server_ip"><spring:message code="server_ip"/></th>
-									<th exportColumn="server_port"><spring:message code="server_port"/></th>
-									<th exportColumn="block_type"><spring:message code="block_type"/></th>
-									<th exportColumn="valid_identifier"><spring:message code="valid_identifier"/></th>
-									<th exportColumn="is_audit"><spring:message code="is_audit"/></th>
-									<th exportColumn="creator"><spring:message code="creator"/></th>
-									<th exportColumn="config_time" class="sort-column r.create_time"><spring:message code="config_time"/></th>
-									<th exportColumn="editor" ><spring:message code="editor"/></th>
-									<th exportColumn="edit_time" class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
-									<th exportColumn="auditor" ><spring:message code="auditor"/></th>
-									<th exportColumn="audit_time"  class="sort-column r.audit_time"><spring:message code="audit_time"/></th>
-									<%-- <th><spring:message code="operation"></spring:message></th> --%>
+									<th style="display: none"><spring:message code="cfg_id"/></th>
+								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
+									<th><spring:message code="block_type"/></th>
+									<th><spring:message code="do_log"/></th>
+									<th><spring:message code="whether_area_block"/></th>
+									<th><spring:message code="letter"/></th>
+									<th><spring:message code="classification"/></th>
+									<th><spring:message code="attribute"/></th>
+									<th><spring:message code="label"/></th>
+									<th><spring:message code="valid_identifier"/></th>
+									<th><spring:message code="is_audit"/></th>
+									<th><spring:message code="log_total"/></th>
+									<th><spring:message code="creator"/></th>
+									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
+									<th><spring:message code="editor"/></th>
+									<th class="sort-column a.edit_time"><spring:message code="edit_time"/></th>
+									<th><spring:message code="auditor"/></th>
+									<th class="sort-column a.audit_time"><spring:message code="audit_time"/></th>
 								</tr>
 							</thead>
 							<tbody>
-								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
-									<tr pId="${status.index}">
-									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" value="${cfg.isAudit}"></td>
-									<%-- <td>${status.index+1 }</td> --%>
-									<td>${cfg.cfgDesc }</td>
-									<td><c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
-										<c:if test="${ipType.itemCode==cfg.ipType}"><spring:message code="${ipType.itemValue}"/></c:if>
-					                </c:forEach></td>
-					                <td><c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPattern">
-										<c:if test="${ipPattern.itemCode==cfg.ipPattern}"><spring:message code="${ipPattern.itemValue}"/></c:if>
-					                </c:forEach></td>
-					                <td><c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPattern">
-										<c:if test="${portPattern.itemCode==cfg.portPattern}"><spring:message code="${portPattern.itemValue}"/></c:if>
-					                </c:forEach></td>
-									<td title="${cfg.srcIpAddress }">${fns:abbr(cfg.srcIpAddress, 42)}</td>
-									<td>${cfg.srcPort }</td>
-									<td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
-									<td>${cfg.destPort }</td>
+								<c:forEach items="${page.list }" var="indexCfg" varStatus="status" step="1">
+								<tr>
 									<td>
-										<c:forEach items="${serviceList}" var="service">
-									       <c:if test="${cfg.action eq service.action}"><spring:message code="${service.actionCode }"/></c:if>
-							            </c:forEach>
+									<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
+									<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
 									</td>
-									<%-- <td>${cfg.areaEffectiveIds }</td> --%>
+									<td>${indexCfg.compileId }</td>
+								    <td>${indexCfg.cfgDesc }</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>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemCode eq indexCfg.action }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('AUDIT_STATUS')}" var="auditC">
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'created'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:if>
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'approved'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:if>
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'unapproved'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:if>
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'cancel_approved'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:if>
-							            </c:forEach>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq indexCfg.doLog }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
 									</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>
+									<td>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==1}">
+												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
+													<spring:message code="yes"/>
+												</a>
+										</c:if>
+									</td>
+									<td>${indexCfg.requestName }</td>
+									<td>
+									<c:set var="classify"></c:set>
+									<c:forEach items="${fn:split(indexCfg.classify,',')}" var="classifyId" varStatus="status">
+										<c:forEach items="${fls}" var="fl">
+											<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="classify" value="${fl.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="classify" value="${classify},${fl.itemValue}"></c:set>
+											</c:if>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+										<a href="javascript:;" data-original-title="${classify}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(classify,20)}
+										</a>	
+									</td>
+									<td>
+									<c:set var="attribute"></c:set>
+									<c:forEach items="${fn:split(indexCfg.attribute,',')}" var="attributeId" varStatus="status">
+										<c:forEach items="${xzs}" var="xz">
+											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="attribute" value="${xz.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="attribute" value="${attribute},${xz.itemValue}"></c:set>
+											</c:if>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+										<a href="javascript:;" data-original-title="${attribute}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(attribute,20)}
+										</a>	
+									
+									</td>
+									<td>
+									<c:set var="lableInfo"></c:set>
+									<c:forEach items="${fn:split(indexCfg.lable,',')}" var="lableId" varStatus="status">
+										<c:forEach items="${lables}" var="lable">
+											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="lableInfo" value="${lable.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="lableInfo" value="${lableInfo},${lable.itemValue}"></c:set>
+											</c:if>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+										<a href="javascript:;" data-original-title="${lableInfo}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(lableInfo,20)}
+										</a>
+									</td>
+								    <td>
+										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
+										</c:choose>
+									</td>
+									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+								    <td>${indexCfg.creatorName }</td>
+									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${indexCfg.editorName }</td>
+									<td><fmt:formatDate value="${indexCfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${indexCfg.auditorName }</td>
+									<td><fmt:formatDate value="${indexCfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 								</tr>
 								</c:forEach>
 							</tbody>
 						</table>
-						<div class="page">${page}</div>
+						<div class="page" style="margin-top:40px">${page}</div>
 					</div>
 					
 				</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp
new file mode 100644
index 000000000..1eebb9e1c
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp
@@ -0,0 +1,228 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<script>
+	 $(document).ready(function() {
+		 //$("div[name='tabTitle"+index+"']").get(0).click();
+	 })
+</script>
+<style type="text/css">
+</style>
+</head>
+
+<c:forEach items="${tabList}" var="region" varStatus="regionStatus">
+	<div id="${region[1]}Title${index}" onclick="switchSubCfgTabInfo('${region[1]}',${index})"
+		class="col-md-1 tabInfo" name="tabTitle${index }">
+			<spring:message code='${region[1]}' />
+			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>
+	</div>
+</c:forEach>
+
+</div>
+<c:forEach items="${tabList}" var="region">
+	<c:if test="${region[0] eq 1 }">
+		<c:forEach items="${_cfg.ipPortList}" var="cfg">
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='ip_type'/>:</label>
+								<label>
+									<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>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='ip_pattern'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+										<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='client_ip'/>:</label>
+								<label>
+									${cfg.srcIpAddress}
+								</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='port_pattern'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
+										<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='direction'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+										<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='protocol'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+										<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+					</div>
+				</div>
+			</c:if>
+			</c:forEach>
+	</c:if>
+	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.sslList) >0)}">
+		<c:forEach items="${_cfg.sslList}" var="cfg">
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+					<div class="row">
+						<div class="col-md-8">
+							<div class="form-group">
+								<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='expression_type' />:</label>
+								<label>
+									<c:choose>
+										<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
+										<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
+									</c:choose>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='match_method' />:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+										<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='whether_hexbinary' />:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+										<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+					</div>
+				</div>
+			</c:if>
+		</c:forEach>
+	</c:if>
+	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.ntcSubscribeIdCfgList) >0)}">
+		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+					<div class="row">
+						<div class="col-md-8">
+							<div class="form-group">
+								<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='expression_type' />:</label>
+								<label>
+									<c:choose>
+										<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
+										<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
+									</c:choose>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='match_method' />:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+										<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='whether_hexbinary' />:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+										<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+					</div>
+				</div>
+			</c:if>
+		</c:forEach>
+	</c:if>
+</c:forEach>
+</html>
\ No newline at end of file

From b8ce71e20edc6edef3638c3633adc5541ce35d39 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Sat, 25 Aug 2018 01:55:10 +0800
Subject: [PATCH 04/39] =?UTF-8?q?(1)=E5=9F=9F=E5=90=8D=E7=99=BD=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95=E6=B7=BB=E5=8A=A0=E8=AE=A2=E9=98=85ID=EF=BC=8Cdolog?=
 =?UTF-8?q?=20(2)WebsiteController=20redirect=20=E4=BD=BF=E7=94=A8Redirect?=
 =?UTF-8?q?Attributes?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../domain/configuration/CfgIndexInfo.java    |   4 -
 .../configuration/ntc/WebsiteController.java  |   6 +-
 .../ntc/WhiteListController.java              | 133 +++---
 .../nis/web/dao/configuration/IpCfgDao.java   |   1 +
 .../nis/web/dao/configuration/IpCfgDao.xml    | 170 ++++++++
 .../service/configuration/DomainService.java  | 248 +++++++++++
 .../service/configuration/IpCfgService.java   |   8 +
 .../sql/update_function_region_dict_data.sql  |   7 +-
 .../views/cfg/whitelist/domainForm.jsp        | 403 +++++++++++++-----
 .../views/cfg/whitelist/domainList.jsp        | 352 +++++++++++----
 .../views/cfg/whitelist/domianSubList.jsp     | 228 ++++++++++
 .../WEB-INF/views/cfg/whitelist/ipForm.jsp    |  27 --
 .../WEB-INF/views/cfg/whitelist/ipSubList.jsp |  52 ---
 13 files changed, 1295 insertions(+), 344 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp

diff --git a/src/main/java/com/nis/domain/configuration/CfgIndexInfo.java b/src/main/java/com/nis/domain/configuration/CfgIndexInfo.java
index 28208e4ac..994cef81f 100644
--- a/src/main/java/com/nis/domain/configuration/CfgIndexInfo.java
+++ b/src/main/java/com/nis/domain/configuration/CfgIndexInfo.java
@@ -10,10 +10,6 @@ package com.nis.domain.configuration;
 
 import java.util.List;
 
-import com.nis.domain.SysRole;
-import com.nis.util.excel.ExcelField;
-import com.nis.util.excel.fieldtype.RoleListType;
-
 
 /**
  * @ClassName: CfgIndexInfo.java 
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
index 95d747420..50ab696a6 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
@@ -180,7 +180,7 @@ public class WebsiteController extends BaseController{
 	
 	@RequestMapping(value = {"saveHttpCfg"})
 	@RequiresPermissions(value={"website:http:config"})
-	public String saveHttpCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
+	public String saveHttpCfg(RedirectAttributes model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
 		websiteCfgService.saveHttpCfg(entity);
 		return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();
 	}
@@ -242,7 +242,7 @@ public class WebsiteController extends BaseController{
 	}
 	@RequestMapping(value = {"saveSslCfg"})
 	@RequiresPermissions(value={"website:ssl:config"})
-	public String saveSslCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
+	public String saveSslCfg(RedirectAttributes model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
 		websiteCfgService.saveSslCfg(entity);
 		return "redirect:" + adminPath +"/ntc/website/sslList?functionId="+entity.getFunctionId();
 	}
@@ -330,7 +330,7 @@ public class WebsiteController extends BaseController{
 	}
 	@RequestMapping(value = {"saveDnsCfg"})
 	@RequiresPermissions(value={"website:dns:config"})
-	public String saveDnsCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
+	public String saveDnsCfg(RedirectAttributes model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
 		websiteCfgService.saveDnsCfg(entity);
 		return "redirect:" + adminPath +"/ntc/website/dnsList?functionId="+entity.getFunctionId();
 	}
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
index 826ca3a86..7637e0646 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
@@ -9,7 +9,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -20,13 +19,12 @@ import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
+import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
-import com.nis.domain.configuration.HttpUrlCfg;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.domain.configuration.template.WhiteListIpTemplate;
 import com.nis.exceptions.MaatConvertException;
-import com.nis.util.Constants;
 import com.nis.web.controller.configuration.CommonController;
 import com.nis.web.security.UserUtils;
 
@@ -43,7 +41,7 @@ public class WhiteListController extends CommonController{
 	//@RequiresPermissions(value={"whitelist:ip:config","whitelist:ip:confirm","whitelist:ip:aduit"},logical=Logical.OR)
 	public String ipList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) {
 		Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");
-		Page<CfgIndexInfo> page = websiteCfgService.getWebsiteList(searchPage, cfg);
+		Page<CfgIndexInfo> page = ipCfgService.getWhiteIpList(searchPage, cfg);
 		model.addAttribute("page", page);
 		initPageCondition(model,cfg);
 		return "/cfg/whitelist/ipList";
@@ -81,7 +79,6 @@ public class WhiteListController extends CommonController{
 		if(StringUtils.isNotBlank(ids)){
 			
 			entity = this.ipCfgService.getIpPortCfg(Long.parseLong(ids));
-			entity = this.websiteCfgService.getSslCfg(Long.parseLong(ids));
 			initUpdateFormCondition(model,entity);
 		}else{
 			initFormCondition(model,entity);
@@ -90,7 +87,7 @@ public class WhiteListController extends CommonController{
 		return "/cfg/whitelist/ipForm";
 	}
 	@RequestMapping(value = {"ip/save"})
-	public String saveIpCfg(Model model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
+	public String saveIpCfg(RedirectAttributes model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
 		ipCfgService.saveIpCfg(entity);
 		return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+entity.getFunctionId();
 	}
@@ -120,14 +117,13 @@ public class WhiteListController extends CommonController{
 	@RequiresPermissions(value={"whitelist:ip:config"})
 	public String updateIpCfgValid(Integer isValid,String ids,Integer functionId) {
 		ipCfgService.updateIpCfgValid(isValid,ids,functionId);
-		return "redirect:" + adminPath +"/ntc/website/sslList?functionId="+functionId;
+		return "redirect:" + adminPath +"/ntc/whitelist/ip/list?functionId="+functionId;
 	}
 	@RequestMapping(value = {"domain/list"})
 	//@RequiresPermissions(value={"whitelist:domain:config","whitelist:domain:confirm","whitelist:domain:aduit"},logical=Logical.OR)
-	public String domainList(Model model,@ModelAttribute("cfg")HttpUrlCfg cfg,HttpServletRequest request,HttpServletResponse response) {
-		cfg.setTableName(HttpUrlCfg.getTablename());
-		Page<HttpUrlCfg> searchPage=new Page<HttpUrlCfg>(request,response,"r");
-		Page<HttpUrlCfg> page = domainService.findPage(searchPage, cfg);
+	public String domainList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) {
+		Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");
+		Page<CfgIndexInfo> page = domainService.getDomainList(searchPage, cfg);
 		model.addAttribute("page", page);
 		initPageCondition(model,cfg);
 		return "/cfg/whitelist/domainList";
@@ -135,47 +131,54 @@ public class WhiteListController extends CommonController{
 	
 	@RequestMapping(value = {"domain/form"})
 	@RequiresPermissions(value={"whitelist:domain:config"})
-	public String domainForm(Model model,String ids,HttpUrlCfg entity) {
+	public String domainForm(Model model,String ids,CfgIndexInfo entity) {
 		if(StringUtils.isNotBlank(ids)){
-			entity = domainService.getStringCfgById(Long.parseLong(ids));
-		}
-		initFormCondition(model,entity);
-		if(entity.getCfgId()!=null){
-			model.addAttribute("_cfg", entity);
+			entity = domainService.getDomainCfg(Long.parseLong(ids));
+			initUpdateFormCondition(model,entity);
 		}else{
-			HttpUrlCfg cfg=new HttpUrlCfg();
-			cfg.initDefaultValue();
-			cfg.setFunctionId(entity.getFunctionId());
-			model.addAttribute("_cfg", cfg);
+			initFormCondition(model,entity);
 		}
-		
+		model.addAttribute("_cfg", entity);
 		return "/cfg/whitelist/domainForm";
 	}
-	@RequestMapping(value = {"domain/saveOrUpdate"})
-	public String saveOrUpdateDomain(RedirectAttributes model, HttpUrlCfg cfg) {
-		cfg.setTableName(HttpUrlCfg.getTablename());
-		logger.info("saveOrUpdateIp loaded");
-		try{
-			Date date=new Date();
-			cfg.setIsValid(Constants.VALID_NO);
-			cfg.setIsAudit(Constants.AUDIT_NOT_YET);
-			if(cfg.getCfgId()==null){//新增
-				cfg.setCreatorId(cfg.getCurrentUser().getId());
-				cfg.setCreateTime(date);
-				domainService.addStringCfg(cfg);
-			}else{//修改
-				cfg.setEditorId(cfg.getCurrentUser().getId());
-				cfg.setEditTime(new Date());
-				domainService.updateStringCfg(cfg);
-			} 
-			addMessage(model,"save_success");
-		}catch(Exception e){
-			logger.error("保存失败",e);
-			addMessage(model,"save_failed");
-		}
-		return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+cfg.getFunctionId();
+	@RequestMapping(value = {"domain/save"})
+	public String saveOrUpdateDomain(RedirectAttributes model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
+		domainService.saveDomainCfg(entity);
+		return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+entity.getFunctionId();
+	}
+	@RequestMapping(value = {"domain/ajaxSubList"})
+	public String ajaxDomainSubList(Model model,Long cfgId,Integer index) {
+		CfgIndexInfo cfg = domainService.getDomainCfg(cfgId);
+		List<String[]> tabList = new ArrayList();
+		if(cfg.getHttpUrlList()!=null){
+			String cfgType = null;
+			for(BaseStringCfg keyword:cfg.getHttpUrlList()){
+				if(!keyword.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"2",keyword.getCfgType()});
+					cfgType = keyword.getCfgType();
+				}
+			}
+		}
+		if(cfg.getNtcSubscribeIdCfgList()!=null){
+			String cfgType = null;
+			for(NtcSubscribeIdCfg keyword:cfg.getNtcSubscribeIdCfgList()){
+				if(!keyword.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"2",keyword.getCfgType()});
+					cfgType = keyword.getCfgType();
+				}
+			}
+		}
+		model.addAttribute("_cfg", cfg);	
+		model.addAttribute("index", index);
+		model.addAttribute("tabList", tabList);
+		return "/cfg/whitelist/domianSubList";
+	}
+	@RequestMapping(value = {"domain/updateValid"})
+	@RequiresPermissions(value={"whitelist:domain:config"})
+	public String updateDomainValid(Integer isValid,String ids,Integer functionId) {
+		domainService.updateDomainCfgValid(isValid,ids,functionId);
+		return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+functionId;
 	}
-	
 	@RequestMapping(value = {"domain/delete"})
 	@RequiresPermissions("whitelist:domain:config")
 	public String deleteDomain(String ids,Integer functionId,RedirectAttributes model) {
@@ -191,29 +194,25 @@ public class WhiteListController extends CommonController{
 	
 	@RequestMapping(value = {"domain/audit"})
 	@RequiresPermissions("whitelist:domain:confirm")
-	public String auditDomain(String ids,HttpUrlCfg cfg,RedirectAttributes redirectAttributes) {
-		try{
-			List<HttpUrlCfg> beans=domainService.getListByCfgId(ids);
-			Date date=new Date();
-			for(HttpUrlCfg bean:beans){
-				HttpUrlCfg domain=new HttpUrlCfg();
-				BeanUtils.copyProperties(bean, domain);
-				domain.setTableName(HttpUrlCfg.getTablename());
-				domain.setAuditorId(bean.getCurrentUser().getId());
-				domain.setAuditTime(date);
-				domain.setIsAudit(cfg.getIsAudit());
-				domain.setIsValid(cfg.getIsValid());
-				domainService.auditWhiteDomain(domain);
+	public String auditDomain(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
+		CfgIndexInfo entity = new CfgIndexInfo();
+		String[] idArray = ids.split(",");
+		for(String id :idArray){
+			entity = domainService.getDomainCfg(Long.parseLong(id));
+			entity.setIsAudit(isAudit);
+			entity.setIsValid(isValid);
+			entity.setAuditorId(UserUtils.getUser().getId());
+			entity.setAuditTime(new Date());
+			entity.setFunctionId(functionId);
+			try {
+				domainService.auditDomainCfg(entity,isAudit);
+			} catch (MaatConvertException e) {
+				e.printStackTrace();
+				logger.info("domain配置下发失败："+e.getMessage());
+				addMessage(redirectAttributes, e.getMessage());
 			}
-			addMessage(redirectAttributes,"audit_success");
-		}catch(MaatConvertException e){
-			logger.error("审核失败", e);
-			addMessage(redirectAttributes, e.getMessage());
-		}catch(Exception e){
-			logger.error("审核失败", e);
-			addMessage(redirectAttributes, "audit_failed");
 		}
-		return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+cfg.getFunctionId();
+		return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+functionId;
 	}
 	//ip配置导入
 	@RequestMapping(value = "ip/import", method=RequestMethod.POST)
diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
index eda34d006..4d199f3f3 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
@@ -44,5 +44,6 @@ public interface IpCfgDao extends CrudDao<BaseIpCfg>{
 	public void deleteIpCfg(CfgIndexInfo entity);
 	public void updateCfgValid(BaseCfg entity);
 	public void auditCfg(BaseCfg entity);
+	public List<CfgIndexInfo> getWhiteIpList(CfgIndexInfo entity);
 	
 }
diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
index 90e496f8b..b7a3b6316 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
@@ -1001,4 +1001,174 @@
 			and function_id=#{functionId,jdbcType=INTEGER}
 	</trim>
   </update>
+  <select id="getWhiteIpList" resultMap="CfgIndexInfoMap" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
+		SELECT 
+	    <include refid="ConfigIndex_Column" />
+	    <trim prefix="," prefixOverrides=",">
+			, s.name as creator_name,e.name as editor_name,u.name as auditor_name
+			,ri.request_title as requestName,dns.cfg_desc as dns_strategy_name
+		</trim>
+	    FROM cfg_index_info a
+	    left join dns_res_strategy dns on a.dns_strategy_id=dns.cfg_id
+	    left join sys_user s on a.creator_id=s.id
+		left join sys_user e on a.editor_id=e.id
+		left join sys_user u on a.auditor_id=u.id
+		left join request_info ri on a.request_id=ri.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 a.CFG_ID=#{cfgId,jdbcType=BIGINT}
+	   		</if>
+	    	<if test="cfgDesc != null and cfgDesc != ''">
+	    		AND a.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
+	    	</if>
+	    	<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>
+	    	<if test="creatorName != null and creatorName != ''">
+	    		AND CREATOR_NAME like concat(concat('%',#{creatorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="editorName != null and editorName != ''">
+	    		AND EDITOR_NAME like concat(concat('%',#{editorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="auditorName != null and auditorName != ''">
+	    		AND AUDITOR_NAME like concat(concat('%',#{auditorName,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="serviceId != null">
+	    		AND a.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="requestId != null">
+	    		AND a.REQUEST_ID=#{requestId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="compileId != null">
+	    		AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="isAreaEffective != null">
+	    		AND a.IS_AREA_EFFECTIVE=#{isAreaEffective,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="classify != null and classify != ''">
+	    		AND a.classify like concat(concat('%',#{classify,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="attribute != null and attribute != ''">
+	    		AND a.attribute like concat(concat('%',#{attribute,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="lable != null and lable != ''">
+	    		AND a.lable like concat(concat('%',#{lable,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="areaEffectiveIds != null and areaEffectiveIds != ''">
+	    		AND a.AREA_EFFECTIVE_IDS like concat(concat('%',#{areaEffectiveIds,jdbcType=VARCHAR}),'%')
+	    	</if>
+	    	<if test="functionId != null">
+	    		AND a.function_id=#{functionId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="ipPort!=null">
+	    		AND a.compile_id in (select t.compile_id from ip_port_cfg t 
+	    		<where>
+	    			<if test="functionId != null">
+			    		AND t.function_id=#{functionId,jdbcType=INTEGER}
+			    	</if>
+	    			<if test="ipPort.srcIpAddress != null and ipPort.srcIpAddress != ''">
+	    				and  t.src_ip_address =#{(ipPort.srcIpAddress,jdbcType=VARCHAR}
+		    		</if>
+		    		<if test="ipPort.srcPort != null  and ipPort.srcPort != ''">
+		    			and  t.src_port =#{ipPort.srcPort,jdbcType=VARCHAR}
+		    		</if>
+		    		<if test="ipPort.destIpAddress != null and ipPort.destIpAddress != ''">
+	    				and  t.dest_ip_address =#{(ipPort.destIpAddress,jdbcType=VARCHAR}
+		    		</if>
+		    		<if test="ipPort.destPort != null  and ipPort.destPort != ''">
+		    			and  t.dest_port =#{ipPort.destPort,jdbcType=VARCHAR}
+		    		</if>
+	    		</where>
+	    		 )
+	    	</if>
+	    	<if test="httpUrl!=null">
+	    		AND a.compile_id in (select f.compile_id from http_url_cfg f
+	    		<where>
+	    			<if test="httpUrl.cfgKeywords != null and httpUrl.cfgKeywords != ''">
+	    				and  f.cfg_keywords  like concat(concat('%',#{httpUrl.cfgKeywords,jdbcType=VARCHAR}),'%')
+		    		</if>
+
+	    		</where>
+	    		 )
+	    	</if>
+	    	<if test="httpReqBody!=null">
+	    		AND a.compile_id in (select f.compile_id from http_body_cfg f
+	    		<where>
+	    			and cfg_type='http_req_body'
+	    			<if test="httpReqBody.cfgKeywords != null and httpReqBody.cfgKeywords != ''">
+	    				and  f.cfg_keywords  like concat(concat('%',#{httpReqBody.cfgKeywords,jdbcType=VARCHAR}),'%')
+		    		</if>
+
+	    		</where>
+	    		 )
+	    	</if>
+	    	<if test="httpResBody!=null">
+	    		AND a.compile_id in (select f.compile_id from http_body_cfg f
+	    		<where>
+	    			and cfg_type='http_res_body'
+	    			<if test="httpResBody.cfgKeywords != null and httpResBody.cfgKeywords != ''">
+	    				and  f.cfg_keywords  like concat(concat('%',#{httpResBody.cfgKeywords,jdbcType=VARCHAR}),'%')
+		    		</if>
+
+	    		</where>
+	    		 )
+	    	</if>
+	    	<if test="httpReqHdr!=null">
+	    		AND a.compile_id in (select f.compile_id from http_req_head_cfg f
+	    		<where>
+	    			<if test="httpReqHdr.cfgKeywords != null and httpReqHdr.cfgKeywords != ''">
+	    				and  f.cfg_keywords  like concat(concat('%',#{httpReqHdr.cfgKeywords,jdbcType=VARCHAR}),'%')
+		    		</if>
+					<if test="httpReqHdr.district != null and httpReqHdr.district != ''">
+	    				and  f.district  like concat(concat('%',#{httpReqHdr.district,jdbcType=VARCHAR}),'%')
+		    		</if>
+	    		</where>
+	    		 )
+	    	</if>
+	    	<if test="httpResHdr!=null">
+	    		AND a.compile_id in (select f.compile_id from http_res_head_cfg f
+	    		<where>
+	    			<if test="httpResHdr.cfgKeywords != null and httpResHdr.cfgKeywords != ''">
+	    				and  f.cfg_keywords  like concat(concat('%',#{httpResHdr.cfgKeywords,jdbcType=VARCHAR}),'%')
+		    		</if>
+					<if test="httpResHdr.district != null and httpResHdr.district != ''">
+	    				and  f.district  like concat(concat('%',#{httpResHdr.district,jdbcType=VARCHAR}),'%')
+		    		</if>
+	    		</where>
+	    		 )
+	    	</if>
+	    	<!-- <if test="sslCfg!=null">
+	    		AND a.compile_id in (select f.compile_id from ssl_keyword_cfg f
+	    		<where>
+	    			<if test="sslCfg.cfgKeywords != null and sslCfg.cfgKeywords != ''">
+	    				and  f.cfg_keywords  like concat(concat('%',#{sslCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
+		    		</if>
+	    		</where>
+	    		 )
+	    	</if> -->
+	    	<!-- 数据范围过滤 -->
+			${sqlMap.dsf}
+	    </trim>
+	    <choose>
+			<when test="page !=null and page.orderBy != null and page.orderBy != ''">
+				ORDER BY ${page.orderBy}
+			</when>
+			<otherwise>
+				ORDER BY a.CFG_ID desc
+			</otherwise>
+		</choose>
+  </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/service/configuration/DomainService.java b/src/main/java/com/nis/web/service/configuration/DomainService.java
index 6811a1024..3bf1542c0 100644
--- a/src/main/java/com/nis/web/service/configuration/DomainService.java
+++ b/src/main/java/com/nis/web/service/configuration/DomainService.java
@@ -11,9 +11,12 @@ 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.configuration.AreaIpCfg;
 import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.HttpUrlCfg;
+import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.domain.maat.MaatCfg;
 import com.nis.domain.maat.MaatCfg.DigestCfg;
 import com.nis.domain.maat.MaatCfg.GroupCfg;
@@ -29,6 +32,8 @@ import com.nis.util.StringUtil;
 import com.nis.web.dao.configuration.AreaIpCfgDao;
 import com.nis.web.dao.configuration.DomainDao;
 import com.nis.web.dao.configuration.StringCfgDao;
+import com.nis.web.dao.configuration.WebsiteCfgDao;
+import com.nis.web.security.UserUtils;
 import com.nis.web.service.CrudService;
 
 /**
@@ -43,6 +48,8 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 	@Autowired
 	protected StringCfgDao stringCfgDao;
 	@Autowired
+	protected WebsiteCfgDao websiteCfgDao;
+	@Autowired
 	protected AreaIpCfgDao areaIpCfgDao;
 	 
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
@@ -408,4 +415,245 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 		// TODO Auto-generated method stub
 		return domainDao.getListByCfgId(ids);
 	}
+	public CfgIndexInfo getDomainCfg(Long cfgId) {
+		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
+		List<HttpUrlCfg> httpUrlList = websiteCfgDao.getHttpUrlList(entity);
+		List<NtcSubscribeIdCfg> subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
+		entity.setHttpUrlList(httpUrlList);
+		entity.setNtcSubscribeIdCfgList(subscribeIdList);
+		return entity;
+	}
+	public void saveDomainCfg(CfgIndexInfo entity){
+		//设置区域运营商信息
+		setAreaEffectiveIds(entity);
+		
+		entity.setIsValid(0);
+		entity.setIsAudit(0);
+		
+		if(entity.getCfgId()==null){
+			Integer compileId = 0;
+			try {
+				List<Integer> idList = ConfigServiceUtil.getId(1, 1);
+				if(idList!=null && idList.size()>0){
+					compileId = idList.get(0);
+				}
+			} catch (MaatConvertException e) {
+				logger.info("获取编译ID出错");
+				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
+			}
+			entity.setCompileId(compileId);
+			entity.setCreateTime(new Date());
+			entity.setCreatorId(entity.getCurrentUser().getId());
+			websiteCfgDao.saveCfgIndex(entity);
+			
+			if(entity.getHttpUrlList()!=null){
+				for(HttpUrlCfg cfg:entity.getHttpUrlList()){
+					if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
+						BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+						websiteCfgDao.saveHttpUrlCfg(cfg);
+					}
+				}
+			}
+			if(entity.getNtcSubscribeIdCfgList()!=null){
+				for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
+					if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
+						BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+						stringCfgDao.saveSubscribeIdCfg(cfg);
+					}
+				}
+			}
+			//保存区域IP信息
+			if(entity.getAreaCfg()!=null){
+				for(AreaIpCfg cfg:entity.getAreaCfg()){
+					cfg.initDefaultValue();
+					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+					areaIpCfgDao.saveAreaIpCfg(cfg);
+				}
+			}
+			
+		}else{
+			websiteCfgDao.updateCfgIndex(entity);
+			//无效子配置后，再新增子配置
+			websiteCfgDao.deleteHttpUrlCfg(entity);
+			stringCfgDao.deleteSubscribeIdCfgByCfgIndexInfo(entity);
+			AreaIpCfg area = new AreaIpCfg();
+			area.setCompileId(entity.getCompileId());
+			area.setFunctionId(entity.getFunctionId());
+			areaIpCfgDao.deleteAreaIpCfg(area);
+			entity.setCreateTime(new Date());
+			entity.setCreatorId(entity.getCurrentUser().getId());
+			if(entity.getHttpUrlList()!=null){
+				for(HttpUrlCfg cfg:entity.getHttpUrlList()){
+					if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
+						BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+						websiteCfgDao.saveHttpUrlCfg(cfg);
+					}
+				}
+			}
+			if(entity.getNtcSubscribeIdCfgList()!=null){
+				for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){
+					if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
+						BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"});
+						stringCfgDao.saveSubscribeIdCfg(cfg);
+					}
+				}
+			}
+			//保存区域IP信息
+			if(entity.getAreaCfg()!=null){
+				for(AreaIpCfg cfg:entity.getAreaCfg()){
+					cfg.initDefaultValue();
+					BeanUtils.copyProperties(entity, cfg,new String[]{"cfgDesc","cfgRegionCode","cfgType"});
+					areaIpCfgDao.saveAreaIpCfg(cfg);
+				}
+			}
+		}
+	}
+	public void updateDomainCfgValid(Integer isValid,String ids,Integer functionId){
+		CfgIndexInfo entity = new CfgIndexInfo();
+		String[] idArray = ids.split(",");
+		for(String id :idArray){
+			entity.setCfgId(Long.parseLong(id));
+			entity.setIsValid(isValid);
+			entity.setEditorId(UserUtils.getUser().getId());
+			entity.setEditTime(new Date());
+			entity.setTableName(CfgIndexInfo.getTablename());
+			entity.setFunctionId(functionId);
+			websiteCfgDao.updateCfgValid(entity);
+			//查询子配置
+			entity = this.getDomainCfg(Long.parseLong(id));
+			
+			if(entity.getHttpUrlList()!=null && entity.getHttpUrlList().size()>0)
+			{
+				HttpUrlCfg cfg = new HttpUrlCfg();
+				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+				cfg.setTableName(HttpUrlCfg.getTablename());
+				websiteCfgDao.updateCfgValid(cfg);
+			}
+			if(entity.getNtcSubscribeIdCfgList()!=null && entity.getNtcSubscribeIdCfgList().size()>0)
+			{
+				NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
+				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+				cfg.setTableName(NtcSubscribeIdCfg.getTablename());
+				websiteCfgDao.updateCfgValid(cfg);
+			}
+			//保存区域IP信息
+			if(entity.getAreaCfg()!=null && entity.getAreaCfg().size()>0){
+				AreaIpCfg cfg = new AreaIpCfg();
+				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+				cfg.setTableName(AreaIpCfg.getTablename());
+				websiteCfgDao.updateCfgValid(cfg);
+			}
+			
+		}
+		
+	}
+	public void auditDomainCfg(CfgIndexInfo entity,Integer isAudit) throws MaatConvertException{
+		// TODO Auto-generated method stub
+		//修改数据库审核状态信息
+				entity.setTableName(CfgIndexInfo.getTablename());
+				websiteCfgDao.auditCfg(entity);
+				
+				ToMaatBean maatBean = new ToMaatBean();		
+				MaatCfg maatCfg = new MaatCfg();
+				List<MaatCfg> configCompileList = new ArrayList();
+				List<GroupCfg> groupRelationList = new ArrayList();
+				List<IpCfg> ipRegionList = new ArrayList();
+				List<StringCfg> strRegionList = new ArrayList();
+				List<NumBoundaryCfg> numRegionList = new ArrayList();
+				List<DigestCfg> digestRegionList = new ArrayList();
+				List<IpCfg> areaIpRegionList = new ArrayList();
+				
+				//查询子配置并修改审核状态
+				entity = this.getDomainCfg(entity.getCfgId());
+				
+				if(entity.getHttpUrlList()!=null && entity.getHttpUrlList().size()>0){
+					HttpUrlCfg cfg = new HttpUrlCfg();
+					BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+					cfg.setTableName(HttpUrlCfg.getTablename());
+					websiteCfgDao.auditCfg(cfg);
+					if(isAudit==1){
+						Map<String,List> map = cfgConvert(strRegionList,entity.getHttpUrlList(),2,entity,groupRelationList);
+						groupRelationList=map.get("groupList");
+						strRegionList=map.get("dstList");
+					}
+				}
+				if(entity.getNtcSubscribeIdCfgList()!=null && entity.getNtcSubscribeIdCfgList().size()>0){
+					NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
+					BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+					cfg.setTableName(NtcSubscribeIdCfg.getTablename());
+					websiteCfgDao.auditCfg(cfg);
+					if(isAudit==1){
+						Map<String,List> map = cfgConvert(strRegionList,entity.getNtcSubscribeIdCfgList(),2,entity,groupRelationList);
+						groupRelationList=map.get("groupList");
+						strRegionList=map.get("dstList");
+					}
+				}
+				//保存区域IP信息
+				List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
+				if(!StringUtil.isEmpty(areaIpCfgList)){
+					AreaIpCfg cfg = new AreaIpCfg();
+					BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+					cfg.setTableName(AreaIpCfg.getTablename());
+					websiteCfgDao.auditCfg(cfg);
+					if(isAudit==1){
+						Map<String,List> map = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
+						groupRelationList=map.get("groupList");
+						areaIpRegionList=map.get("dstList");
+					}
+				}
+				
+				//构造提交综合服务参数格式，一条配置提交一次综合服务
+				if(isAudit==1){
+					maatCfg.initDefaultValue();
+					BeanUtils.copyProperties(entity, maatCfg);
+					maatCfg.setAction(entity.getAction());
+					maatCfg.setAuditTime(entity.getAuditTime());
+					maatCfg.setIpRegionList(ipRegionList);
+					maatCfg.setStrRegionList(strRegionList);
+					maatCfg.setNumRegionList(numRegionList);
+					maatCfg.setDigestRegionList(digestRegionList);
+					maatCfg.setGroupRelationList(groupRelationList);
+					maatCfg.setGroupNum(groupRelationList.size());
+					maatCfg.setAreaIpRegionList(areaIpRegionList);
+					maatCfg.setIsValid(entity.getIsValid());
+					
+					configCompileList.add(maatCfg);
+					maatBean.setConfigCompileList(configCompileList);
+					maatBean.setAuditTime(entity.getAuditTime());
+					maatBean.setCreatorName(entity.getCurrentUser().getName());
+					maatBean.setVersion(Constants.MAAT_VERSION);
+					maatBean.setOpAction(Constants.INSERT_ACTION);
+					//调用服务接口下发配置数据
+					String json=gsonToJson(maatBean);
+					logger.info("domain配置下发配置参数："+json);
+					//调用服务接口下发配置
+					ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+					logger.info("domain配置下发响应信息："+result.getMsg());
+
+				}else if(isAudit==3){
+					maatCfg.setCompileId(entity.getCompileId());
+					maatCfg.setServiceId(entity.getServiceId());
+					maatCfg.setIsValid(0);//无效
+					configCompileList.add(maatCfg);
+					maatBean.setConfigCompileList(configCompileList);
+					maatBean.setAuditTime(entity.getAuditTime());
+					maatBean.setCreatorName(entity.getCurrentUser().getName());
+					maatBean.setVersion(Constants.MAAT_VERSION);
+					maatBean.setOpAction(Constants.UPDATE_ACTION);
+					//调用服务接口取消配置
+					String json=gsonToJson(maatBean);
+					logger.info("domain配置下发配置参数："+json);
+					//调用服务接口下发配置
+					ToMaatResult result = ConfigServiceUtil.put(json,1);
+					logger.info("domain配置取消配置响应信息："+result.getMsg());
+				}
+	}
+	public Page<CfgIndexInfo> getDomainList(Page<CfgIndexInfo> page, CfgIndexInfo entity){
+		// 生成数据权限过滤条件（dsf为dataScopeFilter的简写，在xml中使用 ${sqlMap.dsf}调用权限SQL）
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
+		entity.setPage(page);
+		List<CfgIndexInfo> list = websiteCfgDao.getWebsiteList(entity);
+		page.setList(list);
+		return page;
+	}
 }
diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
index e5642736c..76e510c51 100644
--- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.nis.domain.FunctionRegionDict;
+import com.nis.domain.Page;
 import com.nis.domain.callback.InlineIp;
 import com.nis.domain.configuration.AreaIpCfg;
 import com.nis.domain.configuration.BaseIpCfg;
@@ -739,4 +740,11 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 		}
 		return msgProp;
 	}
+	public Page<CfgIndexInfo> getWhiteIpList(Page<CfgIndexInfo> page, CfgIndexInfo entity) {
+		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
+		entity.setPage(page);
+		List<CfgIndexInfo> list = ipCfgDao.getWhiteIpList(entity);
+		page.setList(list);
+		return page;
+	}
 }
diff --git a/src/main/resources/sql/update_function_region_dict_data.sql b/src/main/resources/sql/update_function_region_dict_data.sql
index 70ca7e31a..c66e6d8d7 100644
--- a/src/main/resources/sql/update_function_region_dict_data.sql
+++ b/src/main/resources/sql/update_function_region_dict_data.sql
@@ -1,9 +1,14 @@
 #ip地址白名单
 INSERT INTO function_region_dict (config_service_type,config_multi_keywords,config_expr_type,config_hex,config_match_method
 ,function_id,config_region_code,config_region_value,config_desc,is_valid,is_maat,region_type,config_region_sort)
-VALUES('subscribe_id',1,'0,1','0,1,2','0,1,2,3',3,2,'WHITE_LIST_SUBSCRIBE_ID','全局IP白名单SUBSCRIBE配置',1,1,2,2);
+VALUES('subscribe_id',0,'0,1','0,1,2','0,1,2,3',3,2,'WHITE_LIST_SUBSCRIBE_ID','全局IP白名单SUBSCRIBE配置',1,1,2,2);
 UPDATE function_service_dict SET region_code='1,2' WHERE function_id=3 AND ACTION=128
 UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0',config_protocol='0' WHERE dict_id=7;
+#域名白名单
+INSERT INTO function_region_dict (config_service_type,config_multi_keywords,config_expr_type,config_hex,config_match_method
+,function_id,config_region_code,config_region_value,config_desc,is_valid,is_maat,region_type,config_region_sort)
+VALUES('subscribe_id',0,'0,1','0,1,2','0,1,2,3',4,2,'WHITE_LIST_SUBSCRIBE_ID','全局域名白名单SUBSCRIBE配置',1,1,2,2);
+UPDATE function_service_dict SET region_code='1,2' WHERE function_id=4 AND ACTION=128
 #ip地址
 UPDATE function_service_dict SET region_code=1 WHERE function_id=5 AND ACTION IN(16,1);
 UPDATE function_service_dict SET region_code=2 WHERE function_id=5 AND ACTION IN(32,96);
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
index 7f9608b95..7a16521e2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp
@@ -2,139 +2,306 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <html>
 <head>
-<title><spring:message code="domain_whitelist"></spring:message></title>
+<title><spring:message code="${cfgName}"></spring:message></title>
+
+<style type="text/css">
+.boxSolid {
+	border: 1px solid #eeeeee
+}
+</style>
 <script type="text/javascript">
-$(function(){
-	$(".action").on("change",function(){
-		$("#serviceId").val($(this).attr("serviceId"));
-	});
-	$("#cfgFrom").validate({
-		errorPlacement: function(error,element){
-			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
-		},
-		submitHandler: function(form){
-			loading('<spring:message code="onloading"/>');
-			form.submit();
-		},
-		errorContainer: "#messageBox",
-	});
-});
+	$(document)
+			.ready(
+					function() {
+						$(".action").on("change", function() {
+							$("#serviceId").val($(this).attr("serviceId"));
+							$("#protocolId").val($(this).attr("protocolId"));
+						}); 
+						$("#serviceId").val($(".action:checked").attr("serviceId"));
+						$("#protocolId").val($(".action:checked").attr("protocolId"));
+						$("#cfgFrom").validate(
+								{
+									errorPlacement : function(error, element) {
+										$(element).parents(".form-group").find(
+												"div[for='"
+														+ element.attr("name")
+														+ "']").append(error);
+									},
+									submitHandler : function(form) {
+										//loading('onloading...');
+										var flag = true;
+										var subscribeId=0;
+										//存在隐藏的subscribeId，不算进域配置
+										if($(".boxSolid.hidden").hasClass("subscribeId")){
+											subscribeId=1;
+										}
+										$(".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;
+											}
+										});
+										//keywords非空校验完成校验二进制字符串
+										$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
+											var isHexbin=$(this).val();
+											if(isHexbin == 1){ //十六进制 
+												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(keywords != ''){
+													if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+														$(this).parents(".boxSolid").find(
+																"div[for='"
+																		+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+																		+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
+														flag = false;
+													}
+												}						
+											}
+										});
+										var flag1=validateInvisibleCharTag();
+										if(flag){
+											flag=flag1;
+										}
+										if(flag){
+											//将disable属性的元素删除
+											$(".disabled").each(function(){
+												$(this).remove();
+											});
+											$("input[name$='exprType']").attr("disabled",false);
+											loading('onloading...');
+											form.submit();
+										}else{
+											return;
+										}
+										
+									},
+									errorContainer : "#messageBox",
+								});
+
+					});
+
+	//业务窗口打开
+	var addContent = function(obj, contentClassName) {
+		var showDiv = $(obj).parent().parent().next();
+		$(showDiv).removeClass("hidden").removeClass(
+				"disabled");
+		/* $("."+contentClassName+"0").find("input,select").each(function(){
+			$(this).removeAttr("disabled");
+		}); */
+		$(obj).addClass("hidden");
+	}
+
+	//业务窗口关闭
+	var delContent = function(contentClassName, addBtnClassName) {
+		$("." + contentClassName).addClass("hidden").addClass("disabled");
+		/* $("."+contentClassName).find("input,select").each(function(){
+			$(this).attr("disabled","true");
+		}); */
+		$("." + addBtnClassName).removeClass("hidden");
+	}
 </script>
 </head>
 <body>
-
-<div class="page-content">
-
-	<h3 class="page-title">
-		<spring:message code="domain_whitelist"></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>
-                        <c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
-						<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
+	<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="domain_whitelist"></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>
+							<c:if test="${empty _cfg.cfgId}">
+								<spring:message code="add"></spring:message>
+							</c:if>
+							<c:if test="${not empty _cfg.cfgId}">
+								<spring:message code="edit"></spring:message>
+							</c:if>
+						</div>
 					</div>
-                      <!-- <div class="tools">
-                          <a href="javascript:;" class="collapse" data-original-title="" title=""> </a>
-                          <a href="#portlet-config" data-toggle="modal" class="config" data-original-title="" title=""> </a>
-                          <a href="javascript:;" class="reload" data-original-title="" title=""> </a>
-                          <a href="javascript:;" class="remove" data-original-title="" title=""> </a>
-                      </div> -->
-                  </div>
-                  <div class="portlet-body form">
-                      <!-- BEGIN FORM-->
-                      <form id="cfgFrom" action="${ctx}/ntc/whitelist/domain/saveOrUpdate" method="post" class="form-horizontal">
-                          <input type="hidden" name="exprType" value="0">
-						  <input type="hidden" name="matchMethod" value="0">
-						  <input type="hidden" name="isHexbin" value="0">
-                          <input type="hidden" name="cfgId" value="${_cfg.cfgId}">
-                          <input type="hidden" name="compileId" value="${_cfg.compileId}">
-                          <input type="hidden" name="isAreaEffective" value="0">
-                          <input type="hidden" name=requestId value="0">
-                          <input type="hidden" name="functionId" value="${_cfg.functionId}">
-                          <c:if test="${fn:length(serviceList)==1}">
-			            	<c:forEach items="${serviceList}" var="service">
-                				<input type="hidden" name="action" value="${service.action }">
-			            	    <input type="hidden" id="serviceId" name="serviceId" value="${service.serviceId}">
-			            	</c:forEach>
-							</c:if>
-							<c:if test="${fn:length(serviceList)>1}">
-							 <input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
-							</c:if>
-						  <!-- 配置域类型 -->
-                   			<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" value="${region.configRegionCode}">
-	                   			</c:if>
-                   			</c:forEach>
-                          <div class="form-body">
-                          <h3 class="form-section"><spring:message code="block_config"/></h3>
+					<div class="portlet-body form">
+						<!-- BEGIN FORM-->
+						<form id="cfgFrom" action="${ctx}/ntc/whitelist/domain/save"
+							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}">
+							<input type="hidden" name="doLog" value="0" >
+							<input type="hidden" name="isAreaEffective" value="0" >
+							<input type="hidden" name=requestId value="0">
+							<input type="hidden" id="serviceId" name="serviceId"
+								value="${_cfg.serviceId}">
+
+							<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 for="cfgDesc"></div>
-								        </div>
-								    </div>
-								    <div class="col-md-6">
+									<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"><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 }"
+																regionCode="${service.regionCode }"
+																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>
+								<h4 class="form-section">
+											<spring:message code="domain_whitelist" />
+								</h4>
+								<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="domain_name"/></label>
 								            <div class="col-md-6">
-								            	 <input class="form-control required domainCheck" type="text" name="cfgKeywords" value="${_cfg.cfgKeywords}">
+								            	 <input class="form-control required domainCheck" type="text" name="httpUrlList[0].cfgKeywords" value="${_cfg.httpUrlList[0].cfgKeywords}">
+								            	 <input type="hidden" name="httpUrlList[0].exprType" value="0">
+												 <input type="hidden" name="httpUrlList[0].matchMethod" value="0">
+											     <input type="hidden" name="httpUrlList[0].isHexbin" value="0">
 								            </div>
-								            <div for="cfgKeywords"></div>
+								            <div for="httpUrlList[0].cfgKeywords"></div>
 								        </div>
 								    </div>
 								</div>
-                          </div>
-                          <c:if test="${fn:length(serviceList)>1}">
-	                          <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="action"/></label>
-								            <div class="col-md-6">
-								            	<c:forEach items="${serviceList}" var="service">
-								                	<label class="radio-inline">
-								                		<c:if test="${_cfg.functionId eq service.functionId}">
-								                			<input type="radio" name="action" serviceId="${service.serviceId }" value="${service.action }" class="required action"
-										            			<c:if test="${_cfg.action==service.action}">checked</c:if>>
-										            			<spring:message code="${service.actionCode }"/>
-								                		</c:if>
-								            		</label>
-								            	</c:forEach>
-								            </div>
-								            <div for="action"></div>
-								        </div>
-								    </div>
+								<!-- dolog begin-->
+								<%-- <div class="row">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+														<c:choose>
+															<c:when test="${dict.itemCode eq _cfg.doLog}">
+																<label class="radio-inline">
+															<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:when>
+															<c:otherwise>
+																<label class="radio-inline">
+																	<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:otherwise>
+														</c:choose>
+													
+											</c:forEach>
+										</div>
+									</div>
+								</div> --%>
+								<!-- dolog end-->
+								<c:set var="strCfgIndex" value="0"></c:set>
+								<c:set var="subscribeIdIndex" value="0"></c:set>
+								<c:forEach items="${regionList}" var="region" varStatus="status">
+									<c:if test="${region.regionType eq 2 and region.configServiceType ne 'subscribe_id'}">
+											<input type="hidden" name="httpUrlList[0].cfgType" value="${region.configRegionValue}">
+											<input type="hidden" name="httpUrlList[0].cfgRegionCode" value="${region.configRegionCode}">
+									</c:if>
+									<c:if test="${region.regionType eq 2 and region.configServiceType eq 'subscribe_id'}">
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+										<h4 class="form-section">
+											<spring:message code="${region.configRegionValue}" />
+											<small> 
+												<span
+												class="glyphicon glyphicon-plus ${tabName}Add <c:if test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">hidden</c:if>"
+												onClick="addContent(this,'${tabName}')" title="add"></span></small>
+										</h4>
+										<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIdIndex}]"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+										<c:choose>
+											<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
+												<c:set var="isBreak" value="false" ></c:set>
+												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
+													<c:choose>
+														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
+															<div class="row boxSolid subscribeId ${tabName}${status.index}">
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+															</div>
+															<c:set var="isBreak" value="true" ></c:set>
+																<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+														</c:when>
+													</c:choose>
+												</c:forEach>
+												<c:if test="${!isBreak}">
+													<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+													</div>
+													<c:if test="${region.configServiceType eq 'subscribe_id' }">
+														<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+													</c:if>
+												</c:if>
+											</c:when>
+											<c:otherwise>
+												<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+												</div>
+												<c:if test="${region.configServiceType eq 'subscribe_id' }">
+													<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+												</c:if>
+											</c:otherwise>
+										</c:choose>
+									</c:if>
+								</c:forEach>
+								<br>
+								<%--@include file="/WEB-INF/include/form/areaInfo.jsp"--%>
+								<br>
+								<%--@include file="/WEB-INF/include/form/basicInfo.jsp"--%>
+								<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>
-						  </c:if>
-                          <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>
+						</form>
+						<!-- END FORM-->
+					</div>
+				</div>
+			</div>
 		</div>
 	</div>
-</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
index e89463d92..c05c55378 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
@@ -2,15 +2,16 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <html>
 <head>
-<title><spring:message code="domain_whitelist"></spring:message></title>
+<title><spring:message code="${cfgName}"></spring:message></title>
+
 <script>
- 	$(document).ready(function() {
- 		//搜索框提示语初始化
-		if("${cfg.cfgKeywords}"){
-			$("#intype").val("${cfg.cfgKeywords}");
-		} else if("${cfg.cfgDesc}"){
+	 $(document).ready(function() {
+		//搜索框提示语初始化
+		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		} else{
+		}else if("${cfg.compileId}"){
+			$("#intype").val("${cfg.compileId}");
+		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
 		$("#seltype").change(function(){
@@ -28,24 +29,69 @@
 				$(this).find("option").attr("selected",false);
 				$(this).find("option:first").attr("selected",true);
 			});
-			$("#cfgKeywords").attr("value",'');
 			$(".Wdate").attr("value",'');
+			$("#level").attr("value",'');
 			$("#searchForm")[0].reset();
 		});
- 	});
+		//异步获取voip相关信息
+		$("span[id^=open]").click(function(){
+			var openId=$(this).attr("id");
+			var closeId=$(this).attr("id").replace("open","close");
+			var index=$(this).attr("id").replace("open","");
+			$("#"+openId).hide();
+			$("#"+closeId).show();
+			//var compileId=$(this).attr("compileId");
+			var cfgId=$(this).attr("cfgId");
+			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+				$("#"+openId).parent().parent().next("tr").show();
+			}else{
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/ntc/whitelist/domain/ajaxSubList',
+					data:{"cfgId":cfgId,"index":index},
+					dataType:"html",
+					success:function(data){
+						var subTab="<tr class='child'>"+
+					 	"<td style='border-right: 1px solid #FFFFFF;'>"+
+					 		"<input type='checkbox' hidden='hidden'/>"+
+					 	"</td>"+
+					 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+						var html="";
+						html+="<div class='row'>";
+						html = html+data;
+						subTab=subTab+html;
+						subTab+="</td>";
+						subTab+="</tr>";
+						$("#"+openId).parent().parent().after(subTab);
+						$("div[name='tabTitle"+index+"']").get(0).click();
+					}
+				});
+			}
+			
+		});
+		
+		$("span[id^=close]").on("click",function(){
+			var closeId=$(this).attr("id");
+			var openId=$(this).attr("id").replace("close","open");
+			$("#"+closeId).hide();
+			$("#"+openId).show();
+			$("#"+closeId).parent().parent().next("tr").hide();
+		}); 
+	}); 
 </script>
+
 </head>
 <body>
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<%-- <button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/string/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button> --%>
-			<shiro:hasPermission name="whitelist:domain:config">
+		<shiro:hasPermission name="whitelist:domain:config">
 			<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/ntc/whitelist/domain/form?functionId=${cfg.functionId}'">
+				onClick="javascript:window.location='${ctx}/ntc/whitelist/domain/form?functionId=${cfg.functionId}'">
 			<i class="fa fa-plus"></i>
-			<spring:message code="add"></spring:message></button>
-			</shiro:hasPermission>
+		<spring:message code="add"></spring:message></button>
+		</shiro:hasPermission>
 	</div>
 
 	<h3 class="page-title">
@@ -53,13 +99,14 @@
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
-	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/whitelist/domain/list" method="post" class="form-search">
+						<sys:message content="${message}"/>
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/whitelist/domain/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="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}"
@@ -69,11 +116,13 @@
 							<!-- 搜索内容与操作按钮栏 -->
 							<div class="col-md-12">
 								<div class="pull-left">
+									<c:set var="state"><spring:message code='state'/></c:set>
 									<form:select path="isAudit" class="selectpicker select2 input-small">
 										<form:option value=""><spring:message code="all_states"/></form:option>
-										<c:forEach items="${fns:getDictList('AUDIT_STATUS')}" var="auditC">
-									       <form:option value="${auditC.itemCode}"><spring:message code="${auditC.itemValue}"></spring:message></form:option>
-							            </c:forEach>
+										<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>
 								
@@ -83,8 +132,12 @@
                                          <div class="input-group-btn">
                                          
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
-                                        		<form:option value="cfgKeywords"><spring:message code="key_word"></spring:message></form:option>
 												<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="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
+												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
+												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
+												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
 											</form:select>
 									
                                          </div>
@@ -99,25 +152,23 @@
 	                                 <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="whitelist:domain:config">
-                                        	<sys:delRow url="${ctx}/ntc/whitelist/domain/form?functionId=${cfg.functionId}" id="contentTable" label="update"></sys:delRow>
-                                            <sys:delRow url="${ctx}/ntc/whitelist/domain/delete?functionId=${cfg.functionId}" id="contentTable" label="delete"></sys:delRow>
-                                      	 </shiro:hasPermission>
-                                      <!--   <button type="button" class="btn btn-default">
-                                            <i class="fa fa-download"></i> 导出</button> -->
-                                    		<shiro:hasPermission name="whitelist:domain: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}/ntc/whitelist/domain/audit?isAudit=1&isValid=1&functionId=${cfg.functionId}" id="contentTable" label="approved"></sys:delRow></li>
-													<li><sys:delRow url="${ctx}/ntc/whitelist/domain/audit?isAudit=2&isValid=0&functionId=${cfg.functionId}" id="contentTable" label="unapproved"></sys:delRow></li>
-													<li><sys:delRow url="${ctx}/ntc/whitelist/domain/audit?isAudit=3&isValid=0&functionId=${cfg.functionId}" id="contentTable" label="cancelPass"></sys:delRow></li>            
-	                                            </ul>
-	                                        </div>
-	                                        </shiro:hasPermission>
+							 		<shiro:hasPermission name="whitelist:domain:config">
+							 			<sys:delRow url="${ctx}/ntc/whitelist/domain/form" id="contentTable" label="update"></sys:delRow>
+                                        <sys:delRow url="${ctx}/ntc/whitelist/domain/updateValid?isValid=-1&functionId=${cfg.functionId}" id="contentTable" label="delete"></sys:delRow>
+                                    </shiro:hasPermission>
+                               		<shiro:hasPermission name="whitelist:domain: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}/ntc/whitelist/domain/audit?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/ntc/whitelist/domain/audit?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/ntc/whitelist/domain/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>
@@ -128,6 +179,68 @@
 							
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
+								<div class="row">
+								
+									<div class="col-md-3">
+											
+										<div class="form-group">
+	                                            <label class="control-label"><spring:message code='request_number'/></label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="requestId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${requestInfos}" var="requestInfo" >
+														<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+		                                        
+                                        <div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='type'/></label>
+	                                            <form:select path="classify" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fls}" var="fl" >
+													<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+											</div>
+                                          
+                                        </div>
+					
+										<div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='attribute'/></label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="attribute" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${xzs}" var="xz" >
+														<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+		                                        
+                                        <div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='label'/></label>
+	                                            <form:select path="lable" class="selectpicker  form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${lables}" var="lable" >
+														<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+									
+								</div>
+								
 								<div class="row">
 									<div class="col-md-2">
 										<div class="form-group">
@@ -136,6 +249,7 @@
 											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>
@@ -144,96 +258,190 @@
 										
 										</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>
 					<div class="table-responsive">
-						<sys:message content="${message}"/>
 						<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><spring:message code="seq"/></th> --%>
-									<th><spring:message code="config_describe"/></th>
-									<th><spring:message code="domain_name"/></th>
+									<th style="display: none"><spring:message code="cfg_id"/></th>
+								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 									<th><spring:message code="block_type"/></th>
+									<th><spring:message code="do_log"/></th>
+									<th><spring:message code="whether_area_block"/></th>
+									<th><spring:message code="letter"/></th>
+									<th><spring:message code="classification"/></th>
+									<th><spring:message code="attribute"/></th>
+									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
-									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
+									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
-									<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
+									<th class="sort-column a.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> --%>
+									<th class="sort-column a.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}" value="${cfg.isAudit}"></td>
-									<%-- <td>${status.index+1 }</td> --%>
-									<td>${cfg.cfgDesc }</td>
-									<td>${cfg.cfgKeywords }</td>
+								<c:forEach items="${page.list }" var="indexCfg" varStatus="status" step="1">
+								<tr>
 									<td>
-										<c:forEach items="${serviceList}" var="service">
-									       <c:if test="${cfg.action eq service.action}"><spring:message code="${service.actionCode}"/></c:if>
-							            </c:forEach>
+									<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
+									<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
+									</td>
+									<td>${indexCfg.compileId }</td>
+								    <td>${indexCfg.cfgDesc }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemCode eq indexCfg.action }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
 									</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>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq indexCfg.doLog }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('AUDIT_STATUS')}" var="auditC">
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'created'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:if>
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'approved'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:if>
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'unapproved'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:if>
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'cancel_approved'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:if>
-							            </c:forEach>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==1}">
+												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
+													<spring:message code="yes"/>
+												</a>
+										</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>
+									<td>${indexCfg.requestName }</td>
+									<td>
+									<c:set var="classify"></c:set>
+									<c:forEach items="${fn:split(indexCfg.classify,',')}" var="classifyId" varStatus="status">
+										<c:forEach items="${fls}" var="fl">
+											<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="classify" value="${fl.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="classify" value="${classify},${fl.itemValue}"></c:set>
+											</c:if>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+										<a href="javascript:;" data-original-title="${classify}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(classify,20)}
+										</a>	
+									</td>
+									<td>
+									<c:set var="attribute"></c:set>
+									<c:forEach items="${fn:split(indexCfg.attribute,',')}" var="attributeId" varStatus="status">
+										<c:forEach items="${xzs}" var="xz">
+											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="attribute" value="${xz.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="attribute" value="${attribute},${xz.itemValue}"></c:set>
+											</c:if>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+										<a href="javascript:;" data-original-title="${attribute}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(attribute,20)}
+										</a>	
+									
+									</td>
+									<td>
+									<c:set var="lableInfo"></c:set>
+									<c:forEach items="${fn:split(indexCfg.lable,',')}" var="lableId" varStatus="status">
+										<c:forEach items="${lables}" var="lable">
+											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="lableInfo" value="${lable.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="lableInfo" value="${lableInfo},${lable.itemValue}"></c:set>
+											</c:if>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+										<a href="javascript:;" data-original-title="${lableInfo}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(lableInfo,20)}
+										</a>
+									</td>
+								    <td>
+										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
+										</c:choose>
+									</td>
+									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+								    <td>${indexCfg.creatorName }</td>
+									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${indexCfg.editorName }</td>
+									<td><fmt:formatDate value="${indexCfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${indexCfg.auditorName }</td>
+									<td><fmt:formatDate value="${indexCfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 								</tr>
 								</c:forEach>
 							</tbody>
 						</table>
-						<div class="page">${page}</div>
+						<div class="page" style="margin-top:40px">${page}</div>
 					</div>
 					
 				</div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
new file mode 100644
index 000000000..9c1a82e0c
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp
@@ -0,0 +1,228 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<script>
+	 $(document).ready(function() {
+		 //$("div[name='tabTitle"+index+"']").get(0).click();
+	 })
+</script>
+<style type="text/css">
+</style>
+</head>
+
+<c:forEach items="${tabList}" var="region" varStatus="regionStatus">
+	<div id="${region[1]}Title${index}" onclick="switchSubCfgTabInfo('${region[1]}',${index})"
+		class="col-md-1 tabInfo" name="tabTitle${index }">
+			<spring:message code='${region[1]}' />
+			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>
+	</div>
+</c:forEach>
+
+</div>
+<c:forEach items="${tabList}" var="region">
+	<c:if test="${region[0] eq 1 }">
+		<c:forEach items="${_cfg.ipPortList}" var="cfg">
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='ip_type'/>:</label>
+								<label>
+									<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>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='ip_pattern'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+										<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='client_ip'/>:</label>
+								<label>
+									${cfg.srcIpAddress}
+								</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='port_pattern'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
+										<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='direction'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+										<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='protocol'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+										<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+					</div>
+				</div>
+			</c:if>
+			</c:forEach>
+	</c:if>
+	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.httpUrlList) >0)}">
+		<c:forEach items="${_cfg.httpUrlList}" var="cfg">
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+					<div class="row">
+						<div class="col-md-8">
+							<div class="form-group">
+								<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='expression_type' />:</label>
+								<label>
+									<c:choose>
+										<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
+										<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
+									</c:choose>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='match_method' />:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+										<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='whether_hexbinary' />:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+										<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+					</div>
+				</div>
+			</c:if>
+		</c:forEach>
+	</c:if>
+	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.ntcSubscribeIdCfgList) >0)}">
+		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+					<div class="row">
+						<div class="col-md-8">
+							<div class="form-group">
+								<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='expression_type' />:</label>
+								<label>
+									<c:choose>
+										<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
+										<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
+									</c:choose>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='match_method' />:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+										<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='whether_hexbinary' />:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+										<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+					</div>
+				</div>
+			</c:if>
+		</c:forEach>
+	</c:if>
+</c:forEach>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
index 9b126f6a3..0a74979c8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
@@ -275,35 +275,8 @@
 										<c:if test="${region.configServiceType eq 'subscribe_id' }">
 											<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIdIndex}]"></c:set>
 										</c:if>
-										<c:if test="${region.configServiceType ne 'subscribe_id' }">
-											<c:set var="cfgName" value="sslList[${strCfgIndex}]"></c:set>
-										</c:if>
 										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
 										<c:choose>
-											<c:when test="${fn:length(_cfg.sslList)>0}">
-												<c:set var="isBreak" value="false" ></c:set>
-												<c:forEach items="${_cfg.sslList}" var="cfg">
-													<c:choose>
-														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
-															<div class="row boxSolid ${tabName}${status.index}">
-																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
-															</div>
-															<c:set var="isBreak" value="true" ></c:set>
-															<c:if test="${region.configServiceType ne 'subscribe_id' }">
-																<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
-															</c:if>
-														</c:when>
-													</c:choose>
-												</c:forEach>
-												<c:if test="${!isBreak}">
-													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
-													</div>
-															<c:if test="${region.configServiceType ne 'subscribe_id' }">
-																<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
-															</c:if>
-												</c:if>
-											</c:when>
 											<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
 												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp
index 1eebb9e1c..79296b282 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipSubList.jsp
@@ -120,58 +120,6 @@
 			</c:if>
 			</c:forEach>
 	</c:if>
-	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.sslList) >0)}">
-		<c:forEach items="${_cfg.sslList}" var="cfg">
-			<c:if test="${region[1] eq cfg.cfgType }">
-				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
-					<div class="row">
-						<div class="col-md-8">
-							<div class="form-group">
-								<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
-							</div>
-						</div>
-					</div>
-					<div class="row">
-						<div class="col-md-4">
-							<div class="form-group">
-								<label><spring:message code='expression_type' />:</label>
-								<label>
-									<c:choose>
-										<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
-										<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
-									</c:choose>
-								</label>
-							</div>
-						</div>
-						</div>
-						<div class="row">
-						<div class="col-md-4">
-							<div class="form-group">
-								<label><spring:message code='match_method' />:</label>
-								<label>
-									<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-										<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
-									</c:forEach>
-								</label>
-							</div>
-						</div>
-						</div>
-						<div class="row">
-						<div class="col-md-4">
-							<div class="form-group">
-								<label><spring:message code='whether_hexbinary' />:</label>
-								<label>
-									<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-										<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
-									</c:forEach>
-								</label>
-							</div>
-						</div>
-					</div>
-				</div>
-			</c:if>
-		</c:forEach>
-	</c:if>
 	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.ntcSubscribeIdCfgList) >0)}">
 		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 			<c:if test="${region[1] eq cfg.cfgType }">

From 13ad6d7199c8d5ee3bf129f9082c98abfb1fce42 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Sat, 25 Aug 2018 10:33:16 +0800
Subject: [PATCH 05/39] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=91=98=E8=A6=81IsVal?=
 =?UTF-8?q?id=E3=80=81IsAudit=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9=E6=97=B6?=
 =?UTF-8?q?,=E5=9F=9F=E9=85=8D=E7=BD=AE=E4=B9=9F=E7=9B=B8=E5=BA=94?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/FileTransferCfgService.java | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
index f0b8dcabd..4f165e93a 100644
--- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
@@ -501,8 +501,13 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 			entity.setFunctionId(functionId);
 			fileTransferCfgDao.updateFileDigestCfg(entity);
 			
-			entity = fileTransferCfgDao.getFileDigest(Long.parseLong(id));
-			
+			entity = this.getFileDigestCfg(Long.parseLong(id));
+			// 修改子域配置状态
+			if((entity.getNtcSubscribeIdCfgList() != null) && (entity.getNtcSubscribeIdCfgList().size() > 0)) {
+				NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
+				BeanUtils.copyProperties(entity, cfg, new String[] {"cfgId"});
+				stringCfgDao.updateSubscribeIdCfg(cfg);
+			}
 			AreaIpCfg areaIpCfg=new AreaIpCfg();
 			BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
 																	,"cfgType"
@@ -522,20 +527,24 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 		entity.setAuditTime(auditTime);
 		fileTransferCfgDao.updateFileDigestCfg(entity);
 		
-		entity = fileTransferCfgDao.getFileDigest(Long.parseLong(id));
+		entity = this.getFileDigestCfg(Long.parseLong(id));
+		// 修改域配置审核状态
+		if((entity.getNtcSubscribeIdCfgList() != null) && (entity.getNtcSubscribeIdCfgList().size() > 0)) {
+			NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
+			BeanUtils.copyProperties(entity, cfg, new String[] {"cfgId"});
+			stringCfgDao.updateSubscribeIdCfg(cfg);
+		}
+		
 		List list=new ArrayList();
 		list.add(entity);
-		
 		AreaIpCfg areaIpCfg=new AreaIpCfg();
 		BeanUtils.copyProperties(entity, areaIpCfg,new String[]{"cfgRegionCode"
 																,"cfgType"
 																,"cfgId"
 																});
 		areaIpCfgDao.updateAreaIpCfgValid(areaIpCfg);
-		
 		List<AreaIpCfg> areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
 		
-		
 		ToMaatBean maatBean = new ToMaatBean();		
 		MaatCfg maatCfg = new MaatCfg();
 		List<MaatCfg> configCompileList = new ArrayList();

From c8a6dd40557e4d14bcf1ca2a02c43836502e9221 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Sat, 25 Aug 2018 11:42:24 +0800
Subject: [PATCH 06/39] =?UTF-8?q?ip=E5=9C=B0=E5=9D=80=E6=B7=BB=E5=8A=A0NTC?=
 =?UTF-8?q?=5FSUBSCRIBE=5FID=EF=BC=8C=E4=B8=A2=E5=BC=83=E5=92=8C=E5=9B=9E?=
 =?UTF-8?q?=E6=B5=81=E4=B8=8D=E5=8A=A0NTC=5FSUBSCRIBE=5FID=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E4=B8=8D=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/ntc/IpController.java       | 115 ++--
 .../ntc/WhiteListController.java              |   2 +-
 .../nis/web/dao/configuration/IpCfgDao.java   |   2 +-
 .../nis/web/dao/configuration/IpCfgDao.xml    |  88 +--
 .../service/configuration/IpCfgService.java   | 149 +++--
 .../sql/update_function_region_dict_data.sql  |   7 +-
 src/main/webapp/WEB-INF/sitemesh3.xml         |   1 +
 .../WEB-INF/views/cfg/ipaddr/ipForm.jsp       | 558 ++++++++++++------
 .../WEB-INF/views/cfg/ipaddr/ipList.jsp       | 452 ++++++++++++++
 .../WEB-INF/views/cfg/ipaddr/ipSubList.jsp    | 176 ++++++
 10 files changed, 1206 insertions(+), 344 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
 create mode 100644 src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp

diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
index d5696f3ac..3af0f780f 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
@@ -1,10 +1,13 @@
 package com.nis.web.controller.configuration.ntc;
 
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -15,15 +18,18 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import com.nis.domain.Page;
 import com.nis.domain.SysDataDictionaryItem;
-import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.IpPortCfg;
+import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.domain.configuration.template.IpAddrTemplate;
 import com.nis.domain.configuration.template.IpsecTemplate;
 import com.nis.domain.configuration.template.TunnelIpTemplate;
-import com.nis.util.Constants;
+import com.nis.exceptions.MaatConvertException;
 import com.nis.util.DictUtils;
 import com.nis.web.controller.configuration.CommonController;
+import com.nis.web.security.UserUtils;
 
 /**
  * IP相关配置控制类
@@ -35,54 +41,87 @@ import com.nis.web.controller.configuration.CommonController;
 public class IpController extends CommonController{
 	@RequestMapping(value = {"list"})
 //	@RequiresPermissions(value={"iplist:config","iplist:confirm"},logical=Logical.OR)
-	public String list(String cfgName,Model model,@ModelAttribute("cfg")IpPortCfg cfg,HttpServletRequest request,HttpServletResponse response) {
-		this._ipList(cfgName, model, cfg, request, response);
-		model.addAttribute("urlPrefix","/ntc/iplist");
-		model.addAttribute("requiresPermissionPrefix","iplist");
-		return "/cfg/common/ipList";
+	public String list(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) {
+		Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");
+		Page<CfgIndexInfo> page = ipCfgService.getIpCfgList(searchPage, cfg);
+		model.addAttribute("page", page);
+		initPageCondition(model,cfg);
+		return "/cfg/ipaddr/ipList";
 	}
 	@RequestMapping(value = {"form"})
 	@RequiresPermissions(value={"iplist:config"})
-	public String form(String cfgName,Model model,String ids,Integer functionId,BaseIpCfg entity) {
-		this._ipForm(cfgName, model, ids, functionId, entity);
-		List<SysDataDictionaryItem>  specialFunctionIdList = DictUtils.getDictList("SPECIAL_FUNCTION_ID");
-		String specialFunctionId=null;
-		for(SysDataDictionaryItem item:specialFunctionIdList) {
-			if(Integer.parseInt(item.getItemCode())==entity.getFunctionId().intValue()) {
-				specialFunctionId=	item.getItemValue();
-				break;
-			}
+	public String form(Model model,String ids,CfgIndexInfo entity) {
+		if(StringUtils.isNotBlank(ids)){
+			entity = ipCfgService.getIpPortCfg(Long.parseLong(ids));
+			initUpdateFormCondition(model,entity);
+		}else{
+			initFormCondition(model,entity);
 		}
-		model.addAttribute("dropAction",Constants.DROP_ACTION);
-		model.addAttribute("urlPrefix","/ntc/iplist");
-		model.addAttribute("requiresPermissionPrefix","iplist");
-//		if(specialFunctionId!=null && "ipsec".equals(specialFunctionId)) {
-//			return "/cfg/ipsec/ipForm";
-//		}else if(specialFunctionId!=null && "ipaddr".equals(specialFunctionId)) {
-//			return "/cfg/ipaddr/ipForm";
-//		}
-		return "/cfg/common/ipForm";
+		model.addAttribute("_cfg", entity);
+		return "/cfg/ipaddr/ipForm";
 	}
 	@RequestMapping(value = {"saveOrUpdate"})
-	public String saveOrUpdate(String cfgName,RedirectAttributes model, IpPortCfg cfg) {
-		this._saveOrUpdateIp(cfgName, model, cfg);
-		return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+cfg.getFunctionId();
+	public String saveOrUpdate(RedirectAttributes model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
+		ipCfgService.saveIpCfg(entity);
+		return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 	}
-	@RequestMapping(value = {"delete"})
+	@RequestMapping(value = {"ajaxSubList"})
+	public String ajaxIpPortSubList(Model model,Long cfgId,Integer index) {
+		CfgIndexInfo cfg = ipCfgService.getIpPortCfg(cfgId);
+		/*List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(cfg.getFunctionId());
+		model.addAttribute("regionList", regionList);*/
+		List<String[]> tabList = new ArrayList();
+		if(cfg.getIpPortList()!=null){
+			String cfgType = null;
+			for(IpPortCfg ip:cfg.getIpPortList()){
+				if(!ip.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"1",ip.getCfgType()});
+					cfgType = ip.getCfgType();
+				}
+			}
+		}
+		if(cfg.getNtcSubscribeIdCfgList()!=null){
+			String cfgType = null;
+			for(NtcSubscribeIdCfg keyword:cfg.getNtcSubscribeIdCfgList()){
+				if(!keyword.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"2",keyword.getCfgType()});
+					cfgType = keyword.getCfgType();
+				}
+			}
+		}
+		model.addAttribute("_cfg", cfg);	
+		model.addAttribute("index", index);
+		model.addAttribute("tabList", tabList);
+		return "/cfg/ipaddr/ipSubList";
+	}
+	@RequestMapping(value = {"updateValid"})
 	@RequiresPermissions("iplist:config")
-	public String delete(String cfgName,String ids,String compileIds,Integer functionId,RedirectAttributes model) {
-		this._deleteIp(cfgName, ids, compileIds, functionId, model);
-		model.addAttribute("urlPrefix","/ntc/iplist");
-		model.addAttribute("requiresPermissionPrefix","iplist");
+	public String updateIpPortCfgValid(Integer isValid,String ids,Integer functionId) {
+		ipCfgService.updateIpCfgValid(isValid, ids, functionId);
 		return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+functionId;
 	}
+	
 	@RequestMapping(value = {"audit"})
 	@RequiresPermissions("iplist:confirm")
-	public String audit(String cfgName,String ids,IpPortCfg cfg,RedirectAttributes redirectAttributes) {
-		this._auditIp(cfgName, ids, cfg, redirectAttributes);
-		redirectAttributes.addAttribute("urlPrefix","/ntc/iplist");
-		redirectAttributes.addAttribute("requiresPermissionPrefix","iplist");
-		return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+cfg.getFunctionId();
+	public String audit(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
+		CfgIndexInfo entity = new CfgIndexInfo();
+		String[] idArray = ids.split(",");
+		for(String id :idArray){
+			entity = ipCfgService.getIpPortCfg(Long.parseLong(id));
+			entity.setIsAudit(isAudit);
+			entity.setIsValid(isValid);
+			entity.setAuditorId(UserUtils.getUser().getId());
+			entity.setAuditTime(new Date());
+			entity.setFunctionId(functionId);
+			try {
+				ipCfgService.auditIpCfg(entity,isAudit);
+			} catch (MaatConvertException e) {
+				e.printStackTrace();
+				logger.info("ssl配置下发失败："+e.getMessage());
+				addMessage(redirectAttributes, e.getMessage());
+			}
+		}
+		return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+functionId;
 	}
 	//ip配置导入
 	@RequestMapping(value = "import", method=RequestMethod.POST)
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
index 7637e0646..6f9053e26 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
@@ -41,7 +41,7 @@ public class WhiteListController extends CommonController{
 	//@RequiresPermissions(value={"whitelist:ip:config","whitelist:ip:confirm","whitelist:ip:aduit"},logical=Logical.OR)
 	public String ipList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) {
 		Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");
-		Page<CfgIndexInfo> page = ipCfgService.getWhiteIpList(searchPage, cfg);
+		Page<CfgIndexInfo> page = ipCfgService.getIpCfgList(searchPage, cfg);
 		model.addAttribute("page", page);
 		initPageCondition(model,cfg);
 		return "/cfg/whitelist/ipList";
diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
index 4d199f3f3..cc42353ba 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
@@ -44,6 +44,6 @@ public interface IpCfgDao extends CrudDao<BaseIpCfg>{
 	public void deleteIpCfg(CfgIndexInfo entity);
 	public void updateCfgValid(BaseCfg entity);
 	public void auditCfg(BaseCfg entity);
-	public List<CfgIndexInfo> getWhiteIpList(CfgIndexInfo entity);
+	public List<CfgIndexInfo> getIpCfgList(CfgIndexInfo entity);
 	
 }
diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
index b7a3b6316..374786c29 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
@@ -1001,7 +1001,7 @@
 			and function_id=#{functionId,jdbcType=INTEGER}
 	</trim>
   </update>
-  <select id="getWhiteIpList" resultMap="CfgIndexInfoMap" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
+  <select id="getIpCfgList" resultMap="CfgIndexInfoMap" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
 		SELECT 
 	    <include refid="ConfigIndex_Column" />
 	    <trim prefix="," prefixOverrides=",">
@@ -1073,92 +1073,6 @@
 	    	<if test="functionId != null">
 	    		AND a.function_id=#{functionId,jdbcType=INTEGER}
 	    	</if>
-	    	<if test="ipPort!=null">
-	    		AND a.compile_id in (select t.compile_id from ip_port_cfg t 
-	    		<where>
-	    			<if test="functionId != null">
-			    		AND t.function_id=#{functionId,jdbcType=INTEGER}
-			    	</if>
-	    			<if test="ipPort.srcIpAddress != null and ipPort.srcIpAddress != ''">
-	    				and  t.src_ip_address =#{(ipPort.srcIpAddress,jdbcType=VARCHAR}
-		    		</if>
-		    		<if test="ipPort.srcPort != null  and ipPort.srcPort != ''">
-		    			and  t.src_port =#{ipPort.srcPort,jdbcType=VARCHAR}
-		    		</if>
-		    		<if test="ipPort.destIpAddress != null and ipPort.destIpAddress != ''">
-	    				and  t.dest_ip_address =#{(ipPort.destIpAddress,jdbcType=VARCHAR}
-		    		</if>
-		    		<if test="ipPort.destPort != null  and ipPort.destPort != ''">
-		    			and  t.dest_port =#{ipPort.destPort,jdbcType=VARCHAR}
-		    		</if>
-	    		</where>
-	    		 )
-	    	</if>
-	    	<if test="httpUrl!=null">
-	    		AND a.compile_id in (select f.compile_id from http_url_cfg f
-	    		<where>
-	    			<if test="httpUrl.cfgKeywords != null and httpUrl.cfgKeywords != ''">
-	    				and  f.cfg_keywords  like concat(concat('%',#{httpUrl.cfgKeywords,jdbcType=VARCHAR}),'%')
-		    		</if>
-
-	    		</where>
-	    		 )
-	    	</if>
-	    	<if test="httpReqBody!=null">
-	    		AND a.compile_id in (select f.compile_id from http_body_cfg f
-	    		<where>
-	    			and cfg_type='http_req_body'
-	    			<if test="httpReqBody.cfgKeywords != null and httpReqBody.cfgKeywords != ''">
-	    				and  f.cfg_keywords  like concat(concat('%',#{httpReqBody.cfgKeywords,jdbcType=VARCHAR}),'%')
-		    		</if>
-
-	    		</where>
-	    		 )
-	    	</if>
-	    	<if test="httpResBody!=null">
-	    		AND a.compile_id in (select f.compile_id from http_body_cfg f
-	    		<where>
-	    			and cfg_type='http_res_body'
-	    			<if test="httpResBody.cfgKeywords != null and httpResBody.cfgKeywords != ''">
-	    				and  f.cfg_keywords  like concat(concat('%',#{httpResBody.cfgKeywords,jdbcType=VARCHAR}),'%')
-		    		</if>
-
-	    		</where>
-	    		 )
-	    	</if>
-	    	<if test="httpReqHdr!=null">
-	    		AND a.compile_id in (select f.compile_id from http_req_head_cfg f
-	    		<where>
-	    			<if test="httpReqHdr.cfgKeywords != null and httpReqHdr.cfgKeywords != ''">
-	    				and  f.cfg_keywords  like concat(concat('%',#{httpReqHdr.cfgKeywords,jdbcType=VARCHAR}),'%')
-		    		</if>
-					<if test="httpReqHdr.district != null and httpReqHdr.district != ''">
-	    				and  f.district  like concat(concat('%',#{httpReqHdr.district,jdbcType=VARCHAR}),'%')
-		    		</if>
-	    		</where>
-	    		 )
-	    	</if>
-	    	<if test="httpResHdr!=null">
-	    		AND a.compile_id in (select f.compile_id from http_res_head_cfg f
-	    		<where>
-	    			<if test="httpResHdr.cfgKeywords != null and httpResHdr.cfgKeywords != ''">
-	    				and  f.cfg_keywords  like concat(concat('%',#{httpResHdr.cfgKeywords,jdbcType=VARCHAR}),'%')
-		    		</if>
-					<if test="httpResHdr.district != null and httpResHdr.district != ''">
-	    				and  f.district  like concat(concat('%',#{httpResHdr.district,jdbcType=VARCHAR}),'%')
-		    		</if>
-	    		</where>
-	    		 )
-	    	</if>
-	    	<!-- <if test="sslCfg!=null">
-	    		AND a.compile_id in (select f.compile_id from ssl_keyword_cfg f
-	    		<where>
-	    			<if test="sslCfg.cfgKeywords != null and sslCfg.cfgKeywords != ''">
-	    				and  f.cfg_keywords  like concat(concat('%',#{sslCfg.cfgKeywords,jdbcType=VARCHAR}),'%')
-		    		</if>
-	    		</where>
-	    		 )
-	    	</if> -->
 	    	<!-- 数据范围过滤 -->
 			${sqlMap.dsf}
 	    </trim>
diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
index 76e510c51..8de70dda0 100644
--- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
@@ -495,10 +495,10 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 		}
 	}
 	public void auditIpCfg(CfgIndexInfo entity,Integer isAudit) throws MaatConvertException{
+		Properties props=this.getMsgProp();
 		//修改数据库审核状态信息
 		entity.setTableName(CfgIndexInfo.getTablename());
 		ipCfgDao.auditCfg(entity);
-		
 		ToMaatBean maatBean = new ToMaatBean();		
 		MaatCfg maatCfg = new MaatCfg();
 		List<MaatCfg> configCompileList = new ArrayList();
@@ -508,10 +508,22 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 		List<NumBoundaryCfg> numRegionList = new ArrayList();
 		List<DigestCfg> digestRegionList = new ArrayList();
 		List<IpCfg> areaIpRegionList = new ArrayList();
-		
+		//获取region
+		List<FunctionRegionDict> dictList =  DictUtils.getFunctionRegionDictList(entity.getFunctionId());
+		int maatType=0;
 		//查询子配置并修改审核状态
 		entity = this.getIpPortCfg(entity.getCfgId());
 		if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
+			//判断下发类型是走maat还是callback
+			String regionValue=entity.getIpPortList().get(0).getCfgType();
+			if(regionValue!=null) {
+				for(FunctionRegionDict region:dictList) {
+					if(regionValue.equals(region.getConfigRegionValue())) {
+						maatType=region.getIsMaat();
+						break;
+					}
+				}
+			}
 			IpPortCfg cfg = new IpPortCfg();
 			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
 			cfg.setTableName(IpPortCfg.getTablename());
@@ -551,48 +563,95 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 		}
 		//构造提交综合服务参数格式，一条配置提交一次综合服务
 		if(isAudit==1){
-			maatCfg.initDefaultValue();
-			BeanUtils.copyProperties(entity, maatCfg);
-			maatCfg.setAction(entity.getAction());
-			maatCfg.setAuditTime(entity.getAuditTime());
-			maatCfg.setIpRegionList(ipRegionList);
-			maatCfg.setStrRegionList(strRegionList);
-			maatCfg.setNumRegionList(numRegionList);
-			maatCfg.setDigestRegionList(digestRegionList);
-			maatCfg.setGroupRelationList(groupRelationList);
-			maatCfg.setGroupNum(groupRelationList.size());
-			maatCfg.setAreaIpRegionList(areaIpRegionList);
-			maatCfg.setIsValid(entity.getIsValid());
-			
-			configCompileList.add(maatCfg);
-			maatBean.setConfigCompileList(configCompileList);
-			maatBean.setAuditTime(entity.getAuditTime());
-			maatBean.setCreatorName(entity.getCurrentUser().getName());
-			maatBean.setVersion(Constants.MAAT_VERSION);
-			maatBean.setOpAction(Constants.INSERT_ACTION);
-			//调用服务接口下发配置数据
-			String json=gsonToJson(maatBean);
-			logger.info("ip配置下发配置参数："+json);
-			//调用服务接口下发配置
-			ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
-			logger.info("ip配置下发响应信息："+result.getMsg());
-
+			if(maatType==Constants.CALLBACK_TYPE){
+				List<InlineIp> ipList=new ArrayList<>();
+				for(IpPortCfg cfg :entity.getIpPortList()) {
+					BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+					InlineIp ip=convertCallBackIp(cfg,null);
+					ipList.add(ip);
+				}
+				//调用服务接口下发配置数据
+				String json=gsonToJson(ipList);
+				logger.info("IP配置下发配置参数："+json);
+				//调用服务接口下发配置
+				try {
+					ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
+					if(result!=null){
+						logger.info("IP配置配置下发响应信息："+result.getMsg());
+					}
+				} catch (Exception e) {
+					logger.error("IP配置配置下发失败",e);
+					throw e;
+				}
+			}else if(maatType==Constants.MAAT_TYPE){
+				maatCfg.initDefaultValue();
+				BeanUtils.copyProperties(entity, maatCfg);
+				maatCfg.setAction(entity.getAction());
+				maatCfg.setAuditTime(entity.getAuditTime());
+				maatCfg.setIpRegionList(ipRegionList);
+				maatCfg.setStrRegionList(strRegionList);
+				maatCfg.setNumRegionList(numRegionList);
+				maatCfg.setDigestRegionList(digestRegionList);
+				maatCfg.setGroupRelationList(groupRelationList);
+				maatCfg.setGroupNum(groupRelationList.size());
+				maatCfg.setAreaIpRegionList(areaIpRegionList);
+				maatCfg.setIsValid(entity.getIsValid());
+				
+				configCompileList.add(maatCfg);
+				maatBean.setConfigCompileList(configCompileList);
+				maatBean.setAuditTime(entity.getAuditTime());
+				maatBean.setCreatorName(entity.getCurrentUser().getName());
+				maatBean.setVersion(Constants.MAAT_VERSION);
+				maatBean.setOpAction(Constants.INSERT_ACTION);
+				//调用服务接口下发配置数据
+				String json=gsonToJson(maatBean);
+				logger.info("ip配置下发配置参数："+json);
+				//调用服务接口下发配置
+				ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+				logger.info("ip配置下发响应信息："+result.getMsg());
+			}else {
+				throw new RuntimeException("<spring:message code=\"request_service_failed\"/>:"+props.getProperty("unknown_cfg_type"));
+			}
 		}else if(isAudit==3){
-			maatCfg.setCompileId(entity.getCompileId());
-			maatCfg.setServiceId(entity.getServiceId());
-			maatCfg.setIsValid(0);//无效
-			configCompileList.add(maatCfg);
-			maatBean.setConfigCompileList(configCompileList);
-			maatBean.setAuditTime(entity.getAuditTime());
-			maatBean.setCreatorName(entity.getCurrentUser().getName());
-			maatBean.setVersion(Constants.MAAT_VERSION);
-			maatBean.setOpAction(Constants.UPDATE_ACTION);
-			//调用服务接口取消配置
-			String json=gsonToJson(maatBean);
-			logger.info("ip配置下发配置参数："+json);
-			//调用服务接口下发配置
-			ToMaatResult result = ConfigServiceUtil.put(json,1);
-			logger.info("ip配置取消配置响应信息："+result.getMsg());
+			if(maatType==Constants.CALLBACK_TYPE){
+				List<InlineIp> ipList=new ArrayList<>();
+				for(IpPortCfg cfg :entity.getIpPortList()) {
+					BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
+					InlineIp ip=convertCallBackIp(cfg,null);
+					ipList.add(ip);
+				}
+				//调用服务接口下发配置数据
+				String json=gsonToJson(ipList);
+				logger.info("IP配置下发配置参数："+json);
+				//调用服务接口下发配置
+				try {
+					ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
+					if(result!=null){
+						logger.info("IP配置配置下发响应信息："+result.getMsg());
+					}
+				} catch (Exception e) {
+					logger.error("IP配置配置下发失败",e);
+					throw e;
+				}
+			}else if(maatType==Constants.MAAT_TYPE){
+				maatCfg.setCompileId(entity.getCompileId());
+				maatCfg.setServiceId(entity.getServiceId());
+				maatCfg.setIsValid(0);//无效
+				configCompileList.add(maatCfg);
+				maatBean.setConfigCompileList(configCompileList);
+				maatBean.setAuditTime(entity.getAuditTime());
+				maatBean.setCreatorName(entity.getCurrentUser().getName());
+				maatBean.setVersion(Constants.MAAT_VERSION);
+				maatBean.setOpAction(Constants.UPDATE_ACTION);
+				//调用服务接口取消配置
+				String json=gsonToJson(maatBean);
+				logger.info("ip配置下发配置参数："+json);
+				//调用服务接口下发配置
+				ToMaatResult result = ConfigServiceUtil.put(json,1);
+				logger.info("ip配置取消配置响应信息："+result.getMsg());
+			}else {
+				throw new RuntimeException("<spring:message code=\"request_service_failed\"/>:"+props.getProperty("unknown_cfg_type"));
+			}
 		}
 	}
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
@@ -740,10 +799,10 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 		}
 		return msgProp;
 	}
-	public Page<CfgIndexInfo> getWhiteIpList(Page<CfgIndexInfo> page, CfgIndexInfo entity) {
+	public Page<CfgIndexInfo> getIpCfgList(Page<CfgIndexInfo> page, CfgIndexInfo entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"a"));
 		entity.setPage(page);
-		List<CfgIndexInfo> list = ipCfgDao.getWhiteIpList(entity);
+		List<CfgIndexInfo> list = ipCfgDao.getIpCfgList(entity);
 		page.setList(list);
 		return page;
 	}
diff --git a/src/main/resources/sql/update_function_region_dict_data.sql b/src/main/resources/sql/update_function_region_dict_data.sql
index c66e6d8d7..1fefff423 100644
--- a/src/main/resources/sql/update_function_region_dict_data.sql
+++ b/src/main/resources/sql/update_function_region_dict_data.sql
@@ -10,8 +10,11 @@ INSERT INTO function_region_dict (config_service_type,config_multi_keywords,conf
 VALUES('subscribe_id',0,'0,1','0,1,2','0,1,2,3',4,2,'WHITE_LIST_SUBSCRIBE_ID','全局域名白名单SUBSCRIBE配置',1,1,2,2);
 UPDATE function_service_dict SET region_code='1,2' WHERE function_id=4 AND ACTION=128
 #ip地址
-UPDATE function_service_dict SET region_code=1 WHERE function_id=5 AND ACTION IN(16,1);
-UPDATE function_service_dict SET region_code=2 WHERE function_id=5 AND ACTION IN(32,96);
+INSERT INTO function_region_dict (config_service_type,config_multi_keywords,config_expr_type,config_hex,config_match_method
+,function_id,config_region_code,config_region_value,config_desc,is_valid,is_maat,region_type,config_region_sort)
+VALUES('subscribe_id',0,'0,1','0,1,2','0,1,2,3',5,3,'NTC_SUBSCRIBE_ID','IP地址SUBSCRIBE配置',1,1,2,2);
+UPDATE function_service_dict SET region_code='1,3' WHERE function_id=5 AND ACTION IN(16,1);
+UPDATE function_service_dict SET region_code='2,3' WHERE function_id=5 AND ACTION IN(32,96);
 UPDATE function_region_dict SET config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17' WHERE dict_id=27;
 UPDATE function_region_dict SET config_service_type='ipaddr',config_ip_port_show='1,2' ,config_ip_type='4,6,46,64,10',config_ip_pattern='1,2,3',config_port_pattern='1,2',config_direction='0,1',config_protocol='0,6,17,1' WHERE dict_id=35;
 #ip限流
diff --git a/src/main/webapp/WEB-INF/sitemesh3.xml b/src/main/webapp/WEB-INF/sitemesh3.xml
index d323a8666..3ee20bec4 100644
--- a/src/main/webapp/WEB-INF/sitemesh3.xml
+++ b/src/main/webapp/WEB-INF/sitemesh3.xml
@@ -34,6 +34,7 @@
   <mapping path="/nis/proxy/intercept/ajax*" exclue="true"/>
   <mapping path="/nis/ntc/whitelist/ip/ajax*" exclue="true"/>
   <mapping path="/nis/ntc/whitelist/domain/ajax*" exclue="true"/>
+  <mapping path="/nis/ntc/iplist/ajax*" exclue="true"/>
   <!-- 对同一路径，启用多个装饰器 -->
   <mapping>
     <path>/articles/*</path>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
index daee16f48..bc94f17b8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
@@ -3,190 +3,408 @@
 <html>
 <head>
 <title><spring:message code="${cfgName}"></spring:message></title>
+
+<style type="text/css">
+.boxSolid {
+	border: 1px solid #eeeeee
+}
+</style>
 <script type="text/javascript">
-$(function(){
-	if($("input[name='action']:checked").val()==0x20||$("input[name='action']:checked").val()==0x60){
-		$("#cfgRegionCode").val($("#cfgRegionCodeCallback").val());	
-		$("#cfgType").val($("#cfgTypeCallback").val());	
-	}else{
-		$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());	
-		$("#cfgType").val($("#cfgTypeMaat").val());	
+	$(document)
+			.ready(
+					function() {
+						/*initCommIpVal();
+						 $("#cancel").on("click", function() {
+							window.history.back();
+						});*/
+						var action=$(".action:checked").val();
+						if(action==32||action==96){
+							$(".subscribeId").find(".glyphicon-remove").click();
+							$(".subscribeId").prev("h4").addClass("hidden");
+						}
+						var regionCodes=$(".action:checked").attr("regionCode").split(",");
+						$("h4[class*='ipPortListTitle']").each(function(){
+							var has=false;
+							for(var ind in regionCodes){
+								if($(this).hasClass("ipPortListTitle"+regionCodes[ind])){
+									has=true;
+								}
+							}
+							if(!has){
+								$(this).html("");
+							}
+						});
+						$(".action").on("change", function() {
+							$("#serviceId").val($(this).attr("serviceId"));
+							$("#protocolId").val($(this).attr("protocolId"));
+							switchAction($(this).val());
+							var regioncode=$(this).attr("regioncode");
+							var hasRegioncode=false;
+							var arr=regioncode.split(',');
+							var cfgType,cfgRegionCode;
+							for(var re in arr){
+								if($("[id='cfgRegionCode"+arr[re]+"']")&&$("[id='cfgRegionCode"+arr[re]+"']").attr("regionType")==1){
+									regioncode=arr[re];
+									cfgType=$("[id='cfgType"+arr[re]+"']").val();
+									cfgRegionCode=$("[id='cfgRegionCode"+arr[re]+"']").val();
+									
+								}
+							}
+							$("h4[class*='ipPortListTitle']").each(function(){
+								var html="<spring:message code='"+cfgType+"'/>";
+								console.log(html);
+								$(this).find(".ipPortTitle").html(html);
+							});
+							var tabInfo=$(".ipPortList");
+							if(tabInfo){
+								tabInfo.find("[name$='cfgType']").val(cfgType);
+								tabInfo.find("[name$='cfgRegionCode']").val(cfgRegionCode);
+								//丢弃回流没有subscribeId
+								if($(this).val()==32||$(this).val()==96){
+									$(".subscribeId").find(".glyphicon-remove").click();
+									$(".subscribeId").prev("h4").addClass("hidden");
+								}else{
+									$(".subscribeId").prev("h4").removeClass("hidden");
+								}
+								//处理ICMP
+								if($(this).val()==32){
+									tabInfo.find("select[name$='protocol'] option[value='1']").removeAttr("disabled");
+									tabInfo.find("select[name$='protocol']").selectpicker("refresh");
+								}else{
+									tabInfo.find("select[name$='protocol'] option[value='1']").attr("disabled",true);
+									tabInfo.find("select[name$='protocol']").selectpicker("refresh");
+								}
+								
+							}
+						}); 
+						$("#serviceId").val($(".action:checked").attr("serviceId"));
+						$("#protocolId").val($(".action:checked").attr("protocolId"));
+						$("#cfgFrom").validate(
+								{
+									errorPlacement : function(error, element) {
+										$(element).parents(".form-group").find(
+												"div[for='"
+														+ element.attr("name")
+														+ "']").append(error);
+									},
+									submitHandler : function(form) {
+										//loading('onloading...');
+										var flag = true;
+										var subscribeId=0;
+										//存在隐藏的subscribeId，不算进域配置
+										if($(".boxSolid.hidden").hasClass("subscribeId")){
+											subscribeId=1;
+										}
+										//代表所有业务都隐藏了，提示必须增加一种业务数据
+										if(($(".boxSolid").length-1) ==($(".boxSolid.hidden").length-subscribeId)){
+											top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+											return;
+										}
+										//代表所有区域都隐藏了，提示必须增加个区域信息
+										if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){
+											if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click();
+											if($("#areaIp").hasClass("hidden")) $("#areaIsp").find(".glyphicon-plus").click();
+											top.$.jBox.tip("<spring:message code='one_more_area'/>", "<spring:message code='info'/>");
+											return;
+										}
+										$(".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;
+											}
+										});
+										//keywords非空校验完成校验二进制字符串
+										$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
+											var isHexbin=$(this).val();
+											if(isHexbin == 1){ //十六进制 
+												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												if(keywords != ''){
+													if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
+														$(this).parents(".boxSolid").find(
+																"div[for='"
+																		+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+																		+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
+														flag = false;
+													}
+												}						
+											}
+										});
+										var flag1=validateInvisibleCharTag();
+										if(flag){
+											flag=flag1;
+										}
+										if(flag){
+											//将disable属性的元素删除
+											$(".disabled").each(function(){
+												$(this).remove();
+											});
+											$("input[name$='exprType']").attr("disabled",false);
+											loading('onloading...');
+											form.submit();
+										}else{
+											return;
+										}
+										
+									},
+									errorContainer : "#messageBox",
+								});
+						//业务内容增加
+						/* $("span[title='add']").on("click", function() {
+							$(".ipPort0").removeClass("hidden");
+						}); */
+
+					});
+
+	//业务窗口打开
+	var addContent = function(obj, contentClassName) {
+		var showDiv = $(obj).parent().parent().next();
+		$(showDiv).removeClass("hidden").removeClass(
+				"disabled");
+		/* $("."+contentClassName+"0").find("input,select").each(function(){
+			$(this).removeAttr("disabled");
+		}); */
+		$(obj).addClass("hidden");
 	}
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
-	$(".action").on("change", function() {
-		$("#serviceId").val($(this).attr("serviceId"));
-		$("#protocolId").val($(this).attr("protocolId"));
-		if($(this).val()==0x20||$(this).val()==0x60){
-			$("#cfgRegionCode").val($("#cfgRegionCodeCallback").val());	
-			$("#cfgType").val($("#cfgTypeCallback").val());	
-			$("input[name='isAreaEffective']").each(function(){
-				if($(this).val()==0){
-					$(this).click();
-				}
-			})
-		}else{
-			$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());	
-			$("#cfgType").val($("#cfgTypeMaat").val());	
-		}
-		
-	});
-	if('${fn:length(serviceList)}'>1){
-		$("#serviceId").val($(".action:checked").attr("serviceId"));
-		$("#protocolId").val($(".action:checked").attr("protocolId"));
+
+	//业务窗口关闭
+	var delContent = function(contentClassName, addBtnClassName) {
+		$("." + contentClassName).addClass("hidden").addClass("disabled");
+		/* $("."+contentClassName).find("input,select").each(function(){
+			$(this).attr("disabled","true");
+		}); */
+		$("." + addBtnClassName).removeClass("hidden");
 	}
-	if($("[name='action']:checked").val()=="${dropAction}"){
-		$("[name='protocol']").append('<option class="icmp" value="1" <c:if test="${_cfg.protocol==1}">selected</c:if>><spring:message code="ICMP"/></option>');
-		$("[name='protocol']").selectpicker("render");
-		$("[name='protocol']").selectpicker("refresh");
-	}
-	$("[name='action']").on("click",function(){
-		if($(this).val()=="${dropAction}"){
-			$("[name='protocol']").append('<option class="icmp" value="1" <c:if test="${_cfg.protocol==1}">selected</c:if>><spring:message code="ICMP"/></option>');
-		}else{
-			if($("[name='protocol'] option[value='1']")){
-				if($("[name='protocol'] option[value='1']").is(":selected")){
-					$("[name='protocol'] option[value='1']").removeAttr("selected");
-					$("[name='protocol']").val(0);
-				}
-				$("[name='protocol'] option[value='1']").remove();
-			}
-			
-		}
-		$("[name='protocol']").selectpicker("render");
-		$("[name='protocol']").selectpicker("refresh");
-	});
-	$("#ipCfgFrom").validate({
-		errorPlacement: function(error,element){
-			$(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
-		},
-		submitHandler: function(form){
-			loading('<spring:message code="onloading"/>');
-			form.submit();
-		},
-		errorContainer: "#messageBox"
-	});
-});
 </script>
 </head>
 <body>
-<div class="page-content">
-	<h3 class="page-title">
-		<spring:message code="${cfgName}"></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>
-                        <c:if test="${empty _cfg.cfgId}"><spring:message code="add"></spring:message></c:if>
-						<c:if test="${not empty _cfg.cfgId}"><spring:message code="edit"></spring:message></c:if>
+	<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="ip_control"></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>
+							<c:if test="${empty _cfg.cfgId}">
+								<spring:message code="add"></spring:message>
+							</c:if>
+							<c:if test="${not empty _cfg.cfgId}">
+								<spring:message code="edit"></spring:message>
+							</c:if>
+						</div>
 					</div>
-                  </div>
-                  <div class="portlet-body form">
-                      <!-- BEGIN FORM-->
-                      <form id="ipCfgFrom" action="${ctx}${urlPrefix}/saveOrUpdate" method="post" class="form-horizontal">
-                          <div class="form-body row">
-                            <input name="cfgName" type="hidden" value="${cfgName}"/>
-                            <input type="hidden" name="cfgId" value="${_cfg.cfgId}">
-                            <input type="hidden" name="compileId" value="${_cfg.compileId}">
-                            <input type="hidden" name="functionId" value="${_cfg.functionId}">
-                            <input type="hidden" id="cfgType" name="cfgType" value="${_cfg.cfgType}">
-	                   		<input type="hidden" id="cfgRegionCode" name="cfgRegionCode" value="${_cfg.cfgRegionCode}">
-                            <c:if test="${fn:length(serviceList)==1}">
-			            	<c:forEach items="${serviceList}" var="service">
-                				<input type="hidden" name="action" value="${service.action }">
-			            	    <input type="hidden" id="serviceId" name="serviceId" value="${service.serviceId}">
-			            	    <input type="hidden" id="protocolId" name="protocolId" value="${service.protocolId}">
-			            	</c:forEach>
-							</c:if>
-							<c:if test="${fn:length(serviceList)>1}">
-							 <input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
-							 <input type="hidden" id="protocolId" name="protocolId" value="${_cfg.protocolId}">
-							</c:if>
-                            <!-- 配置域类型 -->
-                   			<c:forEach items="${regionList}" var="region">
-	                   			<c:if test="${_cfg.functionId eq region.functionId}">
-	                   				<c:if test="${region.isMaat==1}"><!-- is maat -->
-	                   				<input type="hidden" id="cfgTypeMaat" value="${region.configRegionValue}">
-	                   				<input type="hidden" id="cfgRegionCodeMaat" value="${region.configRegionCode}">
-	                   				</c:if>
-	                   				<c:if test="${region.isMaat==2}">
-	                   				<input type="hidden" id="cfgTypeCallback" value="${region.configRegionValue}">
-	                   				<input type="hidden" id="cfgRegionCodeCallback" value="${region.configRegionCode}">
-	                   				</c:if>
-	                   			</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>
-								    <c:if test="${fn:length(serviceList)>1}">
-									    <div class="col-md-6">
-									        <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>>
+					<div class="portlet-body form">
+						<!-- BEGIN FORM-->
+						<form id="cfgFrom" action="${ctx}/ntc/iplist/saveOrUpdate"
+							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}">
+							<input type="hidden" name="createTime" value="${_cfg.createTime}">
+							<input type="hidden" name="creatorId" value="${_cfg.creatorId}">
+							<input type="hidden" id="serviceId" name="serviceId"
+								value="${_cfg.serviceId}">
+							<c:forEach items="${regionList}" var="region">
+	                            <input type="hidden" id="cfgType${region.configRegionCode}" value="${region.configRegionValue}">
+		                   		<input type="hidden" id="cfgRegionCode${region.configRegionCode}"
+		                   		 isMaat="${region.isMaat}"
+		                   		 serviceType="${region.configServiceType}"
+		                   		 ipPortShow="${region.configIpPortShow}"
+		                   		 ipType="${region.configIpType}"
+		                   		 ipPattern="${region.configIpPattern}"
+		                   		 portPattern="${region.configPortPattern}"
+		                   		 direction="${region.configDirection}"
+		                   		 protocol="${region.configProtocol}"
+		                   		 regionType="${region.regionType}"
+		                   		 value="${region.configRegionCode}">
+	                   		</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"><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 }"
+																regionCode="${service.regionCode }"
+																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>
-								   </c:if>
+														</c:if>
+													</label>
+												</c:forEach>
+											</div>
+											<div for="action"></div>
+										</div>
+									</div>
 								</div>
-							<!-- desc and action -->
-							<c:forEach items="${fns:getDictList('SPECIAL_FUNCTION_ID')}" var="sfi">
-								<c:if test="${sfi.itemCode==_cfg.functionId}">
-								<c:set var="specialProtocol" value="${sfi.itemValue}"/>
-								</c:if>
-               				</c:forEach>
-           			   		<%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
-                           	<%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
-                            <%@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">
-                                              <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>
+								<!-- dolog begin-->
+								<div class="row">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+														<c:choose>
+															<c:when test="${dict.itemCode eq _cfg.doLog}">
+																<label class="radio-inline">
+															<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:when>
+															<c:otherwise>
+																<label class="radio-inline">
+																	<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:otherwise>
+														</c:choose>
+													
+											</c:forEach>
+										</div>
+									</div>
+								</div>
+								<!-- dolog end-->
+								<c:set var="ipCfgIndex" value="0"></c:set>
+								<c:set var="strCfgIndex" value="0"></c:set>
+								<c:set var="subscribeIdIndex" value="0"></c:set>
+								<c:forEach items="${regionList}" var="region" varStatus="status">
+									<c:if test="${region.regionType eq 1 }">
+										<c:if test="${ipCfgIndex==0}">
+											<!--ip info-->
+											<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+											<h4 class="form-section ipPortListTitle${region.configRegionCode}">
+												<span class="ipPortTitle"><spring:message code="${region.configRegionValue}" /></span>
+												<small> <span
+													class="glyphicon glyphicon-plus  ${tabName}Add"
+													onClick="addContent(this,'${tabName}')" title="add"></span></small>
+											</h4>
+												<c:set var="cfgName" value="ipPortList[${ipCfgIndex}]"></c:set>
+												<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+												<c:choose>
+													<c:when test="${fn:length(_cfg.ipPortList)>0 and ipCfgIndex<fn:length(_cfg.ipPortList) }">
+														<c:forEach items="${_cfg.ipPortList}" var="ipPort">
+														<c:if test="${region.configRegionValue eq ipPort.cfgType }">
+															<div class="row boxSolid ipPortList ${tabName}${status.index}">
+																<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
+															</div>	
+															<c:set var="ipCfgIndex" value="${ipCfgIndex+1}"></c:set>	
+														</c:if>
+														</c:forEach>
+													</c:when>
+													<c:otherwise>
+														<div class="row boxSolid ipPortList ${tabName}${status.index} hidden disabled">
+															<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
+														</div>
+														<c:set var="ipCfgIndex" value="${ipCfgIndex+1 }"></c:set>
+													</c:otherwise>
+												</c:choose>
+										</c:if>
+									<!--/ip info-->
+									</c:if>
+									<c:if test="${region.regionType eq 2 }">
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+										<h4 class="form-section">
+											<spring:message code="${region.configRegionValue}" />
+											<small> <span
+												class="glyphicon glyphicon-plus ${tabName}Add"
+												onClick="addContent(this,'${tabName}')" title="add"></span></small>
+										</h4>
+										<c:if test="${region.configServiceType eq 'subscribe_id' }">
+											<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIdIndex}]"></c:set>
+										</c:if>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+										<c:choose>
+											<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
+												<c:set var="isBreak" value="false" ></c:set>
+												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
+													<c:choose>
+														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
+															<div class="row boxSolid subscribeId ${tabName}${status.index}">
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+															</div>
+															<c:set var="isBreak" value="true" ></c:set>
+																<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+														</c:when>
+													</c:choose>
+												</c:forEach>
+												<c:if test="${!isBreak}">
+													<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+													</div>
+													<c:if test="${region.configServiceType eq 'subscribe_id' }">
+																<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+															</c:if>
+												</c:if>
+											</c:when>
+											<c:otherwise>
+												<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+												</div>
+												<c:if test="${region.configServiceType eq 'subscribe_id' }">
+													<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+												</c:if>
+												<c:if test="${region.configServiceType ne 'subscribe_id' }">
+													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+												</c:if>
+											</c:otherwise>
+										</c:choose>
+									</c:if>
+								</c:forEach>
+								<br>
+								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>
+								<br>
+								<%@include file="/WEB-INF/include/form/basicInfo.jsp"%>
+								<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>
+
+
+							</div>
+						</form>
+						<!-- END FORM-->
+					</div>
+				</div>
+			</div>
 		</div>
 	</div>
-</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
new file mode 100644
index 000000000..b013ce3c7
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
@@ -0,0 +1,452 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<title><spring:message code="${cfgName}"></spring:message></title>
+
+<script>
+	 $(document).ready(function() {
+		//搜索框提示语初始化
+		if("${cfg.cfgDesc}"){
+			$("#intype").val("${cfg.cfgDesc}");
+		}else if("${cfg.compileId}"){
+			$("#intype").val("${cfg.compileId}");
+		}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",'');
+			$("#level").attr("value",'');
+			$("#searchForm")[0].reset();
+		});
+		//异步获取voip相关信息
+		$("span[id^=open]").click(function(){
+			var openId=$(this).attr("id");
+			var closeId=$(this).attr("id").replace("open","close");
+			var index=$(this).attr("id").replace("open","");
+			$("#"+openId).hide();
+			$("#"+closeId).show();
+			//var compileId=$(this).attr("compileId");
+			var cfgId=$(this).attr("cfgId");
+			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+				$("#"+openId).parent().parent().next("tr").show();
+			}else{
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/ntc/iplist/ajaxSubList',
+					data:{"cfgId":cfgId,"index":index},
+					dataType:"html",
+					success:function(data){
+						var subTab="<tr class='child'>"+
+					 	"<td style='border-right: 1px solid #FFFFFF;'>"+
+					 		"<input type='checkbox' hidden='hidden'/>"+
+					 	"</td>"+
+					 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+						var html="";
+						html+="<div class='row'>";
+						html = html+data;
+						subTab=subTab+html;
+						subTab+="</td>";
+						subTab+="</tr>";
+						$("#"+openId).parent().parent().after(subTab);
+						$("div[name='tabTitle"+index+"']").get(0).click();
+					}
+				});
+			}
+			
+		});
+		
+		$("span[id^=close]").on("click",function(){
+			var closeId=$(this).attr("id");
+			var openId=$(this).attr("id").replace("close","open");
+			$("#"+closeId).hide();
+			$("#"+openId).show();
+			$("#"+closeId).parent().parent().next("tr").hide();
+		}); 
+	}); 
+</script>
+
+</head>
+<body>
+
+<div class="page-content">
+	<div class="theme-panel hidden-xs hidden-sm">
+		<shiro:hasPermission name="iplist:config">
+			<button type="button" class="btn btn-primary"
+				onClick="javascript:window.location='${ctx}/ntc/iplist/form?functionId=${cfg.functionId}'">
+			<i class="fa fa-plus"></i>
+		<spring:message code="add"></spring:message></button>
+		</shiro:hasPermission>
+	</div>
+
+	<h3 class="page-title">
+		<spring:message code="ip_control"></spring:message>
+		<small><spring:message code="date_list"/></small>
+	</h3>
+	<h5 class="page-header"></h5>
+		<div class="col-md-12">
+			<div class="portlet">
+				<div class="portlet-body">
+					<div class="row" >
+						<sys:message content="${message}"/>
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/iplist/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="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='state'/></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="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
+												<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
+												<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
+												<form:option value="voipAccount.district"><spring:message code="strong_string"/></form:option> --%>
+											</form:select>
+									
+                                         </div>
+                                         
+                                         <input id="intype" class="form-control input-medium" type="text" value="">
+                                  
+                                    </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="iplist:config">
+							 			<sys:delRow url="${ctx}/ntc/iplist/form" id="contentTable" label="update"></sys:delRow>
+                                        <sys:delRow url="${ctx}/ntc/iplist/updateValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
+                                    </shiro:hasPermission>
+                               		<shiro:hasPermission name="iplist: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}/ntc/iplist/audit?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/ntc/iplist/audit?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/ntc/iplist/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-3">
+											
+										<div class="form-group">
+	                                            <label class="control-label"><spring:message code='request_number'/></label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="requestId" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${requestInfos}" var="requestInfo" >
+														<form:option value="${requestInfo.id}"><spring:message code="${requestInfo.requestTitle}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+		                                        
+                                        <div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='type'/></label>
+	                                            <form:select path="classify" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fls}" var="fl" >
+													<form:option value="${fl.serviceDictId}"><spring:message code="${fl.itemValue}"></spring:message></form:option>
+												</c:forEach>
+											</form:select>
+											</div>
+                                          
+                                        </div>
+					
+										<div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='attribute'/></label>
+	                                            <c:set var="select"><spring:message code='select'/></c:set>
+	                                            <form:select path="attribute" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${xzs}" var="xz" >
+														<form:option value="${xz.serviceDictId}"><spring:message code="${xz.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+		                                        
+                                        <div class="col-md-3">
+									
+											<div class="form-group">
+	                                            <label class="control-label"><spring:message code='label'/></label>
+	                                            <form:select path="lable" class="selectpicker  form-control" data-live-search="true" data-live-search-placeholder="search">
+													<form:option value=""><spring:message code="select"/></form:option>
+													<c:forEach items="${lables}" var="lable" >
+														<form:option value="${lable.serviceDictId}"><spring:message code="${lable.itemValue}"></spring:message></form:option>
+													</c:forEach>
+												</form:select>
+											</div>
+                                          
+                                        </div>
+									
+								</div>
+								
+								<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>
+					<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 style="display: none"><spring:message code="cfg_id"/></th>
+								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
+									<th><spring:message code="block_type"/></th>
+									<th><spring:message code="do_log"/></th>
+									<th><spring:message code="whether_area_block"/></th>
+									<th><spring:message code="letter"/></th>
+									<th><spring:message code="classification"/></th>
+									<th><spring:message code="attribute"/></th>
+									<th><spring:message code="label"/></th>
+									<th><spring:message code="valid_identifier"/></th>
+									<th><spring:message code="is_audit"/></th>
+									<th><spring:message code="log_total"/></th>
+									<th><spring:message code="creator"/></th>
+									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
+									<th><spring:message code="editor"/></th>
+									<th class="sort-column a.edit_time"><spring:message code="edit_time"/></th>
+									<th><spring:message code="auditor"/></th>
+									<th class="sort-column a.audit_time"><spring:message code="audit_time"/></th>
+								</tr>
+							</thead>
+							<tbody>
+								<c:forEach items="${page.list }" var="indexCfg" varStatus="status" step="1">
+								<tr>
+									<td>
+									<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
+									<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
+									</td>
+									<td>${indexCfg.compileId }</td>
+								    <td>${indexCfg.cfgDesc }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
+											<c:if test="${dict.itemCode eq indexCfg.action }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq indexCfg.doLog }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td>
+										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isAreaEffective==1}">
+												<a href="javascript:viewAreaInfo('${ctx}','${indexCfg.areaEffectiveIds }','${indexCfg.compileId }')" >
+													<spring:message code="yes"/>
+												</a>
+										</c:if>
+									</td>
+									<td>${indexCfg.requestName }</td>
+									<td>
+									<c:set var="classify"></c:set>
+									<c:forEach items="${fn:split(indexCfg.classify,',')}" var="classifyId" varStatus="status">
+										<c:forEach items="${fls}" var="fl">
+											<c:if test="${classifyId eq fn:trim(fl.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="classify" value="${fl.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="classify" value="${classify},${fl.itemValue}"></c:set>
+											</c:if>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+										<a href="javascript:;" data-original-title="${classify}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(classify,20)}
+										</a>	
+									</td>
+									<td>
+									<c:set var="attribute"></c:set>
+									<c:forEach items="${fn:split(indexCfg.attribute,',')}" var="attributeId" varStatus="status">
+										<c:forEach items="${xzs}" var="xz">
+											<c:if test="${attributeId eq fn:trim(xz.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="attribute" value="${xz.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="attribute" value="${attribute},${xz.itemValue}"></c:set>
+											</c:if>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+										<a href="javascript:;" data-original-title="${attribute}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(attribute,20)}
+										</a>	
+									
+									</td>
+									<td>
+									<c:set var="lableInfo"></c:set>
+									<c:forEach items="${fn:split(indexCfg.lable,',')}" var="lableId" varStatus="status">
+										<c:forEach items="${lables}" var="lable">
+											<c:if test="${lableId eq fn:trim(lable.serviceDictId)}">
+											<c:if test="${status.index+1 eq 1}">
+												<c:set var="lableInfo" value="${lable.itemValue}"></c:set>
+											</c:if>
+											<c:if test="${status.index+1 ne 1}">
+												<c:set var="lableInfo" value="${lableInfo},${lable.itemValue}"></c:set>
+											</c:if>
+											</c:if>
+										</c:forEach>
+									</c:forEach>
+										<a href="javascript:;" data-original-title="${lableInfo}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(lableInfo,20)}
+										</a>
+									</td>
+								    <td>
+										<c:if test="${indexCfg.isValid==0}"><spring:message code="no"/></c:if>
+										<c:if test="${indexCfg.isValid==1}"><spring:message code="yes"/></c:if>
+										<c:if test="${indexCfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+									</td>
+									<td>
+										<c:choose>
+											<c:when test="${indexCfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
+											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
+										</c:choose>
+									</td>
+									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+								    <td>${indexCfg.creatorName }</td>
+									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${indexCfg.editorName }</td>
+									<td><fmt:formatDate value="${indexCfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									<td>${indexCfg.auditorName }</td>
+									<td><fmt:formatDate value="${indexCfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+								</tr>
+								</c:forEach>
+							</tbody>
+						</table>
+						<div class="page" style="margin-top:40px">${page}</div>
+					</div>
+					
+				</div>
+			</div>
+</div>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp
new file mode 100644
index 000000000..79296b282
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp
@@ -0,0 +1,176 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<script>
+	 $(document).ready(function() {
+		 //$("div[name='tabTitle"+index+"']").get(0).click();
+	 })
+</script>
+<style type="text/css">
+</style>
+</head>
+
+<c:forEach items="${tabList}" var="region" varStatus="regionStatus">
+	<div id="${region[1]}Title${index}" onclick="switchSubCfgTabInfo('${region[1]}',${index})"
+		class="col-md-1 tabInfo" name="tabTitle${index }">
+			<spring:message code='${region[1]}' />
+			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>
+	</div>
+</c:forEach>
+
+</div>
+<c:forEach items="${tabList}" var="region">
+	<c:if test="${region[0] eq 1 }">
+		<c:forEach items="${_cfg.ipPortList}" var="cfg">
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='ip_type'/>:</label>
+								<label>
+									<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>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='ip_pattern'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+										<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='client_ip'/>:</label>
+								<label>
+									${cfg.srcIpAddress}
+								</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='port_pattern'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
+										<c:if test="${cfg.portPattern eq portPatternC.itemCode}"><spring:message code="${portPatternC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='direction'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+										<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='protocol'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+										<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+					</div>
+				</div>
+			</c:if>
+			</c:forEach>
+	</c:if>
+	<c:if test="${(region[0] eq 2) && (fn:length(_cfg.ntcSubscribeIdCfgList) >0)}">
+		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+					<div class="row">
+						<div class="col-md-8">
+							<div class="form-group">
+								<label><spring:message code='keywords' />:</label><label>${fn:replace(cfg.cfgKeywords, "***and***", " ")}</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='expression_type' />:</label>
+								<label>
+									<c:choose>
+										<c:when test="${cfg.exprType eq 1}"><spring:message code='and_expression'/></c:when>
+										<c:when test="${cfg.exprType eq 0}"><spring:message code='null_expression'/></c:when>
+									</c:choose>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='match_method' />:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+										<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						</div>
+						<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='whether_hexbinary' />:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
+										<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+					</div>
+				</div>
+			</c:if>
+		</c:forEach>
+	</c:if>
+</c:forEach>
+</html>
\ No newline at end of file

From c59408bd84fbf1926e01faee9f0458022efad2cf Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Sat, 25 Aug 2018 11:55:40 +0800
Subject: [PATCH 07/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=BA=BA=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/service/configuration/DomainService.java  | 2 ++
 .../java/com/nis/web/service/configuration/IpCfgService.java   | 2 ++
 src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp            | 3 ---
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/DomainService.java b/src/main/java/com/nis/web/service/configuration/DomainService.java
index 3bf1542c0..eff62180b 100644
--- a/src/main/java/com/nis/web/service/configuration/DomainService.java
+++ b/src/main/java/com/nis/web/service/configuration/DomainService.java
@@ -472,6 +472,8 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 			}
 			
 		}else{
+			entity.setEditTime(new Date());
+			entity.setEditorId(entity.getCurrentUser().getId());
 			websiteCfgDao.updateCfgIndex(entity);
 			//无效子配置后，再新增子配置
 			websiteCfgDao.deleteHttpUrlCfg(entity);
diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
index 8de70dda0..3d46f87b5 100644
--- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
@@ -144,6 +144,8 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 			}
 			
 		}else{
+			entity.setEditTime(new Date());
+			entity.setEditorId(entity.getCurrentUser().getId());
 			ipCfgDao.updateCfgIndex(entity);
 			//无效子配置后，再新增子配置
 			ipCfgDao.deleteIpCfg(entity);
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
index bc94f17b8..bf8cd13a9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
@@ -52,7 +52,6 @@
 							}
 							$("h4[class*='ipPortListTitle']").each(function(){
 								var html="<spring:message code='"+cfgType+"'/>";
-								console.log(html);
 								$(this).find(".ipPortTitle").html(html);
 							});
 							var tabInfo=$(".ipPortList");
@@ -207,8 +206,6 @@
 							<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
 							<input type="hidden" name="compileId" value="${_cfg.compileId}">
 							<input type="hidden" name="functionId" value="${_cfg.functionId}">
-							<input type="hidden" name="createTime" value="${_cfg.createTime}">
-							<input type="hidden" name="creatorId" value="${_cfg.creatorId}">
 							<input type="hidden" id="serviceId" name="serviceId"
 								value="${_cfg.serviceId}">
 							<c:forEach items="${regionList}" var="region">

From 7bb0ac6bd5dc07e97bce972417ea39a146340e7b Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Sat, 25 Aug 2018 12:07:17 +0800
Subject: [PATCH 08/39] =?UTF-8?q?app=20=E7=89=B9=E5=BE=81=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0tree=E5=8F=AF=E6=96=B0=E5=A2=9Eapp?=
 =?UTF-8?q?=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp | 2 +-
 src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp | 2 +-
 src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp   | 2 +-
 src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp    | 2 +-
 src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
index 9b8659eb9..30af2c56a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
@@ -81,7 +81,7 @@ $(function(){
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
 								            <div class="col-md-6">
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
-												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" 
+												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" enableAddBtn="true"
 												 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
 												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
 												 cssClass="form-control required"/>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
index dbd704749..9173267d6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
@@ -96,7 +96,7 @@ $(function(){
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
 								            <div class="col-md-6">
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
-												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true"
+												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" enableAddBtn="true"
 												 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
 												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
 												 cssClass="form-control required"/>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
index fc3a2a519..0cba40463 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
@@ -96,7 +96,7 @@ $(function(){
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
 								            <div class="col-md-6">
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
-												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" 
+												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" enableAddBtn="true"
 												 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
 												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
 												 cssClass="form-control required"/>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
index 7e6354a81..5b2bac185 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
@@ -96,7 +96,7 @@ $(function(){
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
 								            <div class="col-md-6">
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
-												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" 
+												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" enableAddBtn="true"
 												 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
 												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
 												 cssClass="form-control required"/>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
index 29e01e0f1..bfc9c3f26 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
@@ -92,7 +92,7 @@ $(function(){
 								            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="social_app"/></label>
 								            <div class="col-md-6">
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
-												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true"
+												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" enableAddBtn="true"
 												 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
 												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
 												 cssClass="form-control required"/>

From c68a1cd80cb8f9ea70b2a715a4d8aa99418d5cd1 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Sat, 25 Aug 2018 13:51:13 +0800
Subject: [PATCH 09/39] =?UTF-8?q?APP=E7=89=B9=E5=BE=81=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp    |  6 ------
 .../webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp  |  6 ------
 .../webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp  | 10 ++--------
 .../webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp    |  6 ------
 src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp |  8 --------
 .../webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp     |  6 ------
 .../webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp     |  6 ------
 7 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
index 5b4821dfc..a6341eeba 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
@@ -276,7 +276,6 @@
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -315,11 +314,6 @@
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
 		             					</c:forEach>    
 									</td>
 									<%-- <td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
index 98f295caf..b7339e131 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
@@ -276,7 +276,6 @@
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -315,11 +314,6 @@
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
 		             					</c:forEach>    
 									</td>
 									<%-- <td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
index 4de55c4fb..a537971a0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
@@ -272,12 +272,11 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 								    <th><spring:message code="social_app"/></th>
-								    <th><spring:message code="district"/></th>
-								    <th><spring:message code="keywords"/></th>
+								    <th><spring:message code="layer"/></th>
+								    <th><spring:message code="header"/></th>
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -322,11 +321,6 @@
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
 		             					</c:forEach>    
 									</td>
 									<%-- <td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
index 253ed1dae..d7ae91553 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
@@ -278,7 +278,6 @@
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -323,11 +322,6 @@
 									<td>
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
 		             					</c:forEach>    
 									</td>
 									<%-- <td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
index 988d7f235..6346e5aa6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
@@ -283,7 +283,6 @@
 									<th><spring:message code="server_ip"/></th>
 									<th><spring:message code="server_port"/></th>
 									<th><spring:message code="protocol"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th> --%>
 									<%-- <th><spring:message code="whether_area_block"/></th> --%>
 									<%-- <th><spring:message code="letter"/></th>
@@ -323,13 +322,6 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
-											<c:if test="${dict.itemCode eq cfg.doLog }">
-												<spring:message code="${dict.itemValue }"/>
-											</c:if>
-										</c:forEach>
-									</td>
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
 											<c:if test="${dict.itemCode eq cfg.action }">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
index 273c7000f..7424452e2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
@@ -277,7 +277,6 @@
 								    <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-								    <th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -323,11 +322,6 @@
 										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
 											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
 		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
-		             					</c:forEach>
 									</td>
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
index 93dcfa362..50accad77 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
@@ -273,7 +273,6 @@
 									<th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="do_log"/></th>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -314,11 +313,6 @@
 		             					</c:forEach>    
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</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>

From 54264d3bf5d689439e0d56cbb324af4f571ef9ad Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Sat, 25 Aug 2018 13:57:35 +0800
Subject: [PATCH 10/39] =?UTF-8?q?ip=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0doL?=
 =?UTF-8?q?og=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
index bf8cd13a9..df5efbe25 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
@@ -263,7 +263,7 @@
 									</div>
 								</div>
 								<!-- dolog begin-->
-								<div class="row">
+								<div class="row doLog">
 									<div class="col-md-6">
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_log" /></label>

From eebdb41cf53acc1bbc86348ff2e2b6cb982fd809 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Sat, 25 Aug 2018 14:05:11 +0800
Subject: [PATCH 11/39] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=9E=E8=B0=83IP?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8put=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/service/configuration/IpCfgService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
index 3d46f87b5..9ac778361 100644
--- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
@@ -627,7 +627,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 				logger.info("IP配置下发配置参数："+json);
 				//调用服务接口下发配置
 				try {
-					ToMaatResult result = ConfigServiceUtil.postCallbackCfg(json);
+					ToMaatResult result = ConfigServiceUtil.put(json, 2);
 					if(result!=null){
 						logger.info("IP配置配置下发响应信息："+result.getMsg());
 					}

From 1ff5251341693afb73d436672dba9f2f2650cbb5 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Sat, 25 Aug 2018 15:15:20 +0800
Subject: [PATCH 12/39] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=80=BB=E9=87=8F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/app/appByteCfgList.jsp  |  2 +-
 .../views/cfg/app/appDomainCfgList.jsp        |  2 +-
 .../views/cfg/app/appHeaderCfgList.jsp        |  2 +-
 .../WEB-INF/views/cfg/app/appHttpCfgList.jsp  |  2 +-
 .../WEB-INF/views/cfg/app/appIpCfgList.jsp    |  2 +-
 .../views/cfg/app/appPolicyCfgForm.jsp        |  2 +-
 .../views/cfg/app/appPolicyCfgList.jsp        |  4 +-
 .../WEB-INF/views/cfg/app/appSslCfgList.jsp   |  2 +-
 .../WEB-INF/views/cfg/app/appTcpCfgList.jsp   |  2 +-
 .../views/cfg/app/appTopicDomainCfgList.jsp   |  2 +-
 .../views/cfg/av/contIp/contIpList.jsp        |  2 +-
 .../views/cfg/av/contUrl/contUrlList.jsp      |  2 +-
 .../WEB-INF/views/cfg/av/fileSampleList.jsp   |  2 +-
 .../WEB-INF/views/cfg/av/picIp/picIpList.jsp  |  2 +-
 .../views/cfg/av/picUrl/picUrlList.jsp        |  2 +-
 .../WEB-INF/views/cfg/av/signSampleList.jsp   |  2 +-
 .../views/cfg/av/voip/voipAccountList.jsp     |  2 +-
 .../WEB-INF/views/cfg/av/voip/voipList.jsp    |  2 +-
 .../WEB-INF/views/cfg/basicprotocol/list.jsp  |  2 +-
 .../WEB-INF/views/cfg/common/ipForm.jsp       |  5 +++
 .../WEB-INF/views/cfg/common/ipList.jsp       |  2 +-
 .../WEB-INF/views/cfg/ddosIpCfgList.jsp       |  2 +-
 .../webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp |  2 +-
 .../views/cfg/encryptedtunnelbehav/list.jsp   |  2 +-
 .../views/cfg/fileTransfer/fileDigestList.jsp |  2 +-
 .../views/cfg/fileTransfer/ftpList.jsp        |  2 +-
 .../views/cfg/fileTransfer/p2pList.jsp        |  2 +-
 .../views/cfg/intercept/interceptList.jsp     |  2 +-
 .../WEB-INF/views/cfg/ipaddr/ipList.jsp       |  2 +-
 .../WEB-INF/views/cfg/mail/mailList.jsp       |  2 +-
 .../WEB-INF/views/cfg/other/bgpList.jsp       |  2 +-
 .../cfg/proxy/control/httpRedirectList.jsp    |  2 +-
 .../cfg/proxy/control/httpReqReplaceList.jsp  |  2 +-
 .../cfg/proxy/control/httpResReplaceList.jsp  |  2 +-
 .../WEB-INF/views/cfg/website/dnsList.jsp     |  2 +-
 .../WEB-INF/views/cfg/website/httpList.jsp    |  2 +-
 .../WEB-INF/views/cfg/website/sslList.jsp     |  2 +-
 .../views/cfg/whitelist/domainList.jsp        |  2 +-
 .../WEB-INF/views/cfg/whitelist/ipList.jsp    |  2 +-
 .../views/specific/specificServiceCfgForm.jsp | 44 ++++++++++++++++---
 .../webapp/static/global/scripts/common.js    |  4 +-
 41 files changed, 83 insertions(+), 48 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
index a6341eeba..ad428df0a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
@@ -403,7 +403,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
index b7339e131..59ff6dc46 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
@@ -403,7 +403,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
index a537971a0..5a9aa4c83 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
@@ -410,7 +410,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
index d7ae91553..5842bb2b3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
@@ -411,7 +411,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
index 6346e5aa6..a9a2dfd47 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
@@ -409,7 +409,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
index 24eaef2d3..3fc214879 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
@@ -162,7 +162,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
 	</c:forEach>
 	<h3 class="page-title">
-		<spring:message code="app_policy_config"></spring:message>
+		<spring:message code="social_app_control"></spring:message>
 	</h3>
 	<div class="row">
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
index b4f203932..15c40f50e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -99,7 +99,7 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="app_policy_config"></spring:message>
+		<spring:message code="social_app_control"></spring:message>
 		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
@@ -441,7 +441,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
index 7424452e2..0d5ce4024 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
@@ -410,7 +410,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
index 50accad77..472763dab 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
@@ -325,7 +325,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
index 0587bc18b..1e4b564f1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
@@ -412,7 +412,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
index 9daad0873..35cd55091 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
@@ -424,7 +424,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
index 3272f4721..f9e2a7c9a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -333,7 +333,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></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.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
index 8ddeef599..378e36383 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
@@ -385,7 +385,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
index 7a7fe8d80..ad10e8185 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
@@ -424,7 +424,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
index 47a5ed4d8..9b43274e0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
@@ -334,7 +334,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></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.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
index 1fb9b2e32..813c5809d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
@@ -387,7 +387,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
index e52212c12..5ea0ea20c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
@@ -658,7 +658,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
index 220986840..3b1ce06e3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -725,7 +725,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
index 3c0f67483..7f6a2efd9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -447,7 +447,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
index 954cf7777..75d8e2d33 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp
@@ -9,6 +9,11 @@ $(function(){
 		$("#serviceId").val($(".action:checked").attr("serviceId"));
 		$("#protocolId").val($(".action:checked").attr("protocolId"));
 	}
+	var action=$(".action:checked");
+	if(!action){
+		action=$("input[name='action']");
+	}
+	var regionCode=action.attr("regionCode");
 	//initCommIpVal();
 	var serviceType=$("input[name='cfgRegionCode']").attr("serviceType");
 	if(serviceType){
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
index dbcaaf6a9..bc4c1be46 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
@@ -537,7 +537,7 @@
 									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'cancel_approved'}"><span data-audit="cancel" class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:if>
 							            </c:forEach>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
index 16c72fcca..141aa2273 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
@@ -430,7 +430,7 @@
 											<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 functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index e4e22b792..b57887aaa 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -405,7 +405,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
index 60311ce00..fc35ae60a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -447,7 +447,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
index cd699b878..83ea33699 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
@@ -446,7 +446,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
index 68870ed99..b06027058 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
@@ -435,7 +435,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
index e5a0e0d68..04d8eafa3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
@@ -424,7 +424,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
index 1c15a5e45..ff89ae68f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -467,7 +467,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
index b013ce3c7..4c867d1a2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
@@ -430,7 +430,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
index a9f3390a2..8e7e00ab9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
@@ -431,7 +431,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
index 82353e08a..2e6a03a26 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
@@ -433,7 +433,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
index 297137cae..8546cb30a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
@@ -692,7 +692,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
index 75837244e..559ab71c0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
@@ -321,7 +321,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></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.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
index 164d36ff2..18c8350f4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
@@ -322,7 +322,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></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.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
index f3dd01911..e5425739f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
@@ -436,7 +436,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
index 7bad1eed4..2ea06613b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
@@ -586,7 +586,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
index 300b2d9aa..f75d4bb41 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
@@ -430,7 +430,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
index c05c55378..2d9a2c93f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
@@ -430,7 +430,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
index eae562de0..64945cc5d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
@@ -430,7 +430,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
index f175ef565..7472a716c 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
@@ -82,6 +82,7 @@
 						$(this).find("[name='parent.specServiceId']").removeAttr("name");
 						$(this).find("[name='parent.specServiceName']").removeAttr("name");
 						$(this).find("[name='businessType']").removeAttr("name");
+						$(this).find("[name='specServiceCode']").removeAttr("name");
 					}else{
 						var cfgType=$(this).attr("cfgType");
 						if("${specificServiceCfg.parent.specServiceId}"&& "${specificServiceCfg.parent.specServiceId}"!="0"){
@@ -91,7 +92,7 @@
 						}
 					}
 				});
-				$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
+				//$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
 				$(".protocol_name").html('<font color="red">*</font><spring:message code="app_name"/>:');
 				$(".protocol_desc").html('<spring:message code="app_desc"/>:');
 			}else{
@@ -101,6 +102,7 @@
 						$(this).find("[name='parent.specServiceId']").removeAttr("name");
 						$(this).find("[name='parent.specServiceName']").removeAttr("name");
 						$(this).find("[name='businessType']").removeAttr("name");
+						$(this).find("[name='specServiceCode']").removeAttr("name");
 					}else{
 						var cfgType=$(this).attr("cfgType");
 						if("${specificServiceCfg.parent.specServiceId}"&& "${specificServiceCfg.parent.specServiceId}"!="0"){
@@ -112,15 +114,15 @@
 					}
 				});
 				if($("[name='cfgType']").val()==1){
-					$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
+					//$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
 					$(".protocol_name").html('<font color="red">*</font><spring:message code="app_name"/>:');
 					$(".protocol_desc").html('<spring:message code="app_desc"/>:');
 				}else if($("[name='cfgType']").val()==2){
-					$(".protocol_code").html('<font color="red">*</font><spring:message code="tunnel_code"/>:');
+					//$(".protocol_code").html('<font color="red">*</font><spring:message code="tunnel_code"/>:');
 					$(".protocol_name").html('<font color="red">*</font><spring:message code="tunnel_name"/>:');
 					$(".protocol_desc").html('<spring:message code="tunnel_desc"/>:');
 				}else{
-					$(".protocol_code").html('<font color="red">*</font><spring:message code="protocol_code"/>:');
+					//$(".protocol_code").html('<font color="red">*</font><spring:message code="protocol_code"/>:');
 					$(".protocol_name").html('<font color="red">*</font><spring:message code="protocol_name"/>:');
 					$(".protocol_desc").html('<spring:message code="protocol_desc"/>:');
 				}
@@ -133,6 +135,7 @@
 						$("#specificServiceCfg"+cfgType+"Id").attr("name","parent.specServiceId");
 						$("#specificServiceCfg"+cfgType+"Name").attr("name","parent.specServiceName");
 						$("#businessType"+cfgType).attr("name","businessType");
+						$("#specServiceCode"+cfgType).attr("name","specServiceCode");
 						if($(this).hasClass("businessType")){
 							var parentId=$("#specificServiceCfg"+cfgType+"Id").val();
 							if(parentId!=0){
@@ -152,15 +155,15 @@
 					}
 				});
 				if(cfgType==1){
-					$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
+					//$(".protocol_code").html('<font color="red">*</font><spring:message code="app_code"/>:');
 					$(".protocol_name").html('<font color="red">*</font><spring:message code="app_name"/>:');
 					$(".protocol_desc").html('<spring:message code="app_desc"/>:');
 				}else if(cfgType==2){
-					$(".protocol_code").html('<font color="red">*</font><spring:message code="tunnel_code"/>:');
+					//$(".protocol_code").html('<font color="red">*</font><spring:message code="tunnel_code"/>:');
 					$(".protocol_name").html('<font color="red">*</font><spring:message code="tunnel_name"/>:');
 					$(".protocol_desc").html('<spring:message code="tunnel_desc"/>:');
 				}else{
-					$(".protocol_code").html('<font color="red">*</font><spring:message code="protocol_code"/>:');
+					//$(".protocol_code").html('<font color="red">*</font><spring:message code="protocol_code"/>:');
 					$(".protocol_name").html('<font color="red">*</font><spring:message code="protocol_name"/>:');
 					$(".protocol_desc").html('<spring:message code="protocol_desc"/>:');
 				}
@@ -278,6 +281,33 @@
 															</c:if>
 															<div for="businessType"></div>
 														</div>
+														<c:if test="${dict.itemCode==1}">
+														<div class="form-group cfgType specServiceCode">
+															<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="app_code"/>:</label>
+															<div class="col-md-4">
+																<input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[0,2147483647]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
+															</div>
+															<div for="specServiceCode"></div>
+														</div> 
+														</c:if>
+														<c:if test="${dict.itemCode==2}">
+														<div class="form-group cfgType">
+															<label class="col-md-3 control-label protocol_code"><font color="red">*</font><spring:message code="protocol_code"/>:</label>
+															<div class="col-md-4">
+																<input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[0,2147483647]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
+															</div>
+															<div for="specServiceCode"></div>
+														</div> 
+														</c:if>
+														<c:if test="${dict.itemCode==3}">
+														<div class="form-group cfgType">
+															<label class="col-md-3 control-label protocol_code"><font color="red">*</font><spring:message code="tunnel_code"/>:</label>
+															<div class="col-md-4">
+																<input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[0,2147483647]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
+															</div>
+															<div for="specServiceCode"></div>
+														</div> 
+														</c:if>
 													</c:forEach>
 												    <div class="form-group">
 														<label class="col-md-3 control-label protocol_code"><font color="red">*</font><spring:message code="protocol_code"/>:</label>
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 86981373a..603c8d7ba 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -344,8 +344,8 @@ $(function(){
 	td需要配置属性有，functionId，compileId，action
     */
    $("td[compileId]").each(function(){
-	   	var audit=$(this).prev().find("span").data("audit");
-	   	if(audit == "approved"){
+	   	var audit=$(this).attr("audit");
+	   	if(audit == 1){
 	   		var data={};
 			data.date=new Date();
 			data.compileId=$(this).attr("compileId");

From 1130cee1525b81d5e8b666f30b147e9bef3c7713 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Sat, 25 Aug 2018 15:29:25 +0800
Subject: [PATCH 13/39] =?UTF-8?q?xmppList=E5=8A=A0=E5=85=A5=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=80=BB=E9=87=8F=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
index 5c17a4baf..39fe8a711 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
@@ -320,6 +320,7 @@
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -431,6 +432,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

From 4233142304a216ee8b93bf38a1f9cfe8eab377da Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Sat, 25 Aug 2018 15:31:32 +0800
Subject: [PATCH 14/39] =?UTF-8?q?bgp=20=E4=BF=AE=E6=94=B9=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=80=BB=E9=87=8Fcfg=E4=B8=BAindexCfg?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
index 2e6a03a26..aabce352b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
@@ -433,7 +433,7 @@
 											<c:when test="${indexCfg.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 audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

From 0354487dc85057f39db59d86378c565cf253f45c Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Sat, 25 Aug 2018 16:37:39 +0800
Subject: [PATCH 15/39] =?UTF-8?q?ratelimit=E6=95=B0=E6=8D=AE=E5=BA=93?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAvarchar,pojo=E6=94=B9=E4=B8=BAString?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/domain/configuration/AppByteCfg.java  |  6 +--
 .../domain/configuration/AppDomainCfg.java    |  6 +--
 .../domain/configuration/AppHeaderCfg.java    |  6 +--
 .../nis/domain/configuration/AppHttpCfg.java  |  6 +--
 .../domain/configuration/AppInnerRuleCfg.java |  6 +--
 .../nis/domain/configuration/AppIpCfg.java    |  6 +--
 .../domain/configuration/AppPolicyCfg.java    |  6 +--
 .../domain/configuration/AppSslCertCfg.java   |  6 +--
 .../domain/configuration/AppStringCfg.java    |  6 +--
 .../nis/domain/configuration/AppTcpCfg.java   |  6 +--
 .../configuration/AppTopicDomainCfg.java      |  6 +--
 .../nis/domain/configuration/BaseIpCfg.java   |  6 +--
 .../nis/domain/configuration/HttpUrlCfg.java  |  6 +--
 .../template/IpAddrTemplate.java              |  2 +-
 .../configuration/template/IpCfgTemplate.java |  6 +--
 .../template/IpMultiplexPolicyTemplate.java   |  2 +-
 .../configuration/template/IpsecTemplate.java |  2 +-
 .../template/TunnelIpTemplate.java            |  2 +-
 .../template/WhiteListIpTemplate.java         |  2 +-
 .../nis/web/controller/BaseController.java    | 12 ++++--
 .../nis/web/dao/configuration/AppCfgDao.xml   | 42 +++++++++----------
 .../nis/web/dao/configuration/DomainDao.xml   | 10 ++---
 .../nis/web/dao/configuration/IpCfgDao.xml    | 10 ++---
 .../web/dao/configuration/StringCfgDao.xml    | 10 ++---
 .../resources/sql/alter_ratelimit_varchar.sql | 10 +++++
 25 files changed, 101 insertions(+), 87 deletions(-)
 create mode 100644 src/main/resources/sql/alter_ratelimit_varchar.sql

diff --git a/src/main/java/com/nis/domain/configuration/AppByteCfg.java b/src/main/java/com/nis/domain/configuration/AppByteCfg.java
index 1587b9f47..785586f3b 100644
--- a/src/main/java/com/nis/domain/configuration/AppByteCfg.java
+++ b/src/main/java/com/nis/domain/configuration/AppByteCfg.java
@@ -28,7 +28,7 @@ public class AppByteCfg extends BaseCfg<AppByteCfg> {
 	@Expose
 	private Integer compileId;
 	@Expose
-	private Integer ratelimit;
+	private String ratelimit;
 	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
 	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
 	private Integer specServiceId;
@@ -93,11 +93,11 @@ public class AppByteCfg extends BaseCfg<AppByteCfg> {
 		return tableName;
 	}
 
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		return ratelimit;
 	}
 
-	public void setRatelimit(Integer ratelimit) {
+	public void setRatelimit(String ratelimit) {
 		this.ratelimit = ratelimit;
 	}
 	public Integer getAppCode() {
diff --git a/src/main/java/com/nis/domain/configuration/AppDomainCfg.java b/src/main/java/com/nis/domain/configuration/AppDomainCfg.java
index 30e24f777..f0db9a873 100644
--- a/src/main/java/com/nis/domain/configuration/AppDomainCfg.java
+++ b/src/main/java/com/nis/domain/configuration/AppDomainCfg.java
@@ -28,7 +28,7 @@ public class AppDomainCfg extends BaseCfg<AppDomainCfg> {
 	@Expose
 	private Integer compileId;
 	@Expose
-	private Integer ratelimit;
+	private String ratelimit;
 	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
 	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
 	private Integer specServiceId;
@@ -92,11 +92,11 @@ public class AppDomainCfg extends BaseCfg<AppDomainCfg> {
 		return tableName;
 	}
 
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		return ratelimit;
 	}
 
-	public void setRatelimit(Integer ratelimit) {
+	public void setRatelimit(String ratelimit) {
 		this.ratelimit = ratelimit;
 	}
 	public Integer getAppCode() {
diff --git a/src/main/java/com/nis/domain/configuration/AppHeaderCfg.java b/src/main/java/com/nis/domain/configuration/AppHeaderCfg.java
index f33e086f6..ede2b6489 100644
--- a/src/main/java/com/nis/domain/configuration/AppHeaderCfg.java
+++ b/src/main/java/com/nis/domain/configuration/AppHeaderCfg.java
@@ -27,7 +27,7 @@ public class AppHeaderCfg extends BaseCfg<AppHeaderCfg> {
 	@Expose
 	private Integer compileId;
 	@Expose
-	private Integer ratelimit;
+	private String ratelimit;
 	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
 	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
 	private Integer specServiceId;
@@ -92,11 +92,11 @@ public class AppHeaderCfg extends BaseCfg<AppHeaderCfg> {
 		return tableName;
 	}
 
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		return ratelimit;
 	}
 
-	public void setRatelimit(Integer ratelimit) {
+	public void setRatelimit(String ratelimit) {
 		this.ratelimit = ratelimit;
 	}
 	public Integer getAppCode() {
diff --git a/src/main/java/com/nis/domain/configuration/AppHttpCfg.java b/src/main/java/com/nis/domain/configuration/AppHttpCfg.java
index 5f775cd35..61b60d52b 100644
--- a/src/main/java/com/nis/domain/configuration/AppHttpCfg.java
+++ b/src/main/java/com/nis/domain/configuration/AppHttpCfg.java
@@ -28,7 +28,7 @@ public class AppHttpCfg extends BaseCfg<AppHttpCfg> {
 	@Expose
 	private Integer compileId;
 	@Expose
-	private Integer ratelimit;
+	private String ratelimit;
 	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
 	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
 	private Integer specServiceId;
@@ -93,11 +93,11 @@ public class AppHttpCfg extends BaseCfg<AppHttpCfg> {
 		return tableName;
 	}
 
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		return ratelimit;
 	}
 
-	public void setRatelimit(Integer ratelimit) {
+	public void setRatelimit(String ratelimit) {
 		this.ratelimit = ratelimit;
 	}
 	public Integer getAppCode() {
diff --git a/src/main/java/com/nis/domain/configuration/AppInnerRuleCfg.java b/src/main/java/com/nis/domain/configuration/AppInnerRuleCfg.java
index 44ca43c9e..1f9cf9981 100644
--- a/src/main/java/com/nis/domain/configuration/AppInnerRuleCfg.java
+++ b/src/main/java/com/nis/domain/configuration/AppInnerRuleCfg.java
@@ -28,7 +28,7 @@ public class AppInnerRuleCfg extends BaseCfg<AppInnerRuleCfg> {
 	@Expose
 	private Integer compileId;
 	@Expose
-	private Integer ratelimit;
+	private String ratelimit;
 	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
 	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
 	private Integer specServiceId;
@@ -92,11 +92,11 @@ public class AppInnerRuleCfg extends BaseCfg<AppInnerRuleCfg> {
 		return tableName;
 	}
 
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		return ratelimit;
 	}
 
-	public void setRatelimit(Integer ratelimit) {
+	public void setRatelimit(String ratelimit) {
 		this.ratelimit = ratelimit;
 	}
 	public Integer getAppCode() {
diff --git a/src/main/java/com/nis/domain/configuration/AppIpCfg.java b/src/main/java/com/nis/domain/configuration/AppIpCfg.java
index 921aaaf66..22e93fefe 100644
--- a/src/main/java/com/nis/domain/configuration/AppIpCfg.java
+++ b/src/main/java/com/nis/domain/configuration/AppIpCfg.java
@@ -20,7 +20,7 @@ public class AppIpCfg extends BaseCfg<AppIpCfg> {
 	@Expose
 	private Integer compileId;
 	@Expose
-	private Integer ratelimit;
+	private String ratelimit;
 	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
 	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
 	private Integer specServiceId;
@@ -213,11 +213,11 @@ public class AppIpCfg extends BaseCfg<AppIpCfg> {
 		return tableName;
 	}
 
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		return ratelimit;
 	}
 
-	public void setRatelimit(Integer ratelimit) {
+	public void setRatelimit(String ratelimit) {
 		this.ratelimit = ratelimit;
 	}
 	public Integer getAppCode() {
diff --git a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
index 2873bfd98..a2dfa5366 100644
--- a/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
+++ b/src/main/java/com/nis/domain/configuration/AppPolicyCfg.java
@@ -34,7 +34,7 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
 	@Expose
 	private Integer compileId;
 	@Expose
-	private Integer ratelimit;
+	private String ratelimit;
 	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
 	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
 	private Integer specServiceId;
@@ -145,11 +145,11 @@ public class AppPolicyCfg extends BaseCfg<AppPolicyCfg> {
 		return tableName;
 	}
 
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		return ratelimit;
 	}
 
-	public void setRatelimit(Integer ratelimit) {
+	public void setRatelimit(String ratelimit) {
 		this.ratelimit = ratelimit;
 	}
 	public Integer getAppCode() {
diff --git a/src/main/java/com/nis/domain/configuration/AppSslCertCfg.java b/src/main/java/com/nis/domain/configuration/AppSslCertCfg.java
index 0d4af4a17..ecc4d1510 100644
--- a/src/main/java/com/nis/domain/configuration/AppSslCertCfg.java
+++ b/src/main/java/com/nis/domain/configuration/AppSslCertCfg.java
@@ -27,7 +27,7 @@ public class AppSslCertCfg extends BaseCfg<AppSslCertCfg> {
 	@Expose
 	private Integer compileId;
 	@Expose
-	private Integer ratelimit;
+	private String ratelimit;
 	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
 	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
 	private Integer specServiceId;
@@ -92,11 +92,11 @@ public class AppSslCertCfg extends BaseCfg<AppSslCertCfg> {
 		return tableName;
 	}
 
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		return ratelimit;
 	}
 
-	public void setRatelimit(Integer ratelimit) {
+	public void setRatelimit(String ratelimit) {
 		this.ratelimit = ratelimit;
 	}
 	public Integer getAppCode() {
diff --git a/src/main/java/com/nis/domain/configuration/AppStringCfg.java b/src/main/java/com/nis/domain/configuration/AppStringCfg.java
index f61ef011e..1c55cd66f 100644
--- a/src/main/java/com/nis/domain/configuration/AppStringCfg.java
+++ b/src/main/java/com/nis/domain/configuration/AppStringCfg.java
@@ -30,7 +30,7 @@ public class AppStringCfg extends BaseStringCfg<AppStringCfg> {
 	@Expose
 	private Integer compileId;
 	@Expose
-	private Integer ratelimit;
+	private String ratelimit;
 	
 	/* (non-Javadoc)
 	 * @see com.nis.domain.configuration.BaseCfg#initDefaultValue()
@@ -53,11 +53,11 @@ public class AppStringCfg extends BaseStringCfg<AppStringCfg> {
 		return tableName;
 	}
 
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		return ratelimit;
 	}
 
-	public void setRatelimit(Integer ratelimit) {
+	public void setRatelimit(String ratelimit) {
 		this.ratelimit = ratelimit;
 	}
 	
diff --git a/src/main/java/com/nis/domain/configuration/AppTcpCfg.java b/src/main/java/com/nis/domain/configuration/AppTcpCfg.java
index 40270b491..37bd61bfc 100644
--- a/src/main/java/com/nis/domain/configuration/AppTcpCfg.java
+++ b/src/main/java/com/nis/domain/configuration/AppTcpCfg.java
@@ -27,7 +27,7 @@ public class AppTcpCfg extends BaseCfg<AppTcpCfg> {
 	@Expose
 	private Integer compileId;
 	@Expose
-	private Integer ratelimit;
+	private String ratelimit;
 	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
 	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
 	private Integer specServiceId;
@@ -121,11 +121,11 @@ public class AppTcpCfg extends BaseCfg<AppTcpCfg> {
 		return tableName;
 	}
 
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		return ratelimit;
 	}
 
-	public void setRatelimit(Integer ratelimit) {
+	public void setRatelimit(String ratelimit) {
 		this.ratelimit = ratelimit;
 	}
 	public Integer getAppCode() {
diff --git a/src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java b/src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java
index 9fb349789..105d2b631 100644
--- a/src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java
+++ b/src/main/java/com/nis/domain/configuration/AppTopicDomainCfg.java
@@ -26,7 +26,7 @@ public class AppTopicDomainCfg extends BaseCfg<AppTopicDomainCfg> {
 	@Expose
 	private Integer compileId;
 	@Expose
-	private Integer ratelimit;
+	private String ratelimit;
 //	private Integer appCode;//specific_service_cfg表一级节点的spec_service_code
 	private Integer behavCode;//specific_service_cfg表二级节点的spec_service_code
 	private Integer specServiceId;
@@ -101,11 +101,11 @@ public class AppTopicDomainCfg extends BaseCfg<AppTopicDomainCfg> {
 		return tableName;
 	}
 
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		return ratelimit;
 	}
 
-	public void setRatelimit(Integer ratelimit) {
+	public void setRatelimit(String ratelimit) {
 		this.ratelimit = ratelimit;
 	}
 //	public Integer getAppCode() {
diff --git a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java
index 7e565231f..cc50d83dc 100644
--- a/src/main/java/com/nis/domain/configuration/BaseIpCfg.java
+++ b/src/main/java/com/nis/domain/configuration/BaseIpCfg.java
@@ -109,20 +109,20 @@ public class BaseIpCfg extends BaseCfg<BaseIpCfg> {
 	/**
 	 * 限速比例
 	 */
-	protected Integer ratelimit ;
+	protected String ratelimit ;
 	
 	/**
 	 * ratelimit
 	 * @return  ratelimit
 	*/
 	
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		return ratelimit;
 	}
 	/**
 	 * @param ratelimit the ratelimit to set
 	 */
-	public void setRatelimit(Integer ratelimit) {
+	public void setRatelimit(String ratelimit) {
 		this.ratelimit = ratelimit;
 	}
 	/**
diff --git a/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java b/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java
index 17564f535..2fb7b43a9 100644
--- a/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java
+++ b/src/main/java/com/nis/domain/configuration/HttpUrlCfg.java
@@ -20,19 +20,19 @@ import com.nis.util.Constants;
  */
 public class HttpUrlCfg extends BaseStringCfg<HttpUrlCfg> {
 	private static final String tableName="http_url_cfg";
-	private Integer ratelimit;
+	private String ratelimit;
 	/**
 	 * ratelimit
 	 * @return  ratelimit
 	*/
 	
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		return ratelimit;
 	}
 	/**
 	 * @param ratelimit the ratelimit to set
 	 */
-	public void setRatelimit(Integer ratelimit) {
+	public void setRatelimit(String ratelimit) {
 		this.ratelimit = ratelimit;
 	}
 	/**
diff --git a/src/main/java/com/nis/domain/configuration/template/IpAddrTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpAddrTemplate.java
index d3e48df2f..91417546c 100644
--- a/src/main/java/com/nis/domain/configuration/template/IpAddrTemplate.java
+++ b/src/main/java/com/nis/domain/configuration/template/IpAddrTemplate.java
@@ -22,7 +22,7 @@ public class IpAddrTemplate extends IpCfgTemplate {
 	}
 
 	@Override
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		// TODO Auto-generated method stub
 		return super.getRatelimit();
 	}
diff --git a/src/main/java/com/nis/domain/configuration/template/IpCfgTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpCfgTemplate.java
index caaf60321..dd08bbfe9 100644
--- a/src/main/java/com/nis/domain/configuration/template/IpCfgTemplate.java
+++ b/src/main/java/com/nis/domain/configuration/template/IpCfgTemplate.java
@@ -44,7 +44,7 @@ public class IpCfgTemplate {
 	private String attributeName;//18
 	private String lableName;//19
 	private String areaEffectiveIds;//20
-	private Integer ratelimit;//21
+	private String ratelimit;//21
 	private Integer dnsStrategyId;//22
 	private Integer irType;//23
 	private String userRegion1;//77
@@ -128,13 +128,13 @@ public class IpCfgTemplate {
 	 * @return  ratelimit
 	*/
 	@ExcelField(title="ratelimit",align=2,sort=74)
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		return ratelimit;
 	}
 	/**
 	 * @param ratelimit the ratelimit to set
 	 */
-	public void setRatelimit(Integer ratelimit) {
+	public void setRatelimit(String ratelimit) {
 		this.ratelimit = ratelimit;
 	}
 	/**
diff --git a/src/main/java/com/nis/domain/configuration/template/IpMultiplexPolicyTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpMultiplexPolicyTemplate.java
index 29ba68dc0..06e489d15 100644
--- a/src/main/java/com/nis/domain/configuration/template/IpMultiplexPolicyTemplate.java
+++ b/src/main/java/com/nis/domain/configuration/template/IpMultiplexPolicyTemplate.java
@@ -28,7 +28,7 @@ public class IpMultiplexPolicyTemplate extends IpCfgTemplate {
 	}
 	
 	@Override
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		// TODO Auto-generated method stub
 		return super.getRatelimit();
 	}
diff --git a/src/main/java/com/nis/domain/configuration/template/IpsecTemplate.java b/src/main/java/com/nis/domain/configuration/template/IpsecTemplate.java
index de667fa22..c4515e7c4 100644
--- a/src/main/java/com/nis/domain/configuration/template/IpsecTemplate.java
+++ b/src/main/java/com/nis/domain/configuration/template/IpsecTemplate.java
@@ -22,7 +22,7 @@ public class IpsecTemplate extends IpCfgTemplate {
 	}
 
 	@Override
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		// TODO Auto-generated method stub
 		return super.getRatelimit();
 	}
diff --git a/src/main/java/com/nis/domain/configuration/template/TunnelIpTemplate.java b/src/main/java/com/nis/domain/configuration/template/TunnelIpTemplate.java
index 277564871..b94bc7841 100644
--- a/src/main/java/com/nis/domain/configuration/template/TunnelIpTemplate.java
+++ b/src/main/java/com/nis/domain/configuration/template/TunnelIpTemplate.java
@@ -22,7 +22,7 @@ public class TunnelIpTemplate extends IpCfgTemplate {
 	}
 
 	@Override
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		// TODO Auto-generated method stub
 		return super.getRatelimit();
 	}
diff --git a/src/main/java/com/nis/domain/configuration/template/WhiteListIpTemplate.java b/src/main/java/com/nis/domain/configuration/template/WhiteListIpTemplate.java
index 910b77bb1..337f0413c 100644
--- a/src/main/java/com/nis/domain/configuration/template/WhiteListIpTemplate.java
+++ b/src/main/java/com/nis/domain/configuration/template/WhiteListIpTemplate.java
@@ -57,7 +57,7 @@ public class WhiteListIpTemplate extends IpCfgTemplate {
 	}
 
 	@Override
-	public Integer getRatelimit() {
+	public String getRatelimit() {
 		// TODO Auto-generated method stub
 		return super.getRatelimit();
 	}
diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index 08cd1bc25..900c541ce 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -54,7 +54,6 @@ import com.nis.util.DictUtils;
 import com.nis.util.JsonMapper;
 import com.nis.util.StringUtil;
 import com.nis.util.excel.ExportExcel;
-import com.nis.web.dao.configuration.InterceptCfgDao;
 import com.nis.web.service.ArchiveServcie;
 import com.nis.web.service.AreaService;
 import com.nis.web.service.DictService;
@@ -1064,13 +1063,18 @@ public class BaseController {
 				}
 			}
 			if("ipratelimit".equals(specialItem)) {
-				Integer ratelimit=value.getRatelimit();
+				String ratelimit=value.getRatelimit();
 				if(ratelimit==null) {
 					errInfo.append(String.format(prop.getProperty("can_not_null"), prop.getProperty("ratelimit"))+";");
 				}else {
-					if(ratelimit.intValue()<0||ratelimit.intValue()>100) {
-						errInfo.append(prop.getProperty("ratelimit_limit")+";");
+					try {
+						if(Double.parseDouble(ratelimit)<0||Double.parseDouble(ratelimit)>1) {
+							errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("ratelimit_limit"))+";");
+						}
+					}catch (Exception e) {
+						errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("ratelimit_limit"))+";");
 					}
+					
 				}
 			}
 			//attribute check end
diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
index 309954269..5d0adadbc 100644
--- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
@@ -27,7 +27,7 @@
     <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="ratelimit" property="ratelimit" jdbcType="INTEGER" />
+    <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="user_region1" property="userRegion1" jdbcType="VARCHAR" />
     <result column="user_region2" property="userRegion2" jdbcType="VARCHAR" />
@@ -69,7 +69,7 @@
     <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="ratelimit" property="ratelimit" jdbcType="INTEGER" />
+    <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
@@ -102,7 +102,7 @@
     <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="ratelimit" property="ratelimit" jdbcType="INTEGER" />
+    <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
@@ -133,7 +133,7 @@
     <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="ratelimit" property="ratelimit" jdbcType="INTEGER" />
+    <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
@@ -164,7 +164,7 @@
     <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="ratelimit" property="ratelimit" jdbcType="INTEGER" />
+    <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
@@ -195,7 +195,7 @@
     <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="ratelimit" property="ratelimit" jdbcType="INTEGER" />
+    <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
@@ -226,7 +226,7 @@
     <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="ratelimit" property="ratelimit" jdbcType="INTEGER" />
+    <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
   </resultMap>
     
@@ -292,7 +292,7 @@
     <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="ratelimit" property="ratelimit" jdbcType="INTEGER" />
+    <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
@@ -324,7 +324,7 @@
     <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="ratelimit" property="ratelimit" jdbcType="INTEGER" />
+    <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
@@ -356,7 +356,7 @@
     <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="ratelimit" property="ratelimit" jdbcType="INTEGER" />
+    <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
@@ -435,7 +435,7 @@
     #{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},    
-    #{areaEffectiveIds,jdbcType=VARCHAR},#{ratelimit,jdbcType=INTEGER},#{functionId,jdbcType=INTEGER},
+    #{areaEffectiveIds,jdbcType=VARCHAR},#{ratelimit,jdbcType=VARCHAR},#{functionId,jdbcType=INTEGER},
     #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER}
   </sql>
   <sql id="AppTopicCommonCfg_Value_List" >
@@ -446,7 +446,7 @@
     #{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},    
-    #{areaEffectiveIds,jdbcType=VARCHAR},#{ratelimit,jdbcType=INTEGER},#{functionId,jdbcType=INTEGER},
+    #{areaEffectiveIds,jdbcType=VARCHAR},#{ratelimit,jdbcType=VARCHAR},#{functionId,jdbcType=INTEGER},
     #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER}
   </sql>
   
@@ -1951,7 +1951,7 @@
         function_id =  #{functionId,jdbcType=INTEGER},
      <!--  </if>
       <if test="ratelimit != null"> -->
-		RATELIMIT=#{ratelimit,jdbcType=INTEGER},
+		RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
      <!--  </if>
       <if test="cfgRegionCode != null"> -->
    		CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
@@ -2060,7 +2060,7 @@
         function_id =  #{functionId,jdbcType=INTEGER},
       </if>
       <if test="ratelimit != null">
-		RATELIMIT=#{ratelimit,jdbcType=INTEGER},
+		RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
       </if>
       <if test="cfgRegionCode != null">
    		CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
@@ -2173,7 +2173,7 @@
         function_id =  #{functionId,jdbcType=INTEGER},
       </if>
       <if test="ratelimit != null">
-		RATELIMIT=#{ratelimit,jdbcType=INTEGER},
+		RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
       </if>
       <if test="cfgRegionCode != null">
    		CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
@@ -2274,7 +2274,7 @@
         function_id =  #{functionId,jdbcType=INTEGER},
       </if>
       <if test="ratelimit != null">
-		RATELIMIT=#{ratelimit,jdbcType=INTEGER},
+		RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
       </if>
       <if test="cfgRegionCode != null">
    		CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
@@ -2373,7 +2373,7 @@
         function_id =  #{functionId,jdbcType=INTEGER},
       </if>
       <if test="ratelimit != null">
-		RATELIMIT=#{ratelimit,jdbcType=INTEGER},
+		RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
       </if>
       <if test="cfgRegionCode != null">
    		CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
@@ -2472,7 +2472,7 @@
         function_id =  #{functionId,jdbcType=INTEGER},
       </if>
       <if test="ratelimit != null">
-		RATELIMIT=#{ratelimit,jdbcType=INTEGER},
+		RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
       </if>
       <if test="cfgRegionCode != null">
    		CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
@@ -2584,7 +2584,7 @@
         function_id =  #{functionId,jdbcType=INTEGER},
       </if>
       <if test="ratelimit != null">
-		RATELIMIT=#{ratelimit,jdbcType=INTEGER},
+		RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
       </if>
       <if test="cfgRegionCode != null">
    		CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
@@ -2685,7 +2685,7 @@
         function_id =  #{functionId,jdbcType=INTEGER},
       </if>
       <if test="ratelimit != null">
-		RATELIMIT=#{ratelimit,jdbcType=INTEGER},
+		RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
       </if>
       <if test="cfgRegionCode != null">
    		CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
@@ -2806,7 +2806,7 @@
         function_id =  #{functionId,jdbcType=INTEGER},
       </if>
       <if test="ratelimit != null">
-		RATELIMIT=#{ratelimit,jdbcType=INTEGER},
+		RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
       </if>
       <if test="cfgRegionCode != null">
    		CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER},
diff --git a/src/main/java/com/nis/web/dao/configuration/DomainDao.xml b/src/main/java/com/nis/web/dao/configuration/DomainDao.xml
index 68c8ae8f3..8c2fff8ea 100644
--- a/src/main/java/com/nis/web/dao/configuration/DomainDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/DomainDao.xml
@@ -28,7 +28,7 @@
     <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="cfg_region_code" property="cfgRegionCode" jdbcType="VARCHAR" />
-    <result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
+    <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="BaseStringMapWithUser" type="com.nis.domain.configuration.HttpUrlCfg" extends="BaseStringMap">
     <result column="creator_name" property="creatorName" jdbcType="VARCHAR" />
@@ -77,7 +77,7 @@
     #{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}
-    ,#{ratelimit,jdbcType=INTEGER}
+    ,#{ratelimit,jdbcType=VARCHAR}
   </sql>
   <select id="getById" resultMap="BaseStringMap" parameterType="java.lang.Long" >
     SELECT 
@@ -210,7 +210,7 @@
 			    		AND ${page.alias}.CFG_REGION_CODE =#{cfgRegionCode,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="ratelimit != null">
-			    		AND ${page.alias}.RATELIMIT =#{ratelimit,jdbcType=INTEGER}
+			    		AND ${page.alias}.RATELIMIT =#{ratelimit,jdbcType=VARCHAR}
 			    	</if>
 		  		</when>
 		  		<otherwise>
@@ -296,7 +296,7 @@
 			    		AND r.CFG_REGION_CODE =#{cfgRegionCode,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="ratelimit != null">
-			    		AND r.RATELIMIT =#{ratelimit,jdbcType=INTEGER}
+			    		AND r.RATELIMIT =#{ratelimit,jdbcType=VARCHAR}
 			    	</if>
 		  		</otherwise>
 		  	</choose>
@@ -427,7 +427,7 @@
         cfg_region_code =  #{cfgRegionCode,jdbcType=INTEGER},
       </if>
       <if test="ratelimit != null" >
-        ratelimit =  #{ratelimit,jdbcType=INTEGER},
+        ratelimit =  #{ratelimit,jdbcType=VARCHAR},
       </if>
       </trim>
     </set>
diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
index 374786c29..1afd83ab4 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
@@ -34,7 +34,7 @@
     <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="INTEGER" />
+    <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
     <result column="dns_strategy_id" property="dnsStrategyId" jdbcType="INTEGER" />
     <result column="ir_type" property="irType" jdbcType="INTEGER" />
     <result column="user_region1" property="userRegion1" jdbcType="VARCHAR" />
@@ -183,7 +183,7 @@
     #{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},
-    #{areaEffectiveIds,jdbcType=VARCHAR}, #{functionId,jdbcType=INTEGER}, #{ratelimit,jdbcType=INTEGER},
+    #{areaEffectiveIds,jdbcType=VARCHAR}, #{functionId,jdbcType=INTEGER}, #{ratelimit,jdbcType=VARCHAR},
   	#{dnsStrategyId,jdbcType=INTEGER},#{irType,jdbcType=INTEGER},
   	#{userRegion1,jdbcType=VARCHAR},
   	#{userRegion2,jdbcType=VARCHAR},
@@ -374,7 +374,7 @@
 			    		AND ${page.alias}.FUNCTION_ID=#{functionId,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="ratelimit != null">
-			    		AND ${page.alias}.RATELIMIT=#{ratelimit,jdbcType=INTEGER}
+			    		AND ${page.alias}.RATELIMIT=#{ratelimit,jdbcType=VARCHAR}
 			    	</if>
 			    	<if test="dnsStrategyId != null">
 			    		AND ${page.alias}.DNS_STRATEGY_ID=#{dnsStrategyId,jdbcType=INTEGER}
@@ -499,7 +499,7 @@
 			    		AND r.FUNCTION_ID=#{functionId,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="ratelimit != null">
-			    		AND r.RATELIMIT=#{ratelimit,jdbcType=INTEGER}
+			    		AND r.RATELIMIT=#{ratelimit,jdbcType=VARCHAR}
 			    	</if>
 			    	<if test="dnsStrategyId != null">
 			    		AND r.DNS_STRATEGY_ID=#{dnsStrategyId,jdbcType=INTEGER}
@@ -669,7 +669,7 @@
 			FUNCTION_ID=#{functionId,jdbcType=INTEGER},
 	      </if>
 	      <if test="ratelimit != null">
-			RATELIMIT=#{ratelimit,jdbcType=INTEGER},
+			RATELIMIT=#{ratelimit,jdbcType=VARCHAR},
 	      </if>
 	      <if test="dnsStrategyId != null">
 			DNS_STRATEGY_ID=#{dnsStrategyId,jdbcType=INTEGER},
diff --git a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
index 6fbdc94f0..e61b06a23 100644
--- a/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/StringCfgDao.xml
@@ -28,7 +28,7 @@
     <result column="is_hexbin" property="isHexbin" jdbcType="INTEGER" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="cfg_region_code" property="cfgRegionCode" jdbcType="VARCHAR" />
-    <result column="ratelimit" property="ratelimit" jdbcType="INTEGER" />
+    <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap id="BaseStringMapWithUser" type="com.nis.domain.configuration.BaseStringCfg" extends="BaseStringMap">
     <result column="creator_name" property="creatorName" jdbcType="VARCHAR" />
@@ -120,7 +120,7 @@
     #{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}
-    ,#{ratelimit,jdbcType=INTEGER}
+    ,#{ratelimit,jdbcType=VARCHAR}
   </sql>
   <select id="getById" resultMap="BaseStringMap" parameterType="java.lang.Long" >
     SELECT 
@@ -253,7 +253,7 @@
 			    		AND ${page.alias}.CFG_REGION_CODE =#{cfgRegionCode,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="ratelimit != null">
-			    		AND ${page.alias}.RATELIMIT =#{ratelimit,jdbcType=INTEGER}
+			    		AND ${page.alias}.RATELIMIT =#{ratelimit,jdbcType=VARCHAR}
 			    	</if>
 		  		</when>
 		  		<otherwise>
@@ -339,7 +339,7 @@
 			    		AND r.CFG_REGION_CODE =#{cfgRegionCode,jdbcType=INTEGER}
 			    	</if>
 			    	<if test="ratelimit != null">
-			    		AND r.RATELIMIT =#{ratelimit,jdbcType=INTEGER}
+			    		AND r.RATELIMIT =#{ratelimit,jdbcType=VARCHAR}
 			    	</if>
 		  		</otherwise>
 		  	</choose>
@@ -468,7 +468,7 @@
         cfg_region_code =  #{cfgRegionCode,jdbcType=INTEGER},
       </if>
       <if test="ratelimit != null" >
-        ratelimit =  #{ratelimit,jdbcType=INTEGER},
+        ratelimit =  #{ratelimit,jdbcType=VARCHAR},
       </if>
       </trim>
     </set>
diff --git a/src/main/resources/sql/alter_ratelimit_varchar.sql b/src/main/resources/sql/alter_ratelimit_varchar.sql
new file mode 100644
index 000000000..6cd4ae953
--- /dev/null
+++ b/src/main/resources/sql/alter_ratelimit_varchar.sql
@@ -0,0 +1,10 @@
+ALTER TABLE app_byte_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间';
+ALTER TABLE app_domain_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间';
+ALTER TABLE app_http_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间';
+ALTER TABLE app_layer_header_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间';
+ALTER TABLE app_policy_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间';
+ALTER TABLE app_ssl_cert_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间';
+ALTER TABLE area_ip_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间';
+ALTER TABLE dns_domain_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间';
+ALTER TABLE http_url_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间';
+ALTER TABLE ip_port_cfg MODIFY ratelimit VARCHAR(10) NULL COMMENT '限速比例,0到1之间';

From 015a5811c9035ee863640c40e1c552df54cca93a Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Sat, 25 Aug 2018 17:07:34 +0800
Subject: [PATCH 16/39] =?UTF-8?q?APP=E7=AD=96=E7=95=A5=E4=BF=AE=E6=94=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/dao/configuration/AppCfgDao.java   |  1 +
 .../nis/web/dao/configuration/AppCfgDao.xml    |  4 ++++
 .../service/configuration/AppCfgService.java   | 18 +++++++-----------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java
index 26307a96e..a5d4f8037 100644
--- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java
@@ -93,4 +93,5 @@ public interface AppCfgDao {
 	public void auditCfg(BaseCfg entity);
 	//修改配置状态
 	public void updateCfgValid(BaseCfg entity);
+	public void deleteSubscribeIdCfg(AppPolicyCfg entity);
 }
diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
index 5d0adadbc..8d97ef21e 100644
--- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
@@ -2840,6 +2840,10 @@
   <!-- 删除APP策略IP子配置 -->
   <delete id="deleteAppPolicyIpCfg" >
   	delete from ip_port_cfg where compile_id=#{compileId} and function_id=#{functionId}
+  </delete>
+    <!-- 删除SubscribeId子配置 -->
+  <delete id="deleteSubscribeIdCfg" >
+  	delete from ntc_subscribe_id_cfg where compile_id=#{compileId} and function_id=#{functionId}
   </delete>
   <!-- 查询APP策略IP子配置 -->
   <select id="getAppPolicyIpList" resultMap="ipPortMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
index d08a11bed..2a0304020 100644
--- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
@@ -240,15 +240,11 @@ public class AppCfgService extends BaseService {
 				}
 			}
 			appCfgDao.updateAppPolicyCfg(entity);
-
+			
+			// 先删后加 各域配置
 			appCfgDao.deleteAppPolicyIpCfg(entity);
-			if (entity != null && entity.getNtcSubscribeIdCfgList() != null
-					&& entity.getNtcSubscribeIdCfgList().size() > 0) {
-				for (NtcSubscribeIdCfg ntcSubscribeIdCfg : entity.getNtcSubscribeIdCfgList()) {
-					ntcSubscribeIdCfg.setCompileId(entity.getCompileId());
-					stringcfgDao.deleteSubscribeIdCfg(ntcSubscribeIdCfg);
-				}
-			}
+			appCfgDao.deleteSubscribeIdCfg(entity);
+			
 			// 删除旧的区域IP，新增新的区域IP
 			AreaIpCfg area = new AreaIpCfg();
 			area.setCompileId(entity.getCompileId());
@@ -1449,9 +1445,9 @@ public class AppCfgService extends BaseService {
 			}
 			// 删除关键字
 			if (entity.getNtcSubscribeIdCfgList() != null && entity.getNtcSubscribeIdCfgList().size() > 0) {
-				NtcSubscribeIdCfg ntcSubscribeIdCfg = new NtcSubscribeIdCfg();
-				BeanUtils.copyProperties(entity, ntcSubscribeIdCfg, new String[] { "cfgId" });
-				stringcfgDao.updateSubscribeIdCfg(ntcSubscribeIdCfg);
+				NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
+				BeanUtils.copyProperties(entity, cfg, new String[] { "cfgId" });
+				stringcfgDao.updateSubscribeIdCfg(cfg);
 			}
 			// 保存区域IP信息
 			if (entity.getAreaCfg() != null && entity.getAreaCfg().size() > 0) {

From cc0a30795856e9a38abbf4f7833b26c57b5c12fc Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Sun, 26 Aug 2018 10:20:50 +0800
Subject: [PATCH 17/39] =?UTF-8?q?http=E5=A2=9E=E5=8A=A0compileId=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=20apptcpsessionBYte=E5=A2=9E=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E5=80=BC=E7=B1=BB=E5=9E=8B=E5=B1=9E=E6=80=A7=EF=BC=8C=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=B1=BB=E5=9E=8B=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp | 14 +++++++++-----
 .../webapp/WEB-INF/views/cfg/website/httpList.jsp  |  4 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
index 93dcfa362..308f66b76 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
@@ -270,10 +270,12 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 								    <th><spring:message code="social_app"/></th>
-									<th><spring:message code="whether_hexbinary"/></th>
+								    <th><spring:message code="lowBoundary"/></th>
+								    <th><spring:message code="upBoundary"/></th>
+									<%-- <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
-									<th><spring:message code="do_log"/></th>
+									<th><spring:message code="do_log"/></th> --%>
 									<%-- <th><spring:message code="block_type"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -299,7 +301,9 @@
 									</td>
 								    <td>${cfg.cfgDesc }</td>
 								    <td>${cfg.appName }</td>
-								    <td>
+								    <td>${cfg.lowBoundary }</td>
+								    <td>${cfg.upBoundary }</td>
+								    <%-- <td>
 										<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
 											<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
 				               			</c:forEach>
@@ -317,7 +321,7 @@
 										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
 											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
 		             					</c:forEach>    
-									</td>
+									</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>
@@ -331,7 +335,7 @@
 											<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 functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
index 7bad1eed4..589b0b51f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
@@ -465,6 +465,7 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
+									<th style="display: none"><spring:message code="cfg_id"/></th>
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 									<th><spring:message code="block_type"/></th>
 									<th><spring:message code="do_log"/></th>
@@ -491,6 +492,7 @@
 									<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 									<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
 									</td>
+								    <td>${indexCfg.compileId }</td>
 								    <td>${indexCfg.cfgDesc }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
@@ -586,7 +588,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

From 9678a4a10f94144c4be50f87bf4acce44f8c0d8d Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Sun, 26 Aug 2018 10:43:03 +0800
Subject: [PATCH 18/39] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=80=BB=E9=87=8F=E6=9F=A5=E8=AF=A2=EF=BC=8C?=
 =?UTF-8?q?=E6=95=B4=E9=A1=B5=E9=85=8D=E7=BD=AE=E5=8F=AA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=B8=80=E6=AC=A1=EF=BC=8C=E5=87=8F=E5=B0=8F=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=B5=AA=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/domain/report/NtcPzReport.java    | 17 ++--
 .../report/NtcPzReportController.java         | 42 ++++++---
 .../webapp/static/global/scripts/common.js    | 85 ++++++++++++-------
 3 files changed, 89 insertions(+), 55 deletions(-)

diff --git a/src/main/java/com/nis/domain/report/NtcPzReport.java b/src/main/java/com/nis/domain/report/NtcPzReport.java
index 5c864e6a1..d53f89a77 100644
--- a/src/main/java/com/nis/domain/report/NtcPzReport.java
+++ b/src/main/java/com/nis/domain/report/NtcPzReport.java
@@ -25,21 +25,14 @@ public class NtcPzReport extends BaseReport<NtcPzReport>{
 	 */
 	
 	private static final long serialVersionUID = 7079305499220977782L;
-	private Long configId;
+	private Long cfgId;
 	private Date statTime;
-	/**
-	 * configId
-	 * @return  configId
-	*/
 	
-	public Long getConfigId() {
-		return configId;
+	public Long getCfgId() {
+		return cfgId;
 	}
-	/**
-	 * @param configId the configId to set
-	 */
-	public void setConfigId(Long configId) {
-		this.configId = configId;
+	public void setCfgId(Long cfgId) {
+		this.cfgId = cfgId;
 	}
 	/**
 	 * statTime
diff --git a/src/main/java/com/nis/web/controller/report/NtcPzReportController.java b/src/main/java/com/nis/web/controller/report/NtcPzReportController.java
index 8ba060a56..a31da3994 100644
--- a/src/main/java/com/nis/web/controller/report/NtcPzReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcPzReportController.java
@@ -50,30 +50,46 @@ import net.sf.json.JsonConfig;
 public class NtcPzReportController extends BaseController{
 	@RequestMapping(value="ajaxGetLogTotal",method=RequestMethod.POST)
 	@ResponseBody
-	public Map<String, Object> ajaxGetLogTotal(Model model,long endTime,int action,Integer functionId,Integer compileId){
-		Map<String, Object> data=new HashMap<String, Object>();
+	public List<Map<String, Object>> ajaxGetLogTotal(Model model,long endTime,String actions,Integer functionId,String compileIds){
+		List<Map<String, Object>> dataList=new ArrayList<>();
 		SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
 		int interval=Constants.LOG_TIME_RANGE;
 		Date endDate=new Date(endTime);
 		Date startDate=new Date(endTime-interval);
-		int serviceId=0;
+		String serviceIdsStr="";
+		StringBuffer serviceIds=new StringBuffer();
 		List<FunctionServiceDict> serviceList=DictUtils.getFunctionServiceDictList(functionId.intValue()); 
-		for(FunctionServiceDict service:serviceList){
-			if(service.getAction().intValue()==action){
-				serviceId=service.getServiceId().intValue();
-				break;
+		for(String action:actions.split(",")) {
+			for(FunctionServiceDict service:serviceList){
+				if(service.getAction().intValue()==Integer.parseInt(action)){
+					serviceIds.append(service.getServiceId().intValue());
+					serviceIds.append(",");
+				}
 			}
 		}
-		data.put("compileId", compileId.intValue());
-		String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, String.valueOf(compileId), String.valueOf(serviceId), sdf.format(startDate), sdf.format(endDate));
+		if(serviceIds.toString().endsWith(",")) {
+			serviceIdsStr=serviceIds.toString().substring(0,serviceIds.toString().lastIndexOf(","));
+		}
+		String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIdsStr, sdf.format(startDate), sdf.format(endDate));
 		List<NtcPzReport> list=getList(json);
-		if(list!=null&&list.size()>0){
-			data.put("sum",list.get(0).getSum().longValue());
+		String[] idArr=compileIds.split(",");
+		if(list!=null&&(list.size()>0)){
+			for(NtcPzReport report:list) {
+				Map<String, Object> data=new HashMap<String, Object>();
+				data.put("compileId", report.getCfgId().longValue());
+				data.put("sum",report.getSum().longValue());
+				dataList.add(data);
+			}
 		}else {
-			data.put("sum", 0);
+			for(String id:idArr) {
+				Map<String, Object> data=new HashMap<String, Object>();
+				data.put("compileId", id);
+				data.put("sum",0);
+				dataList.add(data);
+			}
 		}
 		
-		return data;
+		return dataList;
 	}
 	@RequestMapping("/ntcPzReport")
 	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 603c8d7ba..376aefa3c 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -336,28 +336,8 @@ $(function(){
    $("input[name$='exprType']:checked").each(function(){
 	   setDefaultMatchMethod(this);
    });
-   /*
-    *配置展示日志总数，审核通过才会调用接口查询日志总量
-	必须放在是否审核一列之后 
-	并且是否审核一列的span标签需配置data-audit="xxxx"属性
-	xxxx可用值为created，approved，unapproved，cancel 
-	td需要配置属性有，functionId，compileId，action
-    */
-   $("td[compileId]").each(function(){
-	   	var audit=$(this).attr("audit");
-	   	if(audit == 1){
-	   		var data={};
-			data.date=new Date();
-			data.compileId=$(this).attr("compileId");
-			data.action=$(this).attr("action");
-			data.functionId=$(this).attr("functionId");
-			data.audit=$(this).attr("audit");
-			data.obj=$(this)
-			GetLogTotal(data);
-	   	}else{
-	   		$(this).html("0");
-	   	}
-	});
+   //获取配置日志总数
+   getTotalLog();
    $(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 		$("#protocolId").val($(this).attr("protocolId"));
@@ -1116,32 +1096,77 @@ var viewAreaInfo=function(path,areaEffectiveIds,compileId){
   
   });
 }
-
-var GetLogTotal=function(data){
+var getTotalLog=function(){
+	/*
+		td需要配置属性有，audit,functionId，compileId，action
+	    */
+	   var data={};
+	   data.date=new Date();
+	   data.compileIds=[];
+	   data.actions=[];
+	   data.objs=[];
+	   $("td[compileId]").each(function(){
+		   	var audit=$(this).attr("audit");
+		   	var compileId=$(this).attr("compileId");
+		   	var action=$(this).attr("action");
+		   	var functionId=$(this).attr("functionId");
+		   	if(audit&&compileId&&action&&functionId){
+		   		if(audit == 1){
+					var has=false;
+					for(var i=0;i<data.actions.length;i++){
+						if(data.actions[i]==$(this).attr("action")){
+							has=true;
+						}
+					}
+					if(!has){
+						data.actions.push($(this).attr("action"));
+					}
+					data.compileIds.push($(this).attr("compileId"));
+					data.functionId=$(this).attr("functionId");
+					data.objs.push($(this));
+			   	}else{
+			   		$(this).html("0");
+			   	}
+		   	}
+		});
+	   if(data.compileIds.length>0){
+		   GetLogTotal(data);
+	   }
+	   
+}
+var GetLogTotal=function(_data){
 	var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
 	var timeStamp=0;
-	if(data.date){
-		timeStamp=data.date.valueOf(); 
+	if(_data.date){
+		timeStamp=_data.date.valueOf(); 
 	}else{
 		timeStamp=(new Date()).valueOf(); 
 	}
-	var totalTr=$(data.obj);
+	var totalTrs=$(_data.objs);
 	var timeout=$.validator.messages.timeout;
 	var request=$.ajax({
 		type:'post',
 		timeout:10000,//超时时间设置，查询接口时间过长超时
 		url:pathName+'/report/ajaxGetLogTotal',
-		data:{"endTime":timeStamp,"action":data.action,"functionId":data.functionId,"compileId":data.compileId},
+		data:{"endTime":timeStamp,"actions":_data.actions.join(','),"functionId":_data.functionId,"compileIds":_data.compileIds.join(',')},
 		dataType:'json',
 		async:true,
 		success:function(data,textStatus){//处理返回结果
 			if(textStatus=="success"){
-				totalTr.html(data.sum);
+				totalTrs.each(function(){
+					for(var i=0;i<data.length;i++){
+						if($(this).attr("compileId")==data[i].compileId){
+							$(this).html(data[i].sum);
+						}
+					}
+				})
 			}
 		},
 		complete:function(XMLHttpRequest,status){//超时设置
 			if(status=="timeout"){
-				totalTr.html(timeout);
+				totalTrs.each(function(){
+					$(this).html(timeout);
+				})
 			}
 		}
 	});

From f99e15b3c4538452c5fe7b37c041e7d39ed902ea Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Sun, 26 Aug 2018 12:52:41 +0800
Subject: [PATCH 19/39] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=B6doLog=E9=80=89=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E4=B8=8D=E5=AF=B9=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/static/global/scripts/common.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 376aefa3c..48d67fad0 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -664,8 +664,12 @@ var switchAction=function(action){
 		$(".doLog").addClass("hidden");
 		$("input[name=doLog][value=0]").prop("checked",true);
 	}else{
-		$(".doLog").removeClass("hidden");
-		$("input[name=doLog][value=2]").prop("checked",true);
+		//如果表单非修改时，选中默认值
+		if(!$("input[name='compileId']").val()){
+			$(".doLog").removeClass("hidden");
+			$("input[name=doLog][value=2]").prop("checked",true);
+		}
+		
 	}
 }
 //ipType、ipPattern、portPattern选项变化时调用此方法，添加默认值

From 5b5e63e816d973e6e24f77a9baa2abf08011e4cb Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Sun, 26 Aug 2018 14:51:39 +0800
Subject: [PATCH 20/39] =?UTF-8?q?ssl=20subscribeId=20BUG=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=20mail=20=E5=AD=90=E5=9F=9F=E9=85=8D=E7=BD=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85bug=E6=9B=B4=E6=94=B9=20ftp=20ftp-url=E5=9F=9F?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=97=A0=E6=B3=95=E6=96=B0=E5=A2=9Ebug?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_ru.properties  |   7 +-
 .../views/cfg/fileTransfer/ftpForm.jsp        |  39 +++++
 .../WEB-INF/views/cfg/mail/mailSubList.jsp    |  51 +++---
 .../WEB-INF/views/cfg/website/sslForm.jsp     | 147 ++++++++++--------
 4 files changed, 147 insertions(+), 97 deletions(-)

diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 9af169396..e315f4c40 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -17,7 +17,7 @@ updatePwd=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u043F\u0430\u0440\u0
 show=\u043F\u043E\u043A\u0430\u0437\u0430\u0442\u044C
 edit= \u0440\u0435\u0434\u0430\u043A\u0442\u0438\u0440\u043E\u0432\u0430\u0442\u044C
 hi=\u041F\u0440\u0438\u0432\u0435\u0442
-Exit=\u0412\u044B\u0445\u043E\u0434
+exit=\u0412\u044B\u0445\u043E\u0434
 choose=\u0412\u044B\u0431\u0440\u0430\u0442\u044C
 onloading=\u0417\u0430\u0433\u0440\u0443\u0437\u043A\u0430 ...
 #==========menu begin=====================
@@ -98,7 +98,7 @@ service_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u04
 system_service_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0431\u0438\u0437\u043D\u0435\u0441-\u0442\u0438\u043F\u043E\u043C \u0441\u0438\u0441\u0442\u0435\u043C\u044B
 features_area=\u0417\u043E\u043D\u0430 \u0441\u043F\u0435\u0446\u0438\u0444\u0438\u043A\u0438
 attribute_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0441\u0432\u043E\u0439\u0441\u0442\u0432\u0430\u043C\u0438
-Isp_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440\u043E\u043C
+isp_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u043E\u043F\u0435\u0440\u0430\u0442\u043E\u0440\u043E\u043C
 ip_multiple_control=IP \u043C\u043D\u043E\u0433\u043E\u0434\u043E\u043C\u0435\u043D\u043D\u043E\u0435 \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435
 ip_port_control=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 IP + \u043F\u043E\u0440\u0442\u0430\u043C\u0438
 website_multiple_control=\u041C\u043D\u043E\u0433\u043E\u0434\u043E\u043C\u0435\u043D\u043D\u043E\u0435 \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u0432\u0435\u0431-\u0441\u0430\u0439\u0442\u043E\u043C
@@ -1024,7 +1024,6 @@ MM_AV_URL=\u0410\u0443\u0434\u0438\u043E \u0438 \u0432\u0435\u0434\u0438\u043E U
 MM_VOIP_IP=VoIP IP
 MM_VOIP_ACCOUNT=\u0421\u0447\u0435\u0442 VoIP
 #=======================for import ip configuration=================
-<<<<<<< HEAD
 drop_ip=\u041E\u0442\u0431\u0440\u0430\u0441\u044B\u0432\u0430\u043D\u0438\u0435IP
 loop_ip=\u0420\u0435\u0444\u043B\u044E\u043A\u0441 IP
 drop_or_loop_ip=\u041E\u0442\u0431\u0440\u0430\u0441\u044B\u0432\u0430\u043D\u0438\u0435/\u0420\u0435\u0444\u043B\u044E\u043A\u0441 IP
@@ -1040,7 +1039,6 @@ tunnel_code=\u0421\u0435\u0440\u0438\u0439\u043D\u044B\u0439 \u043D\u043E\u043C\
 tunnel_name=\u041D\u0430\u0437\u0432\u0430\u043D\u0438\u0435 \u0437\u0430\u0448\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0433\u043E \u0442\u0443\u043D\u043D\u0435\u043B\u044C\u043D\u043E\u0433\u043E \u043F\u043E\u0432\u0435\u0434\u0435\u043D\u0438\u044F
 tunnel_desc= \u041E\u043F\u0438\u0441\u0430\u043D\u0438\u0435 \u0437\u0430\u0448\u0438\u0444\u0440\u043E\u0432\u0430\u043D\u043D\u043E\u0433\u043E \u0442\u0443\u043D\u043D\u0435\u043B\u044C\u043D\u043E\u0433\u043E \u043F\u043E\u0432\u0435\u0434\u0435\u043D\u0438\u044F
 call_external_procedures_failed=\u041E\u0448\u0438\u0431\u043A\u0430 \u0432\u044B\u0437\u043E\u0432\u0430 \u0432\u043D\u0435\u0448\u043D\u0435\u0439 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u043C\u044B
-=======
 drop_ip=IP Drop
 loop_ip=IP Loop
 drop_or_loop_ip=IP Drop Or Loop
@@ -1050,4 +1048,3 @@ file_desc=File Desc
 content_type=Content Type
 content_length=Content Length
 response_file=Response File
->>>>>>> branch 'develop' of http://10.0.6.99/gwall/gwall.git
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
index 059271b01..bf8d965d6 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpForm.jsp
@@ -248,6 +248,45 @@
 									<!--/ip info-->
 									</c:if>
 									<c:if test="${region.regionType eq 2 }">
+									<c:if test="${region.configServiceType eq 'ftp_url' }">
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+										<h4 class="form-section">
+											<spring:message code="${region.configRegionValue}" />
+											<small> <span
+												class="glyphicon glyphicon-plus ${tabName}Add"
+												onClick="addContent(this,'${tabName}')" title="add"></span></small>
+										</h4>
+										<c:set var="cfgName" value="stringList[${strCfgIndex}]"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+										<c:choose>
+											<c:when test="${fn:length(_cfg.stringList)>0}">
+												<c:set var="isBreak" value="false" ></c:set>
+												<c:forEach items="${_cfg.stringList}" var="cfg">
+													<c:choose>
+														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
+															<div class="row boxSolid ${tabName}${status.index}">
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+															</div>
+															<c:set var="isBreak" value="true" ></c:set>
+															<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+														</c:when>
+													</c:choose>
+												</c:forEach>
+												<c:if test="${!isBreak}">
+													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+													</div>
+													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+												</c:if>
+											</c:when>
+											<c:otherwise>
+												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+												</div>
+												<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+											</c:otherwise>
+										</c:choose>
+									</c:if>
 									<c:if test="${region.configServiceType eq 'keywords' }">
 										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
 										<h4 class="form-section">
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
index 34229a3a5..87d449a6c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailSubList.jsp
@@ -19,7 +19,6 @@
 			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>
 	</div>
 </c:forEach>
-
 </div>
 <c:forEach items="${tabList}" var="region">
 	<c:if test="${region[0] eq 1 }">
@@ -37,8 +36,8 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='ip_pattern'/>:</label>
@@ -49,7 +48,8 @@
 								</label>
 							</div>
 						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_ip'/>:</label>
@@ -70,15 +70,15 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
@@ -91,8 +91,8 @@
 								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='direction'/>:</label>
@@ -103,8 +103,8 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='protocol'/>:</label>
@@ -117,6 +117,7 @@
 						</div>
 					</div>
 				</div>
+			</div>
 			</c:if>
 			</c:forEach>
 	</c:if>
@@ -130,8 +131,8 @@
 								<label><spring:message code='district' />:</label><label>${cfg.district }</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
 								<label><spring:message code='keywords' />:</label>
@@ -153,8 +154,8 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='match_method' />:</label>
@@ -165,8 +166,8 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='whether_hexbinary' />:</label>
@@ -192,7 +193,7 @@
 								<label><spring:message code='raw_len' />:</label><label>${cfg.rawLen }</label>
 							</div>
 						</div>
-						</div>
+					</div>
 					<div class="row">						
 						<div class="col-md-4">
 							<div class="form-group">
@@ -213,8 +214,8 @@
 								</a>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-8">
 							<div class="form-group">
 								<label><spring:message code='file_url' />:</label>
@@ -255,8 +256,8 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='match_method' />:</label>
@@ -267,8 +268,8 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
+					</div>
+					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='whether_hexbinary' />:</label>
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
index d92dbada6..9de33fb79 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslForm.jsp
@@ -260,79 +260,92 @@
 									<!--/ip info-->
 									</c:if>
 									<c:if test="${region.regionType eq 2 }">
-										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
-										<h4 class="form-section">
-											<spring:message code="${region.configRegionValue}" />
-											<small> <span
-												class="glyphicon glyphicon-plus ${tabName}Add"
-												onClick="addContent(this,'${tabName}')" title="add"></span></small>
-										</h4>
-										<c:if test="${region.configServiceType eq 'subscribe_id' }">
-											<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIdIndex}]"></c:set>
-										</c:if>
 										<c:if test="${region.configServiceType ne 'subscribe_id' }">
+											<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+											<h4 class="form-section">
+												<spring:message code="${region.configRegionValue}" />
+												<small> <span
+													class="glyphicon glyphicon-plus ${tabName}Add"
+													onClick="addContent(this,'${tabName}')" title="add"></span></small>
+											</h4>
 											<c:set var="cfgName" value="sslList[${strCfgIndex}]"></c:set>
+											<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+											<c:choose>
+													<c:when test="${fn:length(_cfg.sslList)>0}">
+														<c:set var="isBreak" value="false" ></c:set>
+														<c:forEach items="${_cfg.sslList}" var="cfg">
+															<c:choose>
+																<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
+																	<div class="row boxSolid ${tabName}${status.index}">
+																		<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+																	</div>
+																	<c:set var="isBreak" value="true" ></c:set>
+																	
+																		<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+																</c:when>
+															</c:choose>
+														</c:forEach>
+														<c:if test="${!isBreak}">
+															<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+															</div>
+																	
+															<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+															
+														</c:if>
+													</c:when>
+													<c:otherwise>
+														<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+															<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+														</div>
+														<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+													</c:otherwise>
+											</c:choose>
 										</c:if>
-										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
-										<c:choose>
-											<c:when test="${fn:length(_cfg.sslList)>0}">
-												<c:set var="isBreak" value="false" ></c:set>
-												<c:forEach items="${_cfg.sslList}" var="cfg">
-													<c:choose>
-														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
-															<div class="row boxSolid ${tabName}${status.index}">
+										<c:if test="${region.configServiceType eq 'subscribe_id' }">
+											<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+											<h4 class="form-section">
+												<spring:message code="${region.configRegionValue}" />
+												<small> <span
+													class="glyphicon glyphicon-plus ${tabName}Add"
+													onClick="addContent(this,'${tabName}')" title="add"></span></small>
+											</h4>
+												<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIdIndex}]"></c:set>
+											<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+											<c:choose>
+													<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
+														<c:set var="isBreak" value="false" ></c:set>
+														<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
+															<c:choose>
+																<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
+																	<div class="row boxSolid subscribeId ${tabName}${status.index}">
+																		<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+																	</div>
+																	<c:set var="isBreak" value="true" ></c:set>
+																		<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+																</c:when>
+															</c:choose>
+														</c:forEach>
+														<c:if test="${!isBreak}">
+															<div class="row boxSolid ${tabName}${status.index} hidden disabled">
 																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
-															<c:set var="isBreak" value="true" ></c:set>
-															<c:if test="${region.configServiceType ne 'subscribe_id' }">
-																<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
-															</c:if>
-														</c:when>
-													</c:choose>
-												</c:forEach>
-												<c:if test="${!isBreak}">
-													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
-													</div>
-															<c:if test="${region.configServiceType ne 'subscribe_id' }">
-																<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
-															</c:if>
-												</c:if>
-											</c:when>
-											<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
-												<c:set var="isBreak" value="false" ></c:set>
-												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
-													<c:choose>
-														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
-															<div class="row boxSolid subscribeId ${tabName}${status.index}">
-																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
-															</div>
-															<c:set var="isBreak" value="true" ></c:set>
 																<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
-														</c:when>
-													</c:choose>
-												</c:forEach>
-												<c:if test="${!isBreak}">
-													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
-													</div>
-													<c:if test="${region.configServiceType eq 'subscribe_id' }">
-																<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
-															</c:if>
-												</c:if>
-											</c:when>
-											<c:otherwise>
-												<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
-													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
-												</div>
-												<c:if test="${region.configServiceType eq 'subscribe_id' }">
-													<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
-												</c:if>
-												<c:if test="${region.configServiceType ne 'subscribe_id' }">
-													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
-												</c:if>
-											</c:otherwise>
-										</c:choose>
+														</c:if>
+													</c:when>
+													<c:otherwise>
+														<div class="row boxSolid subscribeId ${tabName}${status.index} hidden disabled">
+															<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+														</div>
+														<c:if test="${region.configServiceType eq 'subscribe_id' }">
+															<c:set var="subscribeIdIndex" value="${subscribeIdIndex+1 }"></c:set>
+														</c:if>
+														<c:if test="${region.configServiceType ne 'subscribe_id' }">
+															<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+														</c:if>
+													</c:otherwise>
+											</c:choose>
+										</c:if>
 									</c:if>
 								</c:forEach>
 								<br>

From b79807ccf52c3d1b24ae498579e52f0df19c3a9b Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Sun, 26 Aug 2018 15:17:15 +0800
Subject: [PATCH 21/39] =?UTF-8?q?bgp=E3=80=81xmpp=20subscribe=5Fid?=
 =?UTF-8?q?=E5=9F=9F=E4=B8=8D=E5=8F=AF=E5=8D=95=E7=8B=AC=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=EF=BC=8C=E5=BF=85=E9=A1=BB=E6=90=AD=E9=85=8D=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/other/bgpForm.jsp       | 27 +++++-----
 .../WEB-INF/views/cfg/other/xmppForm.jsp      | 54 ++++++++++---------
 2 files changed, 44 insertions(+), 37 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
index 9636ad067..2135334a9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
@@ -19,6 +19,8 @@
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
+							var action=$("input[name='action']:checked").val();
+							switchAction(action);
 						});
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
 						$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -186,7 +188,7 @@
 								</div>
 								
 								<!-- dolog begin-->
-								<div class="row">
+								<div class="row doLog">
 									<div class="col-md-6">
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
@@ -213,7 +215,7 @@
 								<c:set var="ipCfgIndex" value="0"></c:set>
 								<c:set var="complexCfgIndex" value="0"></c:set>
 								<c:set var="strAsCfgIndex" value="0"></c:set>
-								<c:set var="strCfgIndex" value="0"></c:set>
+								<c:set var="subscribeIndex" value="0"></c:set>
 								<c:forEach items="${regionList}" var="region" varStatus="status">
 									<c:if test="${region.regionType eq 1 }">
 										<!--ip info-->
@@ -285,45 +287,44 @@
 											</c:otherwise>
 										</c:choose>
 									   </c:if>
-									  <c:if test="${region.configServiceType == 'subscribe_id'}">
-									     <c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+									  <c:if test="${region.configServiceType eq 'subscribe_id' }">
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
 										<h4 class="form-section">
 											<spring:message code="${region.configRegionValue}" />
 											<small> <span
 												class="glyphicon glyphicon-plus ${tabName}Add"
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
-										<c:set var="cfgName" value="ntcSubscribeIdCfgList[${strCfgIndex}]"></c:set>
-										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+										<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIndex}]"></c:set>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
 												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 													<c:choose>
 														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
-															<div class="row boxSolid ${tabName}${status.index}">
+															<div class="row ${tabName}${status.index}">
 																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
 															<c:set var="isBreak" value="true" ></c:set>
-															<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+															<c:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
 														</c:when>
 													</c:choose>
 												</c:forEach>
 												<c:if test="${!isBreak}">
-													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<div class="row ${tabName}${status.index} hidden disabled">
 														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
-													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+													<c:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
 												</c:if>
 											</c:when>
 											<c:otherwise>
-												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+												<div class="rows ${tabName}${status.index} hidden disabled">
 													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 												</div>
-												<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+												<c:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
 											</c:otherwise>
 										</c:choose>
-									  </c:if>
+									</c:if>
 									</c:if>
 									<c:if test="${region.regionType eq 3 }">
 										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
index 2574baca3..55e8643e0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
@@ -19,6 +19,8 @@
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
+							var action=$("input[name='action']:checked").val();
+							switchAction(action);
 						});
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
 						$("#protocolId").val($(".action:checked").attr("protocolId"));
@@ -55,7 +57,7 @@
 											}
 										});
 										//keywords非空校验完成校验二进制字符串
-										$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
+				   						$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
 											var isHexbin=$(this).val();
 											if(isHexbin == 1){ //十六进制 
 												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
@@ -155,31 +157,35 @@
 											</div>
 										</div>
 									</div>
-									<div class="col-md-6">
+										<div class="col-md-6">
 										<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>>
-															<spring:message code="${service.actionCode }" />
+													<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>
+												 </c:forEach>					
+											  </div>
 											<div for="action"></div>
 										</div>
 									</div>
 								</div>
 								<!-- dolog begin-->
-								<div class="row">
+								<div class="row doLog">
 									<div class="col-md-6">
 										<div class="form-group">
 											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
@@ -204,7 +210,7 @@
 								<!-- dolog end-->
 								
 								<c:set var="ipCfgIndex" value="0"></c:set>
-								<c:set var="strCfgIndex" value="0"></c:set>
+								<c:set var="subscribeIndex" value="0"></c:set>
 								<c:set var="complexCfgIndex" value="0"></c:set>
 								<c:forEach items="${regionList}" var="region" varStatus="status">
 									<c:if test="${region.regionType eq 1 }">
@@ -239,44 +245,44 @@
 									<!--/ip info-->
 									</c:if>
 									<c:if test="${region.regionType eq 2 }">
-									  <c:if test="${region.configServiceType == 'subscribe_id'}">
-									     <c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+								 <c:if test="${region.configServiceType eq 'subscribe_id' }">
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
 										<h4 class="form-section">
 											<spring:message code="${region.configRegionValue}" />
 											<small> <span
 												class="glyphicon glyphicon-plus ${tabName}Add"
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
-										<c:set var="cfgName" value="ntcSubscribeIdCfgList[${strCfgIndex}]"></c:set>
+										<c:set var="cfgName" value="ntcSubscribeIdCfgList[${subscribeIndex}]"></c:set>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
 												<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
 													<c:choose>
 														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
-															<div class="row boxSolid ${tabName}${status.index}">
+															<div class="row ${tabName}${status.index}">
 																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 															</div>
 															<c:set var="isBreak" value="true" ></c:set>
-															<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+															<c:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
 														</c:when>
 													</c:choose>
 												</c:forEach>
 												<c:if test="${!isBreak}">
-													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<div class="row ${tabName}${status.index} hidden disabled">
 														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 													</div>
-													<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+													<c:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
 												</c:if>
 											</c:when>
 											<c:otherwise>
-												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+												<div class="rows ${tabName}${status.index} hidden disabled">
 													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
 												</div>
-												<c:set var="strCfgIndex" value="${strCfgIndex+1 }"></c:set>
+												<c:set var="subscribeIndex" value="${subscribeIndex+1 }"></c:set>
 											</c:otherwise>
 										</c:choose>
-									  </c:if>
+									</c:if>
 									</c:if>
 									
 									

From dcaebffeb111275883d549e5e8ab6d7d7b868c81 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Sun, 26 Aug 2018 15:26:53 +0800
Subject: [PATCH 22/39] =?UTF-8?q?=E5=8C=BA=E5=9F=9FIP=E6=B3=A8=E9=87=8A=20?=
 =?UTF-8?q?=E6=91=98=E8=A6=81=E5=85=81=E8=AE=B8=E5=8D=95=E7=8B=AC=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AEsubscribe=5Fid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/include/form/areaInfo.jsp  |  4 ++--
 .../views/cfg/fileTransfer/fileDigestForm.jsp | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/main/webapp/WEB-INF/include/form/areaInfo.jsp b/src/main/webapp/WEB-INF/include/form/areaInfo.jsp
index 3eba91733..20d753cdb 100644
--- a/src/main/webapp/WEB-INF/include/form/areaInfo.jsp
+++ b/src/main/webapp/WEB-INF/include/form/areaInfo.jsp
@@ -123,7 +123,7 @@ $(function(){
 	</c:forEach>
 	
 </div>
-<div class="hidden" id="areaIp">
+<%-- <div class="hidden" id="areaIp">
 <h4 class="form-section"><spring:message code="area"/> ip<small><span class="glyphicon glyphicon-plus" title="add"></span></small></h4>
 	<div class="container-fluid hidden row">
 		<div class="row">
@@ -376,4 +376,4 @@ $(function(){
 		</div>
 	</div>
 	</c:forEach>
-</div>
+</div> --%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
index 2629f699a..4f4dd7d7e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestForm.jsp
@@ -28,11 +28,11 @@
 			submitHandler : function(form) {
 				var flag = true;
 				//代表所有业务都隐藏了，提示必须增加一种业务数据
-				if($(".boxSolid").length ==$(".boxSolid.hidden").length){
+				/* if($(".boxSolid").length ==$(".boxSolid.hidden").length){
 					top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
 					return;
-				}
-				$("input[name$='cfgKeywords']").each(function(){
+				} */
+				/* $("input[name$='cfgKeywords']").each(function(){
 					if($(this).val()==''){
 						$(this).parents(".form-group").find(
 								"div[for='"
@@ -40,8 +40,8 @@
 										+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$("#keywordError").text()+"</label>");
 						flag = false;
 					}
-				})
-				$("select[name$='isHexbin']").each(function(){
+				}) */
+				/* $("select[name$='isHexbin']").each(function(){
 					var isHexbin=$(this).val();
 					if(isHexbin == 1){ //十六进制 
 						var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
@@ -53,16 +53,16 @@
 							flag = false;
 						}					
 					}
-				});
+				}); */
 				if(flag){
 					//将disable属性的元素删除
-					$(".disabled").each(function(){
+					/* $(".disabled").each(function(){
 						$(this).remove();
-					});
+					}); */
 					$("input[name$='exprType']").attr("disabled",false);
-					if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){
+					/* if($("[name='behavCode']")&&$("[name='behavCode']").val()!=""){
 						$("input[name$='exprType']").val(1);
-					}
+					} */
 					loading('onloading...');
 					form.submit();
 				}else{

From 565c4f8fc32ee70a55ad013d55608f04a423c4b1 Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Sun, 26 Aug 2018 16:16:23 +0800
Subject: [PATCH 23/39] =?UTF-8?q?1.common.js=E5=A2=9E=E5=8A=A0=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=97=B6=E7=9A=84compileId=20=E4=B8=BA=E6=95=B0?=
 =?UTF-8?q?=E5=AD=97=E5=88=A4=E6=96=AD2.=E9=9F=B3=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E4=B8=AD=E6=B7=BB=E5=8A=A0do=5Flog=E5=AD=97=E6=AE=B5=EF=BC=8Cc?=
 =?UTF-8?q?ompileId=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/dao/configuration/AvCfgDao.xml    | 11 +++++---
 .../web/dao/configuration/AvContentCfgDao.xml | 25 +++++++++++++-----
 .../sql/update_cfg_index_info-20180820.sql    |  7 ++++-
 .../views/cfg/av/contIp/contIpForm.jsp        | 21 +++++++++++++++
 .../views/cfg/av/contIp/contIpList.jsp        | 14 ++++++++++
 .../views/cfg/av/contUrl/contUrlForm.jsp      | 21 +++++++++++++++
 .../views/cfg/av/contUrl/contUrlList.jsp      | 14 ++++++++++
 .../WEB-INF/views/cfg/av/picIp/picIpForm.jsp  | 21 +++++++++++++++
 .../WEB-INF/views/cfg/av/picIp/picIpList.jsp  | 14 ++++++++++
 .../views/cfg/av/picUrl/picUrlForm.jsp        | 21 +++++++++++++++
 .../views/cfg/av/picUrl/picUrlList.jsp        | 15 +++++++++++
 .../WEB-INF/views/cfg/av/signSampleForm.jsp   | 21 +++++++++++++++
 .../WEB-INF/views/cfg/av/signSampleList.jsp   | 16 +++++++++++-
 .../webapp/static/global/scripts/common.js    | 26 ++++++++++++++++++-
 14 files changed, 235 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml
index 58edbb36d..d12cff04a 100644
--- a/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AvCfgDao.xml
@@ -64,6 +64,7 @@
     <result column="creator_name" property="creatorName" jdbcType="VARCHAR" />
     <result column="auditor_name" property="auditorName" jdbcType="VARCHAR" />
     <result column="editor_name" property="editorName" jdbcType="VARCHAR" />
+    <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
   <sql id="AvFileSample_Column" >
     a.CFG_ID, a.SRC_URL,a.SAMPLE_URL, a.SRC_MD5,a.SAMPLE_MD5,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT,
@@ -77,7 +78,7 @@
     a.CFG_ID, a.description,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT,
     a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
     a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
-    a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.cfg_type,a.cfg_region_code,a.LEVEL
+    a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.cfg_type,a.cfg_region_code,a.LEVEL,a.do_log
   </sql>
   
   <select id="getAvFileSampleById" resultMap="AvFileSampleMap" parameterType="java.lang.Long" >
@@ -321,7 +322,7 @@
      description,LEVEL,CFG_DESC,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,AREA_EFFECTIVE_IDS,function_id,cfg_type,cfg_region_code
+    ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,function_id,cfg_type,cfg_region_code,do_log
     )values (
       #{description,jdbcType=VARCHAR},#{level,jdbcType=INTEGER},#{cfgDesc,jdbcType=VARCHAR},#{action,jdbcType=INTEGER}, 
     0,0,#{creatorId,jdbcType=INTEGER}, 
@@ -330,7 +331,8 @@
     #{requestId,jdbcType=INTEGER},#{compileId,jdbcType=INTEGER},#{isAreaEffective,jdbcType=INTEGER},
     #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR},    
     #{areaEffectiveIds,jdbcType=VARCHAR},#{functionId,jdbcType=INTEGER},
-    #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER}
+    #{cfgType,jdbcType=VARCHAR},#{cfgRegionCode,jdbcType=INTEGER},
+    #{doLog,jdbcType=INTEGER}
     )
   </insert>
   
@@ -481,6 +483,9 @@
       <if test="level != null" >
         level =  #{level,jdbcType=INTEGER},
       </if>
+      <if test="doLog != null" >
+        do_log =  #{doLog,jdbcType=INTEGER},
+      </if>
       </trim>
     </set>
     where cfg_id = #{cfgId,jdbcType=BIGINT}
diff --git a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
index 68425b959..ceb889982 100644
--- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
@@ -122,6 +122,7 @@
     <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="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
   
   <resultMap id="BaseStringCfgMap" type="com.nis.domain.configuration.BaseStringCfg" >
@@ -152,6 +153,7 @@
     <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="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
   
   <sql id="AvVoip_Column" >
@@ -180,13 +182,13 @@
 	,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.area_effective_ids,r.function_id,r.cfg_region_code
+	,r.area_effective_ids,r.function_id,r.cfg_region_code,r.do_log
   </sql>
      <sql id="BaseStringCfg_Column" >
      r.cfg_id,r.cfg_desc,r.cfg_keywords,r.cfg_type,
   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.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,r.cfg_region_code,r.do_log
   </sql>
   <!-- voip IP条件查询列表信息 -->
   <select id="findVoipList" resultMap="CfgIndexInfoMap" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
@@ -1285,7 +1287,8 @@
     dest_port,
     dest_ip_address,
     cfg_type,
-    cfg_region_code
+    cfg_region_code,
+    do_log
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -1317,7 +1320,9 @@
     	#{destPort,jdbcType=VARCHAR},
     	#{destIpAddress,jdbcType=VARCHAR},
     	#{cfgType,jdbcType=VARCHAR},
-    	#{cfgRegionCode,jdbcType=INTEGER}
+    	#{cfgRegionCode,jdbcType=INTEGER},
+    	#{doLog,jdbcType=INTEGER}
+    	
     )
   </insert>
   <!-- update av_cont_ip_cfg表信息 -->
@@ -1411,6 +1416,9 @@
       </if>
        <if test="cfgRegionCode != null " >
         cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER},
+      </if>
+       <if test="doLog != null " >
+        do_log = #{doLog,jdbcType=INTEGER},
       </if>
       </trim>
     </set>
@@ -1585,7 +1593,8 @@
 	match_method,
 	is_hexbin,
     cfg_type,
-    cfg_region_code
+    cfg_region_code,
+    do_log
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER}, 
@@ -1611,7 +1620,8 @@
     	#{matchMethod,jdbcType=INTEGER},
     	#{isHexbin,jdbcType=INTEGER},
     	#{cfgType,jdbcType=VARCHAR},
-    	#{cfgRegionCode,jdbcType=INTEGER}
+    	#{cfgRegionCode,jdbcType=INTEGER},
+    	#{doLog,jdbcType=INTEGER}
     )
   </insert>
   
@@ -1688,6 +1698,9 @@
       </if>
        <if test="cfgRegionCode != null " >
         cfg_region_code = #{cfgRegionCode,jdbcType=INTEGER},
+      </if>
+       <if test="doLog != null " >
+        do_log = #{doLog,jdbcType=INTEGER},
       </if>
       </trim>
     </set>
diff --git a/src/main/resources/sql/update_cfg_index_info-20180820.sql b/src/main/resources/sql/update_cfg_index_info-20180820.sql
index 0c481bab7..57a9a3fa2 100644
--- a/src/main/resources/sql/update_cfg_index_info-20180820.sql
+++ b/src/main/resources/sql/update_cfg_index_info-20180820.sql
@@ -1,2 +1,7 @@
 alter table cfg_index_info add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'
-alter table app_policy_cfg add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'
\ No newline at end of file
+alter table app_policy_cfg add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'
+alter table av_cont_ip_cfg add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'
+alter table av_cont_url_cfg add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'
+alter table av_pic_ip_cfg add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'
+alter table av_pic_url_cfg add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'
+alter table av_sign_sample_cfg add do_log int(11)  COMMENT 'do_log:0不需要1记录所有日志2只记录结构化日志。默认是2'
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp
index 322735472..7782e1275 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp
@@ -106,6 +106,27 @@ $(function(){
 								       </div>
 								   </div>
 								</div>
+								<div class="row doLog">
+									<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+															<c:choose>
+																<c:when test="${dict.itemCode eq _cfg.doLog}">
+																	<label class="radio-inline">
+																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:when>
+																<c:otherwise>
+																	<label class="radio-inline">
+																		<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:otherwise>
+															</c:choose>
+												</c:forEach>
+											</div>
+									</div>
+								</div>
 							<!-- desc and action -->
                            <%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
index 35cd55091..c676308ef 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
@@ -8,6 +8,8 @@
  		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
+		}else if("${cfg.compileId}"){
+			$("#intype").val("${cfg.compileId}");
 		}else if("${cfg.srcIpAddress}"){
 			$("#intype").val("${cfg.srcIpAddress}");
 		}else if("${cfg.srcPort}"){
@@ -33,6 +35,7 @@
 			$(".Wdate").attr("value",'');
 			$("#description").attr("value",'');
 			$("#searchForm")[0].reset();
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		});
  	});
  	var edit=function(url){
@@ -102,6 +105,7 @@
                                          
                                         	<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="srcIpAddress"><spring:message code="client_ip"></spring:message></form:option>
 												<form:option value="srcPort"><spring:message code="client_port"></spring:message></form:option>
 											</form:select>
@@ -275,6 +279,7 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
+									<th style="display: none"><spring:message code="cfg_id"/></th>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="ip_type"/></th>
 									<th><spring:message code="client_ip"/></th>
@@ -286,6 +291,7 @@
 									<th><spring:message code="direction"/></th>
 									<th><spring:message code="protocol"/></th>
 									<th><spring:message code="block_type"/></th>
+									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -307,6 +313,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}"  compileId="${cfg.compileId}" value="${cfg.isAudit}"></td>
+									<td>${cfg.compileId }</td>
 									<td>${cfg.cfgDesc }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
@@ -344,6 +351,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.doLog }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
index 95945d6c1..6af43eeb0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
@@ -129,6 +129,27 @@ $(function(){
 								       </div>
 								   </div>
 								</div>
+								<div class="row doLog">
+									<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+															<c:choose>
+																<c:when test="${dict.itemCode eq _cfg.doLog}">
+																	<label class="radio-inline">
+																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:when>
+																<c:otherwise>
+																	<label class="radio-inline">
+																		<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:otherwise>
+															</c:choose>
+												</c:forEach>
+											</div>
+									</div>
+								</div>
 							<!-- desc and action -->
 								<!-- 配置域类型 -->
 	                   		<c:forEach items="${regionList}" var="region">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
index f9e2a7c9a..42fc38606 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -10,6 +10,8 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.cfgKeywords}"){
 			$("#intype").val("${cfg.cfgKeywords}");
+		}else if("${cfg.compileId}"){
+			$("#intype").val("${cfg.compileId}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
@@ -31,6 +33,7 @@
 			$(".Wdate").attr("value",'');
 			$("#description").attr("value",'');
 			$("#searchForm")[0].reset();
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		});
  	});
  	var edit=function(url){
@@ -100,6 +103,7 @@
                                          
                                         	<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="key_word"></spring:message></form:option>
 											</form:select>
 									
@@ -271,12 +275,14 @@
 							<thead>
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
+									<th style="display: none"><spring:message code="cfg_id"/></th>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="key_word"/></th>
 									<th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
 									<th><spring:message code="block_type"/></th>
+									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -297,6 +303,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}"  compileId="${cfg.compileId}" value="${cfg.isAudit}"></td>
+									<td>${cfg.compileId }</td>
 									<td>${cfg.cfgDesc }</td>
 									<td>
 										<a href="javascript:;" data-original-title="${fn:replace(cfg.cfgKeywords, '***and***', ' ')}"
@@ -325,6 +332,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.doLog }">
+												<spring:message code="${dict.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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp
index dc9b2122a..61fee0d1e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp
@@ -107,6 +107,27 @@ $(function(){
 								       </div>
 								   </div>
 								</div>
+								<div class="row doLog">
+									<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+															<c:choose>
+																<c:when test="${dict.itemCode eq _cfg.doLog}">
+																	<label class="radio-inline">
+																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:when>
+																<c:otherwise>
+																	<label class="radio-inline">
+																		<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:otherwise>
+															</c:choose>
+												</c:forEach>
+											</div>
+									</div>
+								</div>
 							<!-- desc and action -->
                            <%@include file="/WEB-INF/include/form/ipInfo.jsp" %>
                            <%@include file="/WEB-INF/include/form/areaInfo.jsp" %>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
index ad10e8185..b239f57a4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
@@ -8,6 +8,8 @@
  		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
+		}else if("${cfg.compileId}"){
+			$("#intype").val("${cfg.compileId}");
 		}else if("${cfg.srcIpAddress}"){
 			$("#intype").val("${cfg.srcIpAddress}");
 		}else if("${cfg.srcPort}"){
@@ -33,6 +35,7 @@
 			$(".Wdate").attr("value",'');
 			$("#description").attr("value",'');
 			$("#searchForm")[0].reset();
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		});
  	});
  	var edit=function(url){
@@ -102,6 +105,7 @@
                                          
                                         	<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="srcIpAddress"><spring:message code="client_ip"></spring:message></form:option>
 												<form:option value="srcPort"><spring:message code="client_port"></spring:message></form:option>
 											</form:select>
@@ -275,6 +279,7 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
+									<th style="display: none"><spring:message code="cfg_id"/></th>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="ip_type"/></th>
 									<th><spring:message code="client_ip"/></th>
@@ -286,6 +291,7 @@
 									<th><spring:message code="direction"/></th>
 									<th><spring:message code="protocol"/></th>
 									<th><spring:message code="block_type"/></th>
+									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -307,6 +313,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}"  compileId="${cfg.compileId}"  value="${cfg.isAudit}"></td>
+									<td>${cfg.compileId }</td>
 									<td>${cfg.cfgDesc }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
@@ -344,6 +351,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.doLog }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="no"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
index f135211a5..e3543b643 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
@@ -120,6 +120,27 @@ $(function(){
 								       </div>
 								   </div>
 								</div>
+								<div class="row doLog">
+									<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+															<c:choose>
+																<c:when test="${dict.itemCode eq _cfg.doLog}">
+																	<label class="radio-inline">
+																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:when>
+																<c:otherwise>
+																	<label class="radio-inline">
+																		<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:otherwise>
+															</c:choose>
+												</c:forEach>
+											</div>
+									</div>
+								</div>
 							<!-- desc and action -->
 							<c:forEach items="${regionList}" var="region">
 	                   			<c:if test="${_cfg.functionId eq region.functionId}">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
index 9b43274e0..5e3ba99e1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
@@ -8,6 +8,8 @@
  		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
+		}else if("${cfg.compileId}"){
+			$("#intype").val("${cfg.compileId}");
 		}else if("${cfg.cfgKeywords}"){
 			$("#intype").val("${cfg.cfgKeywords}");
 		}else{
@@ -31,6 +33,8 @@
 			$(".Wdate").attr("value",'');
 			$("#description").attr("value",'');
 			$("#searchForm")[0].reset();
+			$("#searchForm")[0].reset();
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		});
  	});
  	var edit=function(url){
@@ -100,6 +104,7 @@
                                          
                                         	<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="key_word"></spring:message></form:option>
 											</form:select>
 									
@@ -272,12 +277,14 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
+									<th style="display: none"><spring:message code="cfg_id"/></th>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="key_word"/></th>
 									<th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
 									<th><spring:message code="block_type"/></th>
+									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="whether_area_block"/></th>
@@ -298,6 +305,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}"  compileId="${cfg.compileId}"  value="${cfg.isAudit}"></td>
+									<td>${cfg.compileId }</td>
 									<td>${cfg.cfgDesc }</td>
 									<td>
 										<a href="javascript:;" data-original-title="${fn:replace(cfg.cfgKeywords, '***and***', ' ')}"
@@ -326,6 +334,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.doLog }">
+												<spring:message code="${dict.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>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
index c260fbf7a..1a156fede 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
@@ -152,6 +152,27 @@ $(function(){
 							        </div>
 							    </div>
 							</div>
+							<div class="row doLog">
+									<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+															<c:choose>
+																<c:when test="${dict.itemCode eq _cfg.doLog}">
+																	<label class="radio-inline">
+																<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:when>
+																<c:otherwise>
+																	<label class="radio-inline">
+																		<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																	</label>
+																</c:otherwise>
+															</c:choose>
+												</c:forEach>
+											</div>
+									</div>
+								</div>
                            <%--  <%@include file="/WEB-INF/include/form/areaInfo.jsp" %> --%>
                            <input type="hidden" name="isAreaEffective" value="0">
                             <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
index 813c5809d..8524491f2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
@@ -8,6 +8,8 @@
  		//搜索框提示语初始化
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
+		}else if("${cfg.compileId}"){
+			$("#intype").val("${cfg.compileId}");
 		}else if("${cfg.description}"){
 			$("#intype").val("${cfg.description}");
 		}else if("${cfg.level}"){
@@ -33,6 +35,7 @@
 			$(".Wdate").attr("value",'');
 			$("#description").attr("value",'');
 			$("#searchForm")[0].reset();
+			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		});
  	});
  	var edit=function(url){
@@ -73,7 +76,7 @@
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/av/sample/signSampleList?functionId=${cfg.functionId}" method="post" class="form-search">
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/av/sample/audioSignSampleList?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="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
@@ -102,6 +105,7 @@
                                          
                                         	<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="description"><spring:message code="sample_sign"></spring:message></form:option>
 												<form:option value="level"><spring:message code="harm_level"></spring:message></form:option>
 											</form:select>
@@ -275,10 +279,12 @@
 								<tr>
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<%-- <th><spring:message code="seq"/></th> --%>
+									<th style="display: none"><spring:message code="cfg_id"/></th>
 									<th><spring:message code="sample_sign"/></th>
 									<th><spring:message code="harm_level"/></th>
 									<th><spring:message code="config_describe"/></th>
 									<th><spring:message code="block_type"/></th>
+									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
@@ -299,6 +305,7 @@
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
 									<td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" value="${cfg.isAudit}"></td>
+									<td>${cfg.compileId }</td>
 									<td>
 										<a href="javascript:;" data-original-title="${cfg.description }"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
@@ -314,6 +321,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+											<c:if test="${dict.itemCode eq cfg.doLog }">
+												<spring:message code="${dict.itemValue }"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>${cfg.requestName }</td>
 									<td>
 									<c:set var="classify"></c:set>
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 48d67fad0..8bb931152 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -415,7 +415,31 @@ $(function(){
    initCommIpVal();
 });
 window.onload=function(){
-	//日志查询IP类型增加格式提示
+	// 配置id的搜索下拉框选择切换
+	if ($("#searchForm #seltype").val() == 'compileId') {
+		$("#searchForm #intype").addClass("number");
+	} else {
+		$("#searchForm #intype").removeClass("number");
+	}
+	// reset时去掉number
+	$("#resetBtn").on("click", function() {
+		if ($("#searchForm #seltype").val() == 'compileId') {
+			$("#searchForm #intype").addClass("number");
+		} else {
+			$("#searchForm #intype").removeClass("number");
+		}
+	});
+	// 切换时为compileId加上number
+	$("#searchForm #seltype").on("change", function() {
+		if ($("#searchForm #seltype").val() == 'compileId') {
+			$("#searchForm #intype").addClass("number");
+		} else {
+			$("#searchForm #intype").removeClass("number");
+		}
+	});
+	
+	
+	// 日志查询IP类型增加格式提示
 	$("#searchForm [name='capIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::");
 	$("#searchForm [name='sIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::");
 	$("#searchForm [name='dIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::");

From 6854f82fe109ab0187290ea044f90b2bd33d311c Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Sun, 26 Aug 2018 16:52:02 +0800
Subject: [PATCH 24/39] =?UTF-8?q?appTcp=20=E5=8E=BB=E9=99=A4=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=80=BB=E9=87=8F=EF=BC=8C=E5=8E=BB=E9=99=A4=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E5=9F=9F=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/web/dao/configuration/AppCfgDao.xml   |  18 +-
 .../WEB-INF/views/cfg/app/appTcpCfgForm.jsp   | 204 +-----------------
 .../WEB-INF/views/cfg/app/appTcpCfgList.jsp   |  31 +--
 3 files changed, 19 insertions(+), 234 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
index 8d97ef21e..675f3b7ee 100644
--- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
@@ -352,9 +352,6 @@
     <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="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
@@ -366,7 +363,7 @@
     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.AREA_EFFECTIVE_IDS,r.RATELIMIT,r.FUNCTION_ID,r.CFG_TYPE,r.CFG_REGION_CODE,
-    r.low_boundary,r.up_boundary  as upBoundary,r.EXPR_TYPE,r.MATCH_METHOD,r.IS_HEXBIN,r.do_log
+    r.low_boundary,r.up_boundary  as upBoundary,r.do_log
   </sql>
 
 
@@ -1650,11 +1647,11 @@
     CREATOR_ID,CREATE_TIME,EDITOR_ID,EDIT_TIME,AUDITOR_ID,AUDIT_TIME,
     SERVICE_ID,REQUEST_ID,COMPILE_ID,IS_AREA_EFFECTIVE,CLASSIFY,
     ATTRIBUTE,LABLE,AREA_EFFECTIVE_IDS,RATELIMIT,FUNCTION_ID,CFG_TYPE,CFG_REGION_CODE,
-    low_boundary,up_boundary,EXPR_TYPE,MATCH_METHOD,IS_HEXBIN,DO_LOG
+    low_boundary,up_boundary,DO_LOG
     )values (
      <include refid="AppCommonCfg_Value_List" />,
    	#{lowBoundary,jdbcType=INTEGER},#{upBoundary,jdbcType=INTEGER},
-    #{exprType,jdbcType=INTEGER},#{matchMethod,jdbcType=INTEGER},#{isHexbin,jdbcType=INTEGER},#{doLog,jdbcType=INTEGER}
+     #{doLog,jdbcType=INTEGER}
     )
   </insert>
   <insert id="insertAppPolicyCfg" parameterType="com.nis.domain.configuration.AppPolicyCfg" >
@@ -2820,15 +2817,6 @@
    	   <if test="upBoundary != null and upBoundary != ''">
    		up_boundary=#{upBoundary,jdbcType=INTEGER},
    	  </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="doLog != null">
     	do_log=#{doLog,jdbcType=INTEGER},
       </if>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
index 9d6585cf4..cea10deeb 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
@@ -39,7 +39,6 @@ $(function(){
 			}
 			
 			if(flag){
-				$("input[name$='exprType']").attr("disabled",false);
 				$("#appCode").val($("#specServiceIdId").val());
 				loading('onloading...');
 				form.submit();
@@ -140,6 +139,7 @@ $(function(){
 								            <div for="action"></div>
 								       </div>
 									</div>
+								</div>	
 								<div class="row">
 								    <div class="col-md-6">
 								        <div class="form-group">
@@ -160,20 +160,21 @@ $(function(){
 								        </div>
 								    </div>
 								</div>
-									<div class="row  doLog"  style="display: none;">
-									<div class="col-md-6">
-									  <div class="form-group">
+								<!-- dolog begin-->
+								<div class="row " >
+									<div class="col-md-6" hidden="true">
+									<div class="form-group">
 										<label class="control-label col-md-3"><spring:message code="do_log" /></label>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 										<c:choose>
 											<c:when test="${dict.itemCode eq _cfg.doLog}">
 												<label class="radio-inline">
-													<input type="radio" name="doLog"  value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+													<input type="radio" name="doLog" checked value="0" ><spring:message code="${dict.itemValue}"/>
 												</label>
 											</c:when>
 											<c:otherwise>
 												<label class="radio-inline">
-													<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+													<input type="radio" name="doLog" value="0" ><spring:message code="${dict.itemValue}"/>
 												</label>
 											</c:otherwise>
 										</c:choose>
@@ -181,6 +182,8 @@ $(function(){
 									</div>
 								</div>
 								</div>
+								<!-- dolog end-->
+								
 								<c:forEach items="${regionList}" var="region">
                    				<c:if test="${_cfg.functionId eq region.functionId}">
                    				<input type="hidden" name="cfgType" value="${region.configRegionValue}">
@@ -189,194 +192,7 @@ $(function(){
                    				<input type="hidden" name="exprType" value="0">
                    				<input type="hidden" name="matchMethod" value="0">
                    				<input type="hidden" name="isHexbin" value="0">
-								<%-- <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="expression_type" /></label>
-												<div class="col-md-6">
-													<c:if test="${!empty region.configExprType}">
-														<c:forEach var="exprType" items="${fn:split(region.configExprType,',')}">
-															<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="${_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">
-											<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}" 
-																		<c:if test="${_cfg.matchMethod eq matchMethod || (empty _cfg.matchMethod && matchMethod eq 0)}">
-																		selected
-																		</c:if>
-																		>
-																		<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>
-								<div class="row">
-										<c:if test="${!empty region.configHex}">
-										    <div class="col-md-6">
-										        <div class="form-group ">
-										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
-										            <div class="col-md-6">
-										            	<label class="radio-inline">
-										            		<input type="radio" name="isHex" value="1" class="required"
-										            		><spring:message code="hex"/>
-										            	</label>
-										            	<label class="radio-inline">
-										            		<input type="radio" name="isHex" value="0" class="required"
-										            		><spring:message code="not_hex"/>
-										            	</label>
-										            </div>
-										            <div for="isHex"></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="is_case_insenstive"/></label>
-										            <div class="col-md-6">
-										            	<label class="radio-inline">
-										            		<input type="radio" name="isCaseSenstive" value="1" class="required"
-										            		><spring:message code="case_senstive"/>
-										            	</label>
-										            	<label class="radio-inline">
-										            		<input type="radio" name="isCaseSenstive" value="0" class="required"
-										            		><spring:message code="case_insenstive"/>
-										            	</label>
-										            </div>
-										            <div for="isCaseInsenstive"></div>
-										        </div>
-										    </div>
-								  	</c:if>
-								  	<c:if test="${empty region.configHex}"> 
-										<div class="col-md-6">
-										        <div class="form-group ">
-										            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="is_hex"/></label>
-										            <div class="col-md-6">
-										            	<label class="radio-inline">
-										            		<input type="radio" name="isHex" value="0" class="required" checked
-										            		><spring:message code="not_hex"/>
-										            	</label>
-										            </div>
-										            <div for="isHex"></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="is_case_insenstive"/></label>
-										            <div class="col-md-6">
-										            	<label class="radio-inline">
-										            		<input type="radio" name="isCaseSenstive" value="0" class="required"
-										            			checked
-										            		><spring:message code="case_insenstive"/>
-										            	</label>
-										            </div>
-										            <div for="isCaseInsenstive"></div>
-										        </div>
-										    </div>
-									</c:if>
-								</div>
-								<div class="row hidden">
-									<div class="col-md-6">
-										<div class="form-group">
-											<label class="control-label col-md-3"><font color="red">*</font>
-												<spring:message code="whether_hexbinary" /></label>
-											<div class="col-md-6">
-												<select name="isHexbin"
-													class="selectpicker select2 form-control required">
-													<c:if test="${!empty region.configHex}">
-														<c:forEach var="isHexbin" items="${fn:split(region.configHex,',')}">
-																<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-																	<c:if test="${isHexbinC.itemCode eq isHexbin}">
-																		<option value="${isHexbinC.itemCode}" 
-																		<c:if test="${_cfg.isHexbin eq isHexbin || (empty _cfg.isHexbin && isHexbin eq 0)}">
-																		selected
-																		</c:if>
-																		>
-																		<spring:message code="${isHexbinC.itemValue}"/>
-																		</option>
-																	</c:if>
-																
-																</c:forEach> 
-														</c:forEach>
-													</c:if>
-													<c:if test="${empty region.configHex}"> 
-													
-														<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-															<c:if test="${isHexbinC.itemCode eq 0}">
-																<option value="${isHexbinC.itemCode}"  selected >
-																<spring:message code="${isHexbinC.itemValue}"/>
-																</option>
-															</c:if>
-														</c:forEach> 
-													
-													</c:if>
-												</select>
-											</div>
-											<div for="isHexbin"></div>
-										</div>
-									</div>
-								</div>
-								</c:if> --%>
-                   		</c:forEach>
+                   		       </c:forEach>
 							</div>
 							<input name="isAreaEffective" type="hidden" value="0">
 							<input name="requestId" value="0" type="hidden">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
index 308f66b76..8bd278214 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
@@ -270,8 +270,8 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 								    <th class="cfgDesc"><spring:message code="config_describe"/></th>
 								    <th><spring:message code="social_app"/></th>
-								    <th><spring:message code="lowBoundary"/></th>
-								    <th><spring:message code="upBoundary"/></th>
+								    <th><spring:message code="min_tcp"/></th>
+								    <th><spring:message code="max_tcp"/></th>
 									<%-- <th><spring:message code="whether_hexbinary"/></th>
 									<th><spring:message code="expression_type"/></th>
 									<th><spring:message code="match_method"/></th>
@@ -284,8 +284,8 @@
 									<th><spring:message code="label"/></th> --%>
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
-									<th><spring:message code="creator"/></th>
+<%-- 								<th><spring:message code="log_total"/></th>
+ --%>								<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
 									<th class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
@@ -303,25 +303,6 @@
 								    <td>${cfg.appName }</td>
 								    <td>${cfg.lowBoundary }</td>
 								    <td>${cfg.upBoundary }</td>
-								    <%-- <td>
-										<c:forEach items="${fns:getDictList('WHETHER_HEXBINARY')}" var="isHexbinC">
-											<c:if test="${cfg.isHexbin==isHexbinC.itemCode }"><spring:message code="${isHexbinC.itemValue}"/></c:if>
-				               			</c:forEach>
-									</td>
-									<td>
-										<c:if test="${cfg.exprType==1}"><spring:message code="and_expression"/></c:if>
-										<c:if test="${cfg.exprType==0}"><spring:message code="null_expression"/></c:if>
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
-											<c:if test="${cfg.matchMethod==matchMethodC.itemCode }"><spring:message code="${matchMethodC.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</td>
-									<td>
-										<c:forEach items="${fns:getDictList('DO_LOG')}" var="dict">
-											<c:if test="${cfg.doLog==dict.itemCode }"><spring:message code="${dict.itemValue}"/></c:if>
-		             					</c:forEach>    
-									</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>
@@ -335,8 +316,8 @@
 											<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>${cfg.creatorName }</td>
+<%-- 									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></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>

From 576885f1e81845101bf5fd440fcbe68c71eaf9d0 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Sun, 26 Aug 2018 17:59:44 +0800
Subject: [PATCH 25/39] =?UTF-8?q?=E5=8A=A0=E4=BA=86=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=80=BB=E9=87=8F=E4=B8=80=E5=88=97=E4=BD=86=E6=98=AF=E4=B8=8A?=
 =?UTF-8?q?=E9=9D=A2=E5=B1=9E=E6=80=A7=E4=B8=8D=E5=85=A8=E7=9A=84=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E8=AE=BE=E7=BD=AE=E5=85=B6=E6=97=A5=E5=BF=97=E9=87=8F?=
 =?UTF-8?q?=E4=B8=BA0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/static/global/scripts/common.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 8bb931152..1d6b681ea 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -1155,6 +1155,8 @@ var getTotalLog=function(){
 			   	}else{
 			   		$(this).html("0");
 			   	}
+		   	}else{
+		   		$(this).html("0");
 		   	}
 		});
 	   if(data.compileIds.length>0){

From 8006664e60547789d79c29f08766648b980ac197 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Sun, 26 Aug 2018 18:13:21 +0800
Subject: [PATCH 26/39] =?UTF-8?q?=E5=84=AA=E5=8C=96=E7=8D=B2=E5=8F=96?=
 =?UTF-8?q?=E6=97=A5=E8=AA=8C=E5=A4=B1=E6=95=97=E6=99=82=E7=9A=84=E9=A1=AF?=
 =?UTF-8?q?=E7=A4=BA=E3=80=82=E7=95=B6ajax=20complex=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=9F=B7=E8=A1=8C=E7=9A=84=E6=99=82=E5=80=99=EF=BC=8C=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E7=8B=80=E6=85=8B=E5=A6=82=E6=9E=9C=E7=88=B2success?=
 =?UTF-8?q?=E6=88=96=E8=80=85timeout=E4=B9=8B=E5=A4=96=E7=9A=84=E5=80=BC?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=AF=E7=A4=BAfailed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jquery-validation/1.11.0/localization/messages_en.js     | 3 ++-
 .../jquery-validation/1.11.0/localization/messages_zh.js     | 3 ++-
 src/main/webapp/static/global/scripts/common.js              | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
index 5cf046daf..a384d5d63 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
@@ -64,6 +64,7 @@
 		hexCheck:"Please enter the HEX format character",
 		invisibleChar:"Please enter the visible character",
 		hasInvisibleChar:"The tag {0} has invisible character",
-		haveInvisibleChar:"The tags {0} have invisible character"
+		haveInvisibleChar:"The tags {0} have invisible character",
+		failed:"Failed"
 	});
 }(jQuery));
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
index 5bfc41c8a..223b21c09 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
@@ -64,6 +64,7 @@
 		hexCheck:"请输入十六进制字符",
 		invisibleChar:"请输入可见字符",
 		hasInvisibleChar:"标签{0}包含不可见字符",
-		haveInvisibleChar:"标签{0}包含不可见字符"
+		haveInvisibleChar:"标签{0}包含不可见字符",
+		failed:"获取失败"
 	});
 }(jQuery));
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 1d6b681ea..d6f12c624 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -1174,6 +1174,7 @@ var GetLogTotal=function(_data){
 	}
 	var totalTrs=$(_data.objs);
 	var timeout=$.validator.messages.timeout;
+	var failed=$.validator.messages.failed;
 	var request=$.ajax({
 		type:'post',
 		timeout:10000,//超时时间设置，查询接口时间过长超时
@@ -1197,6 +1198,10 @@ var GetLogTotal=function(_data){
 				totalTrs.each(function(){
 					$(this).html(timeout);
 				})
+			}else if(status !="success"){
+				totalTrs.each(function(){
+					$(this).html(failed);
+				})
 			}
 		}
 	});

From 33c2c81a7e59778d249b9fec56483d9ec0bcdcda Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Sun, 26 Aug 2018 19:54:34 +0800
Subject: [PATCH 27/39] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=BC=B9=E6=A1=86=E8=BD=AC=E4=B9=89=EF=BC=8C?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C2.=E5=8A=A0=E8=BD=BD=E9=81=AE=E7=BD=A9?=
 =?UTF-8?q?=E6=96=87=E5=AD=97onloading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/static/global/scripts/common.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 8bb931152..314fe89af 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -16,9 +16,18 @@ $(function(){
 				var text="";
 				if($(element).find(".tooltips").length > 0){
 					text=$(element).find(".tooltips").attr("data-original-title").trim();
+					
 				}else{
 					text=$(element).text().trim()
 				}
+				//增加换行
+				var count = Math.floor(text.length/34);
+				for(var i=1;i<=count;i++){
+					text=text.substring(0,i*34-1)+"\n"+text.substring(i*34-1);
+				}
+				//特殊字符转义
+				text=text.replace(/[<>&"]/g,function(c){return {'<':'&lt;','>':'&gt;','&':'&amp;','"':'&quot;'}[c];});
+				
 				html+="<div class='row col-md-12'>";
 				html+="<div class='col-md-4'><label>"+$(".table tr th").eq(index).text().trim()+":</label></div>";
 				html+="<div class='col-md-6'><label>"+text+"</label></div>";
@@ -398,7 +407,7 @@ $(function(){
            }
        },
        submitHandler: function(form){
-    	   loading('<spring:message code="onloading"/>');
+    	   loading('onloading');
     	   form.submit();
        }
    });

From e97cb03d22072976abdbabb5b3bec1c1b51ecd5a Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@intranet.com>
Date: Sun, 26 Aug 2018 20:00:38 +0800
Subject: [PATCH 28/39] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/static/global/scripts/common.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 314fe89af..bbf115de8 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -1164,6 +1164,8 @@ var getTotalLog=function(){
 			   	}else{
 			   		$(this).html("0");
 			   	}
+		   	}else{
+		   		$(this).html("0");
 		   	}
 		});
 	   if(data.compileIds.length>0){
@@ -1204,6 +1206,10 @@ var GetLogTotal=function(_data){
 				totalTrs.each(function(){
 					$(this).html(timeout);
 				})
+			}else if(status !="success"){
+				totalTrs.each(function(){
+					$(this).html(failed);
+				})
 			}
 		}
 	});

From 1a4ccf8f6f40186e8b56e4ee57db9e1ece210be7 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Mon, 27 Aug 2018 10:21:26 +0800
Subject: [PATCH 29/39] =?UTF-8?q?=E7=A7=98=E9=92=A5=E5=AF=B9=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E5=A2=9E=E5=8A=A0=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/service/BaseService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java
index 9d06d4119..7f4d49fdd 100644
--- a/src/main/java/com/nis/web/service/BaseService.java
+++ b/src/main/java/com/nis/web/service/BaseService.java
@@ -633,7 +633,7 @@ public abstract class BaseService {
 		proxyObjKeyring.setCrl(cfg.getCrl());
 		proxyObjKeyring.setExpireAfter(cfg.getExpireAfter());
 		proxyObjKeyring.setKeyringId(cfg.getCompileId());
-		proxyObjKeyring.setKeyringName(cfg.getCfgDesc());
+		proxyObjKeyring.setKeyringName(keywordsEscape(cfg.getCfgDesc()));
 		proxyObjKeyring.setKeyringType(cfg.getKeyringType());
 		proxyObjKeyring.setPrivateKeyFile(cfg.getPrivateKeyFile());
 		proxyObjKeyring.setPublicKeyAlgo(cfg.getPublicKeyAlgo());

From e25d29c07b19325c2b43175c075641f37647f36f Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Mon, 27 Aug 2018 10:40:41 +0800
Subject: [PATCH 30/39] =?UTF-8?q?=E5=88=98=E8=80=81=E5=B8=88=E5=BB=BA?=
 =?UTF-8?q?=E8=AE=AE=E6=89=80=E6=9C=89=E7=95=8C=E9=9D=A2=E7=9A=84data=20li?=
 =?UTF-8?q?st=E5=8E=BB=E6=8E=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp         | 1 -
 src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp         | 1 -
 src/main/webapp/WEB-INF/views/basics/sysDictList.jsp             | 1 -
 src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp            | 1 -
 src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp         | 1 -
 src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp       | 1 -
 src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp       | 1 -
 src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp         | 1 -
 src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp           | 1 -
 src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp       | 1 -
 src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp          | 1 -
 src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp          | 1 -
 src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp  | 1 -
 src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp                 | 1 -
 src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp       | 1 -
 src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp     | 1 -
 src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp          | 1 -
 src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp         | 1 -
 src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp       | 1 -
 src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp          | 1 -
 src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp    | 1 -
 src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp           | 1 -
 src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp         | 1 -
 src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp          | 1 -
 src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp              | 1 -
 src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp             | 1 -
 src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp              | 1 -
 src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp               | 1 -
 src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp  | 1 -
 .../webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp     | 1 -
 src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp       | 1 -
 src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp       | 1 -
 src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp    | 1 -
 src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp   | 1 -
 src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp                  | 1 -
 src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp              | 1 -
 src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp              | 1 -
 .../webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp | 1 -
 .../WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp       | 1 -
 src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp            | 1 -
 src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp              | 1 -
 src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp             | 1 -
 .../webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp  | 1 -
 .../WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp       | 1 -
 .../WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp       | 1 -
 src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp    | 1 -
 src/main/webapp/WEB-INF/views/cfg/requestList.jsp                | 1 -
 src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp              | 1 -
 src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp            | 1 -
 src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp           | 1 -
 src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp            | 1 -
 src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp       | 1 -
 src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp           | 1 -
 .../webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp     | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/appList.jsp                | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp                | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp               | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp                | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp                | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp               | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp                 | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp              | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp            | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp               | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp             | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp            | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp            | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp           | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp  | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp  | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp      | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp        | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp      | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp       | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp      | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp           | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp            | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp                | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp            | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp                | 1 -
 src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp             | 1 -
 src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp            | 1 -
 .../webapp/WEB-INF/views/specific/specificServiceCfgList.jsp     | 1 -
 .../webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp | 1 -
 src/main/webapp/WEB-INF/views/sys/dictList.jsp                   | 1 -
 src/main/webapp/WEB-INF/views/sys/menuList.jsp                   | 1 -
 src/main/webapp/WEB-INF/views/sys/officeIndex.jsp                | 1 -
 src/main/webapp/WEB-INF/views/sys/userList.jsp                   | 1 -
 src/main/webapp/WEB-INF/views/systemService/list.jsp             | 1 -
 89 files changed, 89 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
index dc469c74f..d91863016 100644
--- a/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/policyGroupList.jsp
@@ -61,7 +61,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="policy_group_manage"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
index 3fed03a0e..0b6215941 100644
--- a/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
@@ -123,7 +123,6 @@
 	    <c:forEach items="${fns:getItemTypeByNo('SERVICE_DICT_ITM_TYPE',intArr)}" var="shows">
 	    <spring:message code="${shows}" />
 	    </c:forEach>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
index 67ddf7527..d54aa18b7 100644
--- a/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/sysDictList.jsp
@@ -147,7 +147,6 @@
 		<c:forEach items="${fns:getItemTypeByNo('SYS_DICT_ITM_TYPE',intArr)}" var="shows">
 		<spring:message code="${shows}" />
 	    </c:forEach>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
index 1574e1c80..1e0911f2a 100644
--- a/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/taskInfoList.jsp
@@ -40,7 +40,6 @@
 	</shiro:hasPermission>
 	<h3 class="page-title">
 		<spring:message code="special_task"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
index ad428df0a..574dbe923 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
@@ -57,7 +57,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="app_byte_config"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
index 59ff6dc46..56491cd6a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
@@ -57,7 +57,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="app_domain_config"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
index 5a9aa4c83..64f48edbd 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
@@ -57,7 +57,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="app_header_config"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
index 5842bb2b3..e47296ca4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
@@ -57,7 +57,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="app_http_config"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
index a9a2dfd47..10c2b5cf0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
@@ -60,7 +60,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="app_ip_config"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
index 15c40f50e..2bf7f6d1f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -100,7 +100,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="social_app_control"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
index 0d5ce4024..7ad9a946a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
@@ -57,7 +57,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="app_ssl_config"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
index 8bd278214..304cd935d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
@@ -55,7 +55,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="app_tcp_config"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
index 1e4b564f1..81873d4b4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
@@ -58,7 +58,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="app_topic_domain_cfg"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp
index fb99c5dc3..79ee23b2e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appCfgList.jsp
@@ -76,7 +76,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="${cfgName}"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
index c676308ef..9e53984e5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp
@@ -68,7 +68,6 @@
 
 	<h3 class="page-title">
 	<spring:message code="av_content_ip_control"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
index 42fc38606..acbb9c7a0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp
@@ -66,7 +66,6 @@
 
 	<h3 class="page-title">
 	<spring:message code="av_content_url_control"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
index 378e36383..23bdce097 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp
@@ -60,7 +60,6 @@
 
 	<h3 class="page-title">
    		<spring:message code="${regionValue}"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
index b239f57a4..af502f90f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp
@@ -68,7 +68,6 @@
 
 	<h3 class="page-title">
 	<spring:message code="av_picture_ip_control"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
index 5e3ba99e1..7032a41d1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp
@@ -67,7 +67,6 @@
 
 	<h3 class="page-title">
 	<spring:message code="av_picture_url_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
index 8524491f2..d5f6043de 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp
@@ -68,7 +68,6 @@
 
 	<h3 class="page-title">
    		<spring:message code="${regionValue}"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
index 5ea0ea20c..a1550054c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountList.jsp
@@ -326,7 +326,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="av_voip_account_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
index 3b1ce06e3..4c9041669 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp
@@ -392,7 +392,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="av_voip_ip_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
index 7f6a2efd9..8ebd2c3bc 100644
--- a/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp
@@ -103,7 +103,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="basic_protocol"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
index 9ff13147e..e99da4236 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp
@@ -67,7 +67,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="${cfgName}"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
index bc4c1be46..16954d038 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
@@ -123,7 +123,6 @@
 	</div>
 	<h3 class="page-title">
 		<spring:message code="${cfgName}"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
index 3e1e2efa2..110715217 100644
--- a/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgList.jsp
@@ -65,7 +65,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="${cfgName}"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
index 141aa2273..927fe7b73 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgList.jsp
@@ -69,7 +69,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="target_ip_protect"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
index b57887aaa..def7758c8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
@@ -65,7 +65,6 @@
 
 	<h3 class="page-title">
 	<spring:message code="ip_spoofing_configuration"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
index fc35ae60a..9bef21bfd 100644
--- a/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/encryptedtunnelbehav/list.jsp
@@ -103,7 +103,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="encrypted_tunnel_behavior"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
index 83ea33699..2e108d482 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestList.jsp
@@ -99,7 +99,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="file_digest_control"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
index b06027058..2f6a81254 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/ftpList.jsp
@@ -100,7 +100,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="ftp_control"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
index 04d8eafa3..547e962c9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/fileTransfer/p2pList.jsp
@@ -96,7 +96,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="p2p_control"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
index ff89ae68f..4d3701229 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
@@ -103,7 +103,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="${interceptCode }"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
index 32fb50528..060bfe08d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/strateagy/list.jsp
@@ -48,7 +48,6 @@
 
 	<h3 class="page-title">
 	<spring:message code="pxy_intercept_monit_keyring"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
index 889cbc18e..6b31f5f42 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgList.jsp
@@ -63,7 +63,6 @@
 	</div>
 	<h3 class="page-title">
 		<spring:message code="${cfgName}"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
index 4c867d1a2..846eea053 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipList.jsp
@@ -96,7 +96,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="ip_control"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
index 8e7e00ab9..78d451074 100644
--- a/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp
@@ -97,7 +97,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="mail_control"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
index f38aa4611..57ac025c9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/list.jsp
@@ -50,7 +50,6 @@
 
 	<h3 class="page-title">
 	<spring:message code="dns_res_strategy"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
index c528cda9a..1ddf55a2b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/list.jsp
@@ -52,7 +52,6 @@
 
 	<h3 class="page-title">
    		<spring:message code="ip_multiplex_pool_config"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<div class="row">
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
index de3dfcaad..81cf2ea38 100644
--- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgList.jsp
@@ -86,7 +86,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="${cfgName}"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
index aabce352b..ed1976460 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
@@ -98,7 +98,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="bgp_control"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
index 39fe8a711..7e7874be3 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp
@@ -98,7 +98,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="xmpp_control"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
index 8546cb30a..1b63b8818 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
@@ -283,7 +283,6 @@
 	<h3 class="page-title">
 		
 		<spring:message code="${serviceName1 }"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
index 559ab71c0..c0bed3f2c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceList.jsp
@@ -49,7 +49,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="http_req_replace"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
index 18c8350f4..a479ff2c1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceList.jsp
@@ -50,7 +50,6 @@
 
 	<h3 class="page-title">
 	<spring:message code="http_res_replace"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
index 37be7acea..badb053db 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/list.jsp
@@ -60,7 +60,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="file_strategy"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
index 1d84d5137..c65292957 100644
--- a/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/requestList.jsp
@@ -40,7 +40,6 @@
 	</shiro:hasPermission>
 	<h3 class="page-title">
 		<spring:message code="requestInfo"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
index 1a6a4b446..d8bc62a22 100644
--- a/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/stringCfgList.jsp
@@ -65,7 +65,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="${cfgName}"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
index e5425739f..eb5a50454 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp
@@ -96,7 +96,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="dns_control"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
index 589b0b51f..6a9c7a344 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp
@@ -254,7 +254,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="http_control"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
index f75d4bb41..0b9b0e617 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
@@ -96,7 +96,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="ssl_control"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
index 2d9a2c93f..50b954a93 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
@@ -96,7 +96,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="domain_whitelist"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
index 64945cc5d..3efc9acf9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
@@ -96,7 +96,6 @@
 
 	<h3 class="page-title">
 		<spring:message code="ip_whitelist"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
index 34e0ac1fd..751d36493 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -38,7 +38,6 @@ $(document).ready(function(){
 	   <c:if test="${log.functionId == 63}">
 	      <spring:message code="app_policy_config"/>
 	   </c:if>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
index 15864d062..b3b883178 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
@@ -30,7 +30,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 		<spring:message code="social_app_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
index 4d974bcf3..3b8bd9fb7 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
@@ -32,7 +32,6 @@
 	</div>
 	<h3 class="page-title">
 		<spring:message code="bgp_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
index 69eea2267..d14deb1ef 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -30,7 +30,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 		<spring:message code="target_ip_protect"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
index c0b3a80f8..93fc12336 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
@@ -32,7 +32,6 @@
 	</div>
 	<h3 class="page-title">
 		<spring:message code="DNS"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
index 862eac5d9..7ba95a03c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -30,7 +30,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 		<spring:message code="ftp_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
index f1f7c4044..9220bd3b7 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
@@ -32,7 +32,6 @@
 	</div>
 	<h3 class="page-title">
 		<spring:message code="HTTP"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
index abbdb6c98..6d0d7e530 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
@@ -32,7 +32,6 @@
 	</div>
 	<h3 class="page-title">
 		<spring:message code="ip_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
index 645f590df..5b0ea8c62 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
@@ -29,7 +29,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 		<spring:message code="IPSEC"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
index 3d0808933..8b5d615dc 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -30,7 +30,6 @@
 	<div class="page-content">
 		<h3 class="page-title">
 			<spring:message code="L2TP" />
-			<small><spring:message code="date_list" /></small>
 		</h3>
 		<h5 class="page-header"></h5>
 		<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
index c26d18d37..9439e51ac 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -32,7 +32,6 @@
 	</div>
 	<h3 class="page-title">
 		<spring:message code="mail_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
index 57d0f5544..d77399537 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -30,7 +30,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 		<spring:message code="av_content_ip_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
index 988af93b3..1ac1d2743 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -30,7 +30,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 		<spring:message code="av_content_url_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
index 827155ca3..5314c388b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -30,7 +30,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 		<spring:message code="av_picture_ip_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
index 31296520f..a43d8b118 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -30,7 +30,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 		<spring:message code="av_picture_url_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
index ac8905379..cca98f67c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
@@ -30,7 +30,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 		<spring:message code="av_sample_audio_porn_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
index a3c84b5b4..75586dba2 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
@@ -30,7 +30,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 		<spring:message code="av_sample_video_porn_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
index 7a0ea5edc..49fb19310 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -38,7 +38,6 @@
 	<div class="page-content">
 		<h3 class="page-title">
 			<spring:message code="av_sample_audio_control" />
-			<small><spring:message code="date_list" /></small>
 		</h3>
 
 		<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
index f4c9df7c0..4b95db642 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -30,7 +30,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 		<spring:message code="av_sample_picture_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
index 06d9c9f00..ddceffeb1 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -30,7 +30,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 		<spring:message code="av_sample_video_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
index fd54870d9..5e6e956d0 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
@@ -30,7 +30,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 		<spring:message code="av_sample_voip_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
index f24a8dc37..5f6f3ff70 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -30,7 +30,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 		<spring:message code="av_voip_account_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
index 077ab18b2..187cba7d0 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -30,7 +30,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 	<spring:message code="av_voip_ip_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
index 27130cc25..5e7e00a06 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -30,7 +30,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 	<spring:message code="openvpn_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
index f10b0204d..ce3134ee0 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
@@ -33,7 +33,6 @@
 	</div>
 	<h3 class="page-title">
 		<spring:message code="p2p_control"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
index 61f53f363..2e2c088d2 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -30,7 +30,6 @@
 	<div class="page-content">
 		<h3 class="page-title">
 			<spring:message code="pptp_ip_control" />
-			<small><spring:message code="date_list" /></small>
 		</h3>
 		<h5 class="page-header"></h5>
 		<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
index 6bf979c2f..0fd749f5d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -30,7 +30,6 @@ $(document).ready(function(){
 <div class="page-content">
 	<h3 class="page-title">
 		<spring:message code="SSH"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
index f4abeda1f..6e33b7326 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -31,7 +31,6 @@
 	<div class="page-content">
 		<h3 class="page-title">
 		<spring:message code="ssl_control" />
-			<small><spring:message code="date_list" /></small>
 		</h3>
 		<h5 class="page-header"></h5>
 		<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
index 6b5260889..0326db545 100644
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -32,7 +32,6 @@
 	</div>
 	<h3 class="page-title">
 		${logTitle }
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="col-md-12">
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
index ec8f6f129..dc541764c 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgList.jsp
@@ -136,7 +136,6 @@
 	
 	<h3 class="page-title">
 		<spring:message code="specific_service_cfg"/>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
index 72c9f33b6..f06b5de67 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
@@ -236,7 +236,6 @@
 	
 	<h3 class="page-title">
 		<spring:message code="agreement_ip_configuration" />
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/sys/dictList.jsp b/src/main/webapp/WEB-INF/views/sys/dictList.jsp
index 3e27b8900..48e643e72 100644
--- a/src/main/webapp/WEB-INF/views/sys/dictList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/dictList.jsp
@@ -211,7 +211,6 @@
 	
 	<h3 class="page-title">
 		<spring:message code="dictManage"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	<h5 class="page-header"></h5>
 	<div class="row">
diff --git a/src/main/webapp/WEB-INF/views/sys/menuList.jsp b/src/main/webapp/WEB-INF/views/sys/menuList.jsp
index e067e973b..1cd861d22 100644
--- a/src/main/webapp/WEB-INF/views/sys/menuList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/menuList.jsp
@@ -70,7 +70,6 @@
 
 		<h3 class="page-title">
 			<spring:message code="menuManage" />
-			<small><spring:message code="date_list" /></small>
 		</h3>
 
 		<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/sys/officeIndex.jsp b/src/main/webapp/WEB-INF/views/sys/officeIndex.jsp
index ce3bfc39f..01688f9ce 100644
--- a/src/main/webapp/WEB-INF/views/sys/officeIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/officeIndex.jsp
@@ -26,7 +26,6 @@
 	
 	<h3 class="page-title">
 	<spring:message code="officeManage"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 	
 	<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/sys/userList.jsp b/src/main/webapp/WEB-INF/views/sys/userList.jsp
index 36500729d..8473ff2d7 100644
--- a/src/main/webapp/WEB-INF/views/sys/userList.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/userList.jsp
@@ -66,7 +66,6 @@
 
 		<h3 class="page-title">
 			<spring:message code="userManage"></spring:message>
-			<small><spring:message code="date_list" /></small>
 		</h3>
 
 		<h5 class="page-header"></h5>
diff --git a/src/main/webapp/WEB-INF/views/systemService/list.jsp b/src/main/webapp/WEB-INF/views/systemService/list.jsp
index 5e2424112..cdd0e902b 100644
--- a/src/main/webapp/WEB-INF/views/systemService/list.jsp
+++ b/src/main/webapp/WEB-INF/views/systemService/list.jsp
@@ -48,7 +48,6 @@ function checkNum(obj) {
 
 	<h3 class="page-title">
 		<spring:message code="sysService_manage"></spring:message>
-		<small><spring:message code="date_list"/></small>
 	</h3>
 
 	<h5 class="page-header"></h5>

From 7f5d27f90aa59379e82deb41923ea10c47edc818 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 27 Aug 2018 15:26:32 +0800
Subject: [PATCH 31/39] =?UTF-8?q?(1)=E4=BF=AE=E5=A4=8D=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=80=BB=E9=87=8F=E6=9F=A5=E8=AF=A2=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE0=E7=9A=84bug=20(2)=E8=B0=83=E6=95=B4=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E6=97=A5=E5=BF=97=E6=80=BB=E9=87=8F=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=EF=BC=8C=E6=94=B9=E4=B8=BA=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=EF=BC=8C=E5=87=8F=E5=B0=91=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=B5=AA=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/NtcServiceReportController.java    | 31 ++++----
 src/main/webapp/WEB-INF/views/report/list.jsp | 78 ++++++++++++-------
 2 files changed, 68 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/report/NtcServiceReportController.java b/src/main/java/com/nis/web/controller/report/NtcServiceReportController.java
index 5c2846d3b..d452302aa 100644
--- a/src/main/java/com/nis/web/controller/report/NtcServiceReportController.java
+++ b/src/main/java/com/nis/web/controller/report/NtcServiceReportController.java
@@ -5,10 +5,12 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -32,17 +34,13 @@ import net.sf.json.JsonConfig;
 public class NtcServiceReportController extends BaseController {
 	@RequestMapping("/ajaxNtcServiceReport")
 	@ResponseBody
-	public Map<String, Long> report(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
-		Map<String, Long> datas=new HashMap<>();
+	public List<Map<String, Object>> report(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
+		List<Map<String, Object>> datas=new ArrayList<Map<String, Object>>();
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
-		if(bean.getAction()!=null){
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==bean.getAction().intValue()){
-					bean.setSearchService(service.getServiceId().toString());
-				}
-			}
+		StringBuffer serviceId=new StringBuffer();
+		if(StringUtils.isNotBlank(bean.getServices())){
+			serviceId.append(bean.getServices());
 		}else{
-			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){
 				if(i==0){
 					serviceId.append(serviceList.get(i).getServiceId().toString());
@@ -50,8 +48,8 @@ public class NtcServiceReportController extends BaseController {
 					serviceId.append(","+serviceList.get(i).getServiceId().toString());
 				}
 			}
-			bean.setSearchService(serviceId.toString());
 		}
+		bean.setSearchService(serviceId.toString());
 		bean.setSearchBusinessType("1");
 		bean.setPageSize(-1);
 		try {
@@ -64,13 +62,20 @@ public class NtcServiceReportController extends BaseController {
 		try {
 			String json=ConfigServiceUtil.getReport(url.toString(), bean);
 			List<NtcServiceReport> data=getList(json);
+			Map<Integer, Long> dataMap=new HashMap<>();
 			for(NtcServiceReport report:data){
-				if(datas.containsKey(report.getService().toString())){
-					datas.put(report.getService().toString(), datas.get(report.getService().toString())+report.getSum().longValue());
+				if(dataMap.containsKey(report.getService())){
+					dataMap.put(report.getService(), dataMap.get(report.getService())+report.getSum().longValue());
 				}else{
-					datas.put(report.getService().toString(),report.getSum().longValue());
+					dataMap.put(report.getService(),report.getSum().longValue());
 				}
 			}
+			for(Entry<Integer, Long> e:dataMap.entrySet()) {
+				Map<String, Object> _data=new HashMap<>();
+				_data.put("service", e.getKey());
+				_data.put("sum", e.getValue());
+				datas.add(_data);
+			}
 		} catch (Exception e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index e393f3941..025b48826 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -66,32 +66,7 @@
 				}
 			}
 		});
-		$(".service").each(function(){
-			var target=$(this).find("span");
-			var action=$(this).data("action");
-			$.ajax({
-				type:'post',
-				url:'${ctx}/report/ajaxNtcServiceReport',
-				data:{
-					"action":action,
-					"functionId":$("#functionId").val(),
-					"reportType":$('[name="reportType"]').val(),
-					"reportTime":$('[name="reportTime"]').val()
-				},
-				dataType:'json',
-				async:true,
-				success:function(data,textStatus){//处理返回结果
-					if(textStatus=="success"){
-						target.html(data[action]);
-					}
-				},
-				complete:function(XMLHttpRequest,status){//超时设置
-					if(status=="timeout"){
-						target.html(timeout);
-					}
-				}
-			});
-		});
+		ajaxServiceLogTotal();
 		$("#export-btn").click(function(){
 			var te = $(".in table").tableExport({
 				headings:true,
@@ -126,7 +101,54 @@
 			$("#reportTypeDiv").append('<input id="intype" name="reportTime" class="form-control input-medium Wdate" type="text" value="' + reportTime.substring(0, 4) + '" readonly="readonly" onclick=WdatePicker({dateFmt:"yyyy",isShowClear:true});>');
 		}
 	}
-	
+var ajaxServiceLogTotal=function(){
+	var services=[];
+	var objs=[];
+	$(".service").each(function(){
+		objs.push($(this));
+		services.push($(this).data("service"));
+	});
+	var timeout=$.validator.messages.timeout;
+	var failed=$.validator.messages.failed;
+	$.ajax({
+		type:'post',
+		timeout:10000,//超时时间设置，查询接口时间过长超时
+		url:'${ctx}/report/ajaxNtcServiceReport',
+		data:{
+			"services":services.join(","),
+			"functionId":$("#functionId").val(),
+			"reportType":$('[name="reportType"]').val(),
+			"reportTime":$('[name="reportTime"]').val()
+		},
+		dataType:'json',
+		async:true,
+		success:function(data,textStatus){//处理返回结果
+			if(textStatus=="success"){
+				for(var i=0;i<services.length;i++){
+					var target=objs[i].find("span");
+					for(var da in data){
+						if(data[da].service==services[i]){
+							target.html(data[da].sum);
+						}
+					}
+				}
+			}
+		},
+		complete:function(XMLHttpRequest,status){//超时设置
+			if(status=="timeout"){
+				for(var i=0;i<services.length;i++){
+					var target=objs[i].find("span");
+					target.html(timeout);
+				}
+			}else if(status !="success"){
+				for(var i=0;i<services.length;i++){
+					var target=objs[i].find("span");
+					target.html(failed);
+				}
+			}
+		}
+	});
+}	
 var ajaxReport=function(url,target){
 	loading('<spring:message code="onloading"/>');
 	$.ajax({
@@ -193,7 +215,7 @@ function customColumnClick(){
 		<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
 			<c:forEach items="${serviceList}" var="service" varStatus="status">
 				<c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}">
-					<div data-action="${service.action}" class="service btn 
+					<div data-service="${service.serviceId}" class="service btn 
 					<c:if test="${status.index%2==0}">btn-primary</c:if>
 					<c:if test="${status.index%2!=0}">btn-default</c:if>">
 						<spring:message code="${action.itemValue}"/>

From 6f21f50cab09162b666bb436b7f347af8f913a30 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Mon, 27 Aug 2018 15:30:44 +0800
Subject: [PATCH 32/39] =?UTF-8?q?=E6=9C=AA=E5=81=9A=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/report/list.jsp | 78 ++++++++++++-------
 1 file changed, 50 insertions(+), 28 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp
index e393f3941..025b48826 100644
--- a/src/main/webapp/WEB-INF/views/report/list.jsp
+++ b/src/main/webapp/WEB-INF/views/report/list.jsp
@@ -66,32 +66,7 @@
 				}
 			}
 		});
-		$(".service").each(function(){
-			var target=$(this).find("span");
-			var action=$(this).data("action");
-			$.ajax({
-				type:'post',
-				url:'${ctx}/report/ajaxNtcServiceReport',
-				data:{
-					"action":action,
-					"functionId":$("#functionId").val(),
-					"reportType":$('[name="reportType"]').val(),
-					"reportTime":$('[name="reportTime"]').val()
-				},
-				dataType:'json',
-				async:true,
-				success:function(data,textStatus){//处理返回结果
-					if(textStatus=="success"){
-						target.html(data[action]);
-					}
-				},
-				complete:function(XMLHttpRequest,status){//超时设置
-					if(status=="timeout"){
-						target.html(timeout);
-					}
-				}
-			});
-		});
+		ajaxServiceLogTotal();
 		$("#export-btn").click(function(){
 			var te = $(".in table").tableExport({
 				headings:true,
@@ -126,7 +101,54 @@
 			$("#reportTypeDiv").append('<input id="intype" name="reportTime" class="form-control input-medium Wdate" type="text" value="' + reportTime.substring(0, 4) + '" readonly="readonly" onclick=WdatePicker({dateFmt:"yyyy",isShowClear:true});>');
 		}
 	}
-	
+var ajaxServiceLogTotal=function(){
+	var services=[];
+	var objs=[];
+	$(".service").each(function(){
+		objs.push($(this));
+		services.push($(this).data("service"));
+	});
+	var timeout=$.validator.messages.timeout;
+	var failed=$.validator.messages.failed;
+	$.ajax({
+		type:'post',
+		timeout:10000,//超时时间设置，查询接口时间过长超时
+		url:'${ctx}/report/ajaxNtcServiceReport',
+		data:{
+			"services":services.join(","),
+			"functionId":$("#functionId").val(),
+			"reportType":$('[name="reportType"]').val(),
+			"reportTime":$('[name="reportTime"]').val()
+		},
+		dataType:'json',
+		async:true,
+		success:function(data,textStatus){//处理返回结果
+			if(textStatus=="success"){
+				for(var i=0;i<services.length;i++){
+					var target=objs[i].find("span");
+					for(var da in data){
+						if(data[da].service==services[i]){
+							target.html(data[da].sum);
+						}
+					}
+				}
+			}
+		},
+		complete:function(XMLHttpRequest,status){//超时设置
+			if(status=="timeout"){
+				for(var i=0;i<services.length;i++){
+					var target=objs[i].find("span");
+					target.html(timeout);
+				}
+			}else if(status !="success"){
+				for(var i=0;i<services.length;i++){
+					var target=objs[i].find("span");
+					target.html(failed);
+				}
+			}
+		}
+	});
+}	
 var ajaxReport=function(url,target){
 	loading('<spring:message code="onloading"/>');
 	$.ajax({
@@ -193,7 +215,7 @@ function customColumnClick(){
 		<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
 			<c:forEach items="${serviceList}" var="service" varStatus="status">
 				<c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}">
-					<div data-action="${service.action}" class="service btn 
+					<div data-service="${service.serviceId}" class="service btn 
 					<c:if test="${status.index%2==0}">btn-primary</c:if>
 					<c:if test="${status.index%2!=0}">btn-default</c:if>">
 						<spring:message code="${action.itemValue}"/>

From c5e83214f269686772d0d66b59749a502f9ac040 Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Mon, 27 Aug 2018 15:33:04 +0800
Subject: [PATCH 33/39] =?UTF-8?q?=E5=8E=BB=E6=8E=89appType=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E8=8E=B7=E5=8F=96item=5Fvalue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
index cea10deeb..9161fca19 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp
@@ -53,9 +53,6 @@ $(function(){
 </head>
 <body>
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<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>
 	<h3 class="page-title">
@@ -93,7 +90,7 @@ $(function(){
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
 												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" enableAddBtn="true"
 												 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 												 cssClass="form-control required"/>
 								            </div>
 								            <div for="parent.specServiceName"></div>

From b723761f615f7cf53bb1172e78564f7a6a46fad0 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 27 Aug 2018 15:40:54 +0800
Subject: [PATCH 34/39] =?UTF-8?q?(1)=E4=BF=AE=E6=94=B9app=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=EF=BC=8C=E5=9F=BA=E7=A1=80=E5=8D=8F=E8=AE=AE=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=20(2)app=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8D=E5=86=8D=E6=8F=90=E7=A4=BA=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=98=AF=E5=90=A6=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/domain/log/SearchReport.java        | 8 ++++++++
 src/main/webapp/WEB-INF/tags/sys/treeselect.tag           | 1 -
 .../WEB-INF/views/specific/specificServiceCfgForm.jsp     | 4 ++--
 src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp       | 8 +-------
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/nis/domain/log/SearchReport.java b/src/main/java/com/nis/domain/log/SearchReport.java
index c99242112..de1798739 100644
--- a/src/main/java/com/nis/domain/log/SearchReport.java
+++ b/src/main/java/com/nis/domain/log/SearchReport.java
@@ -31,6 +31,7 @@ public class SearchReport extends BaseEntity<SearchReport>{
 	private Integer functionId;
 	private String cfgName;
 	private Integer action;
+	private String services;//service日志总量统计使用
 	private Integer reportType;//小时报，日报，月报
 	//标签，性质，来文函号，境内源Ip,各国目的IP，运营商局点
 	private String reportBusinessType;
@@ -50,6 +51,13 @@ public class SearchReport extends BaseEntity<SearchReport>{
 	//界面查询的时间
 	private String reportTime;
 	
+	
+	public String getServices() {
+		return services;
+	}
+	public void setServices(String services) {
+		this.services = services;
+	}
 	/**
 	 * reportStartTime
 	 * @return  reportStartTime
diff --git a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
index 7d921eca3..672737077 100644
--- a/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
+++ b/src/main/webapp/WEB-INF/tags/sys/treeselect.tag
@@ -58,7 +58,6 @@
 					}
 					//wx提示，c:if标签前加了//注释,c:if标签的判断条件仍会生效
 					for(var i=0; i<nodes.length; i++) {
-						console.log(nodes[i]);
 						//<c:if test="${checked && notAllowSelectParent}">
 						if (nodes[i].isParent && "${checkedPS}"!=''){
 							continue; // 如果为复选框选择，并且父子节点有关联，则过滤掉父节点
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
index 7472a716c..17d1034c0 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceCfgForm.jsp
@@ -285,7 +285,7 @@
 														<div class="form-group cfgType specServiceCode">
 															<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="app_code"/>:</label>
 															<div class="col-md-4">
-																<input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[0,2147483647]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
+																<input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[300001,310000]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
 															</div>
 															<div for="specServiceCode"></div>
 														</div> 
@@ -294,7 +294,7 @@
 														<div class="form-group cfgType">
 															<label class="col-md-3 control-label protocol_code"><font color="red">*</font><spring:message code="protocol_code"/>:</label>
 															<div class="col-md-4">
-																<input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[0,2147483647]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
+																<input id="specServiceCode${dict.itemCode}" name="specServiceCode" maxlength="50" range="[10001,20000]" class="form-control required digits specServiceCodeCheck" value="${specificServiceCfg.specServiceCode}" ctx="${ctx}"/>
 															</div>
 															<div for="specServiceCode"></div>
 														</div> 
diff --git a/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp b/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp
index 4b138a307..4ff6d9515 100644
--- a/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp
+++ b/src/main/webapp/WEB-INF/views/sys/tagTreeselect.jsp
@@ -234,13 +234,7 @@
 				setTimeout(function(){zTree.editName(treeNode)}, 10);
 				return false;
 			}
-			if(confirm("<spring:message code='save' />" + treeNode.name + "?")){
-				return true;
-			}else{
-				setTimeout(function(){zTree.editName(treeNode)}, 10);
-				return false;
-			}
-			
+			return true;
 		}
 		function beforeRemove(treeId, treeNode, newName) {
 			return confirm("<spring:message code='remove' /> " + treeNode.name + "?");

From ed5a25afdcb8087e8c03e0a9b9b56e396e524e43 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Mon, 27 Aug 2018 16:27:33 +0800
Subject: [PATCH 35/39] =?UTF-8?q?APP=20session=20=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E5=90=8D=E7=A7=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index 09886961e..f7401cd13 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1096,8 +1096,8 @@ APP_SUBSCRIBE_ID=Certification Mark Configuration
 reply_file=Reply File
 app_topic_domain_cfg=Topic Website
 #=====================about app Tcp=================================
-min_tcp=Minimum Session Number
-max_tcp=Maximum Session Number
+min_tcp=Minimum Session Size
+max_tcp=Maximum Session Size
 tcp_unit=Unit / byte
 app_tcp_config=APP TCP Session Feature
 app_tcp_max_min=Maximum Session Should Not Exceed 4294967295

From 5f93a39d3fc434aa90f3d63121de6f9fb3ed9c4e Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Mon, 27 Aug 2018 16:31:42 +0800
Subject: [PATCH 36/39] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=95=8C=E9=9D=A2=E5=8F=96=E6=B6=88=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp    | 3 ---
 src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp            | 3 ---
 src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp        | 3 ---
 .../webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp     | 3 ---
 src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp     | 3 ---
 src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp  | 3 ---
 src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp     | 3 ---
 src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp   | 4 +---
 .../webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp    | 3 ---
 src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp     | 3 ---
 src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp          | 3 ---
 .../webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp    | 6 +-----
 src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp         | 3 ---
 src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp          | 3 ---
 .../WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp   | 3 ---
 .../WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp  | 3 ---
 src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp       | 4 +---
 src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp         | 3 ---
 src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp        | 3 ---
 .../WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp  | 3 ---
 .../WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp  | 3 ---
 .../webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp    | 4 ----
 src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp       | 3 ---
 23 files changed, 3 insertions(+), 72 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
index e5cf8fc94..ec9e5fa6f 100644
--- a/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/policyGroupForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
index bab476265..c415a7073 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp
@@ -49,9 +49,6 @@ $(function(){
 		$("#cfgFrom").attr("action","${ctx}/cfg/app/saveOrUpdateCfg");
 		$("#save").submit();
 	});
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$("#cfgFrom").validate({
 		submitHandler: function(form){
 			//loading('onloading...');
diff --git a/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp b/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
index f573fcd0a..029463b9f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/appFeaturesCfg.jsp
@@ -7,9 +7,6 @@
 <script type="text/javascript">
 $(function(){
 	$("#cfgFrom").find("input,select,radio").attr("disabled",true);
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 
 });
 </script>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
index 6af43eeb0..6fdb70057 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$("input[name='cfgKeywords']").addClass("url");
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
index 3f1bb6832..025447f74 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp
@@ -52,9 +52,6 @@ $(function(){
 			$("#areaIp").addClass("hidden");
 		}
 	});
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change",function(){
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
index e3543b643..eae0cc0b9 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
index 1a156fede..c2113764e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp
@@ -42,9 +42,6 @@ $(function(){
 			$("#areaIp").addClass("hidden");
 		}
 	});
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change",function(){
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
index dea5c1b2d..6f06d1f13 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp
@@ -25,9 +25,7 @@ $(function(){
 		},
 		errorContainer: "#messageBox",
 	});
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
+
 });
 </script>
 </head>
diff --git a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp
index 1dc0c6a4b..993f7e945 100644
--- a/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/av/voip/voipAccountForm.jsp
@@ -13,9 +13,6 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
-							window.history.back();
-						});
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
index 4e13ef004..e7152f5f0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp
@@ -13,9 +13,6 @@
 			$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());
 			$("#cfgType").val($("#cfgTypeMaat").val());
 		} */
-		$("#cancel").on("click", function() {
-			window.history.back();
-		});
 		$(".action").on("change", function() {
 			$("#serviceId").val($(this).attr("serviceId"));
 			$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
index 9fc26d8e4..f63d58057 100644
--- a/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/dnsIpCfgForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 		$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
index 0ef46a3b9..1a98a2cb2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
@@ -13,11 +13,7 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
-							window.history.back();
-						});
-						
-						 $(".action").on("change", function() {
+						$(".action").on("change", function() {
 								 switchAction($("input[name=action]:checked").val());
 							   	//拦截根据action切换动作部分
 							   	setInterceptDefaultInfo("");
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp
index 214971208..a78ef53c0 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipCfgDemoForm.jsp
@@ -48,9 +48,6 @@
 				$("#areaIp").addClass("hidden");
 			}
 		});
-		$("#cancel").on("click", function() {
-			window.history.back();
-		});
 		$("select[name$='ipType']").on("change", function() {
 			switchIpType($(this));
 		});
diff --git a/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp
index 3b86fa109..4dfdea7c2 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipsec/ipForm.jsp
@@ -12,9 +12,6 @@ $(function(){
 		$("#cfgRegionCode").val($("#cfgRegionCodeMaat").val());	
 		$("#cfgType").val($("#cfgTypeMaat").val());	
 	}
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 		$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
index f5160759d..5f6932316 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/dnsResStrategy/form.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
index c44a8b6e1..1d75997ce 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/form.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
index 7577582a5..81e66f99c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/multipleCfgForm.jsp
@@ -172,9 +172,7 @@ $(function(){
 		var tableName=$(this).attr("name").replace(".ipType","");
 		switchIpType($(".ipType"));
 	}); 		
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
+
 });
 </script>
 </head>
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
index 2135334a9..c2d9e962a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/bgpForm.jsp
@@ -13,9 +13,6 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
-							window.history.back();
-						});
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
index 55e8643e0..548f97c89 100644
--- a/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/other/xmppForm.jsp
@@ -13,9 +13,6 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
-							window.history.back();
-						});
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp
index 868b0f21e..937fcf997 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpReqReplaceForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp
index 7742d6587..16967272e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/control/httpResReplaceForm.jsp
@@ -5,9 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script type="text/javascript">
 $(function(){
-	$("#cancel").on("click",function(){
-		window.history.back();
-	});
 	$(".action").on("change", function() {
 		$("#serviceId").val($(this).attr("serviceId"));
 	});
diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp
index c7d8eca78..dd6292cd4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/proxy/fileStrategy/form.jsp
@@ -18,10 +18,6 @@
 		$("#cfgFile").on('change',function(){
 			$("#urlInfo").val($("#cfgFile").val());
 		});
-		
-		$("#cancel").on("click", function() {
-			window.history.back();
-		});
 
 		$("#cfgFrom") .validate( {
 			submitHandler : function(form) {
diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
index b984969b6..0e9e7468a 100644
--- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp
@@ -13,9 +13,6 @@
 	$(document)
 			.ready(
 					function() {
-						$("#cancel").on("click", function() {
-							window.history.back();
-						});
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));

From a231611c394fbf22c862dba35130ea6851916f81 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei@intranet.com>
Date: Mon, 27 Aug 2018 16:39:23 +0800
Subject: [PATCH 37/39] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=80=BB=E8=BE=91=EF=BC=8C=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=97=B6=E6=A0=B7=E4=BE=8B=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=88=90=E5=8A=9F=E5=90=8E=E7=AB=8B=E5=88=BB?=
 =?UTF-8?q?=E5=B0=86=E6=BA=90=E6=96=87=E4=BB=B6=E5=92=8C=E6=A0=B7=E4=BE=8B?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E8=87=B3=E4=B8=AD=E9=97=B4?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhangwei <zhangwei@intranet.com>
---
 .../configuration/ntc/AvController.java       | 20 +++---
 .../service/configuration/AvCfgService.java   | 62 ++++++++++++++++---
 2 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
index 5763bc857..3b08b6883 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvController.java
@@ -131,9 +131,11 @@ public class AvController extends BaseController  {
 				entity.setResultPath(resultFileAllPath);
 				
 				File uploadSrcFile = new File(srcFileAllPath);
-				File uploadSampleFile = new File(sampleFileAllPath);
+//				File uploadSampleFile = new File(sampleFileAllPath);
 				FileCopyUtils.copy(srcFile.getBytes(), uploadSrcFile);//保存源文件
-				String host = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath();
+				entity.setSrcUrl("");
+				entity.setSampleUrl("");
+				/*String host = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath();
 				String srcUrl = host+srcFilePath.substring(srcFilePath.indexOf(Constants.AV_FILE_PATH)+Constants.AV_FILE_PATH.length()-1)+sep+uploadSrcFile.getName();
 				String sampleUrl = host+sampleFilePath.substring(sampleFilePath.indexOf(Constants.AV_FILE_PATH)+Constants.AV_FILE_PATH.length()-1)+sep+uploadSampleFile.getName();
 				srcUrl = srcUrl.replace("\\", "/");
@@ -141,7 +143,7 @@ public class AvController extends BaseController  {
 				logger.info("srcUrl:"+srcUrl);
 				logger.info("sampleUrl:"+sampleUrl);
 				entity.setSrcUrl(srcUrl);
-				entity.setSampleUrl(sampleUrl);
+				entity.setSampleUrl(sampleUrl);*/
 				
 //				File uploadSrcFile = new File(srcFilePath);
 //				FileCopyUtils.copy(srcFile.getBytes(), uploadSrcFile);
@@ -209,10 +211,10 @@ public class AvController extends BaseController  {
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
 			entity.setAuditTime(new Date());
-			String oldSrcUrl = entity.getSrcPath();
-			String oldSampleUrl = entity.getSamplePath();
+//			String oldSrcUrl = entity.getSrcPath();
+//			String oldSampleUrl = entity.getSamplePath();
 			try {
-				if(isAudit==1){	
+				/*if(isAudit==1){	
 					Date creatTime = entity.getCreateTime();
 					//音视频文件上传接口调用
 					File srcFile = new File(oldSrcUrl);
@@ -254,15 +256,15 @@ public class AvController extends BaseController  {
 //							entity.setSamplePath("");
 						
 					}
-				}
+				}*/
 				avCfgService.auditAvFileSample(entity,isAudit);	
 				//删除本地源文件和样例文件
-				if(!oldSrcUrl.equals(entity.getSrcUrl())){
+				/*if(!oldSrcUrl.equals(entity.getSrcUrl())){
 					FileUtils.deleteFile(oldSrcUrl);
 				}
 				if(!oldSampleUrl.equals(entity.getSampleUrl())){
 					FileUtils.deleteFile(oldSampleUrl);
-				}
+				}*/
 			}catch(Exception e){
 				e.printStackTrace();
 				if(e instanceof MaatConvertException) {
diff --git a/src/main/java/com/nis/web/service/configuration/AvCfgService.java b/src/main/java/com/nis/web/service/configuration/AvCfgService.java
index 5a68dd1e0..1bde1abd0 100644
--- a/src/main/java/com/nis/web/service/configuration/AvCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AvCfgService.java
@@ -20,11 +20,13 @@ import com.nis.domain.Page;
 import com.nis.domain.configuration.AvFileSampleCfg;
 import com.nis.domain.configuration.AvSignSampleCfg;
 import com.nis.domain.maat.ToMaatResult;
+import com.nis.domain.maat.ToMaatResult.ResponseData;
 import com.nis.exceptions.CallExternalProceduresException;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
 import com.nis.util.FileUtils;
+import com.nis.util.JsonMapper;
 import com.nis.util.StringUtil;
 import com.nis.web.dao.configuration.AvCfgDao;
 import com.nis.web.security.UserUtils;
@@ -181,16 +183,62 @@ public class AvCfgService extends BaseService{
 				Integer fileId = resObject.getInt("fileId");
 				if(state==1 && fileSize>0){//成功
 					entity.setIsSampleCreated(1);//样例文件创建成功
+					if(fileId.equals(entity.getCfgId().intValue())){
+						File uploadSampleFile = new File(entity.getSamplePath());
+						String sampleMd5 = FileUtils.getFileMD5(uploadSampleFile);				
+						entity.setSampleMd5(sampleMd5);
+					}else{
+						logger.error("调用外部程序返回fileId错误,输入的fileId为："+entity.getCfgId()+",输出的fileId为："+fileId);
+						throw new CallExternalProceduresException();
+					}
+					//文件上传至综合服务
+					Date creatTime = entity.getCreateTime();
+					//音视频文件上传接口调用
+					File srcFile = new File(entity.getSrcPath());
+					Map<String,Object> srcMap = new HashMap();
+					srcMap.put("filetype", FileUtils.getSuffix(srcFile.getName(), false));
+					srcMap.put("datatype", "dbSystem");//源文件存入数据中心
+					
+					srcMap.put("createTime",creatTime);
+					srcMap.put("key",FileUtils.getPrefix(srcFile.getName(), false));
+					srcMap.put("fileName", srcFile.getName());
+					srcMap.put("checksum", entity.getSrcMd5());
+					ToMaatResult result1 = ConfigServiceUtil.postFileCfg(null, srcFile, JsonMapper.toJsonString(srcMap));
+					logger.info("音视频源文件上传响应信息："+result1.toString());
+					//获取文件上传响应信息（新的文件访问路径）
+					String srcAccessUrl = null;
+					if(!StringUtil.isEmpty(result1)){
+						ResponseData data = result1.getData();
+						srcAccessUrl=data.getAccessUrl();
+						entity.setSrcUrl(srcAccessUrl);
+					}
+					File sampleFile = new File(entity.getSamplePath());
+					Map<String,Object> sampleMap = new HashMap();
+					sampleMap.put("filetype", FileUtils.getSuffix(sampleFile.getName(), false));
+					sampleMap.put("datatype", "fileSystem");//样例文件存入fastdfs
+					sampleMap.put("createTime", creatTime);
+					sampleMap.put("key",FileUtils.getPrefix(sampleFile.getName(), false));
+					sampleMap.put("fileName", sampleFile.getName());
+					sampleMap.put("checksum", entity.getSampleMd5());
+					ToMaatResult result2 = ConfigServiceUtil.postFileCfg(null, sampleFile, JsonMapper.toJsonString(sampleMap));
+					logger.info("音视频样例文件上传响应信息："+result2.toString());					
+					//获取文件上传响应信息（新的文件访问路径）
+					String sampleAccessUrl = null;
+					if(!StringUtil.isEmpty(result2)){
+						ResponseData data = result2.getData();
+						sampleAccessUrl = data.getAccessUrl();
+						entity.setSampleUrl(sampleAccessUrl);
+						
+					}
+					//删除本地源文件和样例文件
+					FileUtils.deleteFile(entity.getSrcPath());
+					FileUtils.deleteFile(entity.getSamplePath());
 				}else{
 					entity.setIsSampleCreated(-1);//样例文件创建失败
+					logger.error("样例文件生成失败");
+					throw new CallExternalProceduresException();
 				}
-				if(fileId.equals(entity.getCfgId().intValue())){
-					File uploadSampleFile = new File(entity.getSamplePath());
-					String sampleMd5 = FileUtils.getFileMD5(uploadSampleFile);				
-					entity.setSampleMd5(sampleMd5);
-				}else{
-					logger.info("调用外部程序返回fileId错误,输入的fileId为："+entity.getCfgId()+",输出的fileId为："+fileId);
-				}
+				
 			}else{
 				throw new CallExternalProceduresException();
 			}

From 531f85017dd6d8337fc5c5951e386ec84df111b7 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 27 Aug 2018 17:40:14 +0800
Subject: [PATCH 38/39] =?UTF-8?q?ip=E5=B1=9E=E6=80=A7=E5=85=B1=E7=94=A8?=
 =?UTF-8?q?=E5=80=BC=E6=8F=90=E5=8F=96=E4=B8=BA=E4=B8=80=E4=B8=AA=E5=85=A8?=
 =?UTF-8?q?=E5=B1=80=E7=9A=84=E5=87=BD=E6=95=B0=EF=BC=8C=E5=BD=93initCommI?=
 =?UTF-8?q?pVal=E6=89=A7=E8=A1=8C=E7=9A=84=E6=97=B6=E5=80=99=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E5=8C=96ipcommon=E7=9A=84=E5=B1=9E=E6=80=A7=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E4=B8=94=E5=88=9D=E5=A7=8B=E5=8C=96=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=E5=B0=86=E9=A1=B5=E9=9D=A2=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84select=20option=E7=9B=B4=E6=8E=A5remove?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/ipaddr/ipForm.jsp       |  8 +++--
 .../webapp/static/global/scripts/common.js    | 35 ++++++++++++++++---
 2 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
index df5efbe25..381a2b760 100644
--- a/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/ipaddr/ipForm.jsp
@@ -67,10 +67,14 @@
 								}
 								//处理ICMP
 								if($(this).val()==32){
-									tabInfo.find("select[name$='protocol'] option[value='1']").removeAttr("disabled");
+									$.ipcommon.protocol.each(function(){
+										if($(this).attr("value")==1){
+											tabInfo.find("select[name$='protocol']").append($(this));
+										}
+									})
 									tabInfo.find("select[name$='protocol']").selectpicker("refresh");
 								}else{
-									tabInfo.find("select[name$='protocol'] option[value='1']").attr("disabled",true);
+									tabInfo.find("select[name$='protocol'] option[value='1']").remove();
 									tabInfo.find("select[name$='protocol']").selectpicker("refresh");
 								}
 								
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 3a15bcff8..db3543eff 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -1,4 +1,16 @@
 $(function(){
+	//扩展jquery，增加全局函数
+	$.ipcommon=function(){
+		return {};
+	}
+	$.extend($.ipcommon, {
+		ipType:[],
+		ipPattern:[],
+		portPattern:[],
+		protocol:[],
+		direction:[]
+		
+	});
 	$("select[name$='isHexbin']").each(function(){
 		setIsHexBin(this);
 	});
@@ -1453,6 +1465,7 @@ var initCommIpVal=function(){
 	//ip类型处理
 	if(ipType){
 		var arr=ipType.split(',');
+		$.ipcommon.ipType=$("select[name$='ipPattern'] option");
 		$("select[name$='ipType'] option").each(function(){
 			var has=false;
 			for(var type in arr){
@@ -1465,13 +1478,14 @@ var initCommIpVal=function(){
 				}
 			}
 			if(!has){
-				$(this).attr("disabled",true);
+				$(this).remove();
 			}
 		});
 	}
 	//ip格式处理
 	if(ipPattern){
 		arr=ipPattern.split(',');
+		$.ipcommon.ipPattern=$("select[name$='ipPattern'] option");
 		$("select[name$='ipPattern'] option").each(function(){
 			var has=false;
 			for(var type in arr){
@@ -1484,13 +1498,16 @@ var initCommIpVal=function(){
 				}
 			}
 			if(!has){
-				$(this).attr("disabled",true);
+				$(this).remove();
 			}
 		});
+	}else{
+		$.ipcommon.ipPattern=[];
 	}
 	//端口格式处理
 	if(portPattern){
 		arr=portPattern.split(',');
+		$.ipcommon.portPattern=$("select[name$='portPattern'] option");
 		$("select[name$='portPattern'] option").each(function(){
 			var has=false;
 			for(var type in arr){
@@ -1503,13 +1520,16 @@ var initCommIpVal=function(){
 				}
 			}
 			if(!has){
-				$(this).attr("disabled",true);
+				$(this).remove();
 			}
 		});
+	}else{
+		$.ipcommon.portPattern=[];
 	}
 	//方向处理
 	if(direction){
 		arr=direction.split(',');
+		$.ipcommon.direction=$("select[name$='direction'] option");
 		$("select[name$='direction'] option").each(function(){
 			var has=false;
 			for(var type in arr){
@@ -1522,13 +1542,16 @@ var initCommIpVal=function(){
 				}
 			}
 			if(!has){
-				$(this).attr("disabled",true);
+				$(this).remove();
 			}
 		});
+	}else{
+		$.ipcommon.direction=[];
 	}
 	//协议处理
 	if(protocol){
 		arr=protocol.split(',');
+		$.ipcommon.protocol=$("select[name$='protocol'] option");
 		$("select[name$='protocol'] option").each(function(){
 			var has=false;
 			for(var type in arr){
@@ -1541,8 +1564,10 @@ var initCommIpVal=function(){
 				}
 			}
 			if(!has){
-				$(this).attr("disabled",true);
+				$(this).remove();
 			}
 		});
+	}else{
+		$.ipcommon.protocol=[];
 	}
 }
\ No newline at end of file

From 9f33c72a428c1089cb1ba214cb4c253a9182976c Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 27 Aug 2018 18:12:00 +0800
Subject: [PATCH 39/39] =?UTF-8?q?=E5=8E=BB=E6=8E=89social=5Fapp=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E5=80=BC=E7=9A=84=E6=BB=A5=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp     | 5 +----
 src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp     | 5 +----
 src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp   | 5 +----
 src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp   | 5 +----
 src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp   | 5 +----
 src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp   | 5 +----
 src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp     | 5 +----
 src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp     | 5 +----
 src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp       | 5 +----
 src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp       | 5 +----
 src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp   | 5 +----
 src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp   | 5 +----
 src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp      | 5 +----
 src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp      | 5 +----
 src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp      | 5 +----
 .../webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp   | 5 +----
 .../webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp   | 5 +----
 .../WEB-INF/views/specific/specificServiceHostCfgList.jsp    | 5 +----
 18 files changed, 18 insertions(+), 72 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
index facf44d90..1dba41b66 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp
@@ -44,9 +44,6 @@ $(function(){
 </head>
 <body>
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<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>
 	<h3 class="page-title">
@@ -84,7 +81,7 @@ $(function(){
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
 												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" enableAddBtn="true"
 												 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 												 cssClass="form-control required"/>
 								            </div>
 								            <div for="parent.specServiceName"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
index 574dbe923..9a02be04d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp
@@ -43,9 +43,6 @@
 <body>
 
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:byte:config">
 			<button type="button" class="btn btn-primary"
@@ -91,7 +88,7 @@
 									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true"
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
-									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 									 cssClass="form-control input-small"/>
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
index 30af2c56a..1b196efba 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp
@@ -45,9 +45,6 @@ $(function(){
 <body>
 
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<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>
 	<h3 class="page-title">
@@ -83,7 +80,7 @@ $(function(){
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
 												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" enableAddBtn="true"
 												 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 												 cssClass="form-control required"/>
 								            </div>
 								            <div for="parent.specServiceName"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
index 56491cd6a..471f39592 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp
@@ -43,9 +43,6 @@
 <body>
 
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:domain:config">
 			<button type="button" class="btn btn-primary"
@@ -91,7 +88,7 @@
 									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true"
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
-									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 									 cssClass="form-control input-small"/>
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
index 9173267d6..dd0610478 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
@@ -59,9 +59,6 @@ $(function(){
 <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">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<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>
 	<h3 class="page-title">
@@ -98,7 +95,7 @@ $(function(){
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
 												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" enableAddBtn="true"
 												 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 												 cssClass="form-control required"/>
 								            </div>
 								            <div for="parent.specServiceName"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
index 64f48edbd..dbce5b6b4 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp
@@ -43,9 +43,6 @@
 <body>
 
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:http:config">
 			<button type="button" class="btn btn-primary"
@@ -91,7 +88,7 @@
 									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" 
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
-									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 									 cssClass="form-control input-small"/>
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
index 0cba40463..868ebde9d 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp
@@ -59,9 +59,6 @@ $(function(){
 <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">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<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>
 	<h3 class="page-title">
@@ -98,7 +95,7 @@ $(function(){
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
 												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" enableAddBtn="true"
 												 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 												 cssClass="form-control required"/>
 								            </div>
 								            <div for="parent.specServiceName"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
index e47296ca4..70a1e24a5 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp
@@ -43,9 +43,6 @@
 <body>
 
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:http:config">
 			<button type="button" class="btn btn-primary"
@@ -91,7 +88,7 @@
 									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" 
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
-									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 									 cssClass="form-control input-small"/>
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
index 7f981a974..fa110b4e8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp
@@ -27,9 +27,6 @@ $(function(){
 <body>
 
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<h3 class="page-title">
 		<spring:message code="app_ip_config"></spring:message>
 	</h3>
@@ -80,7 +77,7 @@ $(function(){
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
 												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" enableAddBtn="true"
 												 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 												 cssClass="form-control required"/>
 								            </div>
 								            <div for="parent.specServiceName"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
index 10c2b5cf0..f8c87b737 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp
@@ -46,9 +46,6 @@
 <body>
 
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:ip:config">
 			<button type="button" class="btn btn-primary"
@@ -94,7 +91,7 @@
 									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" 
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
-									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 									 cssClass="form-control input-small"/>
 								</div>
 								<div class="pull-left">	
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
index 3fc214879..55487690e 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
@@ -158,9 +158,6 @@ var delContent = function(contentClassName, addBtnClassName) {
 <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">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<h3 class="page-title">
 		<spring:message code="social_app_control"></spring:message>
 	</h3>
@@ -230,7 +227,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 												       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
 														 labelName="parent.specServiceName" notAllowSelectParent="true"
 														 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId="0"
+														 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId="0"
 														notAllowSelectRoot="true" cssClass="form-control required"/>
 										            </div>
 										            <div for="parent.specServiceName"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
index 2bf7f6d1f..e06042a8f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
@@ -86,9 +86,6 @@
 <body>
 
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:policy:config">
 			<button type="button" class="btn btn-primary"
@@ -134,7 +131,7 @@
 									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true"
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
-									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 									 cssClass="form-control input-small"/>
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
index 5b2bac185..f6abcd985 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
@@ -59,9 +59,6 @@ $(function(){
 <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">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<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>
 	<h3 class="page-title">
@@ -98,7 +95,7 @@ $(function(){
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
 												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" enableAddBtn="true"
 												 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 												 cssClass="form-control required"/>
 								            </div>
 								            <div for="parent.specServiceName"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
index 7ad9a946a..4876bd2cd 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp
@@ -43,9 +43,6 @@
 <body>
 
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:http:config">
 			<button type="button" class="btn btn-primary"
@@ -91,7 +88,7 @@
 									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" 
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
-									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 									 cssClass="form-control input-small"/>
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
index 304cd935d..1ff57b08f 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp
@@ -41,9 +41,6 @@
 <body>
 
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:tcp:config">
 			<button type="button" class="btn btn-primary"
@@ -89,7 +86,7 @@
 									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true"
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
-									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 									 cssClass="form-control input-small"/>
 								</div>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
index ae74691a1..954f1b106 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
@@ -47,9 +47,6 @@ $(function(){
 <body>
 
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<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>
 	<h3 class="page-title">
@@ -85,7 +82,7 @@ $(function(){
 										       <sys:treeselect id="specServiceId" name="specServiceId" value="${_cfg.specServiceId}" 
 												 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true" 
 												 labelValue="${empty _cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(_cfg.specServiceId).specServiceName}"
-												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+												 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 												 cssClass="form-control required"/>
 								            </div>
 								            <div for="parent.specServiceName"></div>
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
index 81873d4b4..949e3f4a8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp
@@ -44,9 +44,6 @@
 <body>
 
 <div class="page-content">
-	<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-	</c:forEach>
 	<div class="theme-panel hidden-xs hidden-sm">
 		<shiro:hasPermission name="app:topic:config">
 			<button type="button" class="btn btn-primary"
@@ -92,7 +89,7 @@
 									<sys:treeselect id="specServiceId" name="specServiceId" value="${cfg.specServiceId}" 
 									 labelName="parent.specServiceName" notAllowSelectRoot="true" notAllowSelectParent="true"
 									 labelValue="${empty cfg.specServiceId?spec_service_id:fns:getBySpecServiceId(cfg.specServiceId).specServiceName}"
-									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 									 cssClass="form-control input-small"/>
 								</div> --%>
 								<div class="pull-left">
diff --git a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
index f06b5de67..f1b38102f 100644
--- a/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/specific/specificServiceHostCfgList.jsp
@@ -163,9 +163,6 @@
 </head>
 
 <body>
-<c:forEach items="${fns:getDictList('SPECIFIC_SERVICE_CFG_TYPE') }" var="dict">
-	<c:if test="${dict.itemValue eq 'social_app'}"><c:set var="app" value="${dict.itemCode}"/></c:if>
-</c:forEach>
 <div class="modal fade" id="import_modal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
 <form id="importForm1" action="${ctx}/specific/specificServiceHostCfg/import/" method="post"
 			enctype="multipart/form-data" class="form-horizontal"
@@ -261,7 +258,7 @@
 									 <sys:treeselect id="specServiceId" name="specServiceId" value="${specificServiceCfg.parent.specServiceId}" 
 									 labelName="parent.specServiceName" 
 									 labelValue="${empty specificServiceHostCfg.specServiceId?spec_service_id:fns:getBySpecServiceId(specificServiceHostCfg.specServiceId).specServiceName}"
-									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=${app}" extId=""
+									 title="${spec_service_id}" url="/specific/specificServiceCfg/treeData?isLeafShow=false&cfgType=1" extId=""
 									 cssClass="form-control input-small"/>	
 						
 								   </div>