diff --git a/src/main/java/com/nis/web/controller/basics/CommonGroupManageController.java b/src/main/java/com/nis/web/controller/basics/CommonGroupManageController.java
index 9ae4625d0..a74335615 100644
--- a/src/main/java/com/nis/web/controller/basics/CommonGroupManageController.java
+++ b/src/main/java/com/nis/web/controller/basics/CommonGroupManageController.java
@@ -34,7 +34,7 @@ public class CommonGroupManageController extends BaseController {
 	@Autowired
 	private CommonGroupManageService commonGroupManageService;
 	
-	@RequestMapping(value = {"list", ""})
+	@RequestMapping(value = {"list"})
 	public String policyGroupList(CommonGroupInfo cfg, Model model, HttpServletRequest request, HttpServletResponse response) {
 		if(cfg == null)cfg=new CommonGroupInfo();
 		Page<CommonGroupInfo> pageCondition = new Page<CommonGroupInfo>(request, response,"r");
@@ -59,7 +59,6 @@ public class CommonGroupManageController extends BaseController {
 	@RequestMapping(value = "saveOrUpdate")
 	public String saveOrUpdate(CommonGroupInfo cfg, Model model, RedirectAttributes redirectAttributes,
 			String itType,Integer groupType,HttpServletRequest request) {
-		
 		try {
 			commonGroupManageService.saveOrUpdate(cfg);
 			addMessage(redirectAttributes,"success","save_success");
@@ -68,10 +67,7 @@ public class CommonGroupManageController extends BaseController {
 			addMessage(redirectAttributes,"error","save_failed");
 			LogUtils.saveLog(request, null, e, null);
 		}
-		
 		return "redirect:" + adminPath + "/basics/commonGroup/list";
-		
-		
 	}
 	
 	@RequestMapping(value={"delete"})
@@ -93,62 +89,63 @@ public class CommonGroupManageController extends BaseController {
 		return commonGroupManageService.checkIsIssued(groupIds);
 	}
 	
-	//Group配置导出
-		@RequestMapping(value = "exportGroup")
-		public void exportGroup(Model model,HttpServletRequest  request,HttpServletResponse response,
-				@ModelAttribute("cfg")CommonGroupInfo entity,String ids,RedirectAttributes redirectAttributes){
-			try {
-				//export data info
-				entity.setMenuNameCode("common_group_manage");
-				List<String> titleList=new ArrayList<String>();
-				Map<String, Class<?>> classMap=new HashMap<String, Class<?>>();
-				Map<String, List> dataMap=new HashMap<String, List>();
-				Map<String, String> noExportMap=new HashMap<String, String>();
-				List<CommonGroupInfo> list = new ArrayList<CommonGroupInfo>();
-				if (!StringUtil.isEmpty(ids)) {
-					list = commonGroupManageService.findGroupInfoList(ids);
-				} else {
-					Page<CommonGroupInfo> pageInfo=new Page<CommonGroupInfo>(request, response,"r");
-					pageInfo.setPageNo(1);
-					pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
-					Page page = commonGroupManageService.findCommonGroupInfoList(pageInfo,entity);
-					list=page.getList();
-				}
-
-					titleList.add(entity.getMenuNameCode());
-					classMap.put(entity.getMenuNameCode(), CommonGroupInfo.class);
-					String cfgIndexInfoNoExport=",config_describe,cfg_id,block_type,do_log,action,valid_identifier,is_audit"
-							+ ",auditor,audit_time,letter,whether_area_block,classification,attribute,label"
-							+",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,";
-					// 时间过滤
-					if (entity.getSearch_create_time_start() == null ) {
-						cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport;
-					}
-					if (entity.getSearch_edit_time_start() == null) {
-						cfgIndexInfoNoExport = ",edit_time" + cfgIndexInfoNoExport;
-					}
-					
-					if (!StringUtil.isEmpty(entity.gethColumns())) {
-						cfgIndexInfoNoExport = "," + entity.gethColumns() + "," + cfgIndexInfoNoExport;
-					}
-					noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
-					dataMap.put(entity.getMenuNameCode(), list);
-					String timeRange = initTimeMap(entity);
-					noExportMap.put("timeRange", timeRange);
-					
-					if ("csv".equals(entity.getExType())) {
-						this._exportCsv(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList,
-								classMap, dataMap, noExportMap);
-					} else {
-						this._export(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList,
-								classMap, dataMap, noExportMap);
-					}
-			} catch (Exception e) {
-				logger.error("Group export failed",e);
-				addMessage(redirectAttributes,"error","export_failed");
-				LogUtils.saveLog(request, null, e, null);
+	// 数据导出
+	@RequestMapping(value = "exportGroup")
+	public void exportGroup(Model model,@ModelAttribute("cfg")CommonGroupInfo entity,String ids,RedirectAttributes redirectAttributes,
+			HttpServletRequest  request,HttpServletResponse response){
+		try {
+			entity.setMenuNameCode("common_group_manage");
+			List<String> titleList=new ArrayList<String>();
+			Map<String, Class<?>> classMap=new HashMap<String, Class<?>>();
+			Map<String, List> dataMap=new HashMap<String, List>();
+			Map<String, String> noExportMap=new HashMap<String, String>();
+			List<CommonGroupInfo> list = new ArrayList<CommonGroupInfo>();
+			if (!StringUtil.isEmpty(ids)) {
+				list = commonGroupManageService.findGroupInfoList(ids);
+			} else {
+				Page<CommonGroupInfo> pageInfo=new Page<CommonGroupInfo>(request, response,"r");
+				pageInfo.setPageNo(1);
+				pageInfo.setPageSize(Constants.MAX_EXPORT_SIZE);
+				Page page = commonGroupManageService.findCommonGroupInfoList(pageInfo,entity);
+				list=page.getList();
 			}
-			//return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
+
+			titleList.add(entity.getMenuNameCode());
+			classMap.put(entity.getMenuNameCode(), CommonGroupInfo.class);
+			String cfgIndexInfoNoExport=",config_describe,cfg_id,block_type,do_log,action,valid_identifier,is_audit"
+					+ ",auditor,audit_time,letter,whether_area_block,classification,attribute,label"
+					+",userregion1,userregion2,userregion3,userregion4,userregion5,ir_type,";
+			// 时间过滤
+			if (entity.getSearch_create_time_start() == null ) {
+				cfgIndexInfoNoExport = ",config_time" + cfgIndexInfoNoExport;
+			}
+			if (entity.getSearch_edit_time_start() == null) {
+				cfgIndexInfoNoExport = ",edit_time" + cfgIndexInfoNoExport;
+			}
+			
+			if (!StringUtil.isEmpty(entity.gethColumns())) {
+				cfgIndexInfoNoExport = "," + entity.gethColumns() + "," + cfgIndexInfoNoExport;
+			}
+			noExportMap.put(entity.getMenuNameCode(),cfgIndexInfoNoExport);
+			dataMap.put(entity.getMenuNameCode(), list);
+			String timeRange = initTimeMap(entity);
+			noExportMap.put("timeRange", timeRange);
+			
+			if ("csv".equals(entity.getExType())) {
+				this._exportCsv(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList,
+						classMap, dataMap, noExportMap);
+			} else {
+				this._export(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList,
+						classMap, dataMap, noExportMap);
+			}
+			
+		} catch (Exception e) {
+			logger.error("Group export failed",e);
+			addMessage(redirectAttributes,"error","export_failed");
+			LogUtils.saveLog(request, null, e, null);
+			
 		}
+		
+	}
 	
 }
diff --git a/src/main/java/com/nis/web/controller/basics/IpCommGroupController.java b/src/main/java/com/nis/web/controller/basics/IpCommGroupController.java
index 43aa1d9b5..ae47be7bb 100644
--- a/src/main/java/com/nis/web/controller/basics/IpCommGroupController.java
+++ b/src/main/java/com/nis/web/controller/basics/IpCommGroupController.java
@@ -10,7 +10,6 @@ import java.util.concurrent.BlockingQueue;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jets3t.service.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +19,6 @@ import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
@@ -30,12 +28,10 @@ import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.basics.CommonGroupInfo;
 import com.nis.domain.basics.IpCommCfg;
-import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.IpPortCfg;
 import com.nis.domain.configuration.template.IpCommCfgTemplate;
-import com.nis.domain.specific.ConfigGroupInfo;
 import com.nis.exceptions.MaatConvertException;
 import com.nis.util.Constants;
 import com.nis.util.DictUtils;
@@ -70,7 +66,6 @@ public class IpCommGroupController extends BaseController {
     @RequestMapping(value = { "/addForm" })
     public String addForm(Model model, @ModelAttribute("cfg") CfgIndexInfo cfg, RedirectAttributes redirectAttributes,
     		HttpServletRequest request, HttpServletResponse response) {
-    	// IP Group Tyep为5
         cfg.setGroupType(5);
         initFormCondition(model, cfg);
         
@@ -102,10 +97,10 @@ public class IpCommGroupController extends BaseController {
     public String updateForm(Model model, @ModelAttribute("cfg") IpCommCfg cfg, RedirectAttributes redirectAttributes, String ids,
     		HttpServletRequest request, HttpServletResponse response) {
         cfg = ipCommGroupCfgService.get(Long.parseLong(ids));
-        // initUpdateFormCondition(model, cfg);
         cfg.setGroupType(5);
+        
         initUpdateFormCondition(model, cfg);
-        List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(5);
+        List<CommonGroupInfo> groupInfos = commonGroupManageService.findCommonGroupInfosByType(5);
         model.addAttribute("policyGroupInfos", groupInfos);
         model.addAttribute("_cfg", cfg);
         return "/basics/ipCommGroupFormUpdate";
@@ -113,8 +108,8 @@ public class IpCommGroupController extends BaseController {
 
     @RequestMapping(value = { "/update" })
     @RequiresPermissions(value = { "ip:common:config" })
-    public String update(Model model, HttpServletRequest request, HttpServletResponse response,
-                         @ModelAttribute("cfg") IpCommCfg cfg, RedirectAttributes redirectAttributes) {
+    public String update(Model model, @ModelAttribute("cfg") IpCommCfg cfg, RedirectAttributes redirectAttributes,
+    		HttpServletRequest request, HttpServletResponse response) {
         try {
             ipCommGroupCfgService.update(cfg);
             addMessage(redirectAttributes, "success", "save_success");
@@ -126,47 +121,6 @@ public class IpCommGroupController extends BaseController {
         return "redirect:" + adminPath + "/basics/ip/list?functionId=" + cfg.getFunctionId();
     }
 
-//	@RequestMapping(value = { "/audit" })
-//	@RequiresPermissions(value = { "ip:common:config" })
-//	public String audit(Model model, @ModelAttribute("cfg") IpCommCfg cfg, Integer isAudit, Integer isValid,
-//			String ids, Integer functionId, HttpServletRequest request, HttpServletResponse response,
-//			RedirectAttributes redirectAttributes) {
-//		// 选中配置审核
-//		if (!StringUtil.isEmpty(ids)) {
-//			List<IpCommCfg> ipGroupCfgs = ipCommGroupCfgService.getByIds(ids);
-//			List<IpCommCfg> temp = Lists.newArrayList();
-//			try {
-//				ipCommGroupCfgService.audit(ipGroupCfgs, isAudit, isValid);
-//			} catch (Exception e) {
-//				logger.error("审核失败", e);
-//				addMessage(redirectAttributes, "error", "audit_failed");
-//			} finally {
-//				temp.clear();
-//			}
-//			return "redirect:" + adminPath + "/basics/ip/list?functionId=" + cfg.getFunctionId();
-//		} else {// 全部审核
-//				// 条件下所有配置审核
-//			Page<IpCommCfg> searchPage = new Page<IpCommCfg>(request, response, "a");
-//			Page<IpCommCfg> auditPage = new Page<IpCommCfg>(request, response, "a");
-//			BeanUtils.copyProperties(searchPage, auditPage);
-//
-//			try {
-//				auditAll(auditPage, isValid, cfg);
-//				addMessage(redirectAttributes, "success", "audit_success");
-//			} catch (Exception e) {
-//				logger.error("配置下发失败：", e);
-//				if (e instanceof MaatConvertException) {
-//					addMessage(redirectAttributes, "error", "request_service_failed");
-//				} else {
-//					addMessage(redirectAttributes, "error", "audit_failed");
-//				}
-//
-//			}
-//
-//			return list(model, request, response, cfg);
-//		}
-//	}
-
     @RequestMapping(value = { "/delete" })
     @RequiresPermissions(value = { "ip:common:config" })
     public String delete(Integer isValid, String ids, Integer functionId, RedirectAttributes redirectAttributes) {
@@ -185,12 +139,11 @@ public class IpCommGroupController extends BaseController {
         return "redirect:" + adminPath + "/basics/ip/list?functionId=" + functionId;
     }
 
-    // ipComm配置导出
+    // 数据导出
     @RequestMapping(value = "/exportIpComm")
-    public void exportIpCommonCfg(Model model, HttpServletRequest request, HttpServletResponse response,
-                                  @ModelAttribute("cfg") IpCommCfg entity, String ids, RedirectAttributes redirectAttributes) {
+    public void exportIpCommonCfg(Model model, @ModelAttribute("cfg") IpCommCfg entity, String ids, RedirectAttributes redirectAttributes,
+    		HttpServletRequest request, HttpServletResponse response) {
         try {
-            // export data info
             List<String> titleList = new ArrayList<String>();
             Map<String, Class<?>> classMap = new HashMap<String, Class<?>>();
             Map<String, List> dataMap = new HashMap<String, List>();
@@ -205,7 +158,6 @@ public class IpCommGroupController extends BaseController {
                 Page<IpCommCfg> page = ipCommGroupCfgService.findPage(pageInfo, entity);
                 list = page.getList();
             }
-            //
             titleList.add(entity.getMenuNameCode());
             classMap.put(entity.getMenuNameCode(), IpPortCfg.class);
             String cfgIndexInfoNoExport = ",block_type,do_log,action"
@@ -237,139 +189,15 @@ public class IpCommGroupController extends BaseController {
                 this._export(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList,
                         classMap, dataMap, noExportMap);
             }
+            
         } catch (Exception e) {
             logger.error("IpCommGroupCfg export failed", e);
             addMessage(redirectAttributes, "error", "export_failed");
+            
         }
-        // return "redirect:" + adminPath
-        // +"/ntc/iplist/list?functionId="+entity.getFunctionId();
+        
     }
 
-    /**
-     * 批量审核
-     *
-     * @param isAudit
-     * @param isValid
-     * @param ids
-     * @param functionId
-     * @param redirectAttributes
-     * @return
-     */
-//	@Override
-//	public void auditAll(Page page, Integer auditType, Object entity) throws Exception {
-//		long start = System.currentTimeMillis();
-//		page.setOrderBy("");
-//		page.setPageSize(Constants.MAAT_JSON_SEND_SIZE);
-//		page.setPageNo(1);
-//		page.setLastPage(false);
-//		// 携带审核状态信息的BaseCfg
-//		BaseCfg auditBatchCfg = new BaseCfg();
-//		// 携带审核条件的BaseCfg
-//		IpCommCfg searchIpCommGroupCfg = new IpCommCfg();
-//		BeanUtils.copyProperties(entity, auditBatchCfg);
-//		BeanUtils.copyProperties(entity, searchIpCommGroupCfg);
-//
-//		auditType = (Integer) Reflections.invokeGetter(entity, "isAudit");
-//
-//		// 全部审核通过，只查询当前条件下的所有未审核的配置 -批量审核通过/不通过
-//		if (auditType.equals(1) || auditType.equals(2)) {
-//
-//			searchIpCommGroupCfg.setIsValid(0);
-//			searchIpCommGroupCfg.setIsAudit(0);
-//
-//			if (auditType.equals(1)) {
-//				auditBatchCfg.setIsAudit(1);
-//				auditBatchCfg.setIsValid(1);
-//			} else {
-//				auditBatchCfg.setIsAudit(2);
-//				auditBatchCfg.setIsValid(0);
-//			}
-//			auditBatchCfg.setAuditTime(new Date());
-//			auditBatchCfg.setAuditorId(UserUtils.getUser().getId());
-//		} else {
-//			// 全部取消通过，只查询当前条件下的所有审核通过的配置
-//			searchIpCommGroupCfg.setIsValid(1);
-//			searchIpCommGroupCfg.setIsAudit(1);
-//
-//			auditBatchCfg.setIsAudit(3);
-//			auditBatchCfg.setIsValid(0);
-//			auditBatchCfg.setAuditTime(new Date());
-//			auditBatchCfg.setAuditorId(UserUtils.getUser().getId());
-//		}
-//
-//		ServiceConfigTemplateUtil serviceTemplate = new ServiceConfigTemplateUtil();
-//		Integer functionId = 0;
-//		if (auditBatchCfg != null && !StringUtil.isEmpty(auditBatchCfg.getFunctionId())) {
-//			functionId = auditBatchCfg.getFunctionId();
-//		}
-//		List<Map<String, Object>> serviceList = serviceTemplate.getServiceListByFunctionId(functionId);
-//		for (Map<String, Object> service : serviceList) {
-//			String tableNameXml = service.get("tableName").toString(); // 获取业务主配置表
-//			String serviceTypeXml = service.get("serviceType").toString(); // 业务类型 1maat 2callback
-//			String classNameXml = service.get("className").toString(); // 主配置Java类
-//			String serviceIdXml = service.get("id").toString(); // service字典表 service_id字段
-//			auditBatchCfg.setServiceId(Integer.valueOf(serviceIdXml));
-//			auditBatchCfg.setTableName(tableNameXml);
-//			searchIpCommGroupCfg.setServiceId(Integer.valueOf(serviceIdXml));
-//			searchIpCommGroupCfg.setTableName(tableNameXml);
-//
-//			if ("1".equals(serviceTypeXml)) {// maat类配置
-//				// 存放域配置类型 及 对应表名
-//				List<Map<String, Object>> cfgList = (List<Map<String, Object>>) service.get("cfgList");
-//				List<Map<String, Object>> userRegionList = (List<Map<String, Object>>) service.get("userRegionList");
-//				int cfgType = Integer.parseInt(service.get("cfgType").toString());
-//				if (auditBatchCfg.getIsAudit() == 1) {
-//					boolean hasData = true;
-//
-//					while (hasData) {
-//						page.setPageNo(1);
-//						page.setLastPage(false);
-//						List list = ipCommGroupCfgService.findPage(page, searchIpCommGroupCfg).getList();
-//						if(CollectionUtils.isNotEmpty(list)){
-//							Map<Integer,List> groupIdMap=new HashMap();
-//							// 配置生效处理
-//							if(auditBatchCfg.getIsAudit().equals(1)) {
-//								hasData=commonPolicyService.auditReuseCommonConfigData(page, auditBatchCfg,groupIdMap,hasData);
-//								Map<Integer,List> groupIpMap=new HashMap();
-//								if(CollectionUtils.isNotEmpty(list)) {
-//									for (IpCommCfg obj : (List<IpCommCfg>)list) {
-//										BaseCfg baseCfg=(BaseCfg)obj;
-//										if(!StringUtil.isEmpty(obj.getGroupId())) {
-//											groupIdMap.get(obj.getGroupId()).add(baseCfg);
-//										}else {
-//											List newList=new ArrayList<>();
-//											newList.add(baseCfg);
-//											groupIdMap.put(obj.getGroupId(),newList);
-//										}
-//									}
-//								}
-//
-//							}
-//							if(hasData) {
-//								page.setPageNo(1);
-//								page.setLastPage(false);
-//							}
-//						}else{
-//							hasData = false;
-//						}
-//					}
-//				}
-//			} else {
-//				throw new RuntimeException("wrong service type " + serviceTypeXml);
-//			}
-//		}
-//
-//		// 批量审核通过时，如果没有携带isValid检索条件，返回界面需要将isValid置为null
-//		if (!StringUtil.isEmpty(entity)) {
-//			BaseCfg base = (BaseCfg) entity;
-//			if (!StringUtil.isEmpty(base.getSeltype()) && base.getSeltype().equals("isValid")) {
-//				base.setIsValid(null);
-//				BeanUtils.copyProperties(base, entity);
-//			}
-//		}
-//		long end = System.currentTimeMillis();
-//		logger.warn("配置批量生效/失效耗时：" + (end - start));
-//	}
     @RequestMapping(value = "import", method=RequestMethod.POST)
     public String importIp(HttpServletRequest  request,HttpServletResponse response,RedirectAttributes redirectAttributes,
     		@RequestParam("files") MultipartFile[] files, Integer serviceDictId ,Integer requestId ,String attribute ,String classify
@@ -464,8 +292,9 @@ public class IpCommGroupController extends BaseController {
         logger.warn("import finish,cost:"+(end-start));
         return "redirect:" + adminPath+ importPath;
     }
+    
+    /*@ResponseBody
     @RequestMapping(value="ajaxGetGroups",method=RequestMethod.POST)
-    @ResponseBody
     public Map<Integer,String> ajaxGetGroups(Model model,@RequestParam(required=true,value="groupIds")String groupIds){
         Map<Integer,String> groupIdList=new HashMap<Integer,String>();
         if(StringUtils.isNotBlank(groupIds)) {
@@ -475,5 +304,5 @@ public class IpCommGroupController extends BaseController {
             }
         }
         return groupIdList;
-    }
+    }*/
 }
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/controller/basics/UrlCommGroupController.java b/src/main/java/com/nis/web/controller/basics/UrlCommGroupController.java
index 75b71f145..855d68f0f 100644
--- a/src/main/java/com/nis/web/controller/basics/UrlCommGroupController.java
+++ b/src/main/java/com/nis/web/controller/basics/UrlCommGroupController.java
@@ -8,7 +8,6 @@ import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -41,7 +40,7 @@ public class UrlCommGroupController extends BaseController{
         Page<UrlCommCfg> page = urlCommGroupService.findPage(new Page<UrlCommCfg>(request, response,"r"), entity);
         List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(entity.getFunctionId());
         List<FunctionServiceDict> serviceList = DictUtils.getFunctionServiceDictList(entity.getFunctionId());
-        List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(7);
+        List<CommonGroupInfo> groupInfos = commonGroupManageService.findCommonGroupInfosByType(7);
         
         model.addAttribute("page", page);
         model.addAttribute("regionList", regionList);
@@ -53,14 +52,6 @@ public class UrlCommGroupController extends BaseController{
     @RequestMapping(value = {"/addForm"})
     public String addForm(Model model, @ModelAttribute("cfg")CfgIndexInfo cfg, RedirectAttributes redirectAttributes,
     		HttpServletRequest request, HttpServletResponse response){
-
-//		UrlCommGroupCfg urlCfg = new UrlCommGroupCfg();
-//		urlCfg.setCfgType("NTC_URL_REGION");
-//		cfg.setUrlCommGroupCfg(urlCfg);
-//		List<UrlCommGroupCfg> urlList = new ArrayList<UrlCommGroupCfg>();
-//		urlList.add(urlCfg);
-//		cfg.setUrlCommGroupList(urlList);
-//		initFormCondition(model, entity);
         cfg.setGroupType(11);
         initFormCondition(model,cfg);
         List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(7);
@@ -73,7 +64,6 @@ public class UrlCommGroupController extends BaseController{
     @RequestMapping(value = {"/save"})
     public String save(Model model, @ModelAttribute("cfg")CfgIndexInfo cfg,RedirectAttributes redirectAttributes, 
     		HttpServletRequest request,HttpServletResponse response){
-
         try{
             urlCommGroupService.saveUrlCommGroupCfg(cfg);
         }catch(Exception e){
@@ -93,7 +83,6 @@ public class UrlCommGroupController extends BaseController{
             ,HttpServletResponse response,String ids,@ModelAttribute("cfg")UrlCommCfg cfg
             ,RedirectAttributes redirectAttributes){
         cfg = urlCommGroupService.get(Long.parseLong(ids));
-//		initUpdateFormCondition(model, cfg);
         cfg.setGroupType(11);
         initUpdateFormCondition(model,cfg);
         List<CommonGroupInfo> groupInfos=commonGroupManageService.findCommonGroupInfosByType(7);
@@ -101,6 +90,7 @@ public class UrlCommGroupController extends BaseController{
         model.addAttribute("_cfg", cfg);
         return "/basics/urlCommGroupFormUpdate";
     }
+    
     @RequestMapping(value = {"/update"})
     public String update(Model model,HttpServletRequest request,HttpServletResponse response,@ModelAttribute("cfg")UrlCommCfg cfg,RedirectAttributes redirectAttributes){
         try{
@@ -114,59 +104,6 @@ public class UrlCommGroupController extends BaseController{
         return "redirect:" + adminPath +"/basics/url/list?functionId="+cfg.getFunctionId();
     }
 
-    @RequestMapping(value = {"/audit"})
-    public String audit(Model model,@ModelAttribute("cfg")UrlCommCfg cfg
-            ,Integer isAudit
-            ,Integer isValid
-            ,String ids
-            ,Integer functionId
-            , HttpServletRequest request
-            ,HttpServletResponse response
-            ,RedirectAttributes redirectAttributes) {
-        //选中配置审核
-        if(!StringUtil.isEmpty(ids)) {
-            List<UrlCommCfg> urlGroupCfgs=urlCommGroupService.getByIds(ids);
-//			Map<Long,List<UrlCommGroupCfg>> urlcfgMap=Maps.newHashMap();
-//			for(UrlCommGroupCfg urlCommCfg:urlGroupCfgs) {
-//				urlCommCfg.setIsAudit(isAudit);
-//				urlCommCfg.setIsValid(isValid);
-//				urlCommCfg.setAuditorId(UserUtils.getUser().getId());
-//				urlCommCfg.setAuditTime(new Date());
-//				urlCommCfg.setFunctionId(functionId);
-//				if(urlcfgMap.containsKey(Long.parseLong(urlCommCfg.getUserRegion3()))) {
-//					urlcfgMap.get(Long.parseLong(urlCommCfg.getUserRegion3())).add(urlCommCfg);
-//				}else {
-//					List<UrlCommGroupCfg> _urlCfgs=Lists.newArrayList();
-//					_urlCfgs.add(urlCommCfg);
-//					urlcfgMap.put(Long.parseLong(urlCommCfg.getUserRegion3()), _urlCfgs);
-//				}
-//			}
-            /********************每次下发一个组的region，保证事物********************/
-//			for (Long groupId : urlcfgMap.keySet()) {
-//				try {
-//					urlCommGroupService.audit(urlcfgMap.get(groupId),groupId,isValid);
-//				} catch (Exception e) {
-//					logger.error("配置下发失败：",e);
-//					if(e instanceof MaatConvertException) {
-//						addMessage(redirectAttributes,"error", "request_service_failed");
-//					}else {
-//						addMessage(redirectAttributes,"error", "audit_failed");
-//					}
-//
-//				}
-//			}
-            for (UrlCommCfg urlCommGroup : urlGroupCfgs) {
-                try {
-                    urlCommGroupService.audit(urlCommGroup,isAudit,isValid);
-                } catch (Exception e) {
-                    logger.error("审核失败",e);
-                    addMessage(redirectAttributes,"error","audit_failed");
-                }
-            }
-        }
-        return "redirect:" + adminPath +"/basics/url/list?functionId="+cfg.getFunctionId();
-    }
-
     @RequestMapping(value = {"/delete"})
     public String delete(Integer isValid
             ,String ids,Integer functionId
@@ -185,12 +122,12 @@ public class UrlCommGroupController extends BaseController{
 
         return "redirect:" + adminPath +"/basics/url/list?functionId="+functionId;
     }
-    //urlComm配置导出
+    
+    // 数据导出
     @RequestMapping(value = "/exportUrlComm")
-    public void exportAsnIp(Model model,HttpServletRequest  request,HttpServletResponse response,
+    public void exportUrlComm(Model model,HttpServletRequest  request,HttpServletResponse response,
                             @ModelAttribute("cfg")UrlCommCfg entity,String ids,RedirectAttributes redirectAttributes){
         try {
-            //export data info
             List<String> titleList=new ArrayList<String>();
             Map<String, Class<?>> classMap=new HashMap<String, Class<?>>();
             Map<String, List> dataMap=new HashMap<String, List>();
@@ -205,7 +142,7 @@ public class UrlCommGroupController extends BaseController{
                 Page<UrlCommCfg> page = urlCommGroupService.findPage(pageInfo, entity);
                 list=page.getList();
             }
-//
+
             titleList.add(entity.getMenuNameCode());
             classMap.put(entity.getMenuNameCode(), UrlCommCfg.class);
             String cfgIndexInfoNoExport=",block_type,do_log,action"
@@ -237,10 +174,12 @@ public class UrlCommGroupController extends BaseController{
                 this._export(model, request, response, redirectAttributes, entity.getMenuNameCode(), titleList,
                         classMap, dataMap, noExportMap);
             }
+            
         } catch (Exception e) {
             logger.error("urlGroupConfig export failed",e);
             addMessage(redirectAttributes,"error","export_failed");
+            
         }
-        //return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
+        
     }
 }
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.java b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.java
index e89510da6..a25907fec 100644
--- a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.java
+++ b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.java
@@ -5,7 +5,6 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 import com.nis.domain.basics.CommonGroupInfo;
-import com.nis.domain.basics.PolicyGroupInfo;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.MyBatisDao;
 
@@ -19,17 +18,4 @@ public interface CommonGroupManageDao extends CrudDao<CommonGroupInfo> {
 	
 	List<CommonGroupInfo> findGroupInfoList(@Param("ids")String ids);
 	
-	/*List<PolicyGroupInfo> findPolicyGroupInfos();
-	List<PolicyGroupInfo> findHasIPPolicyGroupInfosByType(int groupType);
-	List<PolicyGroupInfo> findPolicyGroupInfosHasIpRegionByType(int groupType);
-	List<PolicyGroupInfo> findNatPolicyGroups();
-	
-	PolicyGroupInfo getInfoByAsnNo(PolicyGroupInfo policyGroupInfo);
-	List<PolicyGroupInfo> getHasAreaPolicyGroups(int groupType);
-	int insertBatch(List<PolicyGroupInfo> list);
-	
-	Integer getGroupIdByGroupName(String groupName);
-	PolicyGroupInfo getGroupInfo(PolicyGroupInfo policyGroupInfo);
-	
-	*/
 }
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml
index deef9bbfd..e69880749 100644
--- a/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/CommonGroupManageDao.xml
@@ -2,25 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.nis.web.dao.basics.CommonGroupManageDao" >
   
-  <resultMap id="CommonGroupInfoMap" type="com.nis.domain.basics.CommonGroupInfo" >
-    <id column="group_id" property="groupId" jdbcType="INTEGER" />
-    <result column="group_name" property="groupName" jdbcType="VARCHAR" />
-    <result column="group_type" property="groupType" jdbcType="INTEGER" />
-    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
-    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
-    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
-    <result column="creator_id" property="creatorId" jdbcType="INTEGER" />
-    <result column="editor_id" property="editorId" jdbcType="INTEGER" />
-    <result column="service_group_id" property="serviceGroupId" jdbcType="INTEGER" />
-    <result column="description" property="description" jdbcType="VARCHAR" />
-  </resultMap>
+	<resultMap id="CommonGroupInfoMap" type="com.nis.domain.basics.CommonGroupInfo" >
+	    <id column="group_id" property="groupId" jdbcType="INTEGER" />
+	    <result column="group_name" property="groupName" jdbcType="VARCHAR" />
+	    <result column="group_type" property="groupType" jdbcType="INTEGER" />
+	    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+	    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+	    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
+	    <result column="creator_id" property="creatorId" jdbcType="INTEGER" />
+	    <result column="editor_id" property="editorId" jdbcType="INTEGER" />
+	    <result column="service_group_id" property="serviceGroupId" jdbcType="INTEGER" />
+	    <result column="description" property="description" jdbcType="VARCHAR" />
+	</resultMap>
 	<sql id="CommonGroupInfoColumns">
 		r.group_id,r.group_name,r.group_type,r.is_valid,r.create_time,r.edit_time,
 		r.creator_id,r.editor_id,r.service_group_id,r.description
 	</sql>
   
-   <!-- 查出所有 有效数据-->
-      <select id="findCommonGroupInfoList" resultMap="CommonGroupInfoMap">
+	<!-- 查出所有 有效数据-->
+	<select id="findCommonGroupInfoList" resultMap="CommonGroupInfoMap">
 		SELECT
 			<include refid="CommonGroupInfoColumns"/>
 		<trim prefix="," prefixOverrides=",">
@@ -30,7 +30,6 @@
 	    FROM policy_group_info r
 	    left join sys_user s on r.creator_id=s.id
 		left join sys_user e on r.editor_id=e.id
-		
 		<trim prefix="WHERE" prefixOverrides="AND |OR ">
 	    	<if test="page !=null and page.where != null and page.where != ''">
 				 AND ${page.where}
@@ -42,7 +41,7 @@
 	    		AND r.group_type =#{groupType }
 	    	</if>
 	    	<if test="groupType == null">
-	    		AND r.group_type NOT IN(1,2,3,4)
+	    		AND r.group_type IN(5,7,8,9)
 	    	</if>
     		AND r.IS_VALID =1
 	    	<if test="creatorName != null and creatorName != ''">
@@ -62,7 +61,6 @@
 				ORDER BY r.group_id desc
 			</otherwise>
 		</choose>
-		
 	</select>
 	
 	<select id="getById" resultType="com.nis.domain.basics.CommonGroupInfo">
@@ -174,99 +172,4 @@
 			r.group_id IN (${ids})
 	</select>
 	
-   <!-- 查出所有 有效数据-->
-      <!-- <select id="findPolicyGroupInfos" resultMap="PolicyGroupInfoMap">
-		SELECT
-			<include refid="PolicyGroupInfoColumns"/>
-	    FROM policy_group_info r
-	    where r.is_valid=1
-	</select>
-      <select id="findNatPolicyGroups" resultMap="PolicyGroupInfoMap">
-		SELECT
-			<include refid="PolicyGroupInfoColumns"/>
-	    FROM policy_group_info r
-	    where r.is_valid=1 AND r.group_type = 2 OR r.group_type = 3
-	</select>
-      <select id="findHasIPPolicyGroupInfosByType" resultMap="PolicyGroupInfoMap">
-		SELECT
-			<include refid="PolicyGroupInfoColumns"/>
-	    FROM (
-	    SELECT DISTINCT dns_strategy_id FROM dns_ip_cfg WHERE is_valid=1 AND is_audit=1
-		) a
-		LEFT JOIN policy_group_info r ON a.dns_strategy_id=r.group_id
-	    where r.is_valid=1 and r.group_type=#{groupType,jdbcType=INTEGER}
-	</select>
-	
-  
-  
-  <select id="getInfoByAsnNo" resultType="com.nis.domain.basics.PolicyGroupInfo">
-  	SELECT 
-  		<include refid="PolicyGroupInfoColumns"/> 
-  	FROM 
-  		policy_group_info r
-  	<trim prefix="WHERE" prefixOverrides="AND |OR ">
-    	<if test="groupId != null" >
-        	AND group_id =  #{groupId,jdbcType=INTEGER}
-      	</if>
-    	<if test="asnNo != null" >
-        	AND asn_no = #{asnNo,jdbcType=INTEGER}
-      	</if>
-      	<if test="isValid != null" >
-	        AND is_valid = #{isValid,jdbcType=INTEGER}
-	    </if>
-      	<if test="isValid == null" >
-	        AND is_valid != -1
-	    </if>
-    </trim>
-  </select>
-  
-  <select id="getHasAreaPolicyGroups" resultType="com.nis.domain.basics.PolicyGroupInfo">
-  	SELECT
-		<include refid="PolicyGroupInfoColumns"/> 
-	FROM
-		policy_group_info r
-	WHERE
-		r.is_valid = 1 AND
-		r.group_type = #{groupType,jdbcType=INTEGER} AND 
-		r.group_id IN (
-			SELECT ga.group_id FROM group_area_info ga WHERE ga.is_valid != -1
-		)
-  </select>
-  
-  <select id="getGroupIdByGroupName" resultType="java.lang.Integer">
-  	SELECT 
-  		r.group_id 
-  	FROM 
-  		policy_group_info r
-  	WHERE 
-  		r.group_name = #{groupName}
-  </select>
-  
-  <select id="getGroupInfo" resultType="com.nis.domain.basics.PolicyGroupInfo">
-  	SELECT 
-  		<include refid="PolicyGroupInfoColumns"/> 
-  	FROM 
-  		policy_group_info r
-  	<trim prefix="WHERE" prefixOverrides="AND |OR ">
-    	<if test="groupName != null and groupName != ''" >
-        	AND group_name = #{groupName,jdbcType=VARCHAR}
-      	</if>
-      	<if test="groupType != null" >
-        	AND group_type = #{groupType,jdbcType=INTEGER}
-      	</if>
-    	<if test="asnNo != null" >
-        	AND asn_no = #{asnNo,jdbcType=INTEGER}
-      	</if>
-      	<if test="isValid != null" >
-	        AND is_valid = #{isValid,jdbcType=INTEGER}
-	    </if>
-      	<if test="isValid == null" >
-	        AND is_valid != -1
-	    </if>
-    </trim>
-  </select>
-  
-     -->
-  
-  
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/com/nis/web/dao/basics/IpCommGroupCfgDao.xml b/src/main/java/com/nis/web/dao/basics/IpCommGroupCfgDao.xml
index d66e03e25..5a07f931e 100644
--- a/src/main/java/com/nis/web/dao/basics/IpCommGroupCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/IpCommGroupCfgDao.xml
@@ -178,7 +178,9 @@
             <if test="userRegion3 != null">
                 AND r.user_region3 like concat(concat('%',#{userRegion3,jdbcType=VARCHAR}),'%')
             </if>
-
+			<if test="groupId != null">
+                AND r.group_id = #{groupId,jdbcType=INTEGER}
+            </if>
             <!-- 数据范围过滤 -->
             ${sqlMap.dsf}
         </trim>
@@ -309,46 +311,46 @@
     </insert>
     <insert id="insertForBatch" parameterType="com.nis.domain.basics.IpCommCfg" >
     insert into ip_comm_cfg (
-    CFG_DESC,
-    ACTION,
-    IS_VALID,
-    IS_AUDIT,
-    CREATOR_ID,
-    CREATE_TIME,
-    EDITOR_ID,
-    EDIT_TIME,
-    AUDITOR_ID,
-    AUDIT_TIME,
-   	SERVICE_ID,
-   	REQUEST_ID,
-   	REGION_ID,
-   	GROUP_ID,
-   	COMPILE_ID,
-   	IS_AREA_EFFECTIVE,
-   	CLASSIFY,
-    ATTRIBUTE,
-    LABLE,
-    AREA_EFFECTIVE_IDS,
-    FUNCTION_ID,
-    IP_TYPE,
-    SRC_IP_ADDRESS,
-    SRC_IP_PATTERN,
-    DEST_IP_PATTERN,
-    SRC_PORT_PATTERN,
-    DEST_PORT_PATTERN,
-    SRC_PORT,
-    PROTOCOL,
-    PROTOCOL_ID,
-    DIRECTION,
-    DEST_PORT,
-    DEST_IP_ADDRESS,
-    CFG_TYPE,
-    CFG_REGION_CODE,
-    USER_REGION1,
-    USER_REGION2,
-    USER_REGION3,
-    USER_REGION4,
-    USER_REGION5
+	    CFG_DESC,
+	    ACTION,
+	    IS_VALID,
+	    IS_AUDIT,
+	    CREATOR_ID,
+	    CREATE_TIME,
+	    EDITOR_ID,
+	    EDIT_TIME,
+	    AUDITOR_ID,
+	    AUDIT_TIME,
+	   	SERVICE_ID,
+	   	REQUEST_ID,
+	   	REGION_ID,
+	   	GROUP_ID,
+	   	COMPILE_ID,
+	   	IS_AREA_EFFECTIVE,
+	   	CLASSIFY,
+	    ATTRIBUTE,
+	    LABLE,
+	    AREA_EFFECTIVE_IDS,
+	    FUNCTION_ID,
+	    IP_TYPE,
+	    SRC_IP_ADDRESS,
+	    SRC_IP_PATTERN,
+	    DEST_IP_PATTERN,
+	    SRC_PORT_PATTERN,
+	    DEST_PORT_PATTERN,
+	    SRC_PORT,
+	    PROTOCOL,
+	    PROTOCOL_ID,
+	    DIRECTION,
+	    DEST_PORT,
+	    DEST_IP_ADDRESS,
+	    CFG_TYPE,
+	    CFG_REGION_CODE,
+	    USER_REGION1,
+	    USER_REGION2,
+	    USER_REGION3,
+	    USER_REGION4,
+	    USER_REGION5
     )values (
    		#{cfgDesc,jdbcType=VARCHAR},
    		#{action,jdbcType=INTEGER},
@@ -502,10 +504,10 @@
                 <if test="userRegion5 != null and userRegion5 != ''" >
                     USER_REGION5 = #{userRegion5,jdbcType=VARCHAR},
                 </if>
-                <if test="groupId != null and groupId != ''" >
+                <if test="groupId != null" >
                     GROUP_ID = #{groupId,jdbcType=INTEGER},
                 </if>
-                <if test="regionId != null and regionId != ''" >
+                <if test="regionId != null" >
                     REGION_ID = #{regionId,jdbcType=INTEGER},
                 </if>
             </trim>
diff --git a/src/main/java/com/nis/web/dao/basics/UrlCommGroupDao.java b/src/main/java/com/nis/web/dao/basics/UrlCommGroupDao.java
index cbe345e5d..01cbda88b 100644
--- a/src/main/java/com/nis/web/dao/basics/UrlCommGroupDao.java
+++ b/src/main/java/com/nis/web/dao/basics/UrlCommGroupDao.java
@@ -4,7 +4,6 @@ import java.util.List;
 
 import org.apache.ibatis.annotations.Param;
 
-import com.nis.domain.basics.IpCommCfg;
 import com.nis.domain.basics.UrlCommCfg;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.MyBatisDao;
diff --git a/src/main/java/com/nis/web/dao/basics/UrlCommGroupDao.xml b/src/main/java/com/nis/web/dao/basics/UrlCommGroupDao.xml
index 24e45726f..ae33830d2 100644
--- a/src/main/java/com/nis/web/dao/basics/UrlCommGroupDao.xml
+++ b/src/main/java/com/nis/web/dao/basics/UrlCommGroupDao.xml
@@ -29,6 +29,8 @@
         <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
         <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
         <result column="ratelimit" property="ratelimit" jdbcType="VARCHAR" />
+        <result column="region_id" property="regionId" jdbcType="INTEGER" />
+        <result column="group_id" property="groupId" jdbcType="INTEGER" />
         <result column="user_region1" property="userRegion1" jdbcType="VARCHAR" />
         <result column="user_region2" property="userRegion2" jdbcType="VARCHAR" />
         <result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
@@ -43,7 +45,7 @@
         r.create_time,r.editor_id,r.edit_time,r.auditor_id,r.audit_time,r.service_id,
         r.request_id,r.compile_id,r.is_area_effective,r.classify,r.attribute,r.lable,
         r.expr_type,r.match_method,r.is_hexbin,r.area_effective_ids,r.function_id,
-        r.cfg_region_code,r.cfg_type,r.ratelimit,r.user_region1,r.user_region2,
+        r.cfg_region_code,r.cfg_type,r.ratelimit, r.region_id, r.group_id,r.user_region1,r.user_region2,
         r.user_region3,r.user_region4,r.user_region5
 	</sql>
 	
@@ -54,7 +56,7 @@
 	        	,s.name AS creator_name,e.name AS editor_name,u.name AS auditor_name,c.group_name
 	        </trim>
         FROM
-        	http_url_cfg r
+        	url_comm_cfg r
         LEFT JOIN sys_user s ON r.creator_id = s.id
         LEFT JOIN sys_user e ON r.editor_id = e.id
         LEFT JOIN sys_user u ON r.auditor_id = u.id
@@ -132,7 +134,9 @@
             <if test="functionId != null">
                 AND r.FUNCTION_ID=#{functionId,jdbcType=INTEGER}
             </if>
-
+			<if test="groupId != null">
+                AND r.group_id = #{groupId,jdbcType=INTEGER}
+            </if>
             <!-- 数据范围过滤 -->
             ${sqlMap.dsf}
         </trim>
@@ -156,7 +160,7 @@
 				,s.name AS creator_name,e.name AS editor_name,u.name AS auditor_name
 			</trim>
 		FROM
-			http_url_cfg r
+			url_comm_cfg r
 		LEFT JOIN sys_user s ON r.creator_id = s.id
 		LEFT JOIN sys_user e ON r.editor_id = e.id
 		LEFT JOIN sys_user u ON r.auditor_id = u.id
@@ -167,7 +171,7 @@
     	SELECT
 			<include refid="columns"></include>
 		FROM
-			http_url_cfg r
+			url_comm_cfg r
     	where r.CFG_ID =#{cfgId}
 
     </select>
@@ -177,7 +181,7 @@
     	SELECT
 			<include refid="columns"></include>
     	FROM 
-    		http_url_cfg r
+    		url_comm_cfg r
     	WHERE 
     		r.cfg_id = #{ids} AND r.is_valid != -1
     </select>
@@ -186,44 +190,46 @@
     	SELECT
 			<include refid="columns"></include>
     	FROM 
-    		http_url_cfg r
+    		url_comm_cfg r
     	WHERE 
     		r.user_region3 IN(${ids}) AND r.is_valid != -1
     </select>
 
     <insert id="insertUrlCommGroupCfg" parameterType="com.nis.domain.basics.UrlCommCfg">
-    	insert into http_url_cfg (
-	     CFG_DESC,
-	     cfg_keywords,
-	     action,
-	     is_valid,
-	     is_audit,
-	    creator_id,
-	    create_time,
-	    editor_id,
-	    edit_time,
-	    auditor_id,
-	   	audit_time,
-	   	service_id,
-	   	request_id,
-	   	compile_id,
-	   	IS_AREA_EFFECTIVE,
-	   	CLASSIFY,
-	    ATTRIBUTE,
-	    LABLE,
-	    expr_type,
-	    match_method,
-	    is_hexbin,
-	    area_effective_ids,
-	    function_id,
-	    cfg_region_code,
-	    cfg_type,
-	    ratelimit,
-	    user_region1,
-	    user_region2,
-	    user_region3,
-	    user_region4,
-	    user_region5
+    	insert into url_comm_cfg (
+		     CFG_DESC,
+		     cfg_keywords,
+		     action,
+		     is_valid,
+		     is_audit,
+		    creator_id,
+		    create_time,
+		    editor_id,
+		    edit_time,
+		    auditor_id,
+		   	audit_time,
+		   	service_id,
+		   	request_id,
+		   	compile_id,
+		   	IS_AREA_EFFECTIVE,
+		   	CLASSIFY,
+		    ATTRIBUTE,
+		    LABLE,
+		    expr_type,
+		    match_method,
+		    is_hexbin,
+		    area_effective_ids,
+		    function_id,
+		    cfg_region_code,
+		    cfg_type,
+		    ratelimit,
+		    region_id,
+	   		group_id,
+		    user_region1,
+		    user_region2,
+		    user_region3,
+		    user_region4,
+		    user_region5
 	    )values (
 	   		#{cfgDesc,jdbcType=VARCHAR},
 	   		#{cfgKeywords,jdbcType=VARCHAR},
@@ -251,6 +257,8 @@
 	    	#{cfgRegionCode,jdbcType=INTEGER},
 	    	#{cfgType,jdbcType=VARCHAR},
 	    	#{ratelimit,jdbcType=VARCHAR},
+	    	#{regionId,jdbcType=INTEGER},
+    		#{groupId,jdbcType=INTEGER},
 	    	#{userRegion1,jdbcType=VARCHAR},
 	    	#{userRegion2,jdbcType=VARCHAR},
 	    	#{userRegion3,jdbcType=VARCHAR},
@@ -272,7 +280,7 @@
     </update>
 
     <update id="update" parameterType="com.nis.domain.basics.UrlCommCfg" >
-        update http_url_cfg
+        update url_comm_cfg
         <set >
             <trim suffixOverrides=",">
                 <if test="cfgDesc != null and cfgDesc != ''" >
@@ -347,6 +355,9 @@
                 <if test="ratelimit != null and ratelimit != ''" >
                     ratelimit = #{ratelimit,jdbcType=VARCHAR},
                 </if>
+                <if test="groupId != null">
+	                group_id = #{groupId,jdbcType=INTEGER}
+	            </if>
                 <if test="userRegion1 != null and userRegion1 != ''" >
                     user_region1 = #{userRegion1,jdbcType=VARCHAR},
                 </if>
@@ -370,18 +381,18 @@
     </update>
 
     <delete id="delete" parameterType="java.lang.String" >
-    	delete from http_url_cfg where cfg_id in (${ids})
+    	delete from url_comm_cfg where cfg_id in (${ids})
    </delete>
 
     <select id="getByIds" resultMap="urlCommGroupCfgMap">
     	select
     		<include refid="columns"></include>
-    	from http_url_cfg r
+    	from url_comm_cfg r
     	where r.cfg_id in (${ids}) and is_valid !=-1
     </select>
 
     <select id="getGroupIdCount" parameterType="java.lang.String" resultType="java.lang.Integer">
-   		SELECT  COUNT(cfg_id) groupCount from http_url_cfg
+   		SELECT  COUNT(cfg_id) groupCount from url_comm_cfg
    		WHERE user_region3= #{groupId}
    		and is_valid=1
    </select>
diff --git a/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java b/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java
index 83c5349ea..90c7dde1b 100644
--- a/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java
+++ b/src/main/java/com/nis/web/service/basics/CommonGroupManageService.java
@@ -16,15 +16,13 @@ import com.nis.domain.basics.CommonGroupInfo;
 import com.nis.domain.basics.IpCommCfg;
 import com.nis.domain.basics.UrlCommCfg;
 import com.nis.exceptions.MaatConvertException;
+import com.nis.util.ConfigServiceUtil;
 import com.nis.util.StringUtil;
-import com.nis.web.dao.basics.AsnIpCfgDao;
 import com.nis.web.dao.basics.CommonGroupManageDao;
 import com.nis.web.dao.basics.IpCommGroupCfgDao;
 import com.nis.web.dao.basics.UrlCommGroupDao;
-import com.nis.web.dao.specific.ConfigGroupInfoDao;
 import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
-import com.nis.web.service.SpringContextHolder;
 
 @Service
 public class CommonGroupManageService extends BaseService{
@@ -33,17 +31,11 @@ public class CommonGroupManageService extends BaseService{
     private CommonGroupManageDao commonGroupManageDao;
 	
 	@Autowired
-	private ConfigGroupInfoDao configGroupInfoDao;
-	
-	@Autowired
-    private IpCommGroupCfgDao ipCommGroupCfgDao;
+    private IpCommGroupCfgDao ipCommGroupCfgDao; // 校验分组时使用
 	
 	@Autowired
 	private UrlCommGroupDao urlCommGroupDao;
 	 
-	@Autowired
-	private AsnIpCfgDao asnIpCfgDao;
-	
 	public Page<CommonGroupInfo> findCommonGroupInfoList(Page<CommonGroupInfo> page, CommonGroupInfo entity) {
 		entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
 		entity.setPage(page);
@@ -60,52 +52,34 @@ public class CommonGroupManageService extends BaseService{
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public void saveOrUpdate(CommonGroupInfo entity) throws MaatConvertException{
 		entity.setIsValid(1);
-		//新增
-		if(entity.getGroupId()==null){
+		if(entity.getGroupId()==null){ // 新增
 			Date createTime=new Date();
 			entity.setCreatorId(UserUtils.getUser().getId());
 			entity.setCreateTime(createTime);
-			//asn类型从综合服务获取groupId 非ASN组 不对config_group_info表添加数据
-			/*if(4==entity.getGroupType().intValue()) {
-				int serviceGroupId=0;
-				List<Integer> groupIds= ConfigServiceUtil.getId(2,1);
-				if(groupIds.size()>0) {
-					serviceGroupId=groupIds.get(0).intValue();
-				}else {
-					throw new MaatConvertException("Get asn group id failed");
-				}
-				entity.setServiceGroupId(serviceGroupId);
-				//新增协议分组
-				ConfigGroupInfo group = configGroupInfoDao.getConfigGroupInfoByGroupId(serviceGroupId);
-				if(group==null){
-					group = new ConfigGroupInfo();
-					group.setGroupId(serviceGroupId);
-					group.setGroupName(entity.getGroupName());
-					group.setIsIssued(0);
-					group.setGroupType(entity.getGroupType());
-					group.setAsnId(entity.getAsnNo());
-					configGroupInfoDao.insertConfigGroupInfo(group);
-//					if(group.getGroupType().intValue()==4) {
-//						AsnCacheUtils.put(entity.getAsnNo(), group);
-//					}
-					
-				}
-			}*/
+			
+			// 获取GroupId
+			int serviceGroupId=0;
+			List<Integer> groupIds= ConfigServiceUtil.getId(2,1);
+			if(groupIds.size()>0) {
+				serviceGroupId=groupIds.get(0).intValue();
+			}else {
+				throw new MaatConvertException("Get group id failed");
+			}
+			entity.setServiceGroupId(serviceGroupId);
 			commonGroupManageDao.insert(entity);
-		//修改
-		}else{
+		
+		}else{ // 修改
 			Date editTime=new Date();
 			entity.setEditorId(UserUtils.getUser().getId());
 			entity.setEditTime(editTime);
 			commonGroupManageDao.update(entity);
+			
 		}
+		
 	}
 	
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
 	public void deldete(String ids, int isValid){
-		//TODO 公共组删除时需检索是否有被对应公共组配置引用，被引用的公共组无法删除
-		IpCommGroupCfgService ipGroupCfgService = SpringContextHolder.getBean(IpCommGroupCfgService.class);
-		
 		CommonGroupInfo entity=new CommonGroupInfo();
 		Date editTime=new Date();
 		entity.setEditorId(UserUtils.getUser().getId());
@@ -119,14 +93,16 @@ public class CommonGroupManageService extends BaseService{
 				}
 			}
 		}
+		
 	}
 	
-	// 查询指定类型的分组信息
+	// 分组配置界面使用
 	public List<CommonGroupInfo> findCommonGroupInfosByType(int type) {
 		List<CommonGroupInfo> list=commonGroupManageDao.findCommonGroupInfosByType(type);
 		return list;
 	}
 	
+	// 导出时使用
 	public List<CommonGroupInfo> findGroupInfoList(String ids) {
 		List<CommonGroupInfo> list=commonGroupManageDao.findGroupInfoList(ids);
 		return list;
@@ -175,58 +151,4 @@ public class CommonGroupManageService extends BaseService{
 		return false;
 	}
 	
-	/*
-	public List<PolicyGroupInfo> findPolicyGroupInfos() {
-		List<PolicyGroupInfo> list=commonGroupManageDao.findPolicyGroupInfos();
-		return list;
-	}
-	public List<PolicyGroupInfo> findNatPolicyGroups() {
-		List<PolicyGroupInfo> list=commonGroupManageDao.findNatPolicyGroups();
-		return list;
-	}
-	public List<PolicyGroupInfo> findPolicyGroupInfosByType(int type) {
-		List<PolicyGroupInfo> list=commonGroupManageDao.findPolicyGroupInfosByType(type);
-		return list;
-	}
-	public List<PolicyGroupInfo> findHasIpPolicyGroupInfosByType(int type) {
-		List<PolicyGroupInfo> list=commonGroupManageDao.findHasIPPolicyGroupInfosByType(type);
-		return list;
-	}
-	public List<PolicyGroupInfo> findPolicyGroupInfosHasIpRegionByType(int type) {
-		List<PolicyGroupInfo> list=commonGroupManageDao.findPolicyGroupInfosByType(type);
-		return list;
-	}
-	
-	public boolean checkIps(String groupIds) {
-		for(String groupId:groupIds.split(",")) {
-			Integer.parseInt(groupId);
-		}
-		List<Integer> hasIpList=asnIpCfgDao.hasGroupIds(groupIds);
-		if(hasIpList!=null&&hasIpList.size()>0) {
-			return true;
-		}
-		return false;
-	}
-	
-	public PolicyGroupInfo getInfoByAsnNo(PolicyGroupInfo policyGroupInfo){
-		return commonGroupManageDao.getInfoByAsnNo(policyGroupInfo);
-	}
-	
-	*//**
-	 * IP复用配置表单-获取拥有区域信息的策略分组
-	 * @param groupType
-	 * @return
-	 *//*
-	public List<PolicyGroupInfo> getHasAreaPolicyGroups(int groupType) {
-		return commonGroupManageDao.getHasAreaPolicyGroups(groupType);
-	}
-	
-	public Integer getGroupIdByGroupName(String groupName){
-		return commonGroupManageDao.getGroupIdByGroupName(groupName);
-	}
-	
-	public PolicyGroupInfo getGroupInfo(PolicyGroupInfo policyGroupInfo){
-		return commonGroupManageDao.getGroupInfo(policyGroupInfo);
-	}*/
-	
 }
diff --git a/src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java b/src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java
index 951af5a1e..9295a6630 100644
--- a/src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java
+++ b/src/main/java/com/nis/web/service/basics/IpCommGroupCfgService.java
@@ -4,8 +4,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.ibatis.session.ExecutorType;
@@ -17,42 +15,24 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.beust.jcommander.internal.Maps;
-import com.beust.jcommander.internal.Sets;
-import com.google.common.collect.Lists;
 import com.nis.domain.FunctionRegionDict;
 import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
-import com.nis.domain.basics.AsnGroupInfo;
-import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.basics.IpCommCfg;
 import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
-import com.nis.domain.maat.GroupReuseAddBean;
-import com.nis.domain.maat.GroupReuseCfg;
-import com.nis.domain.maat.MaatCfg;
-import com.nis.domain.maat.ToMaatBean;
-import com.nis.domain.maat.ToMaatResult;
-import com.nis.domain.maat.MaatCfg.DigestCfg;
-import com.nis.domain.maat.MaatCfg.GroupCfg;
-import com.nis.domain.maat.MaatCfg.IpCfg;
-import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
-import com.nis.domain.maat.MaatCfg.StringCfg;
+import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
-import com.nis.util.StringUtil;
-import com.nis.web.dao.basics.AsnGroupInfoDao;
-import com.nis.web.dao.basics.AsnIpCfgDao;
 import com.nis.web.dao.basics.IpCommGroupCfgDao;
-import com.nis.web.dao.basics.PolicyGroupInfoDao;
-import com.nis.web.security.UserUtils;
 import com.nis.web.service.BaseService;
 import com.nis.web.service.SpringContextHolder;
 @Service
 public class IpCommGroupCfgService extends BaseService {
+	
     @Autowired
     private IpCommGroupCfgDao ipCommGroupCfgDao;
-    @Autowired
-    private PolicyGroupInfoDao policyGroupInfoDao;
+    
     /**
      * @param page
      * @param entity
@@ -107,6 +87,14 @@ public class IpCommGroupCfgService extends BaseService {
         if(CollectionUtils.isNotEmpty(entity.getIpCommGroupCfgList())) {
             for (int i = 0; i < entity.getIpCommGroupCfgList().size(); i++) {
                 BeanUtils.copyProperties(entity, entity.getIpCommGroupCfgList().get(i), new String[]{"cfgId","userregion3"});
+                Integer regionId = 0;
+                List<Integer> regionIds = ConfigServiceUtil.getId(3, 1);
+				if(regionIds!=null && regionIds.size()>0){
+					regionId = regionIds.get(0);
+				}else {
+					throw new MaatConvertException("Get region id failed");
+				}
+				entity.getIpCommGroupCfgList().get(i).setRegionId(regionId);
                 entity.getIpCommGroupCfgList().get(i).setRequestId(0);
                 entity.getIpCommGroupCfgList().get(i).setClassify("0");
                 entity.getIpCommGroupCfgList().get(i).setAttribute("0");
@@ -115,86 +103,12 @@ public class IpCommGroupCfgService extends BaseService {
                 entity.getIpCommGroupCfgList().get(i).setCreatorId(entity.getCurrentUser().getId());
                 entity.getIpCommGroupCfgList().get(i).setIsValid(Constants.VALID_NO);
                 entity.getIpCommGroupCfgList().get(i).setIsAudit(Constants.AUDIT_NOT_YET);
-                entity.getIpCommGroupCfgList().get(i).setGroupId(Integer.parseInt(entity.getUserRegion3()));
+                entity.getIpCommGroupCfgList().get(i).setGroupId(entity.getGroupId());
                 ipCommGroupCfgDao.insertForBatch(entity.getIpCommGroupCfgList().get(i));
             }
         }
     }
     
-    
-    
-    //	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-//	public void audit(List<IpCommCfg> ipCommGroupCfgs, Integer isAudit, Integer isValid) {
-//		// TODO Auto-generated method stub
-//		Set<Integer> groupIds=Sets.newHashSet();
-//		if(!StringUtil.isEmpty(ipCommGroupCfgs)){
-//			for(IpCommCfg cfg:ipCommGroupCfgs) {
-//				cfg.setIsValid(isValid);
-//				cfg.setIsAudit(isAudit);
-//				cfg.setAuditorId(UserUtils.getUser().getId());
-//				cfg.setAuditTime(new Date());
-//				groupIds.add(cfg.getGroupId());
-//				ipCommGroupCfgDao.update(cfg);
-//			}
-//		}
-//		//查询有效的Ip配置个数
-//		for(Integer groupId:groupIds) {
-//			Integer groupCount=ipCommGroupCfgDao.getGroupIdCount(groupId);
-//			if(groupCount>0){//udFlag 设置为1
-//				policyGroupInfoDao.updateUdFlag(groupId, 1,5);
-//			}else{//udFlag 设置为0
-//				policyGroupInfoDao.updateUdFlag(groupId, 0,5);
-//			}
-//		}
-//		//下发配置时改变公共组udFlag标识
-//		send2Maat(ipCommGroupCfgs,isValid);
-//	}
-//	public void send2Maat(List<IpCommCfg> ipCommGroupCfgs,int isValid) {
-//		GroupReuseAddBean maatBean = new GroupReuseAddBean();
-//		List<GroupReuseCfg> groupReuseList=new ArrayList<>();
-//		GroupReuseCfg groupReuseCfg=new GroupReuseCfg();
-//		List<IpCfg> ipRegionList = groupReuseCfgAddRemoveConvert(ipCommGroupCfgs,isValid,null);
-//		List<StringCfg> strRegionList = new ArrayList<>();
-//		List<NumBoundaryCfg> numRegionList = new ArrayList<>();
-//		groupReuseCfg.setIpRegionList(ipRegionList);
-//		groupReuseCfg.setStrRegionList(strRegionList);
-//		groupReuseCfg.setNumRegionList(numRegionList);
-//		groupReuseList.add(groupReuseCfg);
-//		maatBean.setGroupReuseCfgList(groupReuseList);
-//		maatBean.setAuditTime(new Date());
-//		maatBean.setCreatorName(UserUtils.getUser().getName());
-//		maatBean.setVersion(Constants.MAAT_VERSION);
-//		logger.warn("IP Common Region Send To Maat start");
-//		long start=System.currentTimeMillis();
-//		if(isValid==Constants.VALID_YES) {
-//			maatBean.setOpAction(Constants.INSERT_ACTION);
-//			//调用服务接口下发配置数据
-//			String json=gsonToJson(maatBean);
-//			if(ipCommGroupCfgs.size()<=100) {
-//				logger.info("ip 公共组域新增配置下发配置参数："+json);
-//			}else {
-//				logger.info("ip 公共组域新增配置下发region条数："+ipCommGroupCfgs.size());
-//			}
-//			//调用服务接口下发配置
-//			ToMaatResult result =ConfigServiceUtil.postGroupReuseSources(json);
-//			logger.info("ip 公共组域新增配置响应信息："+result.getMsg());
-//		}else {
-//			maatBean.setOpAction(Constants.UPDATE_ACTION);
-//			//调用服务接口下发配置数据
-//			String json=gsonToJson(maatBean);
-//			if(ipCommGroupCfgs.size()<=100) {
-//				logger.info("ip 公共组域删除配置下发配置参数："+json);
-//			}else {
-//				logger.info("ip 公共组域删除配置下发region条数："+ipCommGroupCfgs.size());
-//
-//			}
-//			//调用服务接口下发配置
-//			ToMaatResult result = ConfigServiceUtil.put(json,3);
-//			logger.info("asn ip复用域删除配置响应信息："+result.getMsg());
-//		}
-//		long end=System.currentTimeMillis();
-//		logger.warn("IP Common Region Send To Maat finish,cost:"+(end-start));
-//	}
     public void delete(String ids) {
         // TODO 公共组配置删除时 需检索是否被其它业务配置引用，没被引用可删除
     	
@@ -203,6 +117,7 @@ public class IpCommGroupCfgService extends BaseService {
         }
         ipCommGroupCfgDao.delete(ids);
     }
+    
     @Transactional(readOnly=false,rollbackFor=RuntimeException.class)
     public void saveAndSend(FunctionRegionDict regionDict, FunctionServiceDict serviceDict, List<BaseIpCfg> cfgs,boolean send) {
         logger.warn("Start to save IP,size:"+cfgs.size());
diff --git a/src/main/java/com/nis/web/service/basics/UrlCommGroupService.java b/src/main/java/com/nis/web/service/basics/UrlCommGroupService.java
index 1e2ae29d1..0af3056bb 100644
--- a/src/main/java/com/nis/web/service/basics/UrlCommGroupService.java
+++ b/src/main/java/com/nis/web/service/basics/UrlCommGroupService.java
@@ -1,49 +1,28 @@
 package com.nis.web.service.basics;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.ibatis.session.ExecutorType;
-import org.apache.ibatis.session.SqlSession;
-import org.apache.ibatis.session.SqlSessionFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.nis.domain.Page;
-import com.nis.domain.basics.AsnGroupInfo;
-import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.basics.UrlCommCfg;
-import com.nis.domain.configuration.BaseIpCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
-import com.nis.domain.maat.GroupReuseAddBean;
-import com.nis.domain.maat.GroupReuseCfg;
-import com.nis.domain.maat.MaatCfg;
-import com.nis.domain.maat.ToMaatBean;
-import com.nis.domain.maat.ToMaatResult;
-import com.nis.domain.maat.MaatCfg.DigestCfg;
-import com.nis.domain.maat.MaatCfg.GroupCfg;
-import com.nis.domain.maat.MaatCfg.IpCfg;
-import com.nis.domain.maat.MaatCfg.NumBoundaryCfg;
-import com.nis.domain.maat.MaatCfg.StringCfg;
+import com.nis.exceptions.MaatConvertException;
 import com.nis.util.ConfigServiceUtil;
 import com.nis.util.Constants;
-import com.nis.util.StringUtil;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.basics.UrlCommGroupDao;
-import com.nis.web.dao.configuration.IpCfgDao;
-import com.nis.web.security.UserUtils;
 import com.nis.web.service.CrudService;
-import com.nis.web.service.SpringContextHolder;
 
 @Service
 public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCommCfg>{
 
     @Autowired
-    private  UrlCommGroupDao   urlCommGroupDao;
-
+    private UrlCommGroupDao urlCommGroupDao;
 
     public Page<UrlCommCfg> findPage(Page<UrlCommCfg> page, UrlCommCfg entity) {
         entity.getSqlMap().put("dsf", configScopeFilter(entity.getCurrentUser(),"r"));
@@ -57,14 +36,11 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
         return page;
     }
 
-
     public List<UrlCommCfg> findByPage(String ids) {
         List<UrlCommCfg> list=urlCommGroupDao.findByPage(ids);
         return list;
     }
 
-
-
     public UrlCommCfg get(Long id ) {
         return urlCommGroupDao.get(id);
     }
@@ -76,6 +52,14 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
         if(entity.getUrlCommGroupList()!=null) {
             for (int i = 0; i < entity.getUrlCommGroupList().size(); i++) {
                 BeanUtils.copyProperties(entity, entity.getUrlCommGroupList().get(i), new String[]{"cfgId"});
+                Integer regionId = 0;
+                List<Integer> regionIds = ConfigServiceUtil.getId(3, 1);
+				if(regionIds!=null && regionIds.size()>0){
+					regionId = regionIds.get(0);
+				}else {
+					throw new MaatConvertException("Get region id failed");
+				}
+                entity.getUrlCommGroupList().get(i).setRegionId(regionId);
                 entity.getUrlCommGroupList().get(i).setRequestId(0);
                 entity.getUrlCommGroupList().get(i).setClassify("0");
                 entity.getUrlCommGroupList().get(i).setAttribute("0");
@@ -90,6 +74,8 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
                 }else{
                     entity.getUrlCommGroupList().get(i).setExprType(0);
                 }
+                entity.getUrlCommGroupList().get(i).setGroupId(entity.getGroupId());
+                
                 urlCommGroupDao.insertUrlCommGroupCfg(entity.getUrlCommGroupList().get(i));
             }
 //			//修改公共组的标识
@@ -118,7 +104,6 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
 
     @Transactional(readOnly=false,rollbackFor=RuntimeException.class)
     public void delete(String ids) {
-
         urlCommGroupDao.delete(ids);
     }
 
@@ -129,7 +114,7 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
         return urlCommGroupDao.getByIds(ids);
     }
 
-    @Transactional(readOnly=false,rollbackFor=RuntimeException.class)
+    /*@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
     public void audit(UrlCommCfg urlGroupCfg,Integer isAudit,Integer isValid) {
 
         if(!StringUtil.isEmpty(urlGroupCfg)){
@@ -148,6 +133,6 @@ public class UrlCommGroupService extends CrudService<CrudDao<UrlCommCfg>, UrlCom
         }else{//udFlag 设置为0
             urlCommGroupDao.updateUrlUdFlag(Integer.parseInt(urlGroupCfg.getUserRegion3()), 0);
         }
-    }
+    }*/
 
 }
diff --git a/src/main/resources/sql/20190603/ip_comm_cfg.sql b/src/main/resources/sql/20190603/add_tables.sql
similarity index 51%
rename from src/main/resources/sql/20190603/ip_comm_cfg.sql
rename to src/main/resources/sql/20190603/add_tables.sql
index 376967743..8015d2eda 100644
--- a/src/main/resources/sql/20190603/ip_comm_cfg.sql
+++ b/src/main/resources/sql/20190603/add_tables.sql
@@ -43,4 +43,45 @@ CREATE TABLE `ip_comm_cfg` (
   `user_region5` varchar(1024) DEFAULT NULL COMMENT '预留自定义域5',
   `cancel_request_id` int(11) DEFAULT NULL COMMENT '取消审核来函',
   PRIMARY KEY (`cfg_id`) USING BTREE
-) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
+
+
+CREATE TABLE `url_comm_cfg` (
+  `cfg_id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键，自增',
+  `cfg_desc` varchar(128) DEFAULT NULL,
+  `cfg_keywords` varchar(2048) NOT NULL,
+  `action` int(11) NOT NULL COMMENT '1:阻断，2：监测， 5： FD 白名单，6：监测白名单，7: FD 监测都白名单，应与业务ID所代表的逻辑相匹配，8-灰名单',
+  `is_valid` int(11) NOT NULL COMMENT '0无效，1有效，-1删除;1）	未审核时配置可删除;2）	审核通过，此字段置1;3）	取消审核通过，此字段置0',
+  `is_audit` int(11) NOT NULL COMMENT '0未审核，1审核通过，2审核未通过，3取消审核通过;1）	审核未通过，配置可修改;2）	审核通过，配置不可删除，只能取消审核通过',
+  `creator_id` int(11) NOT NULL COMMENT '取自sys_user.id',
+  `create_time` datetime NOT NULL,
+  `editor_id` int(11) DEFAULT NULL COMMENT '取自sys_user.id',
+  `edit_time` datetime DEFAULT NULL,
+  `auditor_id` int(11) DEFAULT NULL COMMENT '取自sys_user.id',
+  `audit_time` datetime DEFAULT NULL,
+  `service_id` int(11) NOT NULL COMMENT '参考系统业务类型管理表',
+  `request_id` int(11) NOT NULL COMMENT '取自request_info.id',
+  `compile_id` int(11) NOT NULL COMMENT '取自服务接口返回的maat配置的编译id，配置初始入库时获取。',
+  `is_area_effective` int(11) NOT NULL COMMENT '0否，1是',
+  `classify` varchar(128) DEFAULT NULL COMMENT '分类id，多个用英文逗号分隔',
+  `attribute` varchar(128) DEFAULT NULL COMMENT '性质id，多个用英文逗号分隔',
+  `lable` varchar(128) DEFAULT NULL COMMENT '标签id,多个用英文逗号分隔',
+  `expr_type` int(11) NOT NULL COMMENT '0：无表达式，1：与表达式',
+  `match_method` int(11) NOT NULL COMMENT 'expr_type:0时有意义，其它情况必须置0。0：子串匹配；1：右匹配；2：左匹配；3：完全匹配',
+  `is_hexbin` int(11) NOT NULL COMMENT '默认为0:大小写不敏感，且非HEX;1:HEX格式二进制;2:大小写敏感，且非HEX',
+  `area_effective_ids` varchar(1024) DEFAULT NULL COMMENT '多个英文逗号分隔',
+  `function_id` int(11) NOT NULL,
+  `cfg_region_code` int(11) DEFAULT NULL,
+  `cfg_type` varchar(64) DEFAULT NULL,
+  `ratelimit` varchar(10) DEFAULT NULL COMMENT '限速比例,0到1之间',
+  `region_id` int(11) NOT NULL,
+  `group_id` int(11) NOT NULL,
+  `user_region1` varchar(1024) DEFAULT NULL COMMENT '预留自定义域1',
+  `user_region2` varchar(1024) DEFAULT NULL COMMENT '预留自定义域2',
+  `user_region3` varchar(1024) DEFAULT NULL COMMENT '预留自定义域3',
+  `user_region4` varchar(1024) DEFAULT NULL COMMENT '预留自定义域4',
+  `user_region5` varchar(1024) DEFAULT NULL COMMENT '预留自定义域5',
+  PRIMARY KEY (`cfg_id`) USING BTREE,
+  KEY `http_url_cfg_compileId` (`compile_id`),
+  KEY `http_url_cfg_functionId` (`function_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 ROW_FORMAT=DYNAMIC;
diff --git a/src/main/webapp/WEB-INF/views/basics/commonGroupForm.jsp b/src/main/webapp/WEB-INF/views/basics/commonGroupForm.jsp
index 0337d7b26..aa28f2e78 100644
--- a/src/main/webapp/WEB-INF/views/basics/commonGroupForm.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/commonGroupForm.jsp
@@ -23,12 +23,6 @@ $(function(){
 			}
 		},
 		submitHandler: function(form){
-			if("${_cfg.groupType}" == 4){
-				$(".asnNo").removeClass("hidden");
-			}
-			if("${_cfg.groupType}" == 6){
-				$("#asnNo").val($(".groupType").find("#asnNo").val());
-			}
 			loading('onloading...');
 			form.submit();
 		},
@@ -81,10 +75,6 @@ $(function(){
 															<option value="${groupTypeC.itemCode}" <c:if test="${_cfg.groupType==groupTypeC.itemCode || (_cfg.groupType==null && groupTypeC.itemCode==1)}">selected</c:if>><spring:message code="${groupTypeC.itemValue}"/></option>
 							               				</c:if>
 							               			</c:forEach>
-							               			<%-- <option value="5" <c:if test="${_cfg.groupType eq 5 }">selected</c:if>><spring:message code="IP GROUP"/></option>
-							               			<option value="6" <c:if test="${_cfg.groupType eq 6 }">selected</c:if>><spring:message code="URL GROUP"/></option>
-							               			<option value="7" <c:if test="${_cfg.groupType eq 7 }">selected</c:if>><spring:message code="Domain GROUP"/></option>
-							               			<option value="8" <c:if test="${_cfg.groupType eq 8 }">selected</c:if>><spring:message code="SubscribeID GROUP"/></option> --%>
 												</select>
 								            </div>
 								            <div for="groupType"></div>
diff --git a/src/main/webapp/WEB-INF/views/basics/commonGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/commonGroupList.jsp
index 404de9502..c5893c9d9 100644
--- a/src/main/webapp/WEB-INF/views/basics/commonGroupList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/commonGroupList.jsp
@@ -39,13 +39,6 @@
 		    if(true == $(this).is(':checked')){
 		    	str += $(this).attr("id")+"_"+$(this).attr("groupType")+",";
 		    	ids += $(this).attr("id")+",";
-		    	/* if(typeof (map.get($(this).attr("groupType"))) != "undefined"){
-			    	map.set($(this).attr("groupType"), map.get($(this).attr("groupType")) +"_"+ $(this).attr("id"));
-		    	}else{
-		    		map.set($(this).attr("groupType"), $(this).attr("id"));
-		    	} */
-		    	
-		    	//map.set($(this).attr("groupType"),$(this).attr("id"));
 		    }
 		});
  		
@@ -140,21 +133,13 @@
 								</div> --%>
 								
 								<div class="pull-left">
-								
 									<div class="input-group">
                                          <div class="input-group-btn">
-                                         
                                         	<form:select path="seltype" class="selectpicker select2 input-small" >
 												<form:option value="groupName"><spring:message code="group_name"></spring:message></form:option>
-												<%-- <c:if test="${cfg.groupType==4}">
-												<form:option value="asnNo"><spring:message code="asn_no"></spring:message></form:option>
-												</c:if> --%>
 											</form:select>
-									
                                          </div>
-                                         
                                          <input id="intype" class="form-control input-medium" type="text" value="">
-                                  
                                     </div> 
 								</div>
 								<div class="pull-left">
@@ -162,16 +147,13 @@
 									 <button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/>  </button>
 	                                 <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/>  <i class="fa fa-angle-double-down"></i></button>
 								</div>
-								 <div class="pull-right">
-							 		<%-- <shiro:hasPermission name="avContUrl:config"> --%>
-							 			<sys:delRow url="${ctx}/basics/commonGroup/form?groupType=${cfg.groupType}" id="contentTable" label="update"></sys:delRow>
-                                        <a href="javascript:void(0);" class="btn btn-default" onclick="deletes('${ctx}/basics/commonGroup/delete?isValid=0&groupType=${cfg.groupType}')" data-toggle="tooltip" data-placement="top">
-											<i class="fa fa-trash"> <spring:message code="delete"/></i>
-										</a>
-										<%-- <sys:delRow url="${ctx}/basics/asn/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow> --%>
-                                  <%--  </shiro:hasPermission> --%>
-                               		
-                               		 <div class="btn-group">
+								<div class="pull-right">
+							 		<sys:delRow url="${ctx}/basics/commonGroup/form?groupType=${cfg.groupType}" id="contentTable" label="update"></sys:delRow>
+                                    <a href="javascript:void(0);" class="btn btn-default" onclick="deletes('${ctx}/basics/commonGroup/delete?isValid=0&groupType=${cfg.groupType}')" data-toggle="tooltip" data-placement="top">
+										<i class="fa fa-trash"> <spring:message code="delete"/></i>
+									</a>
+									
+                               		<div class="btn-group">
 	                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
 	                                            <i class="fa fa-wrench"></i> <spring:message code="export"></spring:message>
 	                                            <i class="fa fa-angle-down"></i>
@@ -181,7 +163,6 @@
  												<li><sys:delRow url="${ctx}/basics/commonGroup/exportGroup?exType=csv" searchUrl="${ctx}/basics/commonGroup/list" id="contentTable" maxRow="5" label="cfg_csv"></sys:delRow></li>
 				                            </ul>
 				                 	</div>
-                               		
                                  	<a class="btn  btn-icon-only btn-default setfields tooltips" 
                                       		  data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
                                              <i class="icon-wrench"></i>
@@ -240,12 +221,6 @@
 									<th><input type="checkbox" class="i-checks" id="checkAll"></th>
 									<th column="group_name" ><spring:message code="group_name"/></th>
 									<th column="group_type" ><spring:message code="group_type"/></th>
-									<%-- <c:if test="${cfg.groupType==4}">
-										<th column="asn_no" ><spring:message code="asn_no"/></th>
-									</c:if> --%>
-									<%-- <c:if test="${cfg.groupType==6}">
-										<th><spring:message code="group_type"/></th>
-									</c:if> --%>
 									<th column="desc" ><spring:message code="desc"/></th>
 									<th column="creator" ><spring:message code="creator"/></th>
 									<th column="config_time" class="sort-column r.create_time"><spring:message code="config_time"/></th>
@@ -256,60 +231,24 @@
 							<tbody>
 								<c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
 									<tr>
-									<td><input type="checkbox" class="i-checks" id="${cfg.groupId}" groupType="${cfg.groupType}" serviceGroupId="${cfg.serviceGroupId}"></td>
-									<td>
-										<a href="javascript:;" data-original-title="${cfg.groupName}"
-										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
-											${fns:abbr(cfg.groupName,20)}
-										</a>
-									</td>
-									<td>
-										<%-- <c:if test="${cfg.groupType==5}">
-											<spring:message code="IP GROUP"/>
-										</c:if>
-										<c:if test="${cfg.groupType==6}">
-											<spring:message code="URL GROUP"/>
-										</c:if>
-										<c:if test="${cfg.groupType==7}">
-											<spring:message code="Domain GROUP"/>
-										</c:if>
-										<c:if test="${cfg.groupType==8}">
-											<spring:message code="SubscribeID GROUP"/>
-										</c:if> --%>
-										<c:forEach items="${fns:getDictList('GROUP_TYPE')}" var="groupTypeC">
-											<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
-				               			</c:forEach>
-										<%-- <c:choose>
-											<c:when test="${cfg.groupType==6 }">
-												<c:forEach items="${fns:getDictList('IR_TYPE')}" var="groupTypeC">
-													<c:if test="${cfg.asnNo==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
-						               			</c:forEach>
-											</c:when>
-											<c:otherwise>
-												<c:forEach items="${fns:getDictList('GROUP_TYPE')}" var="groupTypeC">
-													<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
-						               			</c:forEach>
-											</c:otherwise>
-										</c:choose> --%>
-									</td>
-									<%-- <c:if test="${cfg.groupType==4}">
-									<td>${cfg.asnNo}</td>
-									</c:if> --%>
-									<%-- <c:if test="${cfg.groupType==6}">
-									<td>
-										<c:forEach items="${fns:getDictList('IR_TYPE')}" var="ipTypeC">
-											<c:if test="${cfg.asnNo==ipTypeC.itemCode}">
-												${ipTypeC.itemValue }
-											</c:if>
-				               			</c:forEach>
-									</td>
-									</c:if> --%>
-									<td title="${cfg.description }">${fns:abbr(cfg.description,20)}</td>
-									<td>${cfg.creatorName }</td>
-									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-									<td>${cfg.editorName }</td>
-									<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-								</tr>
+										<td><input type="checkbox" class="i-checks" id="${cfg.groupId}" groupType="${cfg.groupType}" serviceGroupId="${cfg.serviceGroupId}"></td>
+										<td>
+											<a href="javascript:;" data-original-title="${cfg.groupName}"
+											 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+												${fns:abbr(cfg.groupName,20)}
+											</a>
+										</td>
+										<td>
+											<c:forEach items="${fns:getDictList('GROUP_TYPE')}" var="groupTypeC">
+												<c:if test="${cfg.groupType==groupTypeC.itemCode }"><spring:message code="${groupTypeC.itemValue}"/></c:if>
+					               			</c:forEach>
+										</td>
+										<td title="${cfg.description }">${fns:abbr(cfg.description,20)}</td>
+										<td>${cfg.creatorName }</td>
+										<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+										<td>${cfg.editorName }</td>
+										<td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
+									</tr>
 								</c:forEach>
 							</tbody>
 						</table>
diff --git a/src/main/webapp/WEB-INF/views/basics/ipCommGroupFormAdd.jsp b/src/main/webapp/WEB-INF/views/basics/ipCommGroupFormAdd.jsp
index 927a5109c..67fd9f693 100644
--- a/src/main/webapp/WEB-INF/views/basics/ipCommGroupFormAdd.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/ipCommGroupFormAdd.jsp
@@ -138,23 +138,19 @@
                                     <div class="form-group">
                                         <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_group"/></label>
                                         <div class="col-md-6">
-                                            <select name="userRegion3" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
-                                                <option value="${_cfg.userRegion3}"><spring:message code="select"/></option>
+                                            <select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
+                                                <option value=""><spring:message code="select"/></option>
                                                 <c:forEach items="${policyGroupInfos}" var="ipGroupInfo">
-                                                    <option value="${ipGroupInfo.groupId}"
-                                                            <c:if test="${_cfg.userRegion3 eq ipGroupInfo.groupId }">
-                                                                selected
-                                                            </c:if>
-                                                    >${ipGroupInfo.groupName}</option>
+                                                    <option value="${ipGroupInfo.serviceGroupId}">${ipGroupInfo.groupName}</option>
                                                 </c:forEach>
                                             </select>
                                         </div>
-                                        <div for="userRegion3"></div>
+                                        <div for="groupId"></div>
                                     </div>
                                 </div>
                             </div>
                             <h4 class="form-section">
-                                <spring:message code="ip_group_configuration" />
+                                <spring:message code="http_ip_title" />
                                 <small> <span
                                         class="glyphicon glyphicon-plus  ipAdd"
                                         onClick="addContent(this,'ipInfo')" title="add"></span></small>
diff --git a/src/main/webapp/WEB-INF/views/basics/ipCommGroupFormUpdate.jsp b/src/main/webapp/WEB-INF/views/basics/ipCommGroupFormUpdate.jsp
index dc0082de0..a8b71cda8 100644
--- a/src/main/webapp/WEB-INF/views/basics/ipCommGroupFormUpdate.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/ipCommGroupFormUpdate.jsp
@@ -5,8 +5,6 @@
     <title><spring:message code="ip_group_configuration"></spring:message></title>
     <script type="text/javascript">
         $(function(){
-            $("select[name='protocol']").parents(".form-group").addClass("hidden");
-            $("select[name='direction']").parents(".form-group").addClass("hidden");
             $("#cfgFrom").validate({
                 errorPlacement: function(error,element){
                     $(element).parents(".form-group").find("div[for='"+element.attr("name")+"']").append(error);
@@ -96,8 +94,8 @@
                                             <select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
                                                 <option value="${_cfg.groupId}"><spring:message code="select"/></option>
                                                 <c:forEach items="${policyGroupInfos}" var="ipGroupInfo">
-                                                    <option value="${ipGroupInfo.groupId}"
-                                                            <c:if test="${_cfg.groupId eq ipGroupInfo.groupId }">
+                                                    <option value="${ipGroupInfo.serviceGroupId}"
+                                                            <c:if test="${_cfg.groupId eq ipGroupInfo.serviceGroupId }">
                                                                 selected
                                                             </c:if>
                                                     >${ipGroupInfo.groupName}</option>
@@ -129,7 +127,12 @@
                                     </div>
                                 </div>
                             </div>
-                            <div class="row ipInfo">
+                            
+                            <h4 class="form-section">
+                                <spring:message code="http_ip_title" />
+                            </h4>
+                            <div class="row ipInfo boxSolid">
+                            	 <div class="row" style="height: 15px;"></div>
                                 <div class="row">
                                     <div class="col-md-6">
                                         <div class="form-group ">
diff --git a/src/main/webapp/WEB-INF/views/basics/ipCommonGroupCfgList.jsp b/src/main/webapp/WEB-INF/views/basics/ipCommonGroupCfgList.jsp
index 19654320c..fd160dda6 100644
--- a/src/main/webapp/WEB-INF/views/basics/ipCommonGroupCfgList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/ipCommonGroupCfgList.jsp
@@ -41,7 +41,7 @@
             //修改导入Form表单action
             var importPath="/basics/ip/list?functionId=${cfg.functionId}"
             $("#importForm1").attr("action","${ctx}/basics/ip/import?importPath="+importPath);
-            ajaxGroupName();
+            
         });
         var edit=function(url){
             var cked = $('tbody tr td input.i-checks:checkbox:checked');
@@ -56,34 +56,7 @@
                 return;
             }
         }
-        var ajaxGroupName=function(){
-            var groupIds=[];
-            $(".group").each(function(){
-                if(groupIds.join(",").indexOf($(this).text().trim())==-1){
-                    groupIds.push($(this).text().trim());
-                }
-            });
-            $.ajax({
-                type:'post',
-                timeout:10000,//超时时间设置，查询接口时间过长超时
-                url:'${ctx}/basics/ip/ajaxGetGroups',
-                data:{"groupIds":groupIds.join(',')},
-                dataType:'json',
-                async:true,
-                success:function(data,textStatus){//处理返回结果
-                    if(textStatus=="success"){
-                        $(".group").each(function(){
-                            var text=$(this);
-                            $.each(data,function(key,values){
-                                if(key==$(text).text()){
-                                    $(text).html(values);
-                                }
-                            });
-                        })
-                    }
-                }
-            });
-        }
+        
     </script>
 </head>
 <body>
@@ -167,7 +140,7 @@
                                 <form:select path="groupId" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
                                     <form:option value=""><spring:message code='ip_group'/></form:option>
                                     <c:forEach items="${policyGroupInfos}" var="policyGroup">
-                                        <form:option value="${policyGroup.groupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
+                                        <form:option value="${policyGroup.serviceGroupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
                                     </c:forEach>
                                 </form:select>
                             </div>
@@ -251,29 +224,8 @@
 
                                     </div>
                                 </div>
-
-                                    <%-- <div class="col-md-2">
-                                        <div class="form-group">
-                                            <label><spring:message code="audit_time"/>：</label>
-                                            <input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-                                            value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-
-                                        </div>
-                                    </div>
-
-                                    <div class="col-md-2">
-                                        <div class="form-group">
-                                            <label>&nbsp;</label>
-                                            <input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-                                            value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-
-                                        </div>
-                                    </div> --%>
                             </div>
-
-
                         </div>
-
                         <!-- /筛选搜索内容栏    结束-->
                     </form:form>
                 </div>
@@ -281,69 +233,62 @@
                 <div class="table-responsive">
                     <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
                         <thead>
-                        <tr>
-                            <th><input type="checkbox" class="i-checks" id="checkAll"></th>
-                            <%-- <th class="sort-column r.compile_id" style="display: none;"  column="cfg_id" ><spring:message code="cfg_id"/></th> --%>
-                            <%-- <th><spring:message code="seq"/></th> --%>
-                            <th column="config_describe" ><spring:message code="config_describe"/></th>
-                            <%-- <th><spring:message code="group"/></th> --%>
-                            <th class="sort-column r.user_region3" column="userregion3" ><spring:message code="ip_group"/></th>
-                            <th column="ip_type" ><spring:message code="ip_type"/></th>
-                            <th column="IP" ><spring:message code="IP"/></th>
-                            <th column="ip_pattern" ><spring:message code="ip_pattern"/></th>
-                            <%-- <th><spring:message code="is_audit"/></th> --%>
-                            <%-- <th><spring:message code="log_total"/></th> --%>
-                            <th column="valid_identifier" ><spring:message code="valid_identifier"/></th>
-                            <th column="creator" ><spring:message code="creator"/></th>
-                            <th column="config_time"  class="sort-column r.create_time"><spring:message code="config_time"/></th>
-                            <th column="editor" ><spring:message code="editor"/></th>
-                            <th column="edit_time" class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
-                            <%-- <th><spring:message code="auditor"/></th>
-                            <th class="sort-column r.audit_time"><spring:message code="audit_time"/></th> --%>
-                            <%-- <th><spring:message code="operation"></spring:message></th> --%>
-                        </tr>
+	                        <tr>
+	                            <th><input type="checkbox" class="i-checks" id="checkAll"></th>
+	                            <th column="config_describe" ><spring:message code="config_describe"/></th>
+	                            <th class="sort-column r.group_id" column="groupId" ><spring:message code="group_name"/></th>
+	                            <th column="ip_type" ><spring:message code="ip_type"/></th>
+	                            <th column="ip_pattern" ><spring:message code="ip_pattern"/></th>
+	                            <th column="IP" ><spring:message code="IP"/></th>
+	                            <th column="protocol" ><spring:message code="protocol"/></th>
+	                            <th column="direction" ><spring:message code="direction"/></th>
+	                            <th column="creator" ><spring:message code="creator"/></th>
+	                            <th column="config_time"  class="sort-column r.create_time"><spring:message code="config_time"/></th>
+	                            <th column="editor" ><spring:message code="editor"/></th>
+	                            <th column="edit_time" class="sort-column r.edit_time"><spring:message code="edit_time"/></th>
+	                        </tr>
                         </thead>
                         <tbody>
                         <c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
                             <tr>
                                 <td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" isValid="${cfg.isValid}" value="${cfg.isAudit}"></td>
-                                    <%-- <td>${cfg.compileId }</td> --%>
                                 <td>${cfg.cfgDesc }</td>
-                                <td class="group">${cfg.groupId}</td>
+                                <td>
+                                	<c:forEach items="${policyGroupInfos}" var="policyGroup">
+                                        <c:if test="${policyGroup.serviceGroupId eq cfg.groupId }">
+                                        	${policyGroup.groupName}
+                                        </c:if>
+                                    </c:forEach>
+                                </td>
                                 <td>
                                     <c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
                                         <c:if test="${cfg.ipType==ipTypeC.itemCode}"><spring:message code="${ipTypeC.itemValue }"/></c:if>
                                     </c:forEach>
                                 </td>
-                                <td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
-                                    <%-- <td>${cfg.destPort }</td> --%>
                                 <td>
                                     <c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
                                         <c:if test="${cfg.destIpPattern==ipPatternC.itemCode}"><spring:message code="${ipPatternC.itemValue }"/></c:if>
                                     </c:forEach>
                                 </td>
-                                    <%-- <td>
-                                        <c:choose>
-                                            <c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-                                            <c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-                                            <c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-                                            <c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
-
-                                        </c:choose>
-                                    </td> --%>
-                                    <%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
+                                <td title="${cfg.destIpAddress }">${fns:abbr(cfg.destIpAddress, 42)}</td>
                                 <td>
-                                    <c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-                                    <c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-                                    <c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+                                    <c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+                                        <c:if test="${cfg.protocol==protocolC.itemCode }">
+                                        	<spring:message code="${protocolC.itemValue }"/>
+                                        </c:if>
+                                    </c:forEach>
+                                </td>
+                                <td>
+                                	<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+                                        <c:if test="${cfg.direction==directionC.itemCode}">
+                                        	<spring:message code="${directionC.itemValue}"/>
+                                        </c:if>
+                                    </c:forEach>
                                 </td>
                                 <td>${cfg.creatorName }</td>
                                 <td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
                                 <td>${cfg.editorName }</td>
                                 <td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-                                    <%-- <td>${cfg.auditorName }</td>
-                                    <td><fmt:formatDate value="${cfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td> --%>
-
                             </tr>
                         </c:forEach>
                         </tbody>
diff --git a/src/main/webapp/WEB-INF/views/basics/urlCommGroupFormAdd.jsp b/src/main/webapp/WEB-INF/views/basics/urlCommGroupFormAdd.jsp
index a42617ec3..d7ef7b342 100644
--- a/src/main/webapp/WEB-INF/views/basics/urlCommGroupFormAdd.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/urlCommGroupFormAdd.jsp
@@ -271,14 +271,14 @@
                                     <div class="form-group">
                                         <label class="control-label col-md-3"><font color="red">*</font><spring:message code="url_group"/></label>
                                         <div class="col-md-6">
-                                            <select name="userRegion3" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
+                                            <select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
                                                 <option value=""><spring:message code="select"/></option>
                                                 <c:forEach items="${policyGroupInfos}" var="urlGroupInfo">
-                                                    <option value="${urlGroupInfo.groupId}">${urlGroupInfo.groupName}</option>
+                                                    <option value="${urlGroupInfo.serviceGroupId}">${urlGroupInfo.groupName}</option>
                                                 </c:forEach>
                                             </select>
                                         </div>
-                                        <div for="userRegion3"></div>
+                                        <div for="groupId"></div>
                                     </div>
                                 </div>
                             </div>
diff --git a/src/main/webapp/WEB-INF/views/basics/urlCommGroupFormUpdate.jsp b/src/main/webapp/WEB-INF/views/basics/urlCommGroupFormUpdate.jsp
index 152700ea8..c6133f5be 100644
--- a/src/main/webapp/WEB-INF/views/basics/urlCommGroupFormUpdate.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/urlCommGroupFormUpdate.jsp
@@ -121,18 +121,18 @@
                                         <label class="control-label col-md-3"><font color="red">*</font><spring:message code="urlGroup"/></label>
                                         <div class="col-md-6">
                                             <%-- <input class="form-control required digits asnMustExists" type="text" name="${cfgName}.cfgKeywords" value="${cfg.cfgKeywords}" ctx="${ctx}"> --%>
-                                            <select name="userRegion3" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
-                                                <option value="${_cfg.userRegion3}"><spring:message code="select"/></option>
-                                                <c:forEach items="${policyGroupInfos}" var="urlGroupInfo">
-                                                    <option value="${urlGroupInfo.groupId}"
-                                                            <c:if test="${_cfg.userRegion3 eq urlGroupInfo.groupId }">
+                                            <select name="groupId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
+                                                <option value=""><spring:message code="select"/></option>
+                                                <c:forEach items="${policyGroupInfos}" var="groupInfo">
+                                                    <option value="${groupInfo.serviceGroupId}"
+                                                            <c:if test="${_cfg.groupId eq groupInfo.serviceGroupId }">
                                                                 selected
                                                             </c:if>
-                                                    >${urlGroupInfo.groupName}</option>
+                                                    >${groupInfo.groupName}</option>
                                                 </c:forEach>
                                             </select>
                                         </div>
-                                        <div for="userRegion3"></div>
+                                        <div for="groupId"></div>
                                     </div>
                                 </div>
                             </div>
@@ -152,7 +152,7 @@
                                      onClick="delContent(this,'strInfo');" />
                              </div>
                          </div> -->
-                            <div class=" boxSolid ">
+                            <div class="boxSolid">
                                 <div class="row" style="height: 15px;"></div>
                                 <c:forEach items="${regionList}" var="region" varStatus="status">
                                     <%-- <c:set var="cfgName" value="urlCommGroupList[-1]"></c:set> --%>
@@ -243,7 +243,11 @@
                                                             <c:forEach var="matchMethod" items="${fn:split(region.configMatchMethod,',')}">
                                                                 <c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
                                                                     <c:if test="${matchMethodC.itemCode eq matchMethod}">
-                                                                        <option value="${matchMethodC.itemCode}">
+                                                                        <option value="${matchMethodC.itemCode}"
+                                                                        	<c:if test="${_cfg.matchMethod eq matchMethod}">
+																				selected
+																			</c:if>
+                                                                        >
                                                                             <spring:message code="${matchMethodC.itemValue}"/>
                                                                         </option>
                                                                     </c:if>
diff --git a/src/main/webapp/WEB-INF/views/basics/urlCommGroupList.jsp b/src/main/webapp/WEB-INF/views/basics/urlCommGroupList.jsp
index ea7a63be2..a33499073 100644
--- a/src/main/webapp/WEB-INF/views/basics/urlCommGroupList.jsp
+++ b/src/main/webapp/WEB-INF/views/basics/urlCommGroupList.jsp
@@ -8,8 +8,6 @@
             //搜索框提示语初始化
             if("${cfg.cfgDesc}"){
                 $("#intype").val("${cfg.cfgDesc}");
-            }else if("${cfg.compileId}"){
-                $("#intype").val("${cfg.compileId}");
             }else if("${cfg.cfgKeywords}"){
                 $("#intype").val("${cfg.cfgKeywords}");
             }else{
@@ -82,7 +80,6 @@
 
     <h3 class="page-title">
         <spring:message code="url_group_configuration"></spring:message>
-
     </h3>
     <h5 class="page-header"></h5>
     <div class="col-md-12">
@@ -96,50 +93,27 @@
                         <input id="exportValue" type="hidden" value=""/>
                         <input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
                         <input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
-                        <sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}"
-                                       callback="page();" />
+                        <sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();" />
                         <!-- 筛选按钮展开状态-->
                         <input id="isFilterAction" name="isFilterAction" type="hidden" value="${cfg.isFilterAction }"/>
                         <!-- 搜索内容与操作按钮栏 -->
                         <div class="col-md-12">
-                            <%-- <div class="pull-left">
-                                <c:set var="state"><spring:message code='group'/></c:set>
-                                <form:select path="isAudit" class="selectpicker select2 input-small">
-                                    <form:option value=""><spring:message code="all_states"/></form:option>
-                                    <form:option value="0"><spring:message code="created"></spring:message></form:option>
-                                    <form:option value="1"><spring:message code="approved"></spring:message></form:option>
-                                    <form:option value="2"><spring:message code="unapproved"></spring:message></form:option>
-                                    <form:option value="3"><spring:message code="cancel_approved"></spring:message></form:option>
-                                </form:select>
-                            </div> --%>
-
                             <div class="pull-left">
                                 <div class="input-group">
                                     <div class="input-group-btn">
                                         <form:select path="seltype" class="selectpicker select2 input-small" >
                                             <form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
-                                            <form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
-                                            <form:option value="cfgKeywords"><spring:message code="URL"></spring:message></form:option>
-                                            <%-- <form:option value="action"><spring:message code="block_type"></spring:message></form:option> --%>
-                                            <form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
+                                            <form:option value="cfgKeywords"><spring:message code="URL"/> <spring:message code="key_word"/></form:option>
                                         </form:select>
                                     </div>
-
                                     <input id="intype" class="form-control input-medium" type="text" value="">
-                                    <div class="input-group-btn">
-                                        <form:select path="isValid" class="selectpicker select2 input-small" >
-                                            <form:option value=""><spring:message code="select"/></form:option>
-                                            <form:option value="1"><spring:message code="yes"/></form:option>
-                                            <form:option value="0"><spring:message code="no"/></form:option>
-                                        </form:select>
-                                    </div>
                                 </div>
                             </div>
                             <div class="pull-left">
                                  <form:select path="groupId" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
                                      <form:option value=""><spring:message code='url_group'/></form:option>
-                                     <c:forEach items="${policyGroups}" var="policyGroup">
-                                     <form:option value="${policyGroup.groupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
+                                     <c:forEach items="${policyGroupInfos}" var="policyGroup">
+                                     <form:option value="${policyGroup.serviceGroupId}"><spring:message code='${policyGroup.groupName}'/></form:option>
                                      </c:forEach>
                                  </form:select>
                             </div>
@@ -166,19 +140,6 @@
                                     </ul>
                                 </div>
 
-                                <%-- <shiro:hasPermission name="url:common:confirm">
-                                    <div class="btn-group">
-                                        <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                                            <i class="fa fa-wrench"></i> <spring:message code="examine"></spring:message>
-                                            <i class="fa fa-angle-down"></i>
-                                        </button>
-                                        <ul class="dropdown-menu pull-right">
-                                            <li><sys:delRow url="${ctx}/basics/url/audit?isAudit=1&isValid=1&functionId=${cfg.functionId }" id="contentTable" label="approved"></sys:delRow></li>
-                                            <li><sys:delRow url="${ctx}/basics/url/audit?isAudit=2&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="unapproved"></sys:delRow></li>
-                                            <li><sys:delRow url="${ctx}/basics/url/audit?isAudit=3&isValid=0&functionId=${cfg.functionId }" id="contentTable" label="cancelPass"></sys:delRow></li>
-                                        </ul>
-                                    </div>
-                                </shiro:hasPermission> --%>
                                 <a class="btn  btn-icon-only btn-default setfields tooltips"
                                    data-container="body" data-placement="top" data-original-title=<spring:message code="custom_columns"/> href="javascript:;">
                                     <i class="icon-wrench"></i>
@@ -224,29 +185,8 @@
 
                                     </div>
                                 </div>
-
-                                <div class="col-md-2">
-                                    <div class="form-group">
-                                        <label><spring:message code="audit_time"/>：</label>
-                                        <input name="search_audit_time_start" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-                                               value="<fmt:formatDate value="${cfg.search_audit_time_start}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-
-                                    </div>
-                                </div>
-
-                                <div class="col-md-2">
-                                    <div class="form-group">
-                                        <label>&nbsp;</label>
-                                        <input name="search_audit_time_end" type="text" readonly="readonly" maxlength="20" class="form-control Wdate"
-                                               value="<fmt:formatDate value="${cfg.search_audit_time_end}" pattern="yyyy-MM-dd HH:mm:ss"/>" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
-
-                                    </div>
-                                </div>
                             </div>
-
-
                         </div>
-
                         <!-- /筛选搜索内容栏    结束-->
                     </form:form>
                 </div>
@@ -254,58 +194,42 @@
                 <div class="table-responsive">
                     <table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
                         <thead>
-                        <tr>
-                            <th><input type="checkbox" class="i-checks" id="checkAll"></th>
-                            <th class="sort-column r.compile_id" style="display: none;"  column="cfg_id" ><spring:message code="cfg_id"/></th>
-
-                            <th column="config_describe" ><spring:message code="config_describe"/></th>
-                            <th class="sort-column cfg_keywords">URL<spring:message code="key_word"/></th>
-                            <th><spring:message code="is_audit"/></th>
-                            <th column="sort-column group_name" ><spring:message code="group_name"/></th>
-                            <th column="valid_identifier" ><spring:message code="valid_identifier"/></th>
-                            <th column="creator" ><spring:message code="creator"/></th>
-                            <th column="config_time"  class="sort-column create_time"><spring:message code="config_time"/></th>
-                            <th column="editor" ><spring:message code="editor"/></th>
-                            <th column="edit_time" class="sort-column edit_time"><spring:message code="edit_time"/></th>
-                            <th column="auditor"><spring:message code="auditor"/></th>
-                            <th class="sort-column audit_time"><spring:message code="audit_time"/></th>
-
-                        </tr>
+	                        <tr>
+	                            <th><input type="checkbox" class="i-checks" id="checkAll"></th>
+	                            <th column="config_describe" ><spring:message code="config_describe"/></th>
+	                            <th class="sort-column r.group_id" column="groupId"><spring:message code="group_name"/></th>
+	                            <th class="sort-column cfg_keywords"><spring:message code="URL"/> <spring:message code="key_word"/></th>
+	                            <th column="match_method" ><spring:message code="match_method"/></th>
+	                            <th column="creator" ><spring:message code="creator"/></th>
+	                            <th column="config_time"  class="sort-column create_time"><spring:message code="config_time"/></th>
+	                            <th column="editor" ><spring:message code="editor"/></th>
+	                            <th column="edit_time" class="sort-column edit_time"><spring:message code="edit_time"/></th>
+	                        </tr>
                         </thead>
                         <tbody>
                         <c:forEach items="${page.list }" var="cfg" varStatus="status" step="1">
                             <tr>
                                 <td><input type="checkbox" class="i-checks" id="${cfg.cfgId}" isValid="${cfg.isValid}" value="${cfg.isAudit}"></td>
-                                <td>${cfg.compileId }</td>
                                 <td>${cfg.cfgDesc }</td>
-                                <td>${cfg.cfgKeywords }</td>
                                 <td>
-                                    <c:choose>
-                                        <c:when test="${cfg.isAudit eq '0'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:when>
-                                        <c:when test="${cfg.isAudit eq '1'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:when>
-                                        <c:when test="${cfg.isAudit eq '2'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:when>
-                                        <c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
-                                    </c:choose>
-                                </td>
-                                <td>${cfg.groupName }
                                 	<c:forEach items="${policyGroupInfos}" var="info">
-                                		<c:if test="${cfg.userRegion3 eq info.groupId }">
+                                		<c:if test="${cfg.groupId eq info.serviceGroupId }">
                                 			<spring:message code="${info.groupName }"/>
                                 		</c:if>
                                     </c:forEach>
                                 </td>
+                                <td>${cfg.cfgKeywords }</td>
                                 <td>
-                                    <c:if test="${cfg.isValid==0}"><spring:message code="no"/></c:if>
-                                    <c:if test="${cfg.isValid==1}"><spring:message code="yes"/></c:if>
-                                    <c:if test="${cfg.isValid==-1}"><spring:message code="deleted"/></c:if>
+                                    <c:forEach items="${fns:getDictList('MATCH_METHOD')}" var="matchMethodC">
+                                        <c:if test="${matchMethodC.itemCode eq cfg.matchMethod}">
+                                        	<spring:message code="${matchMethodC.itemValue}"/>
+                                        </c:if>
+                                    </c:forEach>
                                 </td>
                                 <td>${cfg.creatorName }</td>
                                 <td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
                                 <td>${cfg.editorName }</td>
                                 <td><fmt:formatDate value="${cfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-                                <td>${cfg.auditorName }</td>
-                                <td><fmt:formatDate value="${cfg.auditTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-
                             </tr>
                         </c:forEach>
                         </tbody>