Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

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

@@ -15,8 +15,12 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import com.nis.domain.BaseEntity;
+import com.nis.domain.SysMenu;
 import com.nis.util.Constants;
+import com.nis.util.StringUtil;
+import com.nis.util.StringUtils;
 import com.nis.util.excel.ExcelField;
+import com.nis.web.security.UserUtils;
 
 /**
  * @ClassName: BaseConfig.java 
@@ -196,6 +200,14 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	 * 菜单ID
 	 */
 	protected Integer functionId;
+	/**
+	 * 菜单权限
+	 */
+	protected String permission;
+	/**
+	 * 菜单权限
+	 */
+	protected String menuNameCode;
 	
 	/**
 	 * do_log属性在界面（do_log:0不需要1记录所有日志2只记录结构化日志。默认是2）
@@ -250,6 +262,33 @@ public class BaseCfg<T> extends BaseEntity<T> implements Cloneable{
 	 */
 	public void setFunctionId(Integer functionId) {
 		this.functionId = functionId;
+		if(!StringUtil.isEmpty(functionId) && StringUtil.isEmpty(this.menuNameCode)){
+			List<SysMenu> list = UserUtils.getMenuList();
+			if(!StringUtil.isEmpty(list)) {
+				for (SysMenu menu :list) {
+					if (!StringUtil.isEmpty(menu.getCode()) && !StringUtil.isEmpty(menu.getFunctionId()) &&menu.getFunctionId().equals(functionId)) {
+						this.setMenuNameCode(menu.getCode());
+						
+					}
+					
+				}
+			}
+		}
+
+	}
+	
+	public String getMenuNameCode() {
+		return menuNameCode;
+	}
+	public void setMenuNameCode(String menuNameCode) {
+		this.menuNameCode = menuNameCode;
+	}
+	
+	public String getPermission() {
+		return permission;
+	}
+	public void setPermission(String permission) {
+		this.permission = permission;
 	}
 	/**
 	 * cfgId

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

@@ -27,7 +27,7 @@ public class IpMultiplexPoolCfg extends BaseCfg<IpMultiplexPoolCfg> {
 	private Integer protocol;
 	@Expose
 	@SerializedName("ip")
-	private String srcIpAddress;
+	private String destIpAddress;
 	@Expose
 	private String port;
 	@Expose
@@ -58,11 +58,12 @@ public class IpMultiplexPoolCfg extends BaseCfg<IpMultiplexPoolCfg> {
 		this.protocol = protocol;
 	}
 	
-	public String getSrcIpAddress() {
-		return srcIpAddress;
+
+	public String getDestIpAddress() {
+		return destIpAddress;
 	}
-	public void setSrcIpAddress(String srcIpAddress) {
-		this.srcIpAddress = srcIpAddress;
+	public void setDestIpAddress(String destIpAddress) {
+		this.destIpAddress = destIpAddress;
 	}
 	public String getPort() {
 		return port;

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

@@ -31,6 +31,7 @@ public class SearchReport extends BaseEntity<SearchReport>{
 	private Integer functionId;
 	private String cfgName;
 	private Integer action;
+	private Integer serviceId;
 	private String services;//service日志总量统计使用
 	private Integer reportType;//小时报，日报，月报
 	//标签，性质，来文函号，境内源Ip,各国目的IP，运营商局点
@@ -52,6 +53,12 @@ public class SearchReport extends BaseEntity<SearchReport>{
 	private String reportTime;
 	
 	
+	public Integer getServiceId() {
+		return serviceId;
+	}
+	public void setServiceId(Integer serviceId) {
+		this.serviceId = serviceId;
+	}
 	public String getServices() {
 		return services;
 	}

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

@@ -0,0 +1,50 @@
+package com.nis.domain.maat;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+public class EffectiveRangeCfg implements Serializable{
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -4503782443649076836L;
+	@Expose
+	@SerializedName("tag_sets")
+	private List<List<AreaIsp>> effectiveRangeList;
+	
+	public List<List<AreaIsp>> getEffectiveRangeList() {
+		return effectiveRangeList;
+	}
+
+	public void setEffectiveRangeList(List<List<AreaIsp>> effectiveRangeList) {
+		this.effectiveRangeList = effectiveRangeList;
+	}
+
+	public static class AreaIsp{
+		@Expose
+		private String tag;
+		@Expose
+		private List<String> value;
+		
+		public String getTag() {
+			return tag;
+		}
+		public void setTag(String tag) {
+			this.tag = tag;
+		}
+		public List<String> getValue() {
+			return value;
+		}
+		public void setValue(List<String> value) {
+			this.value = value;
+		}
+		@Override
+		public String toString() {
+			return "AreaIsp [tag=" + tag + ", value=" + value + "]";
+		}
+	}
+}

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

@@ -12,13 +12,14 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
-
 import com.google.gson.annotations.Expose;
 import com.google.gson.annotations.SerializedName;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
+import com.nis.util.StringUtils;
 import com.nis.web.service.BaseService;
+import com.nis.web.service.SpringContextHolder;
+import com.nis.web.service.basics.SysDictInfoService;
 
 /**
  * @ClassName: MaatCfg.java 
@@ -543,8 +544,10 @@ public class MaatCfg implements Serializable {
 	public void setAreaEffectiveIds(String areaEffectiveIds) {
 		if(StringUtils.isEmpty(areaEffectiveIds)){
 			areaEffectiveIds="0";
-		}else if(areaEffectiveIds.contains(":")){
-			areaEffectiveIds = areaEffectiveIds.replace(":", "");
+		}else {
+			// 组织区域、运营商配置下发格式
+			SysDictInfoService service = SpringContextHolder.getBean(SysDictInfoService.class);
+			areaEffectiveIds = service.setEffectiveRange(areaEffectiveIds);
 		}
 		this.areaEffectiveIds = areaEffectiveIds;
 	}

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

@@ -677,4 +677,8 @@ public final class Constants {
 	public static final int  HTTP_CONNECT_TIMEOUT= Configurations.getIntProperty("http_connect_timeout", 10000);
 	public static final int HTTP_CONNECT_REQUEST_TIMEOUT = Configurations.getIntProperty("http_connect_request_timeout", 50000);
 	public static final int HTTP_CONNECT_RETRY_TIMES = Configurations.getIntProperty("http_connect_retry_times", 3);
+	
+	// 区域/运营商配置下发时tag值
+	public static final String AREA_TAG=Configurations.getStringProperty("area_tag","location");
+	public static final String ISP_TAG=Configurations.getStringProperty("isp_tag","isp");
 }

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

@@ -202,6 +202,28 @@ public class DictUtils {
 		}
 		return dictList;		
 	}
+	/**
+	 * 功能业务字典，业务信息
+	 * @param dictId
+	 * @return
+	 */
+	public static FunctionServiceDict getFunctionServiceDict(Integer dictId){
+		FunctionServiceDict serviceDict=null;
+		List<FunctionServiceDict> allDictList = (List<FunctionServiceDict>)CacheUtils.get(Constants.CACHE_FUNCTION_SERVICE_DICT);
+		List<FunctionServiceDict> dictList = new ArrayList();
+		if(StringUtil.isEmpty(allDictList)){
+			FunctionServiceDict entity = new FunctionServiceDict();
+			allDictList = functionServiceDictDao.getList(entity);
+			CacheUtils.put(Constants.CACHE_FUNCTION_SERVICE_DICT, allDictList);
+		}
+		for(FunctionServiceDict entity:allDictList){
+			if(entity.getDictId().equals(dictId)){
+				serviceDict=entity;
+				break;
+			}
+		}
+		return serviceDict;
+	}
 	/**
 	 * 功能业务字典，获取相应功能菜单对应的业务信息
 	 * @param functionId
@@ -238,6 +260,28 @@ public class DictUtils {
 		}
 		return dictList;		
 	}
+	/**
+	 * 功能配置域字典，获取配置域信息
+	 * @param dictId
+	 * @return
+	 */
+	public static FunctionRegionDict getFunctionRegionDict(Integer dictId){
+		FunctionRegionDict regionDict=null;
+		List<FunctionRegionDict> allDictList = (List<FunctionRegionDict>)CacheUtils.get(Constants.CACHE_FUNCTION_REGION_DICT);
+		List<FunctionRegionDict> dictList = new ArrayList();
+		if(StringUtil.isEmpty(allDictList)){
+			FunctionRegionDict entity = new FunctionRegionDict();
+			allDictList = functionRegionDictDao.getList(entity);
+			CacheUtils.put(Constants.CACHE_FUNCTION_REGION_DICT, allDictList);
+		}
+		for(FunctionRegionDict entity:allDictList){
+			if(entity.getDictId().equals(dictId)){
+				regionDict=entity;
+				break;
+			}
+		}
+		return regionDict;		
+	}
 	/**
 	 * 功能配置域字典，获取相应功能菜单对应的配置域信息
 	 * @param functionId

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

@@ -503,4 +503,18 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
 		}
 		return str;
 	}
+	
+	public static String revertStr(String str,String regex){
+		String[] split = str.split(regex);
+		String value = "";
+		for (int i = split.length-1; i >= 0 ; i--) {
+			if( i != 0) {
+				value += split[i]+"/";
+			}else {
+				value += split[i];
+			}
+			
+		}
+		return value;
+	}
 }

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

@@ -486,7 +486,7 @@ public class ExportExcel {
 			if (ss.length==2){
 				cell.setCellValue(ss[0]);
 				Comment comment = this.sheet.createDrawingPatriarch().createCellComment(
-						new XSSFClientAnchor(0, 0, 0, 0, (short) 3, 3, (short) 5, 6));
+						new XSSFClientAnchor(0, 0, 0, 0, (short) i, 0, (short) i+4, 3));
 				comment.setString(new XSSFRichTextString(ss[1]));
 				cell.setCellComment(comment);
 			}else{

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

@@ -678,8 +678,19 @@ public class BaseController {
 		}else{
 			// 判断是否是从配置界面过来的日志查询
 			if(StringUtils.isNotBlank(entry.getIsLogTotalSearch())) {
+				Calendar time = Calendar.getInstance();
+				time.add(Calendar.MINUTE, -5);
+				String searchEndTime = DateUtils.formatDateTime(time.getTime());
+				params.put("searchFoundEndTime",searchEndTime);
+				entry.setSearchFoundEndTime(searchEndTime);
+				
+				time.add(Calendar.MINUTE, -5);
+				String searchStartTime = DateUtils.formatDateTime(time.getTime());
+				params.put("searchFoundStartTime", searchStartTime);
+				entry.setSearchFoundStartTime(searchStartTime);
+				
 				// 判断startTime是否有值
-				if(StringUtils.isNotBlank(Constants.LOG_TIME_START)) {
+				/*if(StringUtils.isNotBlank(Constants.LOG_TIME_START)) {
 					String endTime = Constants.LOG_TIME_END;
 					if(StringUtils.isBlank(endTime)) {
 						endTime = DateUtils.getDateTime();
@@ -717,7 +728,7 @@ public class BaseController {
 					params.put("searchFoundEndTime",searchEndTime);
 					entry.setSearchFoundStartTime(searchStartTime);
 					entry.setSearchFoundEndTime(searchEndTime);
-				}
+				}*/
 				
 			}else {
 				//设置默认查询当前时间及前五分钟

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

@@ -120,9 +120,9 @@ public class AsnIpController extends BaseController{
 	}
 	@RequestMapping(value="ajaxIsLast",method=RequestMethod.POST)
 	@ResponseBody
-	public boolean ajaxIsLast(Model model,@RequestParam(required=true,value="serviceGroupIds")String serviceGroupIds){
-		if(StringUtils.isNotBlank(serviceGroupIds)) {
-			return asnIpCfgService.hasLastIp(serviceGroupIds);
+	public boolean ajaxIsLast(Model model,@RequestParam(required=true,value="serviceGroupIds")String serviceGroupIds,@RequestParam(required=true,value="ids")String ids){
+		if(StringUtils.isNotBlank(serviceGroupIds)&&StringUtils.isNotBlank(ids)) {
+			return asnIpCfgService.hasLastIp(serviceGroupIds,ids);
 		}
 		return false;
 	}

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

@@ -24,9 +24,9 @@ public class LogSearchController extends BaseController{
 		 */
 		// 获取相应日志检索菜单URL
 		String logUrl = menuService.getLogUrl(entity.getFunctionId());
-		Integer serviceId = menuService.getServiceId(entity.getFunctionId(),entity.getAction());
+//		Integer serviceId = menuService.getServiceId(entity.getFunctionId(),entity.getAction());
 		
-		attr.addAttribute("service", serviceId);
+		attr.addAttribute("service", entity.getService().intValue());
 		attr.addAttribute("cfgId", entity.getCfgId());
 		attr.addAttribute("functionId", entity.getFunctionId());
 		attr.addAttribute("date", entity.getDate());

src/main/java/com/nis/web/controller/configuration/maintenance/IpMultiplexPoolCfgController.java

@@ -47,9 +47,8 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 		}
 		
 		//查询ip复用地址池配置的policyGroup列表
-		List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(2);
+		List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(3);
 		model.addAttribute("policyGroups", policyGroups);
-		
 		model.addAttribute("_cfg", cfg);
 		return "/cfg/maintenance/ipMultiplexPool/form";
 	}
@@ -92,7 +91,6 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 		}catch(Exception e){
 			addMessage(redirectAttributes,"delete_failed");
 		}
-		
 		return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/list?functionId="+functionId;
 	}
 	
@@ -125,4 +123,89 @@ public class IpMultiplexPoolCfgController extends BaseController  {
 			return true;
 		}
 	}
+	
+	@RequestMapping(value = {"/snatlist"})
+	public String snatlist(Model model,HttpServletRequest  request,HttpServletResponse response,@ModelAttribute("cfg")IpMultiplexPoolCfg entity){
+		//查询时left join policyGroup
+		Page<IpMultiplexPoolCfg> page = ipMultiplexPoolCfgService.findPage(new Page<IpMultiplexPoolCfg>(request, response,"r"), entity);
+		model.addAttribute("page", page);
+		initPageCondition(model,entity);
+		return "/cfg/maintenance/ipMultiplexPool/snatlist";
+	}
+	
+	@RequestMapping(value = {"/snatform"})
+	@RequiresPermissions(value={"ip:mulitiplex:pool:config"})
+	public String snatfrom(Model model,
+							HttpServletRequest request,
+							HttpServletResponse response,
+							String ids,
+							@ModelAttribute("cfg")IpMultiplexPoolCfg cfg){
+		if(cfg == null){
+			cfg=new IpMultiplexPoolCfg();
+		}
+		if(!StringUtil.isEmpty(ids)){
+			cfg = ipMultiplexPoolCfgService.getIpMultiplexPoolCfg(Long.valueOf(ids),null);
+			initFormCondition(model, cfg);
+		}else{
+			initFormCondition(model, cfg);
+		}
+		
+		//查询ip复用地址池配置的policyGroup列表
+		List<PolicyGroupInfo> policyGroups=policyGroupInfoService.findPolicyGroupInfosByType(2);
+		model.addAttribute("policyGroups", policyGroups);
+		model.addAttribute("_cfg", cfg);
+		return "/cfg/maintenance/ipMultiplexPool/snatform";
+	}
+	
+	@RequestMapping(value = {"/snatsaveOrUpdate"})
+	@RequiresPermissions(value={"ip:mulitiplex:pool:config"})
+	public String snatsaveOrUpdate(Model model,HttpServletRequest request,HttpServletResponse response,RedirectAttributes redirectAttributes,
+			@ModelAttribute("cfg")IpMultiplexPoolCfg cfg){
+		try{
+			
+			ipMultiplexPoolCfgService.saveOrUpdate(cfg);
+			
+			addMessage(redirectAttributes,"save_success");
+		}catch(Exception e){
+			e.printStackTrace();
+			addMessage(redirectAttributes,"save_failed");
+		}
+		
+		return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+cfg.getFunctionId();
+	}
+	
+	@RequestMapping(value = {"/snataudit"})
+	@RequiresPermissions(value={"ip:mulitiplex:pool:confirm"})
+	public String snataudit(Integer isAudit,Integer isValid,String ids,Integer functionId,RedirectAttributes redirectAttributes) {
+		if(!StringUtil.isEmpty(ids)){
+			String[] idArray = ids.split(",");
+			Date auditTime=new Date();
+			for(String id :idArray){
+				try {
+					ipMultiplexPoolCfgService.audit(isAudit,isValid,functionId,id,auditTime);
+				} catch (MaatConvertException e) {
+					e.printStackTrace();
+					logger.info("SNAT地址池管理配置下发失败："+e.getMessage());
+					addMessage(redirectAttributes, e.getMessage());
+				}
+			}
+			
+		}
+		return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId;
+	}
+	@RequestMapping(value = {"/snatdelete"})
+	@RequiresPermissions(value={"ip:mulitiplex:pool:config"})
+	public String snatdelete(Integer isAudit,Integer isValid,String ids,Integer functionId,Model model,RedirectAttributes redirectAttributes
+			,HttpServletRequest request,HttpServletResponse response){
+		try{
+			if(!StringUtil.isEmpty(ids)){
+				ipMultiplexPoolCfgService.delete(isAudit,isValid,ids,functionId);
+			}
+			addMessage(redirectAttributes,"delete_success");
+		}catch(Exception e){
+			addMessage(redirectAttributes,"delete_failed");
+		}
+		return "redirect:" + adminPath +"/maintenance/ipMultiplexPoolCfg/snatlist?functionId="+functionId;
+	}
+	
 }

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

@@ -3,7 +3,6 @@ package com.nis.web.controller.configuration.ntc;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -13,7 +12,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -22,27 +20,22 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
-import com.nis.domain.SysUser;
 import com.nis.domain.basics.ServiceDictInfo;
 import com.nis.domain.basics.SysDictInfo;
 import com.nis.domain.configuration.AreaBean;
 import com.nis.domain.configuration.AreaIpCfg;
-import com.nis.domain.configuration.AvContIpCfg;
 import com.nis.domain.configuration.AvVoipAccountCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
-import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.domain.configuration.AvVoipIpCfg;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.BaseStringCfg;
-import com.nis.util.Configurations;
 import com.nis.util.Constants;
 import com.nis.util.DateUtils;
 import com.nis.util.StringUtil;
 import com.nis.util.excel.ExportExcel;
 import com.nis.web.controller.BaseController;
-import com.nis.web.security.UserUtils;
 
 /**
  * 处理音视频文本业务
@@ -55,11 +48,11 @@ public class AvContentController extends BaseController  {
 	/*****************************voip业务***************/
 	//音视频VOIP IP配置新增界面
 		@RequestMapping(value = {"/voipForm"})
