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 }">