-		@RequiresPermissions(value={"avVoipIp:config"})
+		@RequiresPermissions(value={"avVoip:config"})
 		public String voipFrom(Model model,HttpServletRequest request ,HttpServletResponse response
 				,String compileIds,String ids, CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){
-			if(!StringUtil.isEmpty(compileIds)){
-				cfg.setCompileId(Integer.parseInt(compileIds));
+			if(!StringUtil.isEmpty(ids)){
+				cfg.setCfgId(Long.parseLong(ids));
 				cfg = avContentCfgService.getCfgIndexInfo(cfg);
 				initUpdateFormCondition(model, cfg);
 			}else{
@@ -70,7 +63,7 @@ public class AvContentController extends BaseController  {
 			return "/cfg/av/voip/voipForm";
 		}
 		//音视频VOIP Account配置新增界面
-		@RequestMapping(value = {"/voipAccountForm"})
+/*		@RequestMapping(value = {"/voipAccountForm"})
 		@RequiresPermissions(value={"avVoipAccount:config"})
 		public String voipAccountForm(Model model,HttpServletRequest request ,HttpServletResponse response
 				,String compileIds,String ids, CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){
@@ -85,7 +78,7 @@ public class AvContentController extends BaseController  {
 			
 			model.addAttribute("_cfg", cfg);
 			return "/cfg/av/voip/voipAccountForm";
-		}
+		}*/
 	
 	//保存voip ip信息
 	@RequestMapping(value = {"/saveVoip"})
@@ -97,18 +90,18 @@ public class AvContentController extends BaseController  {
 		}catch(Exception e){
 			if(e instanceof MaatConvertException) {
 				e.printStackTrace();
-				logger.error("voip IP信息保存失败",e);
+				logger.error("voip 信息保存失败",e);
 				addMessage(redirectAttributes,"request_service_failed");
 			}else {
 				e.printStackTrace();
-				logger.error("voip IP信息保存失败",e);
+				logger.error("voip 信息保存失败",e);
 				addMessage(redirectAttributes,"save_failed");
 			}
 		}
 		return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+cfg.getFunctionId();
 	}
 	//保存voip Account信息
-	@RequestMapping(value = {"/saveAccountVoip"})
+/*	@RequestMapping(value = {"/saveAccountVoip"})
 	public String saveAccountVoip(Model model,HttpServletRequest request,HttpServletResponse response,String ids,
 			CfgIndexInfo cfg ,RedirectAttributes redirectAttributes){
 		try{
@@ -126,12 +119,10 @@ public class AvContentController extends BaseController  {
 			}
 		}
 		return "redirect:" + adminPath +"/ntc/av/voipAccountList?functionId="+cfg.getFunctionId();
-	}
-	//视频文本VOIP IP配置列表
+	}*/
+	//视频文本VOIP 配置列表
 	@RequestMapping(value = {"/voipList"})
-	public String voipCfgList(Model model,HttpServletRequest  request
-			,HttpServletResponse response
-			,@ModelAttribute("cfg")CfgIndexInfo entity
+	public String voipCfgList(Model model,HttpServletRequest  request ,HttpServletResponse response ,@ModelAttribute("cfg")CfgIndexInfo entity
 			,RedirectAttributes redirectAttributes){
 		if(entity.getVoipIp()== null){
 			entity.setVoipIp(new AvVoipIpCfg());
@@ -148,7 +139,7 @@ public class AvContentController extends BaseController  {
 		return "/cfg/av/voip/voipList";
 	}
 	//视频文本VOIP Account配置列表
-	@RequestMapping(value = {"/voipAccountList"})
+/*	@RequestMapping(value = {"/voipAccountList"})
 	public String voipCfgAccountList(Model model,HttpServletRequest request ,HttpServletResponse response
 			,@ModelAttribute("cfg")CfgIndexInfo entity ,RedirectAttributes redirectAttributes){
 		if(entity.getVoipAccount()== null){
@@ -161,12 +152,12 @@ public class AvContentController extends BaseController  {
 		model.addAttribute("page", page);
 		initPageCondition(model,entity);
 		return "/cfg/av/voip/voipAccountList";
-	}
+	}*/
 	
 	
 	//修改VOIP IP配置状态
 	@RequestMapping(value = {"/updateAvVoipValid"})
-	@RequiresPermissions(value={"avVoipIp:config"})
+	@RequiresPermissions(value={"avVoip:config"})
 	public String updateVoipValid(Integer isAudit,String compileIds,Integer isValid,String ids,Integer functionId
 			,RedirectAttributes redirectAttributes
 			) {
@@ -175,18 +166,18 @@ public class AvContentController extends BaseController  {
 		} catch (Exception e) {
 			if(e instanceof MaatConvertException) {
 				e.printStackTrace();
-				logger.error("voip IP信息审核失败",e);
+				logger.error("voip 信息审核失败",e);
 				addMessage(redirectAttributes,"request_service_failed");
 			}else {
 				e.printStackTrace();
-				logger.error("voip IP信息审核失败",e);
+				logger.error("voip 信息审核失败",e);
 				addMessage(redirectAttributes,"audit_failed");
 			}
 		}
 		return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+functionId;
 	}
 	//修改VOIP account配置状态
-	@RequestMapping(value = {"/updateAvVoipAccountValid"})
+/*	@RequestMapping(value = {"/updateAvVoipAccountValid"})
 	@RequiresPermissions(value={"avVoipAccount:config"})
 	public String updateVoipAccountValid(Integer isAudit,String compileIds,Integer isValid,String ids,Integer functionId
 			,RedirectAttributes redirectAttributes
@@ -205,15 +196,13 @@ public class AvContentController extends BaseController  {
 			}
 		}
 		return "redirect:" + adminPath +"/ntc/av/voipAccountList?functionId="+functionId;
-	}
+	}*/
 	//修改VOIP IP配置审核状态
 	@RequestMapping(value = {"/auditAvVoip"})
-	@RequiresPermissions(value={"avVoipIp:confirm"})
-	public String auditVoip(Integer isAudit,Integer isValid,String ids
-			,String compileIds,Integer functionId
-			,RedirectAttributes redirectAttributes) {
-		if(!StringUtil.isEmpty(compileIds)){
-			String[] idArray = compileIds.split(",");
+	@RequiresPermissions(value={"avVoip:confirm"})
+	public String auditVoip(Integer isAudit,Integer isValid,String ids ,String compileIds,Integer functionId ,RedirectAttributes redirectAttributes) {
+		if(!StringUtil.isEmpty(ids)){
+			String[] idArray = ids.split(",");
 			Date auditTime=new Date();
 			for(String id :idArray){
 				try {
@@ -221,7 +210,7 @@ public class AvContentController extends BaseController  {
 				} catch (MaatConvertException e) {
 					if(e instanceof MaatConvertException) {
 						e.printStackTrace();
-						logger.info("VOIP配置下发失败："+e.getMessage());;
+						logger.error("VOIP配置下发失败："+e.getMessage());;
 						addMessage(redirectAttributes,"request_service_failed");
 					}else {
 						e.printStackTrace();
@@ -236,7 +225,7 @@ public class AvContentController extends BaseController  {
 		return "redirect:" + adminPath +"/ntc/av/voipList?functionId="+functionId;
 	}
 	//修改VOIP IP配置审核状态
-	@RequestMapping(value = {"/auditAvVoipAccount"})
+/*	@RequestMapping(value = {"/auditAvVoipAccount"})
 	@RequiresPermissions(value={"avVoipAccount:confirm"})
 	public String auditVoipAccount(Integer isAudit,Integer isValid,String ids
 			,String compileIds,Integer functionId
@@ -262,14 +251,14 @@ public class AvContentController extends BaseController  {
 			
 		}
 		return "redirect:" + adminPath +"/ntc/av/voipAccountList?functionId="+functionId;
-	}
+	}*/
 	
 	/**
 	 * 账号account
 	 * 根据索引表信息异步获取子表信息
 	 * @return
 	 */
-	@ResponseBody
+	/*@ResponseBody
 	@RequestMapping(value = "ajaxVoipAccountInfo")
 	public Map getVoipAccountInfo(CfgIndexInfo cfgIndexInfo) {
 		Map<String, Object> voipAndAccountInfoMap=new HashMap<String, Object>();
@@ -282,25 +271,50 @@ public class AvContentController extends BaseController  {
 		voipAndAccountInfoMap.put("account", voipAccountCfgList);
 		voipAndAccountInfoMap.put("subscribe", ntcSubscribeIdCfgList);
 		return voipAndAccountInfoMap;
-	}
+	}*/
 	/**
 	 * 根据索引表信息异步获取子表信息
 	 * @return
 	 */
-	@ResponseBody
-	@RequestMapping(value = "ajaxVoipIpInfo")
-	public Map getVoipIpInfo(CfgIndexInfo cfgIndexInfo) {
-		Map<String, Object> voipAndAccountInfoMap=new HashMap<String, Object>();
+	@RequestMapping(value = {"/ajaxVoipIpInfo"})
+	public String getVoipIpInfo(Model model,Long cfgId,Integer index) {
+		CfgIndexInfo cfgIndexInfo = new CfgIndexInfo();
+		cfgIndexInfo.setCfgId(cfgId);
+		CfgIndexInfo cfg = avContentCfgService.getCfgIndexInfo(cfgIndexInfo);
+		List<String[]> tabList = new ArrayList();
 		//获取voipIpCfg信息
-		List<AvVoipIpCfg> voipIpCfgList=new ArrayList<AvVoipIpCfg>();
-		List<NtcSubscribeIdCfg> ntcSubscribeIdCfgList=new ArrayList<NtcSubscribeIdCfg>();
-		
-		voipIpCfgList = avContentCfgService.getVoipIpCfgList(cfgIndexInfo);
-		ntcSubscribeIdCfgList=avContentCfgService.getSubscribeIdCfgList(cfgIndexInfo);
-		
-		voipAndAccountInfoMap.put("ip", voipIpCfgList);
-		voipAndAccountInfoMap.put("subscribe", ntcSubscribeIdCfgList);
-		return voipAndAccountInfoMap;
+		if(cfg.getVoipIps()!=null){
+			String cfgType = null;
+			for(AvVoipIpCfg ip:cfg.getVoipIps()){
+				if(!ip.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"1",ip.getCfgType()});
+					cfgType = ip.getCfgType();
+				}
+			}
+		}
+		if(cfg.getVoipAccounts()!=null){
+			String cfgType = null;
+			for(AvVoipAccountCfg account:cfg.getVoipAccounts()){
+				if(account!=null&&!account.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"2",account.getCfgType()});
+					cfgType = account.getCfgType();
+				}
+			}
+		}
+		//查询关键字
+		if(cfg.getNtcSubscribeIdCfgList()!=null){
+			String cfgType = null;
+			for(NtcSubscribeIdCfg ntc:cfg.getNtcSubscribeIdCfgList()){
+				if(!ntc.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"2",ntc.getCfgType()});
+					cfgType = ntc.getCfgType();
+				}
+			}
+		}
+		model.addAttribute("_cfg", cfg);	
+		model.addAttribute("index", index);
+		model.addAttribute("tabList", tabList);
+		return "/cfg/av/voip/voipSubList";
 	}
 	/*****************************voip业务***************/
 	

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

@@ -20,12 +20,14 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
 import com.nis.domain.SysDataDictionaryItem;
+import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.NtcSubscribeIdCfg;
 import com.nis.domain.configuration.template.IpAddrTemplate;
 import com.nis.domain.configuration.template.IpsecTemplate;
 import com.nis.domain.configuration.template.TunnelIpTemplate;
+import com.nis.domain.specific.ConfigGroupInfo;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.DictUtils;
 import com.nis.web.controller.configuration.CommonController;
@@ -57,6 +59,8 @@ public class IpController extends CommonController{
 		}else{
 			initFormCondition(model,entity);
 		}
+		List<ConfigGroupInfo> policyGroups=asnPolicyCfgService.getConfigGroupInfoList(4);
+		model.addAttribute("policyGroups", policyGroups);
 		model.addAttribute("_cfg", entity);
 		return "/cfg/ipaddr/ipForm";
 	}
@@ -89,6 +93,9 @@ public class IpController extends CommonController{
 				}
 			}
 		}
+		if(StringUtils.isNotBlank(cfg.getUserRegion4())) {
+			tabList.add(new String[]{"3","ASN"});
+		}
 		model.addAttribute("_cfg", cfg);	
 		model.addAttribute("index", index);
 		model.addAttribute("tabList", tabList);
@@ -114,11 +121,21 @@ public class IpController extends CommonController{
 			entity.setAuditTime(new Date());
 			entity.setFunctionId(functionId);
 			try {
-				ipCfgService.auditIpCfg(entity,isAudit);
-			} catch (MaatConvertException e) {
+				if(StringUtils.isNoneBlank(entity.getUserRegion4())) {
+					ipCfgService.auditAsnCfg(entity, isAudit);
+				}else {
+					ipCfgService.auditIpCfg(entity,isAudit);
+				}
+				
+			} catch (Exception e) {
 				e.printStackTrace();
-				logger.info("ssl配置下发失败："+e.getMessage());
-				addMessage(redirectAttributes, e.getMessage());
+				logger.info("ip配置下发失败："+e.getMessage());
+				if(e instanceof MaatConvertException) {
+					addMessage(redirectAttributes, e.getMessage());
+				}else {
+					addMessage(redirectAttributes, "audit_failed");
+				}
+				
 			}
 		}
 		return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+functionId;

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

@@ -13,14 +13,17 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 import com.nis.domain.Page;
+import com.nis.domain.SysUser;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.PxyObjKeyring;
 import com.nis.exceptions.MaatConvertException;
+import com.nis.util.StringUtil;
 import com.nis.web.controller.configuration.CommonController;
 import com.nis.web.security.UserUtils;
 
@@ -30,9 +33,10 @@ import com.nis.web.security.UserUtils;
  *
  */
 @Controller
-@RequestMapping("${adminPath}/proxy/intercept")
+@RequestMapping(value={"${adminPath}/proxy/intercept"})
 public class InterceptController extends CommonController{
-	@RequestMapping(value = {"/ip/list","domain/list"})
+	
+	@RequestMapping(value = {"/ip/list","/domain/list","/ippayload/list"})
 	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);
@@ -51,8 +55,7 @@ public class InterceptController extends CommonController{
 		
 		return "/cfg/intercept/interceptList";
 	}
-	@RequestMapping(value = {"/interceptIpForm","interceptDomainForm"})
-	@RequiresPermissions(value={"intercept:ip:config","intercept:domain:config"})
+	@RequestMapping(value = {"/interceptIpForm","interceptDomainForm","interceptIpPayloadForm"})
 	public String interceptIpForm(Model model,String ids,CfgIndexInfo entity) {
 		if(StringUtils.isNotBlank(ids)){
 			entity = interceptCfgService.getInterceptCfg(Long.parseLong(ids));
@@ -73,7 +76,7 @@ public class InterceptController extends CommonController{
 		model.addAttribute("_cfg", entity);
 		return "/cfg/intercept/interceptForm";
 	}
-	@RequestMapping(value = {"/ip/saveOrUpdate","/domain/saveOrUpdate"})
+	@RequestMapping(value = {"/ip/saveOrUpdate","/domain/saveOrUpdate","/ippayload/SaveOrUpdate"})
 	public String saveInterceptIpCfg(RedirectAttributes redirectAttributes,Model model,HttpServletRequest request,HttpServletResponse response,String ids,CfgIndexInfo entity) {
 		try {
 			interceptCfgService.saveInterceptCfg(entity);
@@ -85,7 +88,7 @@ public class InterceptController extends CommonController{
 		return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+entity.getFunctionId();
 	}
 	
-	@RequestMapping(value = {"/ajaxInterceptIpSubList","/ajaxInterceptDomainSubList"})
+	@RequestMapping(value = {"/ajaxInterceptIpSubList","/ajaxInterceptDomainSubList","/ajaxInterceptIpPayloadSubList"})
 	public String ajaxInterceptIpSubList(Model model,Long cfgId,Integer index) {
 		CfgIndexInfo cfg = interceptCfgService.getInterceptCfg(cfgId);
 		List<String[]> tabList = new ArrayList();
@@ -122,8 +125,7 @@ public class InterceptController extends CommonController{
 		return "/cfg/intercept/interceptSubList";
 	}
 	
-	@RequestMapping(value = {"auditInterceptIpCfg","auditInterceptDomainCfg"})
-	@RequiresPermissions(value={"intercept:ip:confirm","intercept:domain:confirm"})
+	@RequestMapping(value = {"auditInterceptIpCfg","auditInterceptDomainCfg","auditInterceptIpPayloadCfg"})
 	public String auditInterceptIpCfg(Integer isAudit,Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
 		CfgIndexInfo entity = new CfgIndexInfo();
 		String[] idArray = ids.split(",");
@@ -145,8 +147,7 @@ public class InterceptController extends CommonController{
 		return "redirect:" + adminPath +"/proxy/intercept/ip/list?functionId="+functionId;
 	}
 	
-	@RequestMapping(value = {"updateInterceptIpValid","updateInterceptDomainValid"})
-	@RequiresPermissions(value={"intercept:ip:config","intercept:domain:config"})
+	@RequestMapping(value = {"updateInterceptIpValid","updateInterceptDomainValid","updateInterceptIpPayloadValid"})
 	public String updateInterceptIpValid(Integer isValid,String ids,Integer functionId, RedirectAttributes redirectAttributes) {
 		try {
 			interceptCfgService.updatInterceptValid(isValid,ids,functionId);

src/main/java/com/nis/web/controller/report/NtcDestIpReportController.java

@@ -35,12 +35,8 @@ public class NtcDestIpReportController extends BaseController {
 		
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		
-		if(bean.getAction()!=null){
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==bean.getAction().intValue()){
-					bean.setSearchService(service.getServiceId().toString());
-				}
-			}
+		if(bean.getServiceId()!=null){
+			bean.setServices(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){

src/main/java/com/nis/web/controller/report/NtcEntranceReportController.java

@@ -10,6 +10,7 @@ import java.util.Map.Entry;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -33,12 +34,8 @@ public class NtcEntranceReportController extends BaseController {
 	@RequestMapping("/ajaxNtcIspReport")
 	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
-		if(bean.getAction()!=null){
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==bean.getAction().intValue()){
-					bean.setSearchService(service.getServiceId().toString());
-				}
-			}
+		if(bean.getServiceId()!=null){
+			bean.setServices(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){

src/main/java/com/nis/web/controller/report/NtcLwhhReportController.java

@@ -9,6 +9,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -21,7 +22,6 @@ import com.nis.domain.report.NtcLwhhReport;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
-import com.nis.util.StringUtil;
 import com.nis.web.controller.BaseController;
 
 import net.sf.json.JSONArray;
@@ -36,12 +36,8 @@ public class NtcLwhhReportController extends BaseController {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		List<RequestInfo> requestInfos=requestInfoService.getAllRequestInfo();
 		model.addAttribute("requestInfos", requestInfos);
-		if(bean.getAction()!=null){
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==bean.getAction().intValue()){
-					bean.setSearchService(service.getServiceId().toString());
-				}
-			}
+		if(bean.getServiceId()!=null){
+			bean.setServices(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){

src/main/java/com/nis/web/controller/report/NtcPzReportController.java

@@ -53,7 +53,7 @@ import net.sf.json.JsonConfig;
 public class NtcPzReportController extends BaseController{
 	@RequestMapping(value="ajaxGetLogTotal",method=RequestMethod.POST)
 	@ResponseBody
-	public List<Map<String, Object>> ajaxGetLogTotal(Model model,Long endTime,String actions,Integer functionId,String compileIds){
+	public List<Map<String, Object>> ajaxGetLogTotal(Model model,Long endTime,String actions,String serviceIds,Integer functionId,String compileIds){
 		List<Map<String, Object>> dataList=new ArrayList<>();
 		SimpleDateFormat sdf=new SimpleDateFormat(Constants.SEARCH_DATEFORMAT);
 		Date endDate=null;
@@ -95,22 +95,25 @@ public class NtcPzReportController extends BaseController{
 			logger.info("log search end time:"+sdf.format(endDate));
 			logger.info("log search start time:"+sdf.format(startDate));
 		}
-		
-		String serviceIdsStr="";
-		StringBuffer serviceIds=new StringBuffer();
-		List<FunctionServiceDict> serviceList=DictUtils.getFunctionServiceDictList(functionId.intValue()); 
-		for(String action:actions.split(",")) {
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==Integer.parseInt(action)){
-					serviceIds.append(service.getServiceId().intValue());
-					serviceIds.append(",");
-				}
-			}
-		}
-		if(serviceIds.toString().endsWith(",")) {
-			serviceIdsStr=serviceIds.toString().substring(0,serviceIds.toString().lastIndexOf(","));
-		}
-		String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIdsStr, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate));
+//		String serviceIdsStr="";
+//		if(StringUtils.isBlank(serviceIds)) {
+//			StringBuffer _serviceIds=new StringBuffer();
+//			List<FunctionServiceDict> serviceList=DictUtils.getFunctionServiceDictList(functionId.intValue()); 
+//			for(String action:actions.split(",")) {
+//				for(FunctionServiceDict service:serviceList){
+//					if(service.getAction().intValue()==Integer.parseInt(action)){
+//						_serviceIds.append(service.getServiceId().intValue());
+//						_serviceIds.append(",");
+//					}
+//				}
+//			}
+//			if(_serviceIds.toString().endsWith(",")) {
+//				serviceIdsStr=_serviceIds.toString().substring(0,_serviceIds.toString().lastIndexOf(","));
+//			}
+//		}else {
+//			serviceIdsStr=serviceIds;
+//		}
+		String json=ConfigServiceUtil.getReport(Constants.BUSINESSTYPE_CONFIG, compileIds, serviceIds, startDate==null?null:sdf.format(startDate), endDate==null?null:sdf.format(endDate));
 		List<NtcPzReport> list=getList(json);
 		String[] idArr=compileIds.split(",");
 		if(list!=null&&(list.size()>0)){
@@ -136,12 +139,8 @@ public class NtcPzReportController extends BaseController{
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		List<ServiceDictInfo> labels=serviceDictInfoService.findAllLableDict();
 		model.addAttribute("labels", labels);
-		if(bean.getAction()!=null){
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==bean.getAction().intValue()){
-					bean.setSearchService(service.getServiceId().toString());
-				}
-			}
+		if(bean.getServiceId()!=null){
+			bean.setSearchService(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){

src/main/java/com/nis/web/controller/report/NtcSrcipDomesticReportController.java

@@ -9,6 +9,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -33,12 +34,8 @@ public class NtcSrcipDomesticReportController extends BaseController {
 	@RequestMapping("/ajaxNtcSrcipDomesticReport")
 	public String list(@ModelAttribute("bean") SearchReport bean,Model model, HttpServletRequest request, HttpServletResponse response) {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
-		if(bean.getAction()!=null){
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==bean.getAction().intValue()){
-					bean.setSearchService(service.getServiceId().toString());
-				}
-			}
+		if(bean.getServiceId()!=null){
+			bean.setServices(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){

src/main/java/com/nis/web/controller/report/NtcTagReportController.java

@@ -9,6 +9,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -35,12 +36,8 @@ public class NtcTagReportController extends BaseController {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		List<ServiceDictInfo> labels=serviceDictInfoService.findAllLableDict();
 		model.addAttribute("labels", labels);
-		if(bean.getAction()!=null){
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==bean.getAction().intValue()){
-					bean.setSearchService(service.getServiceId().toString());
-				}
-			}
+		if(bean.getServiceId()!=null){
+			bean.setServices(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){

src/main/java/com/nis/web/controller/report/NtcXzReportController.java

@@ -9,6 +9,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -36,12 +37,8 @@ public class NtcXzReportController extends BaseController {
 		List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(bean.getFunctionId());
 		List<ServiceDictInfo> xzs=serviceDictInfoService.findAllXzDict();
 		model.addAttribute("xzs", xzs);
-		if(bean.getAction()!=null){
-			for(FunctionServiceDict service:serviceList){
-				if(service.getAction().intValue()==bean.getAction().intValue()){
-					bean.setSearchService(service.getServiceId().toString());
-				}
-			}
+		if(bean.getServiceId()!=null){
+			bean.setServices(bean.getServiceId().toString());
 		}else{
 			StringBuffer serviceId=new StringBuffer();
 			for(int i=0;i<serviceList.size();i++){

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

@@ -18,5 +18,5 @@ public interface AsnIpCfgDao extends CrudDao<AsnIpCfg>{
 	public List<AsnIpCfg> findAllList(AsnIpCfg cfg);
 	public List<ConfigGroupInfo> findPolicyGroupInfosByType(@Param("groupId")Integer groupId);
 	public List<Integer>  findOtherIps(@Param("groupId")Integer groupId,@Param("cfgId")Integer cfgId);
-	public List<Integer> countValidIPs(@Param("ids")String ids);
+	public List<Integer> countValidIPs(@Param("groups")String groups,@Param("ids")String ids);
 }

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

@@ -387,7 +387,7 @@
 	  select 1 from asn_ip_cfg where is_valid !=-1 and asn_ip_group in(${ids}) limit 1
 	</select>
 	<select id="countValidIPs" resultType="java.lang.Integer" parameterType="java.lang.Integer">
-	  select count(1) from asn_ip_cfg where is_valid !=-1 and asn_ip_group in(${ids}) GROUP BY asn_ip_group;
+	  select count(1) from asn_ip_cfg where is_valid !=-1 and asn_ip_group in(${groups}) and cfg_id not in(${ids}) GROUP BY asn_ip_group;
 	</select>
 	
 </mapper>

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

@@ -85,9 +85,9 @@ public interface SysDictInfoDao extends CrudDao<SysDictInfo> {
 	*/
 	List<SysDictInfo> getDistrictDict(String itemCode);
 
+	List<SysDictInfo> getEffectiveArea(String itemCode);
 
-
-
+	SysDictInfo getDictByItemCode(String itemCode);
 
 
 

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

@@ -263,4 +263,22 @@
 	FROM sys_dict_info s
 	WHERE s.is_valid = 1 AND item_type = 3	AND item_code like concat(#{itemCode,jdbcType=VARCHAR},'%')
   </select>
+  
+  <select id="getEffectiveArea" parameterType="java.lang.String" resultType="com.nis.domain.basics.SysDictInfo">
+  	SELECT 
+  		<include refid="sysDictInfoColumns"/>
+  	FROM 
+  		sys_dict_info s
+  	WHERE 
+  		s.is_valid = 1 AND s.item_code = #{itemCode}
+  </select>
+  
+  <select id="getDictByItemCode" resultType="com.nis.domain.basics.SysDictInfo">
+  	select 
+  		<include refid="sysDictInfoColumns"/>
+  	from 
+  		sys_dict_info s 
+  	where 
+  		s.is_valid = 1 AND s.item_code = #{itemCode}
+  </select>
 </mapper>

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

@@ -109,6 +109,18 @@
 	    	<if test="userRegion1 != null and userRegion1 !=''">
 	    		AND r.user_region1=#{userRegion1,jdbcType=VARCHAR}
 	    	</if>
+	    	<if test="userRegion2 != null and userRegion2 !=''">
+	    		AND r.user_region2=#{userRegion2,jdbcType=VARCHAR}
+	    	</if>
+	    	<if test="userRegion3 != null and userRegion3 !=''">
+	    		AND r.user_region3=#{userRegion3,jdbcType=VARCHAR}
+	    	</if>
+	    	<if test="userRegion4 != null and userRegion4 !=''">
+	    		AND r.user_region4=#{userRegion4,jdbcType=VARCHAR}
+	    	</if>
+	    	<if test="userRegion5 != null and userRegion5 !=''">
+	    		AND r.user_region5=#{userRegion5,jdbcType=VARCHAR}
+	    	</if>
 	    	<if test="functionId != null">
 	    		AND r.function_id=#{functionId,jdbcType=INTEGER}
 	    	</if>

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

@@ -7,7 +7,7 @@
 	    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
 	    <result column="ip_type" property="ipType" jdbcType="INTEGER" />
 	    <result column="protocol" property="protocol" jdbcType="INTEGER" />
-	    <result column="ip" property="srcIpAddress" jdbcType="VARCHAR" />
+	    <result column="ip" property="destIpAddress" jdbcType="VARCHAR" />
 	    <result column="port" property="port" jdbcType="VARCHAR" />
 	    <result column="direction" property="direction" jdbcType="INTEGER" />
 	    <result column="user_region" property="userRegion" jdbcType="VARCHAR" />
@@ -72,8 +72,8 @@
 	    	<if test="cfgDesc != null and cfgDesc != ''">
 	    		AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%') 
 	    	</if>
-	    	<if test="srcIpAddress != null and srcIpAddress != ''">
-	    		AND r.ip like concat(concat('%',#{srcIpAddress,jdbcType=VARCHAR}),'%') 
+	    	<if test="destIpAddress != null and destIpAddress != ''">
+	    		AND r.ip like concat(concat('%',#{destIpAddress,jdbcType=VARCHAR}),'%') 
 	    	</if>
 	    	<if test="groupName != null and groupName != ''">
 	    		AND a.group_name like concat(concat('%',#{groupName,jdbcType=VARCHAR}),'%') 
@@ -204,7 +204,7 @@
     	#{functionId,jdbcType=INTEGER},
     	#{ipType,jdbcType=INTEGER},
     	#{protocol,jdbcType=INTEGER},
-    	#{srcIpAddress,jdbcType=VARCHAR},
+    	#{destIpAddress,jdbcType=VARCHAR},
     	#{port,jdbcType=VARCHAR},
     	#{direction,jdbcType=INTEGER},
     	#{userRegion,jdbcType=VARCHAR},
@@ -277,8 +277,8 @@
       <if test="protocol != null" >
         protocol = #{protocol,jdbcType=INTEGER},
       </if>
-      <if test="srcIpAddress != null and srcIpAddress!=''" >
-        ip = #{srcIpAddress,jdbcType=VARCHAR},
+      <if test="destIpAddress != null and destIpAddress!=''" >
+        ip = #{destIpAddress,jdbcType=VARCHAR},
       </if>
       <if test="port != null and port!=''" >
         port = #{port,jdbcType=VARCHAR},

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

@@ -178,14 +178,17 @@ public class AsnIpCfgService extends CrudService<CrudDao<AsnIpCfg>, AsnIpCfg> {
 	 * @param serviceGroupIds
 	 * @return
 	 */
-	public boolean hasLastIp(String serviceGroupIds) {
+	public boolean hasLastIp(String serviceGroupIds,String ids) {
 		// TODO Auto-generated method stub
 		for(String groupId:serviceGroupIds.split(",")) {
 			Long.parseLong(groupId);
 		}
-		List<Integer> countList=asnIpCfgDao.countValidIPs(serviceGroupIds);
+		List<Integer> countList=asnIpCfgDao.countValidIPs(serviceGroupIds,ids);
+		if(countList.size()==0) {
+			return true;
+		}
 		for(Integer count:countList) {
-			if(count==1) {
+			if(count==0) {
 				return true;
 			}
 		}

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

@@ -1,5 +1,6 @@
 package com.nis.web.service.basics;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -11,9 +12,13 @@ import com.google.common.collect.Lists;
 import com.nis.domain.Page;
 import com.nis.domain.SysUser;
 import com.nis.domain.basics.SysDictInfo;
+import com.nis.domain.maat.EffectiveRangeCfg;
+import com.nis.domain.maat.EffectiveRangeCfg.AreaIsp;
 import com.nis.util.ConfigDictUtils;
 import com.nis.util.Configurations;
+import com.nis.util.Constants;
 import com.nis.util.StringUtil;
+import com.nis.util.StringUtils;
 import com.nis.web.dao.basics.SysDictInfoDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
@@ -22,7 +27,7 @@ import com.nis.web.service.BaseService;
 public class SysDictInfoService extends BaseService{
 	
 	@Autowired
-     private SysDictInfoDao sysDictInfoDao;
+    private SysDictInfoDao sysDictInfoDao;
 	
 	
 	
@@ -216,17 +221,105 @@ public class SysDictInfoService extends BaseService{
 	public List<SysDictInfo> getDistrictDict(String tableName){
 		return sysDictInfoDao.getDistrictDict(tableName);
 	}
-
-
-
-
-
-
-
-
-
-
-
-
+	
+	// 组织区域、运营商配置下发格式
+	public String setEffectiveRange(String areaEffectiveIds){
+		EffectiveRangeCfg rangeCfg = new EffectiveRangeCfg();
+		List<List<AreaIsp>> effectiveRangeList = new ArrayList();
+		
+		List<String> locaValueList = new ArrayList();
+		List<String> ispValueList = new ArrayList();
+		
+		for (String areaEffectiveId : StringUtils.split(areaEffectiveIds, ",")) {
+			List<AreaIsp> areaIspList = new ArrayList();
+			
+			AreaIsp area = new AreaIsp();
+			area.setTag(Constants.AREA_TAG);
+			AreaIsp isp = new AreaIsp();
+			isp.setTag(Constants.ISP_TAG);
+			String areaStr = "";
+			// 区域和运营商
+			if(areaEffectiveId.contains(":")) {
+				
+				int index = areaEffectiveId.indexOf(":");
+				String areaCode = areaEffectiveId.substring(0, index);
+				String ispCode = areaEffectiveId.substring(index+1);
+				// 查询该区域信息及其所有父节点信息
+				List<SysDictInfo> list = sysDictInfoDao.getEffectiveArea(areaCode);
+				for (SysDictInfo sysDictInfo : list) {
+					areaStr += sysDictInfo.getItemValue();
+					while(sysDictInfo.getParent().getSysDictId() != 0) {
+						sysDictInfo = sysDictInfoDao.getDictById(sysDictInfo.getParent().getSysDictId());
+						areaStr += "/"+sysDictInfo.getItemValue();
+					}
+				}
+				String areaItemValue = StringUtils.revertStr(areaStr, "/");
+				if(!locaValueList.contains(areaItemValue)) {
+					
+					locaValueList = new ArrayList();
+					ispValueList = new ArrayList();
+					
+					locaValueList.add(areaItemValue);
+					
+				}else {
+					// 区域相同就只加运营商信息
+					SysDictInfo ispStr = sysDictInfoDao.getDictByItemCode(ispCode);
+					if(!ispValueList.contains(ispStr.getItemValue())) {
+						ispValueList.add(ispStr.getItemValue());
+						if(ispValueList.size() < 2) {
+							
+							isp.setValue(ispValueList);
+							areaIspList.add(isp);
+							effectiveRangeList.add(areaIspList);
+						}
+					}
+					continue;
+				}
+				
+				// 查询运营商信息
+				SysDictInfo ispStr = sysDictInfoDao.getDictByItemCode(ispCode);
+				if(!ispValueList.contains(ispStr.getItemValue())) {
+					ispValueList.add(ispStr.getItemValue());
+				}
+				
+				area.setValue(locaValueList);
+				isp.setValue(ispValueList);
+				
+				areaIspList.add(area);
+				areaIspList.add(isp);
+				effectiveRangeList.add(areaIspList);
+			}else {
+				// 区域
+				SysDictInfo dict = sysDictInfoDao.getDictByItemCode(areaEffectiveId);
+				
+				// 查询所有父节点区域信息
+				areaStr += dict.getItemValue();
+				while(dict.getParent().getSysDictId() != 0) {
+					dict = sysDictInfoDao.getDictById(dict.getParent().getSysDictId());
+					areaStr += "/"+dict.getItemValue();
+				}
+				String areaItemValue = StringUtils.revertStr(areaStr, "/");
+				if(!locaValueList.contains(areaItemValue)) {
+					locaValueList = new ArrayList();
+					locaValueList.add(areaItemValue);
+					area.setValue(locaValueList);
+					areaIspList.add(area);
+					effectiveRangeList.add(areaIspList);
+				}
+				
+			}
+			
+		}
+		
+		rangeCfg.setEffectiveRangeList(effectiveRangeList);
+		return gsonToJson(rangeCfg);
+	}
+	
+	public static void main(String[] args) {
+		SysDictInfoService service = new SysDictInfoService();
+		String json = service.setEffectiveRange("7182:4,7182:5");
+		
+		System.err.println(json);
+	}
 	
 }

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

@@ -78,13 +78,13 @@ public class AvContentCfgService extends BaseService{
 	 * @param entity
 	 * @return
 	 */
-	public Page<CfgIndexInfo> findAccountPage(Page<CfgIndexInfo> page, CfgIndexInfo entity) {
+	/*public Page<CfgIndexInfo> findAccountPage(Page<CfgIndexInfo> page, CfgIndexInfo entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
 		entity.setPage(page);
 		List<CfgIndexInfo> list=avContentCfgDao.findAccountList(entity);
 		page.setList(list);
 		return page;
-	}
+	}*/
 	/**
 	 * 根据索引表信息获取voipIpCfg信息
 	 * @param entity
@@ -116,20 +116,16 @@ public class AvContentCfgService extends BaseService{
 	 */
 	public CfgIndexInfo getCfgIndexInfo(CfgIndexInfo entity) {
 		CfgIndexInfo cfg=avContentCfgDao.getCfgIndexInfo(entity);
-		List<NtcSubscribeIdCfg>  ntcSubscribeList=getSubscribeIdCfgList(entity);
-		if(ntcSubscribeList ==null || ntcSubscribeList.size() <=0){
-			ntcSubscribeList.add(new NtcSubscribeIdCfg());
-		}
-		List<AvVoipIpCfg>  voipIps=getVoipIpCfgList(entity);
-		if(voipIps ==null || voipIps.size() <=0){
-			voipIps.add(new AvVoipIpCfg());
-		}
+		List<NtcSubscribeIdCfg>  ntcSubscribeList=getSubscribeIdCfgList(cfg);
+		List<AvVoipIpCfg>  voipIps=getVoipIpCfgList(cfg);
+		List<AvVoipAccountCfg>  voipAccounts=getVoipAccountCfgList(cfg);
 		cfg.setNtcSubscribeIdCfgList(ntcSubscribeList);
 		cfg.setVoipIps(voipIps);
+		cfg.setVoipAccounts(voipAccounts);
 		
 		return cfg;
 	}
-	public CfgIndexInfo getCfgIndexInfo2(CfgIndexInfo entity) {
+/*	public CfgIndexInfo getCfgIndexInfo2(CfgIndexInfo entity) {
 		CfgIndexInfo cfg=avContentCfgDao.getCfgIndexInfo(entity);
 		List<AvVoipAccountCfg>  voipAccounts=new ArrayList<>();
 		voipAccounts=getVoipAccountCfgList(entity);
@@ -145,7 +141,7 @@ public class AvContentCfgService extends BaseService{
 		cfg.setNtcSubscribeIdCfgList(ntcSubscribeList);
 		
 		return cfg;
-	}
+	}*/
 	
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public void saveOrUpdateAvVoip(CfgIndexInfo entity){
@@ -178,6 +174,12 @@ public class AvContentCfgService extends BaseService{
 								}
 							}
 						}
+						if(entity.getVoipAccounts()!=null&&entity.getVoipAccounts().size()>0){
+							for(AvVoipAccountCfg voipAccount : entity.getVoipAccounts()){
+								entity.setVoipAccount(voipAccount);
+								avContentCfgDao.insertAvVoipAccountCfg(entity);
+							}
+						}
 						//保存区域IP信息
 						if(entity.getAreaCfg()!=null){
 							for(AreaIpCfg cfg:entity.getAreaCfg()){
@@ -199,6 +201,7 @@ public class AvContentCfgService extends BaseService{
 					//无效子配置后，再新增子配置
 					avContentCfgDao.deleteAvVoipIp(entity);
 					stringCfgDao.deleteSubscribeIdCfgByCfgIndexInfo(entity);
+					avContentCfgDao.deleteAvVoipAccountCfg(entity);
 					AreaIpCfg area = new AreaIpCfg();
 					area.setCompileId(entity.getCompileId());
 					area.setFunctionId(entity.getFunctionId());
@@ -219,6 +222,12 @@ public class AvContentCfgService extends BaseService{
 							}
 						}
 					}
+					if(entity.getVoipAccounts()!=null&&entity.getVoipAccounts().size()>0){
+						for (AvVoipAccountCfg voipAccount : entity.getVoipAccounts()) {
+							entity.setVoipAccount(voipAccount);
+							avContentCfgDao.insertAvVoipAccountCfg(entity);
+						}
+					}
 					//保存区域IP信息
 					if(entity.getAreaCfg()!=null){
 						for(AreaIpCfg cfg:entity.getAreaCfg()){
@@ -230,7 +239,7 @@ public class AvContentCfgService extends BaseService{
 				}
 	}
 	
-	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	/*@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public void saveOrUpdateAvVoipAccount(CfgIndexInfo entity){
 		//设置区域运营商信息
 		setAreaEffectiveIds(entity);
@@ -311,7 +320,7 @@ public class AvContentCfgService extends BaseService{
 				}
 			}
 		}
-	}
+	}*/
 	
 	
 	/**
@@ -333,6 +342,7 @@ public class AvContentCfgService extends BaseService{
 			entity.setEditTime(new Date());
 			avContentCfgDao.updateAvVoipIp(entity);
 			avContentCfgDao.updateAvVoipKeywordCfgt(entity);
+			avContentCfgDao.updateAvVoipAccount(entity);
 			avContentCfgDao.updateCfgIndexInfo(entity);
 			AreaIpCfg areaIpCfg=new AreaIpCfg();
 			BeanUtils.copyProperties(entity, areaIpCfg);
@@ -345,7 +355,7 @@ public class AvContentCfgService extends BaseService{
 	 * @param isValid
 	 * @param ids compileIds
 	 */
-	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+/*	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public void updateAvVoipAccountValid(Integer isAudit,Integer isValid,String compileIds,Integer functionId){
 		String[] idArray = compileIds.split(",");
 		for(String id :idArray){
@@ -363,7 +373,7 @@ public class AvContentCfgService extends BaseService{
 			BeanUtils.copyProperties(entity, areaIpCfg);
 			areaIpCfgDao.updateAreaIpCfgValid(areaIpCfg);
 		}
-	}
+	}*/
 	/**
 	 * 
 	 * @param isAudit
@@ -372,16 +382,17 @@ public class AvContentCfgService extends BaseService{
 	 * @param functionId
 	 */
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void auditAvVoip(Integer isAudit,Integer isValid,Integer functionId,String compileId,Date auditTime){
+	public void auditAvVoip(Integer isAudit,Integer isValid,Integer functionId,String id,Date auditTime){
 		CfgIndexInfo entity = new CfgIndexInfo();
 		
 		List<CfgIndexInfo> list = new ArrayList();
 		List<AvVoipIpCfg> voipIpList = new ArrayList();
 		List <NtcSubscribeIdCfg> ntcList = new ArrayList();
+		List<AvVoipAccountCfg> accountList = new ArrayList();
 		List<AreaIpCfg> areaIpCfgList = new ArrayList();
 		
 		CfgIndexInfo searchCfg=new CfgIndexInfo();
-		searchCfg.setCompileId(Integer.parseInt(compileId));
+		searchCfg.setCfgId(Long.parseLong(id));
 		
 		entity = avContentCfgDao.getCfgIndexInfo(searchCfg);
 		entity.setIsAudit(isAudit);
@@ -390,6 +401,7 @@ public class AvContentCfgService extends BaseService{
 		entity.setAuditTime(auditTime);
 		
 		avContentCfgDao.updateAvVoipIp(entity);
+		avContentCfgDao.updateAvVoipAccount(entity);
 		avContentCfgDao.updateAvVoipKeywordCfgt(entity);
 		
 		avContentCfgDao.updateCfgIndexInfo(entity);
@@ -398,6 +410,7 @@ public class AvContentCfgService extends BaseService{
 		areaIpCfgDao.updateAreaIpCfg(areaIpCfg);
 		
 		voipIpList=avContentCfgDao.findVoipIpCfgList(entity);
+		accountList=avContentCfgDao.findVoipAccountCfgList(entity);
 		ntcList=stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
 		areaIpCfgList=areaIpCfgDao.getByCompileId(entity.getCompileId());
 		
@@ -423,6 +436,11 @@ public class AvContentCfgService extends BaseService{
 				groupRelationList=ntcMap.get("groupList");
 				strRegionList=ntcMap.get("dstList");
 			}
+			if(!StringUtil.isEmpty(accountList)){
+				Map<String,List> accountMap = cfgConvert(strRegionList,accountList,2,entity,groupRelationList);
+				groupRelationList=accountMap.get("groupList");
+				strRegionList=accountMap.get("dstList");
+			}
 			if(!StringUtil.isEmpty(areaIpCfgList)){
 				Map<String,List> areaMap = cfgConvert(areaIpRegionList,areaIpCfgList,1,entity,groupRelationList);
 				groupRelationList=areaMap.get("groupList");
@@ -452,10 +470,10 @@ public class AvContentCfgService extends BaseService{
 			maatBean.setOpAction(Constants.INSERT_ACTION);
 			//调用服务接口下发配置数据
 			String json=gsonToJson(maatBean);
-			logger.info("voip IP配置下发配置参数："+json);
+			logger.info("voip 配置下发配置参数："+json);
 			//调用服务接口下发配置
 			ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
-			logger.info("voip IP配置下发响应信息："+result.getMsg());
+			logger.info("voip 配置下发响应信息："+result.getMsg());
 
 		}else if(isAudit==3){
 			maatCfg.setCompileId(entity.getCompileId());
@@ -469,15 +487,15 @@ public class AvContentCfgService extends BaseService{
 			maatBean.setOpAction(Constants.UPDATE_ACTION);
 			//调用服务接口取消配置
 			String json=gsonToJson(maatBean);
-			logger.info("voip IP配置下发配置参数："+json);
+			logger.info("voip 配置下发配置参数："+json);
 			//调用服务接口下发配置
 			ToMaatResult result = ConfigServiceUtil.put(json,1);
-			logger.info("voip IP配置取消配置响应信息："+result.getMsg());
+			logger.info("voip 配置取消配置响应信息："+result.getMsg());
 		}
 		
 		
 	}
-	/********************************voip业务*********************************/
+	/********************************voip account业务*********************************/
 	/**
 	 * 
 	 * @param isAudit
@@ -485,7 +503,7 @@ public class AvContentCfgService extends BaseService{
 	 * @param ids 编译Id
 	 * @param functionId
 	 */
-	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+/*	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public void auditAvVoipAccount(Integer isAudit,Integer isValid,Integer functionId,String compileId,Date auditTime){
 		CfgIndexInfo entity = new CfgIndexInfo();
 		
@@ -591,7 +609,7 @@ public class AvContentCfgService extends BaseService{
 		}
 		
 		
-	}
+	}*/
 	/********************************voip业务*********************************/
 	
 	

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

@@ -15,6 +15,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.nis.domain.FunctionRegionDict;
 import com.nis.domain.Page;
+import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.callback.InlineIp;
 import com.nis.domain.configuration.AreaIpCfg;
 import com.nis.domain.configuration.BaseIpCfg;
@@ -29,15 +30,18 @@ import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
 import com.nis.domain.maat.MaatCfg.StringCfg;
 import com.nis.domain.maat.ToMaatBean;
 import com.nis.domain.maat.ToMaatResult;
+import com.nis.domain.specific.ConfigGroupInfo;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Configurations;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
 import com.nis.util.StringUtil;
+import com.nis.web.dao.basics.AsnIpCfgDao;
 import com.nis.web.dao.configuration.AreaIpCfgDao;
 import com.nis.web.dao.configuration.IpCfgDao;
 import com.nis.web.dao.configuration.StringCfgDao;
+import com.nis.web.dao.specific.SpecificServiceCfgDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.CrudService;
 
@@ -54,6 +58,10 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 	protected StringCfgDao stringCfgDao;
 	@Autowired
 	protected AreaIpCfgDao areaIpCfgDao;
+	@Autowired
+	protected SpecificServiceCfgDao specificServiceCfgDao;
+	@Autowired
+	protected AsnIpCfgDao asnIpCfgDao;
 	/**
 	 * 
 	 * addIpCfg(新增IP类配置)
@@ -344,18 +352,29 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 				}else if(Constants.SERVICE_IP_RATELIMIT==cfg.getServiceId().intValue()){
 					maatCfg.setUserRegion(Constants.USERREGION_RATE_LIMIT+"="+cfg.getRatelimit());
 				}
-				if(!StringUtil.isEmpty(cfg.getUserRegion1())){
-					String userRegion = "";
-					if(cfg.getUserRegion1().startsWith(Constants.REDIRECT_RESPONSE_CODE_STARTWITH)){
-						userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+cfg.getUserRegion1()+
-									 Constants.USER_REGION_SPLIT+
-									 Constants.REDIRECT_URL_KEY+"="+cfg.getUserRegion2();
-					}else{
-						userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+cfg.getUserRegion1()+
-								 Constants.USER_REGION_SPLIT+
-								 Constants.REDIRECT_CONTENT_KEY+"="+cfg.getUserRegion2();
+				//限速需要发Droprate=0.001 ，暂不支持Bandwidth=200kbps
+				if(cfg.getAction().equals(Constants.RATELIMIT_ACTION)){
+					if(cfg.getUserRegion1().equals("0")){//丢包率
+						cfg.setUserRegion2(StringUtil.isEmpty(cfg.getUserRegion2()) ? "":cfg.getUserRegion2());
+						maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+cfg.getUserRegion2());
+					}else if(cfg.getUserRegion1().equals("1")){//带宽
+						cfg.setUserRegion3(StringUtil.isEmpty(cfg.getUserRegion3()) ? "":cfg.getUserRegion3());
+						maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY+"="+cfg.getUserRegion3());
+					}
+				}else {
+					if(!StringUtil.isEmpty(cfg.getUserRegion1())){
+						String userRegion = "";
+						if(cfg.getUserRegion1().startsWith(Constants.REDIRECT_RESPONSE_CODE_STARTWITH)){
+							userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+cfg.getUserRegion1()+
+										 Constants.USER_REGION_SPLIT+
+										 Constants.REDIRECT_URL_KEY+"="+cfg.getUserRegion2();
+						}else{
+							userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+cfg.getUserRegion1()+
+									 Constants.USER_REGION_SPLIT+
+									 Constants.REDIRECT_CONTENT_KEY+"="+cfg.getUserRegion2();
+						}
+						maatCfg.setUserRegion(userRegion);
 					}
-					maatCfg.setUserRegion(userRegion);
 				}
 				configCompileList.add(maatCfg);
 				maatBean.setOpAction(Constants.INSERT_ACTION);
@@ -656,6 +675,130 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 			}
 		}
 	}
+	/**
+	 * 
+	 * @param isAudit
+	 * @param isValid
+	 * @param ids cfgId
+	 * @param functionId
+	 */
+	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+	public void auditAsnCfg(CfgIndexInfo entity,Integer isAudit){
+		entity.setTableName(CfgIndexInfo.getTablename());
+		entity.setIsAudit(isAudit);
+		ipCfgDao.auditCfg(entity);
+		ToMaatBean maatBean = new ToMaatBean();		
+		MaatCfg maatCfg = new MaatCfg();
+		List<MaatCfg> configCompileList = new ArrayList<>();
+		List<GroupCfg> groupRelationList = new ArrayList<>();
+		List<IpCfg> ipRegionList = new ArrayList<>();
+		List<StringCfg> strRegionList = new ArrayList<>();
+		List<NumBoundaryCfg> numRegionList = new ArrayList<>();
+		List<DigestCfg> digestRegionList = new ArrayList<>();
+		List<IpCfg> areaIpRegionList = new ArrayList<>();
+		if(isAudit==Constants.AUDIT_YES) {
+			ConfigGroupInfo group=specificServiceCfgDao.getConfigGroupInfoByGroupId(Integer.parseInt(entity.getUserRegion4()));
+			if(group.getIsIssued()==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.setAreaIpRegionList(areaIpRegionList);
+				maatCfg.setIsValid(entity.getIsValid());
+				//group
+				GroupCfg groupCfg=new GroupCfg();
+				groupCfg.setCompileId(entity.getCompileId());
+				groupCfg.setGroupId(Integer.parseInt(entity.getUserRegion4()));
+				groupCfg.setIsValid(Constants.VALID_YES);
+				groupCfg.setAuditTime(entity.getAuditTime());
+				groupRelationList.add(groupCfg);
+				maatCfg.setGroupNum(groupRelationList.size());
+				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("ipaddr asn组复用配置下发配置参数："+json);
+				//调用服务接口下发配置
+				ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+				logger.info("ipaddr asn组复用配置下发响应信息："+result.getMsg());
+			}else {//首次下发
+				maatCfg.initDefaultValue();
+				BeanUtils.copyProperties(entity, maatCfg);
+				maatCfg.setAction(entity.getAction());
+				maatCfg.setAuditTime(entity.getAuditTime());
+				maatCfg.setStrRegionList(strRegionList);
+				maatCfg.setNumRegionList(numRegionList);
+				maatCfg.setDigestRegionList(digestRegionList);
+				maatCfg.setGroupRelationList(groupRelationList);
+				maatCfg.setAreaIpRegionList(areaIpRegionList);
+				maatCfg.setIsValid(entity.getIsValid());
+				//group
+				GroupCfg groupCfg=new GroupCfg();
+				groupCfg.setCompileId(entity.getCompileId());
+				groupCfg.setGroupId(Integer.parseInt(entity.getUserRegion4()));
+				groupCfg.setIsValid(Constants.VALID_YES);
+				groupCfg.setAuditTime(entity.getAuditTime());
+				groupRelationList.add(groupCfg);
+				maatCfg.setGroupNum(groupRelationList.size());
+				//region
+				//查询asn group id下所有的 ip
+				AsnIpCfg asnIpCfg=new AsnIpCfg();
+				asnIpCfg.setAsnIpGroup(Integer.parseInt(entity.getUserRegion4()));
+				List<AsnIpCfg> allAsnIpCfgs=asnIpCfgDao.findAllList(asnIpCfg);
+				ipRegionList.addAll(groupReuseCfgAddRemoveConvert(allAsnIpCfgs,Constants.VALID_YES,null));
+				maatCfg.setIpRegionList(ipRegionList);
+				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("ipaddr asn配置下发配置参数："+json);
+				//调用服务接口下发配置
+				ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+				logger.info("ipaddr asn配置下发响应信息："+result.getMsg());
+				ConfigGroupInfo info=new ConfigGroupInfo();
+				info.setIsIssued(1);
+				info.setGroupId(Integer.parseInt(entity.getUserRegion4()));
+				specificServiceCfgDao.updateConfigGroupInfobyGroupId(info);
+				AsnIpCfg cfg=new AsnIpCfg();
+				cfg.setIsValid(Constants.VALID_YES);
+				cfg.setAsnIpGroup(Integer.parseInt(entity.getUserRegion4()));
+				asnIpCfgDao.updateIssued(cfg);
+			}
+		}else if(isAudit==Constants.AUDIT_NOT_YES) {//取消审核通过
+			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("ipaddr asn取消下发配置参数："+json);
+			//调用服务接口下发配置
+			ToMaatResult result = ConfigServiceUtil.put(json,1);
+			logger.info("ipaddr asn取消配置响应信息："+result.getMsg());
+		}else {
+			throw new RuntimeException("unknown isAudit value "+isAudit);
+		}
+		
+	}
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public void deleteIp(String ids,String compileIds,int functionId){
 		if(StringUtils.isNotBlank(compileIds)){
@@ -723,6 +866,10 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 		List<NtcSubscribeIdCfg> subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
 		entity.setIpPortList(ipPortList);
 		entity.setNtcSubscribeIdCfgList(subscribeIdList);
+		if(StringUtils.isNotBlank(entity.getUserRegion4())) {
+			ConfigGroupInfo info=specificServiceCfgDao.getConfigGroupInfoByGroupId(Integer.parseInt(entity.getUserRegion4().trim()));
+			entity.setAsnIpGroupName(info.getGroupName());
+		}
 		return entity;
 	}
 	public BaseIpCfg getIpCfgById(String tableName,long id){

src/main/resources/messages/message_en.properties

@@ -804,7 +804,7 @@ NTC_HTTP_RES_BODY=Response Body Configuration
 NTC_UNIVERSAL_IP=IP Configuration
 NTC_BGP_AS=AS Configuration
 NTC_DNS_REGION=Keyword Configuration
-WHITE_LIST_DOMAIN=Domain White List
+WHITE_LIST_DOMAIN=URL Configuration
 av_voip_account=VoIP Account Configuration
 av_cont_ip=Content IP Configuration
 NTC_SSL_SNI=SNI Keyword Configuration
@@ -901,6 +901,7 @@ av_voip_ip_reject=Multimedia VoIP Control
 av_voip_ip_monit=Multimedia VoIP Monitoring
 website_http_reject=Website Http Control
 website_http_monit=Website Http Monitoring
+website_http_whitelist=Website Http White List 
 domain_white_whitelist=Global Domain Name White List
 av_content_ip_reject=Multimedia Content IP Control
 av_content_ip_monit=Multimedia Content IP Monitoring
@@ -1171,4 +1172,9 @@ percentage=Percentage
 APP_SSL=APP SSL Feature
 APP_IP_RANGE=APP IP RANGE
 APP_DK=APP DK Feature
-MM_SUBSCRIBE_ID=Subscribe ID
+MM_SUBSCRIBE_ID=Subscribe ID
+mail_note=Note\uff1aIdentifiable Protocols Include SMTP\u3001POP3\u3001IMAP\u3002
+av_content_url_note=Note\uff1aIdentifiable Protocols Include RTSP\u3001TRMP\u3001MMS\u3002
+protocol_note=Note:Recognizable Protocols Include SIP,RTCP,RTP\u3002
+snat_multiplex=SNAT Address Pool
+dnat_multiplex=DNAT Address Pool

src/main/resources/messages/message_zh_CN.properties

@@ -802,7 +802,7 @@ NTC_HTTP_RES_BODY=\u5E94\u7B54\u5185\u5BB9\u5173\u952E\u5B57\u914D\u7F6E
 NTC_UNIVERSAL_IP=IP\u914D\u7F6E
 NTC_BGP_AS=AS\u914D\u7F6E
 NTC_DNS_REGION=\u5173\u952E\u5B57\u914D\u7F6E
-WHITE_LIST_DOMAIN=\u57DF\u540D\u767D\u540D\u5355
+WHITE_LIST_DOMAIN=URL\u914D\u7F6E
 av_voip_account=VoIP\u8D26\u53F7\u914D\u7F6E
 av_cont_ip=\u5185\u5BB9IP\u914D\u7F6E
 NTC_SSL_SNI=SNI\u5173\u952E\u5B57\u914D\u7F6E
@@ -1168,4 +1168,9 @@ percentage=\u767E\u5206\u6BD4
 APP_SSL=APP SSL\u7279\u5F81
 APP_IP_RANGE=APP IP RANGE
 APP_DK=APP DK\u7279\u5F81
-MM_SUBSCRIBE_ID=\u8D26\u53F7
+MM_SUBSCRIBE_ID=\u8D26\u53F7
+mail_note=\u6CE8\uFF1A\u53EF\u8BC6\u522B\u534F\u8BAE\u5305\u62ECSMTP\u3001POP3\u3001IMAP\u3002
+av_content_url_note=\u6CE8\uFF1A\u53EF\u8BC6\u522B\u534F\u8BAE\u5305\u62ECRTSP\u3001TRMP\u3001MMS\u3002
+protocol_note=\u6CE8\uFF1A\u53EF\u8BC6\u522B\u534F\u8BAE\u5305\u62ECSIP\u3001RTCP\u3001RTP\u3002
+snat_multiplex=SNAT\u5730\u5740\u6C60\u7BA1\u7406
+dnat_multiplex=DNAT\u5730\u5740\u6C60\u7BA1\u7406

src/main/resources/nis.properties

@@ -521,4 +521,6 @@ app_spec_service_code_min_val=300001
 groupReuseSources=groupReuseSources
 log_time_range=3600000
 log_time_start=2018-08-01 00:00:00
-log_time_end=2018-10-01 00:00:00
+log_time_end=2018-10-01 00:00:00
+area_tag=location
+isp_tag=isp

src/main/resources/sql/20180928/extend_ip_region.sql

@@ -0,0 +1,29 @@
+UPDATE function_service_dict SET region_code=1 WHERE function_id=5 AND region_code='1,3';
+UPDATE function_service_dict SET region_code=2 WHERE function_id=5 AND region_code='2,3';
+UPDATE function_service_dict SET is_valid=1 WHERE function_id=5 AND ACTION=1;
+UPDATE function_service_dict SET is_valid=0 WHERE function_id=5 AND ACTION=96;
+
+INSERT INTO function_service_dict (function_id,protocol_id,ACTION,action_code,service_id,service_name,service_desc,is_valid,region_code) VALUES(5,0,64,'ratelimit',1057,'ip_ratelimit','ip地址限速',1,1);
+
+#根据PROTOCOL字典查出的值替换63
+SELECT id FROM sys_data_dictionary_name WHERE mark= 'PROTOCOL';
+INSERT INTO sys_data_dictionary_item (item_code,item_value,item_desc,item_sort,STATUS,TYPE,dictionary_id) VALUES(8,'IPSEC','IPSEC',0,1,1,63);
+INSERT INTO sys_data_dictionary_item (item_code,item_value,item_desc,item_sort,STATUS,TYPE,dictionary_id) VALUES(15,'GRE','GRE',0,1,1,63);
+
+UPDATE function_region_dict SET is_valid=0 WHERE function_id=5 AND config_region_value ='NTC_SUBSCRIBE_ID';
+UPDATE function_region_dict SET config_protocol='0,6,17,1,8,15' WHERE function_id=5 AND config_region_value ='INLINE_IP_CB';
+UPDATE function_region_dict SET config_protocol='0,6,17,1,8,15' WHERE function_id=5 AND config_region_value ='INLINE_IP_CB';
+update function_region_dict set  config_ip_type='4,6' where region_type=1 and config_ip_type like '%,46,64,10%';
+UPDATE function_service_dict SET region_code=4 WHERE function_id=5 AND action_code='ratelimit';
+INSERT INTO function_region_dict (function_id,config_region_code,config_region_value,config_desc,is_valid,is_maat,region_type,config_ip_type,config_ip_pattern,config_port_pattern,config_direction,config_protocol,config_ip_port_show,config_region_sort)VALUES(5,4,'LIMIT_IP','IP限流',1,1,1,'4,6','1,2,3','1,2','0,1','0,6,17','1,2',4);
+
+
+
+#asn region
+INSERT INTO function_region_dict (config_service_type,function_id,config_region_code,config_region_value,config_desc,is_valid,is_maat,region_type,config_region_sort)
+VALUES ('asn',5,5,'NTC_ASN_IP','asn',1,1,1,5);
+# asn service
+INSERT INTO function_service_dict (function_id,protocol_id,ACTION,action_code,service_id,service_name,service_desc,is_valid,region_code)
+VALUES (5,0,16,'reject',37,'ans_reject','ANS_REJECT',1,5);
+INSERT INTO function_service_dict (function_id,protocol_id,ACTION,action_code,service_id,service_name,service_desc,is_valid,region_code)
+VALUES (5,0,1,'monit',149,'ans_monit','ANS_MONIT',1,5);

src/main/resources/sql/20180928/update_dict_item_info.sql

@@ -0,0 +1,5 @@
+#delete ip resuse ip group add snat ip and dnat ip
+delete from sys_data_dictionary_item where dictionary_id=83 and id =1114;
+INSERT INTO sys_data_dictionary_item VALUES   (2600, '2', 'SNAT IP', 'ip<EFBFBD><EFBFBD><EFBFBD><EFBFBD>', 0, 1, 1, 83);
+INSERT INTO sys_data_dictionary_item VALUES   (2601, '3', 'DNAT IP', 'ip<EFBFBD><EFBFBD><EFBFBD><EFBFBD>', 0, 1, 1, 83);
+

src/main/resources/sql/20180928/update_region_ddos.sql

@@ -0,0 +1,2 @@
+#ddos ip config info update
+update function_region_dict set config_ip_pattern='1,3' ,config_port_pattern='1' ,config_direction='1' where dict_id=74

src/main/resources/sql/20180928/update_region_info.sql

@@ -0,0 +1,3 @@
+#delte ip whitelist subscribe
+update function_region_dict set is_valid=0 where dict_id=189;
+

src/main/resources/sql/20180928/update_voip.sql

@@ -0,0 +1,5 @@
+ #voip ip跟voip account 合二为一
+update sys_menu set href = "/ntc/av/voipList" where id = 831;
+update function_service_dict set service_name='av_voip_monit' where dict_id=17
+update function_service_dict set service_name='av_voip_reject' where dict_id=16
+update function_region_dict set config_region_value='MM_SUBSCRIBE_ID',function_id=24,config_region_code=2 where dict_id=208

src/main/resources/sql/20180929/update_avAudio.sql

@@ -0,0 +1,3 @@
+#音视频添加action白名单置位无效
+update function_service_dict set is_valid='0' where dict_id='130';
+update function_service_dict set is_valid='0' where dict_id='131';

src/main/resources/sql/20180929/update_http_url.sql

@@ -0,0 +1,8 @@
+INSERT INTO `function_service_dict` ( `function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `region_code`) VALUES ( '6', '4', '16', 'reject', '17', 'website_http_reject', NULL, '1', NULL, NULL, NULL, NULL, '1,2,3,4,5,6');
+INSERT INTO `function_service_dict` ( `function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `region_code`) VALUES ( '6', '4', '1', 'monit', '129', 'website_http_monit', NULL, '1', NULL, NULL, NULL, NULL, '1,2,3,4,5,6');
+
+update  function_region_dict set function_id='6' , config_service_type='http_url'  where  dict_id='15';
+
+#ip复用地址池
+INSERT INTO `function_service_dict` ( `function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `region_code`) VALUES ( '633', '0', '96', 'loop', '832', 'ip_reuse_adress_pool_loop', NULL, '1', NULL, NULL, NULL, NULL, NULL);
+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_district`, `config_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_maat`, `region_type`, `config_ip_type`, `config_ip_pattern`, `config_port_pattern`, `config_direction`, `config_protocol`, `config_ip_port_show`, `config_region_sort`) VALUES (NULL, NULL, NULL, NULL, NULL, '633', '1', 'IR_STATIC_IP_POOL_CB', NULL, 'IP复用地址池配置', '1', NULL, NULL, NULL, NULL, '2', '2', '4,6', '1,2,3', '1,2', '0', '0', '1', '1');

src/main/resources/sql/20180930/add_ip_payload.sql

@@ -0,0 +1,4 @@
+update  function_service_dict set function_id=212 where dict_id=110;
+update function_region_dict set function_id=212 where dict_id=167;
+INSERT INTO function_region_dict VALUES
+   ('', '', '', '', '', 230, 212, 1, 'PXY_INTERCEPT_IP', '', 'IP PAYLOAD', 1, NULL, NULL, NULL, NULL, 1, 1, '4,6', '1,2,3', '1,2', '0', '17,1', '1,2', 1);

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

@@ -95,7 +95,8 @@
 <script src="${pageContext.request.contextPath}/static/global/scripts/common.js" type="text/javascript"></script>
 <script src="${pageContext.request.contextPath}/static/global/scripts/jquery.tagsinput.js" type="text/javascript"></script>
 <script src="${pageContext.request.contextPath}/static/global/scripts/app.js" type="text/javascript"></script>
-
+<script src="${pageContext.request.contextPath}/static/global/scripts/ipRegion.js" type="text/javascript"></script>
+<script src="${pageContext.request.contextPath}/static/global/scripts/pzLog.js" type="text/javascript"></script>
 <!-- 文件导入 -->
 <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-fileupload/js/bootstrap-fileupload.js" type="text/javascript"></script>
 <script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-fileupload/js/jquery.cookie.min.js" type="text/javascript"></script>
@@ -103,4 +104,4 @@
 <script src="${pageContext.request.contextPath}/static/global/plugins/jquery-tree-multiselect/jquery.tree-multiselect.js" type="text/javascript"></script>
 
 <!-- 日志界面 -->
-<script src="${pageContext.request.contextPath}/static/pages/scripts/pageLogs.js" type="text/javascript"></script>
+<script src="${pageContext.request.contextPath}/static/pages/scripts/pageLogs.js" type="text/javascript"></script>

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

@@ -1,283 +1,286 @@
-<%@ tag language="java" pageEncoding="UTF-8"%>
-<%@ include file="/WEB-INF/include/taglib.jsp"%>
-<%@ attribute name="id" type="java.lang.String" required="true"%>
-<%@ attribute name="url" type="java.lang.String" required="true"%>
-<%@ attribute name="label" type="java.lang.String" required="false"%>
-<%@ attribute name="maxRow" type="java.lang.Long" required="false"%>
-<c:choose>
-	<c:when test="${label eq 'delete'}">
-		<a href="javascript:void(0);" class="btn btn-default" onclick="del('${url}')" data-toggle="tooltip" data-placement="top">
-			<i class="fa fa-trash"> <spring:message code="delete"/></i>
-		</a>
-	</c:when>
-	<c:when test="${label eq 'update'}">
-		<a href="javascript:void(0);" onclick="update('${url}')" class="btn btn-default" data-toggle="tooltip" data-placement="top">
-			<i class="fa fa-check"></i> <spring:message code="edit"/>
-		</a>
-	</c:when>
-	<c:when test="${label eq 'approved'}">
-		<a href="javascript:void(0);" onclick="passOpt('${url}')"><i class="fa fa-check"></i> <spring:message code="approved"/></a>
-	</c:when>
-	<c:when test="${label eq 'unapproved'}">
-		<a href="javascript:void(0);" onclick="noPassOpt('${url}')"><i class="fa fa-remove"></i> <spring:message code="unapproved"/></a>
-	</c:when>
-	<c:when test="${label eq 'cancelPass'}">
-		<a href="javascript:void(0);" onclick="cancelPassOpt('${url}')"><i class="fa fa-undo"></i> <spring:message code="cancel_approved"/></a>
-	</c:when>
-	<c:when test="${label eq 'export'}">
-		<a href="javascript:void(0);" class="btn btn-default" onclick="exportData('${url}',${maxRow })" data-toggle="tooltip" data-placement="top">
-			<i class="fa fa-download"> <spring:message code="export"/></i>
-		</a>
-	</c:when>
-</c:choose>
-<%-- 使用方法： 1.将本tag写在查询的form之前；2.传入table的id和controller的url --%>
-<script type="text/javascript">
-$(document).ready(function() {
-    $('#${id} thead tr th input.i-checks').on('ifChecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定 
-    	  $('#${id} tbody tr td input.i-checks').iCheck('check');
-    	});
-
-    $('#${id} thead tr th input.i-checks').on('ifUnchecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定 
-    	  $('#${id} tbody tr td input.i-checks').iCheck('uncheck');
-    	});
-});
-//删除
-function del(url){
-	var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
-	
-	if($(checkboxes).filter(":checked").length>0){
-		if(validateAllNoAudit(checkboxes)){
-			top.$.jBox.tip("<spring:message code='has_prohibit_delete'/>", "<spring:message code='info'/>");
-			return;
-		}else{
-			var serviceGroupIds=[],canDel=true;
-			$(checkboxes).filter(":checked").each(function(){
-				if($(this).attr("serviceGroupId")){
-					serviceGroupIds.push($(this).attr("serviceGroupId"));
-				}
-			})
-			if(serviceGroupIds.length>0){
-				$.ajax({
- 	 				type:'post',
- 	 				url:'${ctx}/basics/asn/ajaxIsLast',
- 	 				data:{"serviceGroupIds":serviceGroupIds.join(',')},
- 	 				async:false,
- 	 				success:function(data,textStatus){//处理返回结果
- 	 					if(data){
- 	 						top.$.jBox.tip('<spring:message code="last_ip_in_asn_group"/>');
- 	 						canDel=false;
- 	 					}
- 	 				}
- 	 			});
-			}
-			if(canDel){
-				doAll(checkboxes,url);
-			}
-		}
-	}else{
-		top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
-		return;
-	}
-}
-//修改配置
-function update(url){
-	var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
-	var cked = $("tbody tr td input.i-checks:checkbox:checked");
-	if($(checkboxes).filter(":checked").length==1){
-		if(cked.val()==1){
-			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
-			return;
-		}else if(cked.val()==3){
-			top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
-			return;
-		}
-		//处理asnIp,asn组下发过的ip配置不允许修改
-		if(cked.attr("serviceGroupId")&&cked.attr("isValid")){
-			var serviceGroupId=cked.attr("serviceGroupId");
-			var _isValid=cked.attr("isValid");
-			if(_isValid==1){
-				top.$.jBox.tip("<spring:message code='can_not_edit_issued_ans_ip'/>", "<spring:message code='info'/>");
-				return;
-			}
-		}
-		doAll(checkboxes,url);
-	}else{
-		top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
-		return;
-	}
-}
-//通过
-function passOpt(url){
-var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
-	
-	if($(checkboxes).filter(":checked").length>0){
-		if(validateAllNoAudit(checkboxes)){
-			top.$.jBox.tip("<spring:message code='has_prohibit_pass'/>", "<spring:message code='info'/>");
-			return;
-			}else{
-					doAll(checkboxes,url);
-				}
-			}else{
-				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
-				return;
-		}
-}
-//未通过
-function noPassOpt(url){
-var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
-	
-	if($(checkboxes).filter(":checked").length>0){
-		if(validateAllNoAudit(checkboxes)){
-			top.$.jBox.tip("<spring:message code='has_prohibit_nopass'/>", "<spring:message code='info'/>");
-			return;
-			}else{
-					doAll(checkboxes,url);
-				}
-			}else{
-				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
-				return;
-		}
-}
-//配置取消
-function cancelPassOpt(url){
-var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
-	
-	if($(checkboxes).filter(":checked").length>0){
-		if(validateAllPass(checkboxes)){
-			doAll(checkboxes,url);
-			}else{
-				top.$.jBox.tip("<spring:message code='hasnot_approved'/>", "<spring:message code='info'/>");
-				return;
-				}
-			}else{
-				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
-				return;
-		}
-}
-	function doAll(checkboxes,url){
-		// var url = $(this).attr('data-url');
-		  var str="";
-		  var compileIdStr="";
-		  var ids="";
-		  var compileIds="";
-		  var flag=false;//是否删除的为但是响应策略的无策略配置
-		  checkboxes.each(function(){
-		    if(true == $(this).is(':checked')){
-		    	var id=$(this).attr("id");
-		    	var serviceId=$(this).attr("id");
-		    	if($(this).attr("serviceId")){
-		    		  serviceId=$(this).attr("serviceId");
-		      	}
-		    	if(serviceId == 65 && id==0){
-		    		flag=true;
-		    	}
-		      	str+=$(this).attr("id")+",";
-		      	if($(this).attr("compileId")){
-		    		  compileIdStr +=$(this).attr("compileId")+",";
-		      	}
-		    }
-		  });
-		  
-		  
-		  if(flag && url.indexOf("?isAudit=3") > 1){
-			  top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
-			return;
-		  }
-		  
-		  if(str.substr(str.length-1)== ','){
-		    ids = str.substr(0,str.length-1);
-		  }
-		  if(compileIdStr.substr(compileIdStr.length-1)== ','){
-			  compileIds = compileIdStr.substr(0,compileIdStr.length-1);
-		  }
-		  if(ids == ""){
-			  //top.$.jBox.tip("不能选择公共模型（"+nodes[i].name+"）请重新选择。");
-			  top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
-			return;
-		  }
-			top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='info'/>",function(v,h,f){
-				
-				if(v=="ok"){
-					if(url.indexOf("?")>0){
-						window.location = url+"&ids="+ids+"&compileIds="+compileIds;
-					}else{
-						window.location = url+"?ids="+ids+"&compileIds="+compileIds;
-					}
-					if(url.indexOf("?isAudit") > 1){
-						loading('<spring:message code="onloading"/>');
-					}else if(url.indexOf("export") > 1){
-						closeTip();
-					}
-					//$("#searchForm").submit();
-				}
-			},{buttonsFocus:1});
-			top.$('.jbox-body .jbox-icon').css('top','55px');
-
-	}
-	//验证选择的配置，是否可删除或者审核未通过或者审核通过,只有未审核的配置可删除或审核未通过或审核通过
-	function validateAllNoAudit(checkboxes){
-		var flag = false;
-		$(checkboxes).filter(":checked").each(function(){
-			if($(this).val()!=0){
-				flag = true;
-				return;
-			}		 	
-		});
-		return flag;
-	}
-	//验证选择的配置，是否有审核通过的
-	function validatePass(checkboxes){
-		var flag = false;
-		$(checkboxes).filter(":checked").each(function(){
-			if($(this).val()==1){
-				flag = true;
-				return;
-			}		 	
-		});
-		return flag;
-	}
-	//验证选择的配置，是否全部为审核通过的
-	function validateAllPass(checkboxes){
-		var flag = true;
-		$(checkboxes).filter(":checked").each(function(){
-			if($(this).val()!=1){
-				flag = false;
-				return;
-			}		 	
-		});
-		return flag;
-	}
-	//删除
-	function exportData(url,maxRow){
-		var column=[];
-		$("#${id} ${value} thead tr th").each(function(){
-			if($(this).attr("exportColumn")){
-				column.push($(this).attr("exportColumn"));
-			}
-		});
-		if(column){
-			url+="&columns="+column.toString();
-		}
-		var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
-		//导出选中数据
-		if($(checkboxes).filter(":checked").length>0){ 
-			doAll(checkboxes,url);
-		//导出检索条件下所有数据
-		}else{
-			if($("#showTotalCount").html().trim() > maxRow){
-				top.$.jBox.confirm("<spring:message code='export_confirm_message'/>"+maxRow+"!","<spring:message code='info'/>",function(v,h,f){
-					if(v=="ok"){
-						$("#searchForm").attr("action",url);
-						$("#searchForm").submit();
-						closeTip();
-					}
-				},{buttonsFocus:1});
-				top.$('.jbox-body .jbox-icon').css('top','55px');
-			}else{
-				$("#searchForm").attr("action",url);
-				$("#searchForm").submit();
-				closeTip();
-			}
-		}
-	}
+<%@ tag language="java" pageEncoding="UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<%@ attribute name="id" type="java.lang.String" required="true"%>
+<%@ attribute name="url" type="java.lang.String" required="true"%>
+<%@ attribute name="label" type="java.lang.String" required="false"%>
+<%@ attribute name="maxRow" type="java.lang.Long" required="false"%>
+<c:choose>
+	<c:when test="${label eq 'delete'}">
+		<a href="javascript:void(0);" class="btn btn-default" onclick="del('${url}')" data-toggle="tooltip" data-placement="top">
+			<i class="fa fa-trash"> <spring:message code="delete"/></i>
+		</a>
+	</c:when>
+	<c:when test="${label eq 'update'}">
+		<a href="javascript:void(0);" onclick="update('${url}')" class="btn btn-default" data-toggle="tooltip" data-placement="top">
+			<i class="fa fa-check"></i> <spring:message code="edit"/>
+		</a>
+	</c:when>
+	<c:when test="${label eq 'approved'}">
+		<a href="javascript:void(0);" onclick="passOpt('${url}')"><i class="fa fa-check"></i> <spring:message code="approved"/></a>
+	</c:when>
+	<c:when test="${label eq 'unapproved'}">
+		<a href="javascript:void(0);" onclick="noPassOpt('${url}')"><i class="fa fa-remove"></i> <spring:message code="unapproved"/></a>
+	</c:when>
+	<c:when test="${label eq 'cancelPass'}">
+		<a href="javascript:void(0);" onclick="cancelPassOpt('${url}')"><i class="fa fa-undo"></i> <spring:message code="cancel_approved"/></a>
+	</c:when>
+	<c:when test="${label eq 'export'}">
+		<a href="javascript:void(0);" class="btn btn-default" onclick="exportData('${url}',${maxRow })" data-toggle="tooltip" data-placement="top">
+			<i class="fa fa-download"> <spring:message code="export"/></i>
+		</a>
+	</c:when>
+</c:choose>
+<%-- 使用方法： 1.将本tag写在查询的form之前；2.传入table的id和controller的url --%>
+<script type="text/javascript">
+$(document).ready(function() {
+    $('#${id} thead tr th input.i-checks').on('ifChecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定 
+    	  $('#${id} tbody tr td input.i-checks').iCheck('check');
+    	});
+
+    $('#${id} thead tr th input.i-checks').on('ifUnchecked', function(event){ //ifCreated 事件应该在插件初始化之前绑定 
+    	  $('#${id} tbody tr td input.i-checks').iCheck('uncheck');
+    	});
+});
+//删除
+function del(url){
+	var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
+	
+	if($(checkboxes).filter(":checked").length>0){
+		if(validateAllNoAudit(checkboxes)){
+			top.$.jBox.tip("<spring:message code='has_prohibit_delete'/>", "<spring:message code='info'/>");
+			return;
+		}else{
+			var serviceGroupIds=[],ids=[],canDel=true;
+			$(checkboxes).filter(":checked").each(function(){
+				if($(this).attr("serviceGroupId")&&$(this).attr("isValid")){
+					if($(this).attr("isValid")==1){//下发过的组的ip才需要判断是否是组内最后一个IP
+						serviceGroupIds.push($(this).attr("serviceGroupId"));
+					}
+					ids.push($(this).attr("id"));
+				}
+			})
+			if(serviceGroupIds.length>0){
+				$.ajax({
+ 	 				type:'post',
+ 	 				url:'${ctx}/basics/asn/ajaxIsLast',
+ 	 				data:{"serviceGroupIds":serviceGroupIds.join(','),"ids":ids.join(',')},
+ 	 				async:false,
+ 	 				success:function(data,textStatus){//处理返回结果
+ 	 					if(data){
+ 	 						top.$.jBox.tip('<spring:message code="last_ip_in_asn_group"/>');
+ 	 						canDel=false;
+ 	 					}
+ 	 				}
+ 	 			});
+			}
+			if(canDel){
+				doAll(checkboxes,url);
+			}
+		}
+	}else{
+		top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+		return;
+	}
+}
+//修改配置
+function update(url){
+	var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
+	var cked = $("tbody tr td input.i-checks:checkbox:checked");
+	if($(checkboxes).filter(":checked").length==1){
+		if(cked.val()==1){
+			top.$.jBox.tip("<spring:message code='has_approved'/>", "<spring:message code='info'/>");
+			return;
+		}else if(cked.val()==3){
+			top.$.jBox.tip("<spring:message code='cancel_approved'/>", "<spring:message code='info'/>");
+			return;
+		}
+		//处理asnIp,asn组下发过的ip配置不允许修改
+		if(cked.attr("serviceGroupId")&&cked.attr("isValid")){
+			var serviceGroupId=cked.attr("serviceGroupId");
+			var _isValid=cked.attr("isValid");
+			if(_isValid==1){
+				top.$.jBox.tip("<spring:message code='can_not_edit_issued_ans_ip'/>", "<spring:message code='info'/>");
+				return;
+			}
+		}
+		doAll(checkboxes,url);
+	}else{
+		top.$.jBox.tip("<spring:message code='check_one'/>", "<spring:message code='info'/>");
+		return;
+	}
+}
+//通过
+function passOpt(url){
+var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
+	
+	if($(checkboxes).filter(":checked").length>0){
+		if(validateAllNoAudit(checkboxes)){
+			top.$.jBox.tip("<spring:message code='has_prohibit_pass'/>", "<spring:message code='info'/>");
+			return;
+			}else{
+					doAll(checkboxes,url);
+				}
+			}else{
+				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+				return;
+		}
+}
+//未通过
+function noPassOpt(url){
+var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
+	
+	if($(checkboxes).filter(":checked").length>0){
+		if(validateAllNoAudit(checkboxes)){
+			top.$.jBox.tip("<spring:message code='has_prohibit_nopass'/>", "<spring:message code='info'/>");
+			return;
+			}else{
+					doAll(checkboxes,url);
+				}
+			}else{
+				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+				return;
+		}
+}
+//配置取消
+function cancelPassOpt(url){
+var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
+	
+	if($(checkboxes).filter(":checked").length>0){
+		if(validateAllPass(checkboxes)){
+			doAll(checkboxes,url);
+			}else{
+				top.$.jBox.tip("<spring:message code='hasnot_approved'/>", "<spring:message code='info'/>");
+				return;
+				}
+			}else{
+				top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+				return;
+		}
+}
+	function doAll(checkboxes,url){
+		// var url = $(this).attr('data-url');
+		  var str="";
+		  var compileIdStr="";
+		  var ids="";
+		  var compileIds="";
+		  var flag=false;//是否删除的为但是响应策略的无策略配置
+		  checkboxes.each(function(){
+		    if(true == $(this).is(':checked')){
+		    	var id=$(this).attr("id");
+		    	var serviceId=$(this).attr("id");
+		    	if($(this).attr("serviceId")){
+		    		  serviceId=$(this).attr("serviceId");
+		      	}
+		    	if(serviceId == 65 && id==0){
+		    		flag=true;
+		    	}
+		      	str+=$(this).attr("id")+",";
+		      	if($(this).attr("compileId")){
+		    		  compileIdStr +=$(this).attr("compileId")+",";
+		      	}
+		    }
+		  });
+		  
+		  
+		  if(flag && url.indexOf("?isAudit=3") > 1){
+			  top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+			return;
+		  }
+		  
+		  if(str.substr(str.length-1)== ','){
+		    ids = str.substr(0,str.length-1);
+		  }
+		  if(compileIdStr.substr(compileIdStr.length-1)== ','){
+			  compileIds = compileIdStr.substr(0,compileIdStr.length-1);
+		  }
+		  if(ids == ""){
+			  //top.$.jBox.tip("不能选择公共模型（"+nodes[i].name+"）请重新选择。");
+			  top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+			return;
+		  }
+			top.$.jBox.confirm("<spring:message code='confirm_message'/>","<spring:message code='info'/>",function(v,h,f){
+				
+				if(v=="ok"){
+					if(url.indexOf("?")>0){
+						window.location = url+"&ids="+ids+"&compileIds="+compileIds;
+					}else{
+						window.location = url+"?ids="+ids+"&compileIds="+compileIds;
+					}
+					if(url.indexOf("?isAudit") > 1){
+						loading('<spring:message code="onloading"/>');
+					}else if(url.indexOf("export") > 1){
+						closeTip();
+					}
+					//$("#searchForm").submit();
+				}
+			},{buttonsFocus:1});
+			top.$('.jbox-body .jbox-icon').css('top','55px');
+
+	}
+	//验证选择的配置，是否可删除或者审核未通过或者审核通过,只有未审核的配置可删除或审核未通过或审核通过
+	function validateAllNoAudit(checkboxes){
+		var flag = false;
+		$(checkboxes).filter(":checked").each(function(){
+			if($(this).val()!=0){
+				flag = true;
+				return;
+			}		 	
+		});
+		return flag;
+	}
+	//验证选择的配置，是否有审核通过的
+	function validatePass(checkboxes){
+		var flag = false;
+		$(checkboxes).filter(":checked").each(function(){
+			if($(this).val()==1){
+				flag = true;
+				return;
+			}		 	
+		});
+		return flag;
+	}
+	//验证选择的配置，是否全部为审核通过的
+	function validateAllPass(checkboxes){
+		var flag = true;
+		$(checkboxes).filter(":checked").each(function(){
+			if($(this).val()!=1){
+				flag = false;
+				return;
+			}		 	
+		});
+		return flag;
+	}
+	//删除
+	function exportData(url,maxRow){
+		var column=[];
+		$("#${id} ${value} thead tr th").each(function(){
+			if($(this).attr("exportColumn")){
+				column.push($(this).attr("exportColumn"));
+			}
+		});
+		if(column){
+			url+="&columns="+column.toString();
+		}
+		var checkboxes=$("#${id} ${value} tbody tr td input.i-checks:checkbox");
+		//导出选中数据
+		if($(checkboxes).filter(":checked").length>0){ 
+			doAll(checkboxes,url);
+		//导出检索条件下所有数据
+		}else{
+			if($("#showTotalCount").html().trim() > maxRow){
+				top.$.jBox.confirm("<spring:message code='export_confirm_message'/>"+maxRow+"!","<spring:message code='info'/>",function(v,h,f){
+					if(v=="ok"){
+						$("#searchForm").attr("action",url);
+						$("#searchForm").submit();
+						closeTip();
+					}
+				},{buttonsFocus:1});
+				top.$('.jbox-body .jbox-icon').css('top','55px');
+			}else{
+				$("#searchForm").attr("action",url);
+				$("#searchForm").submit();
+				closeTip();
+			}
+		}
+	}
 </script>

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

@@ -37,9 +37,9 @@ $(function(){
 
 <div class="page-content">
 
-	<h3 class="page-title">
+<%-- 	<h3 class="page-title">
 		<spring:message code="policy_group_manage"></spring:message>
-	</h3>
+	</h3> --%>
 	
 	<div class="row">
 		<div class="col-md-12">

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

@@ -153,7 +153,7 @@ label.errorShow {
 	</div>
 		
 		
-	<h3 class="page-title">
+<%-- 	<h3 class="page-title">
 		<c:if test="${itType==1 }">
 			<spring:message code="classification"/>
 			<c:set var="title" value="classification"></c:set>
@@ -166,7 +166,7 @@ label.errorShow {
 			<spring:message code="label"/>
 			<c:set  var="title" value="label"></c:set>
 		</c:if>
-	</h3>
+	</h3> --%>
 
 	<div class="row">
 		<div class="col-md-12">

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

@@ -110,7 +110,7 @@
 	</div>
 		
 		
-	<h3 class="page-title">
+<%-- 	<h3 class="page-title">
 	<c:if test="${itType==1 }">
 		<spring:message code="area"/>
 		<c:set var="title" value="area"></c:set>
@@ -119,7 +119,7 @@
 		<spring:message code="isp"/>
 		<c:set  var="title" value="isp"></c:set>
 	</c:if>
-	</h3>
+	</h3> --%>
 
 	<div class="row">
 		<div class="col-md-12">

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

@@ -9,9 +9,9 @@
 
 <div class="page-content">
 	<div class="row">
-	<h3 class="page-title">
+<%-- 	<h3 class="page-title">
 		<spring:message code="special_task"/>
-	</h3>
+	</h3> --%>
 		<div class="col-md-12">
 			<div class="portlet box blue">
 				<div class="portlet-title">

src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileForm.jsp

@@ -40,8 +40,8 @@ $(function(){
 <body>
 
 <div class="page-content">
-<h3 class="page-title">
-		<spring:message code="app_built_in_features_config"></spring:message>
+ <h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
 	</h3>
 	<div class="row">
 		<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/app/appBuiltinFeatureFileList.jsp

@@ -46,7 +46,7 @@
 	</div>
 
 	<h3 class="page-title">
-	<spring:message code="app_built_in_features_config"></spring:message>
+		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/app/appByteCfgForm.jsp

@@ -46,9 +46,9 @@ $(function(){
 <div class="page-content">
 	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
 	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
-	<h3 class="page-title">
-		<spring:message code="app_byte_config"></spring:message>
-	</h3>
+ 	<h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
+	</h3> 
 	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet box blue">

src/main/webapp/WEB-INF/views/cfg/app/appByteCfgList.jsp

@@ -57,14 +57,14 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="app_byte_config"></spring:message>
+		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<sys:message content="${message}"/>
+						
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/byteCfgList?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}"/>
@@ -271,6 +271,7 @@
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
+					<sys:message content="${message}"/>
 					<div class="table-responsive">
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
@@ -419,7 +420,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgForm.jsp

@@ -47,9 +47,9 @@ $(function(){
 <div class="page-content">
 	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
 	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
-	<h3 class="page-title">
-		<spring:message code="app_domain_config"></spring:message>
-	</h3>
+ 	<h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
+	</h3> 
 	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet box blue">

src/main/webapp/WEB-INF/views/cfg/app/appDomainCfgList.jsp

@@ -57,14 +57,14 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="app_domain_config"></spring:message>
+		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<sys:message content="${message}"/>
+						
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/domainCfgList?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}"/>
@@ -271,6 +271,7 @@
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
+					<sys:message content="${message}"/>
 					<div class="table-responsive">
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
@@ -419,7 +420,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp

@@ -61,13 +61,8 @@ $(function(){
 <div class="page-content">
 	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
 	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
-	<h3 class="page-title">
-		<%-- <spring:message code="app_header_config"></spring:message> --%>
-		<c:forEach items="${serviceList}" var="service">
-             <c:if test="${_cfg.functionId eq service.functionId}">
-                <spring:message code="${service.serviceName}"></spring:message>
-             </c:if>
-        </c:forEach>     
+ 	<h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>    
 	</h3>
 	<div class="row">
 		<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgList.jsp

@@ -110,15 +110,14 @@
 	</div>
 
 	<h3 class="page-title">
-		<%-- <spring:message code="app_header_config"></spring:message> --%>
-		<spring:message code="${serviceName}"></spring:message>
+		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<sys:message content="${message}"/>
+						
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/headerCfgList?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}"/>
@@ -325,6 +324,7 @@
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
+					<sys:message content="${message}"/>
 					<div class="table-responsive">
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
@@ -481,7 +481,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgForm.jsp

@@ -61,8 +61,8 @@ $(function(){
 <div class="page-content">
 	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
 	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
-	<h3 class="page-title">
-		<spring:message code="app_http_config"></spring:message>
+ 	<h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
 	</h3>
 	<div class="row">
 		<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/app/appHttpCfgList.jsp

@@ -57,14 +57,14 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="app_http_config"></spring:message>
+		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<sys:message content="${message}"/>
+						
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/httpCfgList?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}"/>
@@ -272,6 +272,7 @@
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
+					<sys:message content="${message}"/>
 					<div class="table-responsive">
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
@@ -427,7 +428,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/app/appIpCfgForm.jsp

@@ -28,8 +28,8 @@ $(function(){
 <body>
 
 <div class="page-content">
-	<h3 class="page-title">
-		<spring:message code="app_ip_config"></spring:message>
+ 	<h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
 	</h3>
 	<div class="row">
 		<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/app/appIpCfgList.jsp

@@ -60,14 +60,14 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="app_ip_config"></spring:message>
+		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<sys:message content="${message}"/>
+						
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/ipCfgList?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}"/>
@@ -276,6 +276,7 @@
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
+					<sys:message content="${message}"/>
 					<div class="table-responsive">
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
@@ -417,7 +418,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgForm.jsp

@@ -98,8 +98,8 @@ var delContent = function(contentClassName, addBtnClassName) {
             <c:set var="serviceName" value="${service.serviceName}"/>
          </c:if>
     </c:forEach>
-		<h3 class="page-title">
-			<spring:message code="${serviceName }"></spring:message>
+ 		<h3 class="page-title">
+			<spring:message code="${_cfg.menuNameCode }"></spring:message>
 		</h3>
 		<div class="row">
 			<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/app/appMultiFeatureCfgList.jsp

@@ -108,14 +108,14 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="${serviceName }"></spring:message>
+		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<sys:message content="${message}"/>
+						
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/feature/multiFeatureCfgList?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}"/>
@@ -322,6 +322,7 @@
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
+					<sys:message content="${message}"/>
 					<div class="table-responsive">
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
@@ -364,7 +365,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp

@@ -97,9 +97,9 @@ $(function(){
 		},
 		errorContainer: "#messageBox",
 	});
-	if('${_cfg.behavCode}'){
+	//if('${_cfg.behavCode}'){
 		ajaxBehaviour($("#specServiceIdId").val());
-	}
+	//}
 	$("#specServiceIdId").on("change",function(){
 		ajaxBehaviour($(this).val());
 	});
@@ -167,8 +167,8 @@ var delContent = function(contentClassName, addBtnClassName) {
 <span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
 <span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
 <div class="page-content">
-	<h3 class="page-title">
-		<spring:message code="social_app_control"></spring:message>
+ 	<h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
 	</h3>
 	<div class="row">
 		<div class="col-md-12">
@@ -210,7 +210,8 @@ var delContent = function(contentClassName, addBtnClassName) {
 									        </div>
 									    </div>
 									    <!-- doLog -->
-										<div class="col-md-6">
+									    <div class="row doLog">
+										 <div class="col-md-6">
 											<div class="form-group">
 												<label class="control-label col-md-3"><spring:message code="do_log" /></label>
 												<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
@@ -229,6 +230,7 @@ var delContent = function(contentClassName, addBtnClassName) {
 												</c:forEach>
 											</div>
 										</div>
+                   					 </div>
                    					</div>
 									 <div class="row">
 		                              		<div class="col-md-6">

src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp

@@ -102,14 +102,14 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="social_app_control"></spring:message>
+		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<sys:message content="${message}"/>
+						
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/policyCfgList?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}"/>
@@ -333,6 +333,7 @@
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
+					<sys:message content="${message}"/>
 					<div class="table-responsive">
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
@@ -467,7 +468,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp

@@ -61,8 +61,8 @@ $(function(){
 <div class="page-content">
 	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
 	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
-	<h3 class="page-title">
-		<spring:message code="app_ssl_config"></spring:message>
+ 	<h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
 	</h3>
 	<div class="row">
 		<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/app/appSslCfgList.jsp

@@ -57,14 +57,14 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="app_ssl_config"></spring:message>
+		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<sys:message content="${message}"/>
+						
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/sslCfgList?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}"/>
@@ -271,6 +271,7 @@
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
+					<sys:message content="${message}"/>
 					<div class="table-responsive">
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
@@ -426,7 +427,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgForm.jsp

@@ -55,9 +55,9 @@ $(function(){
 <div class="page-content">
 	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
 	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
-	<h3 class="page-title">
-		<spring:message code="app_tcp_config"></spring:message>
-	</h3>
+ 	<h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
+	</h3> 
 	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet box blue">

src/main/webapp/WEB-INF/views/cfg/app/appTcpCfgList.jsp

@@ -55,14 +55,14 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="app_tcp_config"></spring:message>
+		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<sys:message content="${message}"/>
+						
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/tcpCfgList?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}"/>
@@ -269,6 +269,7 @@
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
+					<sys:message content="${message}"/>
 					<div class="table-responsive">
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
@@ -325,7 +326,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-<%-- 									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+<%-- 									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
  --%>								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp

@@ -145,7 +145,7 @@ $(function(){
 	<span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
 	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
 	<h3 class="page-title">
-		<spring:message code="app_topic_domain_cfg"></spring:message>
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
 	</h3>
 	<div class="row">
 		<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgList.jsp

@@ -54,14 +54,14 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="app_topic_domain_cfg"></spring:message>
+		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<sys:message content="${message}"/>
+						
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/app/topicDomainCfgList?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}"/>
@@ -268,6 +268,7 @@
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
+					<sys:message content="${message}"/>
 					<div class="table-responsive">
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
@@ -436,7 +437,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/appCfgForm.jsp

@@ -71,9 +71,9 @@ $(function(){
 
 <div class="page-content">
 
-	<h3 class="page-title">
+<%-- 	<h3 class="page-title">
 		<spring:message code="${cfgName}"></spring:message>
-	</h3>
+	</h3> --%>
 	
 	<div class="row">
 		<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp

@@ -28,9 +28,9 @@ $(function(){
 
 <div class="page-content">
 
-	<h3 class="page-title">
+<%-- 	<h3 class="page-title">
 		<spring:message code="ASN"></spring:message>
-	</h3>
+	</h3> --%>
 	
 	<div class="row">
 		<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgList.jsp

@@ -102,7 +102,6 @@
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<sys:message content="${message}"/>
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/cfg/asnPolicy/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}"/>
@@ -253,6 +252,7 @@
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
+					<sys:message content="${message}"/>
 					<div class="table-responsive">
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
@@ -383,7 +383,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><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>

src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpForm.jsp

@@ -64,8 +64,8 @@ var delContent = function(contentClassName, addBtnClassName) {
 <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="av_content_ip_control"></spring:message>
+ 	<h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
 	</h3>
 	
 	<div class="row">

src/main/webapp/WEB-INF/views/cfg/av/contIp/contIpList.jsp

@@ -112,7 +112,7 @@
 	</div>
 
 	<h3 class="page-title">
-	<spring:message code="av_content_ip_control"></spring:message>
+	<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
@@ -499,7 +499,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlForm.jsp

@@ -96,11 +96,10 @@ var delContent = function(contentClassName, addBtnClassName) {
 	<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="av_content_url_control"></spring:message>
-	</h3>
-	
-	
+ 	<h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
+	</h3> 
+	<span style="color: red;font-size: 14px;letter-spacing: 0px;"> <spring:message code="av_content_url_note"></spring:message></span>
 	<div class="row">
 		<div class="col-md-12">
 			<div class="portlet box blue">

src/main/webapp/WEB-INF/views/cfg/av/contUrl/contUrlList.jsp

@@ -110,7 +110,7 @@
 	</div>
 
 	<h3 class="page-title">
-	<spring:message code="av_content_url_control"></spring:message>
+	<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
@@ -416,7 +416,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">

src/main/webapp/WEB-INF/views/cfg/av/fileSampleForm.jsp

@@ -100,12 +100,8 @@ function hiddenlevel(){
 
 <div class="page-content">
 
-	<h3 class="page-title">
-		<c:forEach items="${regionList}" var="region">
-   			<c:if test="${_cfg.functionId eq region.functionId}">
-   				<spring:message code="${region.configRegionValue}"></spring:message>
-   			</c:if>
-   		</c:forEach>
+ <h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
 	</h3>
 	
 	<div class="row">

src/main/webapp/WEB-INF/views/cfg/av/fileSampleList.jsp

@@ -61,7 +61,7 @@
 	</div>
 
 	<h3 class="page-title">
-   		<spring:message code="${regionValue}"></spring:message>
+   		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
@@ -404,7 +404,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpForm.jsp

@@ -65,9 +65,9 @@ var delContent = function(contentClassName, addBtnClassName) {
 <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="av_picture_ip_control"></spring:message>
-	</h3>
+ 	<h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
+	</h3> 
 	
 	<div class="row">
 		<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/av/picIp/picIpList.jsp

@@ -112,7 +112,7 @@
 	</div>
 
 	<h3 class="page-title">
-	<spring:message code="av_picture_ip_control"></spring:message>
+	<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
@@ -500,7 +500,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlForm.jsp

@@ -88,8 +88,8 @@ var delContent = function(contentClassName, addBtnClassName) {
 	<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="av_picture_url_control"></spring:message>
+	 <h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
 	</h3>
 	
 	<div class="row">

src/main/webapp/WEB-INF/views/cfg/av/picUrl/picUrlList.jsp

@@ -111,7 +111,7 @@
 	</div>
 
 	<h3 class="page-title">
-	<spring:message code="av_picture_url_control"/>
+	<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
@@ -418,7 +418,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">

src/main/webapp/WEB-INF/views/cfg/av/signSampleForm.jsp

@@ -75,12 +75,8 @@ function hiddenlevel(){
 <body>
 
 <div class="page-content">
-	<h3 class="page-title">
-		<c:forEach items="${regionList}" var="region">
-			<c:if test="${_cfg.functionId eq region.functionId}">
-				<spring:message code="${region.configRegionValue}"></spring:message>
-			</c:if>
-		</c:forEach>
+ 	<h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
 	</h3>
 	<div class="row">
 		<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/av/signSampleList.jsp

@@ -67,7 +67,7 @@
 	</div>
 
 	<h3 class="page-title">
-   		<spring:message code="${regionValue}"></spring:message>
+   		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
@@ -415,7 +415,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/av/switchSignSample.jsp

@@ -63,11 +63,7 @@ $(function(){
 
 <div class="page-content">
 	<h3 class="page-title">
-				<spring:message code="av_sample_video_porn_control"></spring:message>
-		<%-- <c:forEach items="${regionList}" var="region">
-			<c:if test="${_cfg.functionId eq region.functionId}">
-			</c:if>
-		</c:forEach> --%>
+				<spring:message code="${_cfg.menuNameCode }"></spring:message>
 	</h3>
 	<div class="row">
 		<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp

@@ -37,17 +37,27 @@
 										}
 									},
 									submitHandler : function(form) {
-										
 										var flag = true;
-										var subscribeId=0;
 										//存在隐藏的subscribeId，不算进域配置
-										if($(".boxSolid.hidden").hasClass("subscribeId")){
-											subscribeId=1;
-										}
-										//代表所有业务都隐藏了，提示必须增加一种业务数据
-										if(($(".boxSolid").length - 1) == ($(".boxSolid.hidden").length - subscribeId)){
-											top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
-											return;
+										if($(".boxSolid[class~='subscribeId']").length>0){
+											if($(".boxSolid.hidden[class~='subscribeId']").is(":hidden")){
+												if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){
+													top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+													return;
+												}
+											}
+											if(!$(".boxSolid.hidden[class~='subscribeId']").is(":hidden")){
+												if(($(".boxSolid").length) == ($(".boxSolid.hidden").length) + 1){
+													top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+													return;
+												}
+											}
+											//代表所有业务都隐藏了，提示必须增加一种业务数据
+										}else{
+											if(($(".boxSolid").length) == ($(".boxSolid.hidden").length)){
+												top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
+												return;
+											}
 										}
 										//代表所有区域都隐藏了，提示必须增加个区域信息
 										if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){
@@ -133,9 +143,10 @@
 	<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="av_voip_ip_control"></spring:message>
-		</h3>
+<%-- 		<h3 class="page-title">
+			<spring:message code="av_voip_control"></spring:message>
+		</h3> --%>
+		<span style="color: red;font-size: 14px;letter-spacing: 0px;"> <spring:message code="protocol_note"></spring:message></span>
 		<div class="row">
 			<div class="col-md-12">
 				<div class="portlet box blue">
@@ -228,6 +239,7 @@
 								
 								<c:set var="ipCfgIndex" value="0"></c:set>
 								<c:set var="strCfgIndex" value="0"></c:set>
+								<c:set var="accountCfgIndex" value="0"></c:set>
 								<c:forEach items="${regionList}" var="region" varStatus="status">
 									<c:if test="${region.regionType eq 1 }">
 										<!--ip info-->
@@ -260,7 +272,49 @@
 										</c:choose>
 									<!--/ip info-->
 									</c:if>
+									
 									<c:if test="${region.regionType eq 2 }">
+									<c:if test="${region.configServiceType eq 'voip_account' }">
+										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
+										<h4 class="form-section">
+											<spring:message code="${region.configRegionValue}" />
+											<small> <span
+												class="glyphicon glyphicon-plus ${tabName}Add"
+												onClick="addContent(this,'${tabName}')" title="add"></span></small>
+										</h4>
+										<c:set var="cfgName" value="voipAccounts[${accountCfgIndex}]"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
+										<c:choose>
+											<c:when test="${fn:length(_cfg.voipAccounts)>0}">
+												<c:set var="isBreak" value="false" ></c:set>
+												<c:forEach items="${_cfg.voipAccounts}" var="cfg">
+													<c:choose>
+														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
+															<div class="row boxSolid ${tabName}${status.index}">
+																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+															</div>
+															<c:set var="isBreak" value="true" ></c:set>
+															<c:set var="accountCfgIndex" value="${accountCfgIndex+1 }"></c:set>
+														</c:when>
+													</c:choose>
+												</c:forEach>
+												<c:if test="${!isBreak}">
+													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+													</div>
+													<c:set var="accountCfgIndex" value="${accountCfgIndex+1 }"></c:set>
+												</c:if>
+											</c:when>
+											<c:otherwise>
+												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
+													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+												</div>
+												<c:set var="accountCfgIndex" value="${accountCfgIndex+1 }"></c:set>
+											</c:otherwise>
+										</c:choose>
+									</c:if>
+									<!-- 关键字 -->									
+									<c:if test="${region.configServiceType eq 'subscribe_id' }">
 										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
 										<h4 class="form-section">
 											<spring:message code="${region.configRegionValue}" />
@@ -269,7 +323,6 @@
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
 										<c:set var="cfgName" value="ntcSubscribeIdCfgList[${strCfgIndex}]"></c:set>
-										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
@@ -299,6 +352,7 @@
 											</c:otherwise>
 										</c:choose>
 									</c:if>
+									</c:if>
 								</c:forEach>
 								<br>
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>

src/main/webapp/WEB-INF/views/cfg/av/voip/voipForm.jsp.bak

@@ -14,39 +14,42 @@
 			.ready(
 					function() {
 						$(".glyphicon-plus").first().click();
+						/* $("#cancel").on("click", function() {
+							window.history.back();
+						});*/
 						$(".action").on("change", function() {
 							$("#serviceId").val($(this).attr("serviceId"));
 							$("#protocolId").val($(this).attr("protocolId"));
 							var action=$("input[name='action']:checked").val();
 						 	switchAction(action);
-						});
+						}); 
 						$("#serviceId").val($(".action:checked").attr("serviceId"));
 						$("#protocolId").val($(".action:checked").attr("protocolId"));
 						$("#cfgFrom").validate(
 								{ errorPlacement : function(error, element) {
-									if($(element).parents().hasClass("tagsinput")){
-										$(element).parents(".col-md-6").next("div").append(error);
-									}else{
-										$(element).parents(".form-group").find(
-												"div[for='"
-														+ element.attr("name")
-														+ "']").append(error);
-									}
-								},
+										if($(element).parents().hasClass("tagsinput")){
+											$(element).parents(".col-md-6").next("div").append(error);
+										}else{
+											$(element).parents(".form-group").find(
+													"div[for='"
+															+ element.attr("name")
+															+ "']").append(error);
+										}
+									},
 									submitHandler : function(form) {
 										
 										var flag = true;
 										var subscribeId=0;
-										//存在隐藏的subscribeId，不算进域配置
+										//瀛樺湪闅愯棌鐨剆ubscribeId锛屼笉绠楄繘鍩熼厤缃<EFBFBD>
 										if($(".boxSolid.hidden").hasClass("subscribeId")){
 											subscribeId=1;
 										}
-										//代表所有业务都隐藏了，提示必须增加一种业务数据
+										//浠ｈ〃鎵<EFBFBD>鏈変笟鍔￠兘闅愯棌浜嗭紝鎻愮ず蹇呴』澧炲姞涓<EFBFBD>绉嶄笟鍔℃暟鎹<EFBFBD>
 										if(($(".boxSolid").length - 1) == ($(".boxSolid.hidden").length - subscribeId)){
 											top.$.jBox.tip("<spring:message code='one_more'/>", "<spring:message code='info'/>");
 											return;
 										}
-										//代表所有区域都隐藏了，提示必须增加个区域信息
+										//浠ｈ〃鎵<EFBFBD>鏈夊尯鍩熼兘闅愯棌浜嗭紝鎻愮ず蹇呴』澧炲姞涓尯鍩熶俊鎭<EFBFBD>
 										if($("input[name='isAreaEffective']:checked").val()==1 && $(".container-fluid:visible").size()==0){
 											if($("#areaIsp").hasClass("hidden")) $("#areaIp").find(".glyphicon-plus").click();
 											if($("#areaIp").hasClass("hidden")) $("#areaIsp").find(".glyphicon-plus").click();
@@ -62,10 +65,10 @@
 												flag = false;
 											}
 										})
-										//keywords非空校验完成校验二进制字符串
+										//keywords闈炵┖鏍￠獙瀹屾垚鏍￠獙浜岃繘鍒跺瓧绗︿覆
 										$(".boxSolid:visible").find("select[name$='isHexbin']").each(function(){
 											var isHexbin=$(this).val();
-											if(isHexbin == 1){ //十六进制 
+											if(isHexbin == 1){ //鍗佸叚杩涘埗 
 												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
 												keywords=keywords.replace("***and***","")	
 											if(keywords != ''){
@@ -84,7 +87,7 @@
 											flag=flag1;
 										}
 										if(flag){
-											//将disable属性的元素删除
+											//灏哾isable灞炴<EFBFBD>х殑鍏冪礌鍒犻櫎
 											$(".disabled").each(function(){
 												$(this).remove();
 											});
@@ -98,14 +101,14 @@
 									},
 									errorContainer : "#messageBox",
 								});
-						//业务内容增加
+						//涓氬姟鍐呭澧炲姞
 						/* $("span[title='add']").on("click", function() {
 							$(".ipPort0").removeClass("hidden");
 						}); */
 
 					});
 
-	//业务窗口打开
+	//涓氬姟绐楀彛鎵撳紑
 	var addContent = function(obj, contentClassName) {
 		var showDiv = $(obj).parent().parent().next();
 		$(showDiv).removeClass("hidden").removeClass(
@@ -116,7 +119,7 @@
 		$(obj).addClass("hidden");
 	}
 
-	//业务窗口关闭
+	//涓氬姟绐楀彛鍏抽棴
 	var delContent = function(contentClassName, addBtnClassName) {
 		$("." + contentClassName).addClass("hidden").addClass("disabled");
 		/* $("."+contentClassName).find("input,select").each(function(){
@@ -131,7 +134,7 @@
 	<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="av_voip_account_control"></spring:message>
+			<spring:message code="${_cfg.menuNameCode }"></spring:message>
 		</h3>
 		<div class="row">
 			<div class="col-md-12">
@@ -149,7 +152,7 @@
 					</div>
 					<div class="portlet-body form">
 						<!-- BEGIN FORM-->
-						<form id="cfgFrom" action="${ctx}/ntc/av/saveAccountVoip"  
+						<form id="cfgFrom" action="${ctx}/ntc/av/saveVoip"  
 							method="post" class="form-horizontal">
 							<input type="hidden" name="cfgId" value="${_cfg.cfgId}">
 							<input type="hidden" name="compileId" value="${_cfg.compileId}">
@@ -158,6 +161,8 @@
 								value="${_cfg.serviceId}">
 
 							<div class="form-body">
+
+
 								<div class="row">
 									<div class="col-md-6">
 										<div class="form-group">
@@ -169,25 +174,24 @@
 											</div>
 										</div>
 									</div>
+									<!-- 鍔ㄤ綔 -->
 									<div class="col-md-6">
 										<div class="form-group">
-											<label class="control-label col-md-3"><spring:message
-													code="action" /></label>
+											<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 }"
+													<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 }">
+																<c:if test="${dict.itemCode eq service.action }">
 																		<spring:message code="${dict.itemValue }"/>
-																	</c:if>
-																</c:forEach>
+																</c:if>
+															</c:forEach>
 														</c:if>
 													</label>
 												</c:forEach>
@@ -195,8 +199,9 @@
 											<div for="action"></div>
 										</div>
 									</div>
+									
 								</div>
-								<!-- dolog begin-->
+							<!-- dolog begin-->
 								<div class="row doLog">
 									<div class="col-md-6">
 										<div class="form-group">
@@ -214,56 +219,48 @@
 																</label>
 															</c:otherwise>
 														</c:choose>
+													
 											</c:forEach>
 										</div>
 									</div>
 								</div>
 								<!-- dolog end-->
-								<c:set var="accountCfgIndex" value="0"></c:set>
+								
+								<c:set var="ipCfgIndex" value="0"></c:set>
 								<c:set var="strCfgIndex" value="0"></c:set>
 								<c:forEach items="${regionList}" var="region" varStatus="status">
-									<c:if test="${region.regionType eq 2 }">
-									<c:if test="${region.configServiceType eq 'voip_account' }">
+									<c:if test="${region.regionType eq 1 }">
+										<!--ip info-->
 										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
 										<h4 class="form-section">
 											<spring:message code="${region.configRegionValue}" />
 											<small> <span
-												class="glyphicon glyphicon-plus ${tabName}Add"
+												class="glyphicon glyphicon-plus  ${tabName}Add"
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
-										<c:set var="cfgName" value="voipAccounts[${accountCfgIndex}]"></c:set>
+										<c:set var="cfgName" value="voipIps[${ipCfgIndex}]"></c:set>
 										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
 										<c:choose>
-											<c:when test="${fn:length(_cfg.voipAccounts)>0}">
-												<c:set var="isBreak" value="false" ></c:set>
-												<c:forEach items="${_cfg.voipAccounts}" var="cfg">
-													<c:choose>
-														<c:when test="${region.configRegionValue eq cfg.cfgType and !isBreak}">
-															<div class="row boxSolid ${tabName}${status.index}">
-																<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
-															</div>
-															<c:set var="isBreak" value="true" ></c:set>
-															<c:set var="accountCfgIndex" value="${accountCfgIndex+1 }"></c:set>
-														</c:when>
-													</c:choose>
-												</c:forEach>
-												<c:if test="${!isBreak}">
-													<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-														<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
-													</div>
-													<c:set var="accountCfgIndex" value="${accountCfgIndex+1 }"></c:set>
+											<c:when test="${fn:length(_cfg.voipIps)>0 and ipCfgIndex<fn:length(_cfg.voipIps) }">
+												<c:forEach items="${_cfg.voipIps}" var="ipPort">
+												<c:if test="${region.configRegionValue eq ipPort.cfgType }">
+													<div class="row boxSolid ${tabName}${status.index}">
+														<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
+													</div>	
+													<c:set var="ipCfgIndex" value="${ipCfgIndex+1}"></c:set>		
 												</c:if>
+												</c:forEach>
 											</c:when>
 											<c:otherwise>
 												<div class="row boxSolid ${tabName}${status.index} hidden disabled">
-													<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+													<%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%>
 												</div>
-												<c:set var="accountCfgIndex" value="${accountCfgIndex+1 }"></c:set>
+												<c:set var="ipCfgIndex" value="${ipCfgIndex+1 }"></c:set>
 											</c:otherwise>
 										</c:choose>
+									<!--/ip info-->
 									</c:if>
-									<!-- 关键字 -->									
-									<c:if test="${region.configServiceType eq 'subscribe_id' }">
+									<c:if test="${region.regionType eq 2 }">
 										<c:set var="tabName" value="${region.configRegionValue}Tab"></c:set>
 										<h4 class="form-section">
 											<spring:message code="${region.configRegionValue}" />
@@ -272,6 +269,7 @@
 												onClick="addContent(this,'${tabName}')" title="add"></span></small>
 										</h4>
 										<c:set var="cfgName" value="ntcSubscribeIdCfgList[${strCfgIndex}]"></c:set>
+										<%-- <c:set var="regionValue" value="${region.configRegionValue}"></c:set> --%>
 										<c:choose>
 											<c:when test="${fn:length(_cfg.ntcSubscribeIdCfgList)>0}">
 												<c:set var="isBreak" value="false" ></c:set>
@@ -301,7 +299,6 @@
 											</c:otherwise>
 										</c:choose>
 									</c:if>
-									</c:if>
 								</c:forEach>
 								<br>
 								<%@include file="/WEB-INF/include/form/areaInfo.jsp"%>

src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp

@@ -3,9 +3,6 @@
 <html>
 <head>
 <title><spring:message code="${cfgName}"></spring:message></title>
-<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/css/bootstrap-select.min.css" rel="stylesheet"/>
-<link href="${pageContext.request.contextPath}/static/global/plugins/treeTable/themes/vsStyle/treeTable.min.css" rel="stylesheet" type="text/css" />
-<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/bootstrap-select.min.js"></script>
 <c:choose>
 	<c:when test="${cookie.Language.value eq 'zh_CN'}">
 		<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-select/js/i18n/defaults-zh_CN.min.js"></script>
@@ -27,6 +24,8 @@
 			$("#intype").val("${cfg.cfgDesc}");
 		}else if("${cfg.voipIp.srcIpAddress}"){
 			$("#intype").val("${cfg.voipIp.srcIpAddress}");
+		}else if("${cfg.voipAccount.cfgKeywords}"){
+			$("#intype").val("${cfg.voipAccount.cfgKeywords}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
 		}else if("${cfg.voipIp.srcPort}"){
@@ -64,10 +63,8 @@
 			var index=$(this).attr("id").replace("open","");
 			$("#"+openId).hide();
 			$("#"+closeId).show();
-			var compileId=$(this).attr("compileId");
+			//var compileId=$(this).attr("compileId");
 			var cfgId=$(this).attr("cfgId");
-			var hasIp=false;
-			var hasSubscribe=false;
 			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
 				$("#"+openId).parent().parent().next("tr").show();
 			}else{
@@ -75,305 +72,22 @@
 					type:'post',
 					async:false,
 					url:'${ctx}/ntc/av/ajaxVoipIpInfo',
-					data:{"compileId":compileId,"cfgId":cfgId},
+					data:{"cfgId":cfgId,"index":index},
+					dataType:"html",
 					success:function(data){
-						var voipIpCfgTab="<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 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'>";
-						if(data.subscribe.length >0){
-							hasSubscribe=true;
-							html+="<div id='subscribeTitle"+index+"'  onclick='switchInfo(\"ip\","+index+")' class='col-md-1 tabInfo badge-info' >";
-							html+="<spring:message code='NTC_SUBSCRIBE_ID'/>";
-							html+="<i id='subscribeDown"+index+"' class='fa fa-angle-double-down '></i>";
-							html+="<i id='subscribeUp"+index+"' class='fa fa-angle-double-up '  style='display:none'></i>";
-							html+="</div>";
-						}
-						if(data.ip.length >0){
-							hasIp=true;
-							html+="<div id='ipTitle"+index+"' onclick='switchInfo(\"subscribe\","+index+")' class='col-md-1 tabInfo' >";
-							html+="<spring:message code='av_voip_ip_title'/>"; 
-							html+="<i id='ipDown"+index+"' class='fa fa-angle-double-down' style='display:none' ></i>";
-							html+="<i id='ipUp"+index+"' class='fa fa-angle-double-up '></i>";
-							html+="</div>";
-						}
-						
-						html+="</div>";
-						//subscribe信息
-						if(data.subscribe.length > 0){
-							html+="<div  id='subscribeInfo"+index+"' class='content content'>";
-							$.each(data.subscribe,function(index,item){
-								html+="<div class='row'>";
-								html+="<div class='col-md-8'>";
-								html+="<div class='form-group'>";
-								html+="<label class='keyword-disinline'><spring:message code='NTC_SUBSCRIBE_ID'/>： ";
-								html+=item.cfgKeywords.replace(/\*\*\*and\*\*\*/g , " ");
-								html+="</label>";
-								html+="</div>";
-								html+="</div>";
-								html+="</div>";
-								
-								if(item.isHexbin==0){
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_hex'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='not_hex'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_case_insenstive'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='case_insenstive'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-								}
-								if(item.isHexbin==1){
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_hex'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='hex'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_case_insenstive'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='case_insenstive'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-								}
-								if(item.isHexbin==2){
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_hex'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='not_hex'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_case_insenstive'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='case_senstive'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-								}
-								
-								html+="<div class='row'>";
-								html+="<div class='col-md-4'>";
-								html+="<div class='form-group'>";
-								html+="<label><spring:message code='expression_type'/>：</label>";
-								html+="<label>"
-								if(item.exprType==1){
-									html+="<spring:message code='and_expression'/>"
-								}
-								if(item.exprType==0){
-									html+="<spring:message code='null_expression'/>"
-								}
-								html+="</label>";
-								html+="</div>";
-								html+="</div>";
-								html+="</div>";
-								html+="<div class='row'>";
-								html+="<div class='col-md-4'>";
-								html+="<div class='form-group'>";
-								html+="<label><spring:message code='match_method'/>：</label>";
-								html+="<label>"
-								if(item.matchMethod==0){
-									html+="<spring:message code='substring_match'/>"
-								}
-								if(item.matchMethod==1){
-									html+="<spring:message code='right_match'/>"
-								}
-								if(item.matchMethod==2){
-									html+="<spring:message code='left_match'/>"
-								}
-								if(item.matchMethod==3){
-									html+="<spring:message code='exactly_match'/>"
-								}
-								html+="</label>";
-								html+="</div>";
-								html+="</div>";
-								html+="</div>";
-								/* if(index < (data.ip.length-1) && index != 0){
-									alert("下一行");
-								} 
-								html+="<h5 class='page-header'></h5>";*/
-							})
-							html+="</div>";
-						} 
-						//ip信息
-						if(data.ip.length >0){
-							html+="<div id='ipInfo"+index+"' class='content' style='display:none'>";
-							$.each(data.ip,function(index,item){
-								html+="<div class='row'>";
-								html+="<div class='col-md-4'>";
-								html+="<div class='form-group'>";
-								html+="<label><spring:message code='ip_type'/>：</label>";
-								html+="<label>"
-								if(item.ipType==4){
-									html+="<spring:message code='ipv4'/>";
-								}
-								if(item.ipType==6){
-									html+="<spring:message code='ipv6'/>";
-								}
-								if(item.ipType==46){
-									html+="<spring:message code='4over6'/>";
-								}
-								if(item.ipType==64){
-									html+="<spring:message code='6over4'/>";
-								}
-								if(item.ipType==10){
-									html+="<spring:message code='all'/>";
-								}
-								html+="</label>";
-								html+="</div>";
-								html+="</div>";
-								html+="</div>";
-								html+="<div class='row'>";
-								html+="<div class='col-md-4'>";
-								html+="<div class='form-group'>";
-								html+="<label><spring:message code='ip_pattern'/>：</label>";
-								html+="<label>"
-								if(item.ipPattern==1){
-									html+="<spring:message code='ip_subnet'/>"
-								}
-								if(item.ipPattern==2){
-									html+="<spring:message code='ip_range'/>"
-								}
-								if(item.ipPattern==3){
-									html+="IP"
-								}
-								html+="</label>";
-								html+="</div>";
-								html+="</div>";
-								html+="<div class='col-md-4'>";
-								html+="<div class='form-group'>";
-								html+="<label><spring:message code='client_ip'/>：</label>";
-								html+="<label>"
-								html+=item.srcIpAddress;
-								html+="</label>";
-								html+="</div>";
-								html+="</div>";
-								html+="</div>";
-								html+="<div class='row'>";
-								html+="<div class='col-md-4'>";
-								html+="<div class='form-group'>";
-								html+="<label><spring:message code='port_pattern'/>：</label>";
-								html+="<label>"
-								if(item.portPattern==1){
-									html+="port"
-								}
-								if(item.portPattern==2){
-									html+="<spring:message code='port_mask'/>"
-								}
-								html+="</label>";
-								html+="</div>";
-								html+="</div>";
-								html+="<div class='col-md-4'>";
-								html+="<div class='form-group'>";
-								html+="<label><spring:message code='client_port'/>：</label>";
-								html+="<label>"
-								html+=item.srcPort;
-								html+="</label>";
-								html+="</div>";
-								html+="</div>";
-								html+="</div>";
-								html+="<div class='row'>";
-								html+="<div class='col-md-4'>";
-								html+="<div class='form-group'>";
-								html+="<label><spring:message code='server_ip'/>：</label>";
-								html+="<label>"
-								html+=item.destIpAddress;
-								html+="</label>";
-								html+="</div>";
-								html+="</div>";
-								html+="<div class='col-md-4'>";
-								html+="<div class='form-group'>";
-								html+="<label><spring:message code='server_port'/>：</label>";
-								html+="<label>"
-								html+=item.destPort;
-								html+="</label>";
-								html+="</div>";
-								html+="</div>";
-								html+="</div>";
-								html+="<div class='row'>";
-								html+="<div class='col-md-4'>";
-								html+="<div class='form-group'>";
-								html+="<label><spring:message code='direction'/>：</label>";
-								html+="<label>"
-								if(item.direction==0){
-									html+="<spring:message code='twoway'/>"
-								}
-								if(item.direction==1){
-									html+="<spring:message code='oneway'/>"
-								}
-								if(item.direction==2){
-									html+="<spring:message code='egress'/>"
-								}
-								html+="</label>";
-								html+="</div>";
-								html+="</div>";
-								html+="<div class='col-md-4'>";
-								html+="<div class='form-group'>";
-								html+="<label><spring:message code='protocol'/>：</label>";
-								html+="<label>"
-								if(item.protocol==6){
-									html+="TCP"
-								}
-								if(item.protocol==17){
-									html+="UDP"
-								}
-								if(item.protocol==0){
-									html+="<spring:message code='arbitrary'/>"
-								}
-								html+="</label>";
-								html+="</div>";
-								html+="</div>";
-								html+="</div>";
-								/* if(index < (data.ip.length-1) && index != 0){
-									alert("下一行");
-								} 
-								html+="<h5 class='page-header'></h5>";*/
-							})
-							html+="</div>";
-							
-						}
-							
-						voipIpCfgTab=voipIpCfgTab+html;
-						voipIpCfgTab+="</td>";
-						voipIpCfgTab+="</tr>";
-						$("#"+openId).parent().parent().after(voipIpCfgTab);
-						if(hasSubscribe && ! hasIp){
-							switchInfo("ip",index);
-						}
-						if(hasIp && ! hasSubscribe){
-							switchInfo("subscribe",index);
-						}
+						html = html+data;
+						subTab=subTab+html;
+						subTab+="</td>";
+						subTab+="</tr>";
+						$("#"+openId).parent().parent().after(subTab);
+						$("div[name='tabTitle"+index+"']").eq(0).click();
 					}
 				});
 			}
@@ -389,41 +103,13 @@
 		}); 
 	}); 
 	
-	function switchInfo(flag,index){
-			//关闭ip信息
-		if("ip" ==flag){
-			$("#ipInfo"+index).hide();
-			$("#downIp"+index).hide();
-			$("#ipTitle"+index).removeClass("badge-info");
-			$("#subscribeInfo"+index).show();
-			$("#subscribeDown"+index).show();
-			$("#subscribeUp"+index).hide();
-			$("#ipUp"+index).show();
-			$("#ipDown"+index).hide();
-			$("#subscribeTitle"+index).addClass("badge-info");
-		}else{
-		//关闭subscribe信息
-			$("#subscribeInfo"+index).hide();
-			$("#downsubscribe"+index).hide();
-			$("#subscribeTitle"+index).removeClass("badge-info");
-			$("#ipInfo"+index).show();
-			$("#ipDown"+index).show();
-			$("#subscribeUp"+index).show();
-			$("#subscribeDown"+index).hide();
-			$("#ipUp"+index).hide();
-			$("#ipTitle"+index).addClass("badge-info");
-		}
-		
-		
-	}
-	
 </script>
 </head>
 <body>
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<shiro:hasPermission name="avVoipIp:config">
+		<shiro:hasPermission name="avVoip:config">
 		<button type="button" class="btn btn-primary"
 			onClick="javascript:window.location='${ctx}/ntc/av/voipForm?functionId=${cfg.functionId}'">
 		<i class="fa fa-plus"></i>
@@ -432,7 +118,7 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="av_voip_ip_control"/>
+		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
@@ -470,6 +156,7 @@
 												<form:option value="compileId"><spring:message code="cfg_id"/></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="av_voip_account_control"/></form:option>
 												<form:option value="action"><spring:message code="action"></spring:message></form:option>
 												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="NTC_SUBSCRIBE_ID"/></form:option>
 												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
@@ -500,12 +187,12 @@
 	                                 <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="avVoipIp:config">
+							 		<shiro:hasPermission name="avVoip:config">
 							 			<sys:delRow url="${ctx}/ntc/av/voipForm" id="contentTable" label="update"></sys:delRow>
                                         <sys:delRow url="${ctx}/ntc/av/updateAvVoipValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
                                     <%-- <sys:delRow url="${ctx}/ntc/av/voipExport?functionId=${cfg.functionId }" id="contentTable" label="export" maxRow="${page.maxExportSize }"></sys:delRow> --%>
-                               		<shiro:hasPermission name="avVoipIp:confirm">
+                               		<shiro:hasPermission name="avVoip: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>
@@ -651,8 +338,8 @@
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
-					<sys:message content="${message}" />
 					<div class="table-responsive">
+					<sys:message content="${message}" />
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
@@ -682,7 +369,7 @@
 								<tr>
 									<td>
 									<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
-									<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" compileId="${indexCfg.compileId}" value="${indexCfg.isAudit}">
+									<input type="checkbox" class="i-checks child-checks" compileId="${indexCfg.compileId}" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
 									</td>
 								    <td>${indexCfg.compileId }</td>
 								    <td>${indexCfg.cfgDesc }</td>
@@ -779,7 +466,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
+									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><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>

src/main/webapp/WEB-INF/views/cfg/av/voip/voipList.jsp.bak

@@ -22,22 +22,24 @@
 </c:choose>
 <script>
 	 $(document).ready(function() {
-		//搜索框提示语初始化
+		//鎼滅储妗嗘彁绀鸿鍒濆鍖<EFBFBD>
 		if("${cfg.cfgDesc}"){
 			$("#intype").val("${cfg.cfgDesc}");
-		}else if("${cfg.ntcSubscribeIdCfg.cfgKeywords}"){
-			$("#intype").val("${cfg.ntcSubscribeIdCfg.cfgKeywords}");
+		}else if("${cfg.voipIp.srcIpAddress}"){
+			$("#intype").val("${cfg.voipIp.srcIpAddress}");
 		}else if("${cfg.compileId}"){
 			$("#intype").val("${cfg.compileId}");
-		}else if("${cfg.voipAccount.cfgKeywords}"){
-			$("#intype").val("${cfg.voipAccount.cfgKeywords}");
+		}else if("${cfg.voipIp.srcPort}"){
+			$("#intype").val("${cfg.voipIp.srcPort}");
+		}else if("${cfg.ntcSubscribeIdCfg.cfgKeywords}"){
+			$("#intype").val("${cfg.ntcSubscribeIdCfg.cfgKeywords}");
 		}else{
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		}
 		$("#seltype").change(function(){
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text());
 		});
- 		//筛选功能初始化
+ 		//绛涢<EFBFBD>夊姛鑳藉垵濮嬪寲
 		filterActionInit();
 		$("#isAudit").change(function(){
 			page();
@@ -55,7 +57,7 @@
 			$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
 		});
 		
-		//异步获取voip相关信息
+		//寮傛鑾峰彇voip鐩稿叧淇℃伅
 		$("span[id^=open]").click(function(){
 			var openId=$(this).attr("id");
 			var closeId=$(this).attr("id").replace("open","close");
@@ -64,15 +66,15 @@
 			$("#"+closeId).show();
 			var compileId=$(this).attr("compileId");
 			var cfgId=$(this).attr("cfgId");
+			var hasIp=false;
 			var hasSubscribe=false;
-			var hasAccount=false;
 			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
 				$("#"+openId).parent().parent().next("tr").show();
 			}else{
 				$.ajax({
 					type:'post',
 					async:false,
-					url:'${ctx}/ntc/av/ajaxVoipAccountInfo',
+					url:'${ctx}/ntc/av/ajaxVoipIpInfo',
 					data:{"compileId":compileId,"cfgId":cfgId},
 					success:function(data){
 						var voipIpCfgTab="<tr class='child'>"+
@@ -82,45 +84,109 @@
 										 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
 						var html="";
 						html+="<div class='row'>";
-						/* 订阅关键字 */
 						if(data.subscribe.length >0){
 							hasSubscribe=true;
-							html+="<div id='subscribeTitle"+index+"' onclick='switchInfo(\"account\","+index+")' class='col-md-1 tabInfo badge-info' >";
+							html+="<div id='subscribeTitle"+index+"'  onclick='switchInfo(\"ip\","+index+")' class='col-md-1 tabInfo badge-info' >";
 							html+="<spring:message code='NTC_SUBSCRIBE_ID'/>";
 							html+="<i id='subscribeDown"+index+"' class='fa fa-angle-double-down '></i>";
 							html+="<i id='subscribeUp"+index+"' class='fa fa-angle-double-up '  style='display:none'></i>";
 							html+="</div>";
 						}
-						
-						if(data.account.length >0){
-							hasAccount=true;
-							html+="<div id='accountTitle"+index+"'  onclick='switchInfo(\"subscribe\","+index+")' class='col-md-1 tabInfo' >";
-							html+="<spring:message code='av_voip_account_title'/>";
-							html+="<i id='accountDown"+index+"' class='fa fa-angle-double-down '></i>";
-							html+="<i id='accountUp"+index+"' class='fa fa-angle-double-up '  style='display:none'></i>";
+						if(data.ip.length >0){
+							hasIp=true;
+							html+="<div id='ipTitle"+index+"' onclick='switchInfo(\"subscribe\","+index+")' class='col-md-1 tabInfo' >";
+							html+="<spring:message code='av_voip_ip_title'/>"; 
+							html+="<i id='ipDown"+index+"' class='fa fa-angle-double-down' style='display:none' ></i>";
+							html+="<i id='ipUp"+index+"' class='fa fa-angle-double-up '></i>";
 							html+="</div>";
 						}
 						
-						
 						html+="</div>";
-						//subscribe信息
+						//subscribe淇℃伅
 						if(data.subscribe.length > 0){
-							html+="<div  id='subscribeInfo"+index+"' class='content content2'>";
+							html+="<div  id='subscribeInfo"+index+"' class='content content'>";
 							$.each(data.subscribe,function(index,item){
-								//console.log(item.cfgKeywords);
 								html+="<div class='row'>";
 								html+="<div class='col-md-8'>";
 								html+="<div class='form-group'>";
-								html+="<label><spring:message code='NTC_SUBSCRIBE_ID'/>： ";
+								html+="<label class='keyword-disinline'><spring:message code='NTC_SUBSCRIBE_ID'/>锛<EFBFBD> ";
 								html+=item.cfgKeywords.replace(/\*\*\*and\*\*\*/g , " ");
 								html+="</label>";
 								html+="</div>";
 								html+="</div>";
 								html+="</div>";
+								
+								if(item.isHexbin==0){
+									html+="<div class='row'>";
+									html+="<div class='col-md-4'>";
+									html+="<div class='form-group'>";
+									html+="<label><spring:message code='is_hex'/>锛<></label>";
+									html+="<label>"
+									html+="<spring:message code='not_hex'/>"
+									html+="</label>";
+									html+="</div>";
+									html+="</div>";
+									html+="</div>";
+									html+="<div class='row'>";
+									html+="<div class='col-md-4'>";
+									html+="<div class='form-group'>";
+									html+="<label><spring:message code='is_case_insenstive'/>锛<></label>";
+									html+="<label>"
+									html+="<spring:message code='case_insenstive'/>"
+									html+="</label>";
+									html+="</div>";
+									html+="</div>";
+									html+="</div>";
+								}
+								if(item.isHexbin==1){
+									html+="<div class='row'>";
+									html+="<div class='col-md-4'>";
+									html+="<div class='form-group'>";
+									html+="<label><spring:message code='is_hex'/>锛<></label>";
+									html+="<label>"
+									html+="<spring:message code='hex'/>"
+									html+="</label>";
+									html+="</div>";
+									html+="</div>";
+									html+="</div>";
+									html+="<div class='row'>";
+									html+="<div class='col-md-4'>";
+									html+="<div class='form-group'>";
+									html+="<label><spring:message code='is_case_insenstive'/>锛<></label>";
+									html+="<label>"
+									html+="<spring:message code='case_insenstive'/>"
+									html+="</label>";
+									html+="</div>";
+									html+="</div>";
+									html+="</div>";
+								}
+								if(item.isHexbin==2){
+									html+="<div class='row'>";
+									html+="<div class='col-md-4'>";
+									html+="<div class='form-group'>";
+									html+="<label><spring:message code='is_hex'/>锛<></label>";
+									html+="<label>"
+									html+="<spring:message code='not_hex'/>"
+									html+="</label>";
+									html+="</div>";
+									html+="</div>";
+									html+="</div>";
+									html+="<div class='row'>";
+									html+="<div class='col-md-4'>";
+									html+="<div class='form-group'>";
+									html+="<label><spring:message code='is_case_insenstive'/>锛<></label>";
+									html+="<label>"
+									html+="<spring:message code='case_senstive'/>"
+									html+="</label>";
+									html+="</div>";
+									html+="</div>";
+									html+="</div>";
+								}
+								
 								html+="<div class='row'>";
 								html+="<div class='col-md-4'>";
 								html+="<div class='form-group'>";
-								html+="<label><spring:message code='expression_type'/>：</label>";
+								html+="<label><spring:message code='expression_type'/>锛<EFBFBD></label>";
 								html+="<label>"
 								if(item.exprType==1){
 									html+="<spring:message code='and_expression'/>"
@@ -135,7 +201,7 @@
 								html+="<div class='row'>";
 								html+="<div class='col-md-4'>";
 								html+="<div class='form-group'>";
-								html+="<label><spring:message code='match_method'/>：</label>";
+								html+="<label><spring:message code='match_method'/>锛<EFBFBD></label>";
 								html+="<label>"
 								if(item.matchMethod==0){
 									html+="<spring:message code='substring_match'/>"
@@ -153,102 +219,36 @@
 								html+="</div>";
 								html+="</div>";
 								html+="</div>";
-								if(item.isHexbin==0){
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_hex'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='not_hex'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_case_insenstive'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='case_insenstive'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-								}
-								if(item.isHexbin==1){
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_hex'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='hex'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_case_insenstive'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='case_insenstive'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-								}
-								if(item.isHexbin==2){
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_hex'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='not_hex'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_case_insenstive'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='case_senstive'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-								}
 								/* if(index < (data.ip.length-1) && index != 0){
-									alert("下一行");
+									alert("涓嬩竴琛<EFBFBD>");
 								} 
 								html+="<h5 class='page-header'></h5>";*/
 							})
 							html+="</div>";
 						} 
-						//account信息
-						if(data.account.length > 0){
-							html+="<div  id='accountInfo"+index+"' class='content content2' style='display:none'>";
-							$.each(data.account,function(index,item){
-								html+="<div class='row'>";
-								html+="<div class='col-md-8'>";
-								html+="<div class='form-group'>";
-								html+="<label><spring:message code='account'/>： ";
-									html+=item.cfgKeywords.replace(/\*\*\*and\*\*\*/g , " ");
-								html+="</label>";
-								html+="</div>";
-								html+="</div>";
-								html+="</div>";
+						//ip淇℃伅
+						if(data.ip.length >0){
+							html+="<div id='ipInfo"+index+"' class='content' style='display:none'>";
+							$.each(data.ip,function(index,item){
 								html+="<div class='row'>";
 								html+="<div class='col-md-4'>";
 								html+="<div class='form-group'>";
-								html+="<label><spring:message code='expression_type'/>：</label>";
+								html+="<label><spring:message code='ip_type'/>锛<EFBFBD></label>";
 								html+="<label>"
-								if(item.exprType==1){
-									html+="<spring:message code='and_expression'/>"
+								if(item.ipType==4){
+									html+="<spring:message code='ipv4'/>";
 								}
-								if(item.exprType==0){
-									html+="<spring:message code='null_expression'/>"
+								if(item.ipType==6){
+									html+="<spring:message code='ipv6'/>";
+								}
+								if(item.ipType==46){
+									html+="<spring:message code='4over6'/>";
+								}
+								if(item.ipType==64){
+									html+="<spring:message code='6over4'/>";
+								}
+								if(item.ipType==10){
+									html+="<spring:message code='all'/>";
 								}
 								html+="</label>";
 								html+="</div>";
@@ -257,106 +257,121 @@
 								html+="<div class='row'>";
 								html+="<div class='col-md-4'>";
 								html+="<div class='form-group'>";
-								html+="<label><spring:message code='match_method'/>：</label>";
+								html+="<label><spring:message code='ip_pattern'/>锛<EFBFBD></label>";
 								html+="<label>"
-								if(item.matchMethod==0){
-									html+="<spring:message code='substring_match'/>"
+								if(item.ipPattern==1){
+									html+="<spring:message code='ip_subnet'/>"
 								}
-								if(item.matchMethod==1){
-									html+="<spring:message code='right_match'/>"
+								if(item.ipPattern==2){
+									html+="<spring:message code='ip_range'/>"
 								}
-								if(item.matchMethod==2){
-									html+="<spring:message code='left_match'/>"
+								if(item.ipPattern==3){
+									html+="IP"
 								}
-								if(item.matchMethod==3){
-									html+="<spring:message code='exactly_match'/>"
+								html+="</label>";
+								html+="</div>";
+								html+="</div>";
+								html+="<div class='col-md-4'>";
+								html+="<div class='form-group'>";
+								html+="<label><spring:message code='client_ip'/>锛<></label>";
+								html+="<label>"
+								html+=item.srcIpAddress;
+								html+="</label>";
+								html+="</div>";
+								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
+								html+="<div class='col-md-4'>";
+								html+="<div class='form-group'>";
+								html+="<label><spring:message code='port_pattern'/>锛<></label>";
+								html+="<label>"
+								if(item.portPattern==1){
+									html+="port"
+								}
+								if(item.portPattern==2){
+									html+="<spring:message code='port_mask'/>"
+								}
+								html+="</label>";
+								html+="</div>";
+								html+="</div>";
+								html+="<div class='col-md-4'>";
+								html+="<div class='form-group'>";
+								html+="<label><spring:message code='client_port'/>锛<></label>";
+								html+="<label>"
+								html+=item.srcPort;
+								html+="</label>";
+								html+="</div>";
+								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
+								html+="<div class='col-md-4'>";
+								html+="<div class='form-group'>";
+								html+="<label><spring:message code='server_ip'/>锛<></label>";
+								html+="<label>"
+								html+=item.destIpAddress;
+								html+="</label>";
+								html+="</div>";
+								html+="</div>";
+								html+="<div class='col-md-4'>";
+								html+="<div class='form-group'>";
+								html+="<label><spring:message code='server_port'/>锛<></label>";
+								html+="<label>"
+								html+=item.destPort;
+								html+="</label>";
+								html+="</div>";
+								html+="</div>";
+								html+="</div>";
+								html+="<div class='row'>";
+								html+="<div class='col-md-4'>";
+								html+="<div class='form-group'>";
+								html+="<label><spring:message code='direction'/>锛<></label>";
+								html+="<label>"
+								if(item.direction==0){
+									html+="<spring:message code='twoway'/>"
+								}
+								if(item.direction==1){
+									html+="<spring:message code='oneway'/>"
+								}
+								if(item.direction==2){
+									html+="<spring:message code='egress'/>"
+								}
+								html+="</label>";
+								html+="</div>";
+								html+="</div>";
+								html+="<div class='col-md-4'>";
+								html+="<div class='form-group'>";
+								html+="<label><spring:message code='protocol'/>锛<></label>";
+								html+="<label>"
+								if(item.protocol==6){
+									html+="TCP"
+								}
+								if(item.protocol==17){
+									html+="UDP"
+								}
+								if(item.protocol==0){
+									html+="<spring:message code='arbitrary'/>"
 								}
 								html+="</label>";
 								html+="</div>";
 								html+="</div>";
 								html+="</div>";
-								if(item.isHexbin==0){
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_hex'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='not_hex'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_case_insenstive'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='case_insenstive'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-								}
-								if(item.isHexbin==1){
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_hex'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='hex'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_case_insenstive'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='case_insenstive'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-								}
-								if(item.isHexbin==2){
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_hex'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='not_hex'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-									html+="<div class='row'>";
-									html+="<div class='col-md-4'>";
-									html+="<div class='form-group'>";
-									html+="<label><spring:message code='is_case_insenstive'/>：</label>";
-									html+="<label>"
-									html+="<spring:message code='case_senstive'/>"
-									html+="</label>";
-									html+="</div>";
-									html+="</div>";
-									html+="</div>";
-								}
 								/* if(index < (data.ip.length-1) && index != 0){
-									alert("下一行");
+									alert("涓嬩竴琛<EFBFBD>");
 								} 
 								html+="<h5 class='page-header'></h5>";*/
 							})
 							html+="</div>";
-						} 
+							
+						}
 							
 						voipIpCfgTab=voipIpCfgTab+html;
 						voipIpCfgTab+="</td>";
 						voipIpCfgTab+="</tr>";
 						$("#"+openId).parent().parent().after(voipIpCfgTab);
-						if(hasSubscribe && ! hasAccount){
-							switchInfo("account",index);
+						if(hasSubscribe && ! hasIp){
+							switchInfo("ip",index);
 						}
-						if(hasAccount && ! hasSubscribe){
+						if(hasIp && ! hasSubscribe){
 							switchInfo("subscribe",index);
 						}
 					}
@@ -375,30 +390,28 @@
 	}); 
 	
 	function switchInfo(flag,index){
-		
-		if("account" ==flag){
-			//关闭account信息
-			$("#accountInfo"+index).hide();
-			$("#downAccount"+index).hide();
-			$("#accountTitle"+index).removeClass("badge-info");
+			//鍏抽棴ip淇℃伅
+		if("ip" ==flag){
+			$("#ipInfo"+index).hide();
+			$("#downIp"+index).hide();
+			$("#ipTitle"+index).removeClass("badge-info");
 			$("#subscribeInfo"+index).show();
 			$("#subscribeDown"+index).show();
-			$("#accountUp"+index).show();
-			$("#accountDown"+index).hide();
 			$("#subscribeUp"+index).hide();
+			$("#ipUp"+index).show();
+			$("#ipDown"+index).hide();
 			$("#subscribeTitle"+index).addClass("badge-info");
-			
 		}else{
-			//关闭subscribe信息
+		//鍏抽棴subscribe淇℃伅
 			$("#subscribeInfo"+index).hide();
 			$("#downsubscribe"+index).hide();
 			$("#subscribeTitle"+index).removeClass("badge-info");
-			$("#accountInfo"+index).show();
-			$("#accountDown"+index).show();
+			$("#ipInfo"+index).show();
+			$("#ipDown"+index).show();
 			$("#subscribeUp"+index).show();
 			$("#subscribeDown"+index).hide();
-			$("#accountUp"+index).hide();
-			$("#accountTitle"+index).addClass("badge-info");
+			$("#ipUp"+index).hide();
+			$("#ipTitle"+index).addClass("badge-info");
 		}
 		
 		
@@ -410,32 +423,32 @@
 
 <div class="page-content">
 	<div class="theme-panel hidden-xs hidden-sm">
-		<shiro:hasPermission name="avVoipAccount:config">
+		<shiro:hasPermission name="avVoipIp:config">
 		<button type="button" class="btn btn-primary"
-			onClick="javascript:window.location='${ctx}/ntc/av/voipAccountForm?functionId=${cfg.functionId}'">
+			onClick="javascript:window.location='${ctx}/ntc/av/voipForm?functionId=${cfg.functionId}'">
 		<i class="fa fa-plus"></i>
 		<spring:message code="add"></spring:message></button>
 		</shiro:hasPermission>
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="av_voip_account_control"/>
+		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/av/voipAccountList?functionId=${cfg.functionId}" method="post" class="form-search">
+						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/ntc/av/voipList?functionId=${cfg.functionId}" method="post" class="form-search">
 							<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
 							<input id="audit" name="audit" type="hidden" value="${audit}"/>
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
 						callback="page();" />
-							<!-- 筛选按钮展开状态-->
+							<!-- 绛涢<EFBFBD>夋寜閽睍寮<EFBFBD>鐘舵<EFBFBD><EFBFBD>-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
-							<!-- 搜索内容与操作按钮栏 -->
+							<!-- 鎼滅储鍐呭涓庢搷浣滄寜閽爮 -->
 							<div class="col-md-12">
 								<div class="pull-left">
 									<c:set var="state"><spring:message code='state'/></c:set>
@@ -455,7 +468,8 @@
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
 												<form:option value="compileId"><spring:message code="cfg_id"/></form:option>
-												<form:option value="voipAccount.cfgKeywords"><spring:message code="account"/></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="action"><spring:message code="action"></spring:message></form:option>
 												<form:option value="ntcSubscribeIdCfg.cfgKeywords"><spring:message code="NTC_SUBSCRIBE_ID"/></form:option>
 												<form:option value="isValid"><spring:message code="is_valid"></spring:message></form:option>
@@ -486,21 +500,21 @@
 	                                 <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="avVoipAccount:config">
-							 			<sys:delRow url="${ctx}/ntc/av/voipAccountForm" id="contentTable" label="update"></sys:delRow>
-                                        <sys:delRow url="${ctx}/ntc/av/updateAvVoipAccountValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
+							 		<shiro:hasPermission name="avVoipIp:config">
+							 			<sys:delRow url="${ctx}/ntc/av/voipForm" id="contentTable" label="update"></sys:delRow>
+                                        <sys:delRow url="${ctx}/ntc/av/updateAvVoipValid?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow>
                                     </shiro:hasPermission>
                                     <%-- <sys:delRow url="${ctx}/ntc/av/voipExport?functionId=${cfg.functionId }" id="contentTable" label="export" maxRow="${page.maxExportSize }"></sys:delRow> --%>
-                               		<shiro:hasPermission name="avVoipAccount:confirm">
+                               		<shiro:hasPermission name="avVoipIp: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/av/auditAvVoipAccount?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
-												<li><sys:delRow url="${ctx}/ntc/av/auditAvVoipAccount?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
-												<li><sys:delRow url="${ctx}/ntc/av/auditAvVoipAccount?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>            
+	                                            <li><sys:delRow url="${ctx}/ntc/av/auditAvVoip?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/ntc/av/auditAvVoip?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
+												<li><sys:delRow url="${ctx}/ntc/av/auditAvVoip?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>            
 				                            </ul>
 				                         </div>
                                     </shiro:hasPermission>
@@ -510,9 +524,9 @@
                                      </a>
                                  </div>
 							</div>
-							<!-- /搜索内容与操作按钮栏 -->
+							<!-- /鎼滅储鍐呭涓庢搷浣滄寜閽爮 -->
 							
-							<!-- 筛选搜索内容栏默认隐藏-->
+							<!-- 绛涢<EFBFBD>夋悳绱㈠唴瀹规爮榛樿闅愯棌-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
 								
@@ -579,7 +593,7 @@
 								<div class="row">
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="config_time"/>：</label>
+											<label><spring:message code="config_time"/>锛<EFBFBD></label>
 											<input name="search_create_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
 											value="<fmt:formatDate value='${cfg.search_create_time_start}' pattern='yyyy-MM-dd HH:mm:ss'/>" onClick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
@@ -596,7 +610,7 @@
 									
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="edit_time"/>：</label>
+											<label><spring:message code="edit_time"/>锛<EFBFBD></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});"/>
 										
@@ -614,7 +628,7 @@
 									
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="audit_time"/>：</label>
+											<label><spring:message code="audit_time"/>锛<EFBFBD></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});"/>
 										
@@ -634,11 +648,11 @@
 							
 							</div> 
 							
-							<!-- /筛选搜索内容栏    结束-->
+							<!-- /绛涢<EFBFBD>夋悳绱㈠唴瀹规爮    缁撴潫-->
 						</form:form>
 					</div>
-					<sys:message content="${message}" />
 					<div class="table-responsive">
+					<sys:message content="${message}" />
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
 								<tr>
@@ -667,7 +681,7 @@
 								<c:forEach items="${page.list }" var="indexCfg" varStatus="status" step="1">
 								<tr>
 									<td>
-									<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
+									<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> 鈻<EFBFBD> </span><span  style="display: none" id="close${status.index}" > 鈻<EFBFBD> </span>
 									<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" compileId="${indexCfg.compileId}" value="${indexCfg.isAudit}">
 									</td>
 								    <td>${indexCfg.compileId }</td>

src/main/webapp/WEB-INF/views/cfg/av/voip/voipSubList.jsp

@@ -0,0 +1,331 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<script src="${pageContext.request.contextPath}/static/global/scripts/app.min.js" type="text/javascript"></script>
+<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.voipIps}" 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 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 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 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 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>
+			</div>
+			</c:if>
+			</c:forEach>
+	</c:if>
+	<c:if test="${region[0] eq 2 }">
+		<c:forEach items="${_cfg.voipAccounts}" var="cfg">
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
+					<div class="row">
+						<div class="col-md-8">
+							<div class="form-group">
+								<label><spring:message code='keywords' />: 
+									${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>
+					<c:if test="${cfg.isHexbin==0 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="not_hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_insenstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<c:if test="${cfg.isHexbin==1 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_insenstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<c:if test="${cfg.isHexbin==2 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="not_hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_senstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+				</div>
+			</c:if>
+		</c:forEach>
+		<c:forEach items="${_cfg.ntcSubscribeIdCfgList}" var="cfg">
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content content${region[0]}" name="subCfg${index}">
+					<div class="row">
+						<div class="col-md-8">
+							<div class="form-group">
+								<label><spring:message code='keywords' />: 
+									${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>
+					<c:if test="${cfg.isHexbin==0 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="not_hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_insenstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<c:if test="${cfg.isHexbin==1 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_insenstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+					<c:if test="${cfg.isHexbin==2 }">
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_hex"/>:</label>
+									<label>
+										<spring:message code="not_hex"/>
+									</label>
+								</div>
+							</div>
+						</div>
+						<div class="row">
+							<div class="col-md-4">
+								<div class="form-group">
+									<label><spring:message code="is_case_insenstive"/>:</label>
+									<label>
+										<spring:message code="case_senstive"/>
+									</label>
+								</div>
+							</div>
+						</div>
+					</c:if>
+				</div>
+			</c:if>
+		</c:forEach>
+	</c:if>
+</c:forEach>
+</html>

src/main/webapp/WEB-INF/views/cfg/basicprotocol/form.jsp

@@ -131,8 +131,8 @@ var delContent = function(contentClassName, addBtnClassName) {
 <span id="keywordError" style="display:none"><spring:message code="required"></spring:message></span>
 	<span id="tagsinputTip" style="display:none"><spring:message code="multiple_keywords_tip"></spring:message></span>
 <div class="page-content">
-	<h3 class="page-title">
-		<spring:message code="basic_protocol"></spring:message>
+ 	<h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
 	</h3>
 	<div class="row">
 		<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/basicprotocol/list.jsp

@@ -105,14 +105,14 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="basic_protocol"></spring:message>
+		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
 			<div class="portlet">
 				<div class="portlet-body">
 					<div class="row" >
-						<sys:message content="${message}"/>
+						
 						<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/basicprotocol/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}"/>
@@ -336,6 +336,7 @@
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
 					</div>
+					<sys:message content="${message}"/>
 					<div class="table-responsive">
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
 							<thead>
@@ -470,7 +471,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
+									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
 								    <td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/common/domainForm.jsp

@@ -56,8 +56,8 @@
 	</c:forEach>
 	<div class="page-content">
 
-		<h3 class="page-title">
-			<spring:message code="${cfgName}"></spring:message>
+ 		<h3 class="page-title">
+			<spring:message code="${_cfg.menuNameCode }"></spring:message>
 		</h3>
 
 		<div class="row">

src/main/webapp/WEB-INF/views/cfg/common/domainList.jsp

@@ -66,8 +66,8 @@
 	</div>
 
 	<h3 class="page-title">
-		<spring:message code="${cfgName}"></spring:message>
-	</h3>
+			<spring:message code="${cfg.menuNameCode }"></spring:message>
+		</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
 			<div class="portlet">

src/main/webapp/WEB-INF/views/cfg/common/ipForm.jsp

@@ -280,8 +280,8 @@ $(function(){
 </head>
 <body>
 <div class="page-content">
-	<h3 class="page-title">
-		<spring:message code="${cfgName}"></spring:message>
+ 	<h3 class="page-title">
+		<spring:message code="${_cfg.menuNameCode }"></spring:message>
 	</h3>
 	<div class="row">
 		<div class="col-md-12">

src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp

@@ -117,7 +117,7 @@
 		</shiro:hasPermission>
 	</div>
 	<h3 class="page-title">
-		<spring:message code="${cfgName}"></spring:message>
+		<spring:message code="${cfg.menuNameCode }"></spring:message>
 	</h3>
 	<h5 class="page-header"></h5>
 		<div class="col-md-12">
@@ -492,7 +492,7 @@
 									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'cancel_approved'}"><span data-audit="cancel" class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:if>
 							            </c:forEach>
 									</td>
-									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp

@@ -32,9 +32,9 @@ $(function(){
 
 <div class="page-content">
 
-	<h3 class="page-title">
+	<%-- <h3 class="page-title">
 		<spring:message code="target_ip_protect"></spring:message>
-	</h3>
+	</h3> --%>
 	
 	<div class="row">
 		<div class="col-md-12">