From 7ab1a381317d4f6392c6261e4328769d8f23f68b Mon Sep 17 00:00:00 2001
From: leijun <leijun@nismail.iie.ac.cn>
Date: Wed, 28 Nov 2018 19:06:14 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97=201=E3=80=81=E8=B0=83=E6=95=B4=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=AD=97=E6=AE=B5=E6=9F=A5=E8=AF=A2=E5=8F=8A=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=A1=B5=E9=9D=A2=202=E3=80=81=E5=A2=9E=E5=8A=A0cgi?=
 =?UTF-8?q?=20=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=20=E8=B0=83=E6=95=B4htt?=
 =?UTF-8?q?p=20url=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nis/util/httpclient/HttpClientUtil.java   |  49 +++++
 .../maintenance/UserManageController.java     |  11 +-
 .../configuration/UserManageService.java      | 128 +++++++----
 .../messages/message_zh_CN.properties         |  16 +-
 .../cfg/maintenance/userManage/addIpModal.jsp |  69 ++++++
 .../views/cfg/maintenance/userManage/list.jsp | 201 ++++--------------
 .../views/cfg/whitelist/domainList.jsp        |   4 +-
 7 files changed, 259 insertions(+), 219 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/addIpModal.jsp

diff --git a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java
index 97442a0d3..68d9565e4 100644
--- a/src/main/java/com/nis/util/httpclient/HttpClientUtil.java
+++ b/src/main/java/com/nis/util/httpclient/HttpClientUtil.java
@@ -373,4 +373,53 @@ public class HttpClientUtil {
 //        
 //    }  
   
+	/**
+	 * CGI get 获取消息      
+	 * @param destUrl 业务地址
+	 * @param params 参数列表
+	 * @return 查询结果数据json
+	 */
+	public static String getCGI(String destUrl, Map<String, Object> params, HttpServletRequest req) throws IOException {
+		String result = null;
+		Response response=null;
+		String url = "";
+		try {
+			URIBuilder uriBuilder = new URIBuilder(destUrl);
+			if(params!=null) {
+				for (String param : params.keySet()) {
+					if(!StringUtil.isBlank(param)&&params.get(param)!=null) {
+						uriBuilder.addParameter(param, params.get(param).toString());
+					}
+				}
+			}
+			System.err.println(uriBuilder);
+			url=uriBuilder.toString();
+			//创建连接
+			WebTarget wt = ClientUtil.getWebTarger(url);
+			logger.info("getMsg url:"+url);
+			//获取响应结果
+			Builder header = wt.request(MediaType.APPLICATION_JSON).header("Content-Type", MediaType.APPLICATION_JSON);
+			response= header.get();
+			int status = response.getStatus();
+			if (status ==  HttpStatus.SC_OK) {
+				result= response.readEntity(String.class);
+				result = galaxyMessageFormat(result);
+				logger.info("获取消息成功，相应内容如下： " + result);
+				
+			} else {
+				logger.error("获取消息失败，相应内容如下： " + result);
+				throw new MaatConvertException(status+"");
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			logger.error("获取消息失败，相应内容如下： " + result);
+			logger.error("获取消息失败 ", e);
+			throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>:");
+		}finally {
+            if (response != null) {
+                response.close();
+            }
+        }
+		return result;
+	}
 }
diff --git a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
index d3f0728f3..df0b54fcb 100644
--- a/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
+++ b/src/main/java/com/nis/web/controller/configuration/maintenance/UserManageController.java
@@ -57,9 +57,9 @@ public class UserManageController  extends BaseController{
 	@RequiresPermissions(value={"user:manage:config"})
 	public String delete(Integer isValid
 			,String ids
-			,RedirectAttributes redirectAttributes){
+			,RedirectAttributes redirectAttributes,HttpServletRequest  request){
 			try{
-				userManageService.delete(isValid,ids);
+				userManageService.delete(isValid,ids,request);
 				addMessage(redirectAttributes,"delete_success");
 			}catch(Exception e){
 				logger.error("Delete failed",e);
@@ -151,17 +151,16 @@ public class UserManageController  extends BaseController{
 			UserManage  user=new UserManage();
 			IpReuseIpCfg  ipReuseIpCfg=ipReuseIpCfgService.getIpByIp(ip);
 			//根据ip调用接口获取数据
-			//user=userManageService.getUserList(ip, request);
+			 //user=userManageService.getUser(ip, request);
 			if(ipReuseIpCfg!=null){
 				user.setServerIp(ipReuseIpCfg.getDestIpAddress());
-				user.setRemarks(ipReuseIpCfg.getCfgDesc());
 				userManageList.add(user);
 			}
 		}
 		return userManageList;
 	}
 
-	@RequestMapping(value = "view")
+/*	@RequestMapping(value = "view")
 	@RequiresPermissions(value={"user:manage:config"})
 	public String view(String serverIp,String userName,HttpServletResponse response,Model model){
 			UserManage  user=new UserManage();
@@ -174,5 +173,5 @@ public class UserManageController  extends BaseController{
 		}
 		model.addAttribute("user", user);
 		return "/cfg/maintenance/userManage/userView";
-	}
+	}*/
 }
diff --git a/src/main/java/com/nis/web/service/configuration/UserManageService.java b/src/main/java/com/nis/web/service/configuration/UserManageService.java
index 6da3f6346..6de5cb043 100644
--- a/src/main/java/com/nis/web/service/configuration/UserManageService.java
+++ b/src/main/java/com/nis/web/service/configuration/UserManageService.java
@@ -65,19 +65,29 @@ public class UserManageService extends BaseService{
 				entity.setCreatorId(entity.getCurrentUser().getId());
 				entity.setIsValid(Constants.VALID_NO);
 				userManageDao.insert(entity);
-			} catch (MaatConvertException e) {
-				e.printStackTrace();
-				logger.info("获取编译ID出错");
-				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
-		  }
 		//cgi接口添加
 			/*String[] ipArray = entity.getServerIp().split(",");
 			for(String ip :ipArray){
 				//循环调用接口增加
+				Map<String, Object> params = new HashMap<String, Object>();
+				params.put("server_ip", ip);
+				params.put("user_name", entity.getUserName());
+				params.put("user_pwd", entity.getUserPwd());
+				LogRecvData<UserManage> fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_CREATE,request);
+				//返回处理
+				if (fromJson.getStatus().intValue() == 200) {
+				}else{
+				}
 				String url="?cmd=UserCreate&server_ip="+ip+"&user_name="+entity.getUserName()+"&user_pwd="+entity.getUserPwd();
 				System.out.println(url);
-			}*/
+			 }*/
+			} catch (MaatConvertException e) {
+				e.printStackTrace();
+				logger.info("获取编译ID出错");
+				throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
+		  } 
 		}else{
+			try {
 			entity.setEditTime(createTime);
 			entity.setEditorId(entity.getCurrentUser().getId());
 			//获取修改之前数据
@@ -87,8 +97,14 @@ public class UserManageService extends BaseService{
 			/*String[] ipArray = olduser.getServerIp().split(",");
 			for(String ip :ipArray){
 				//循环调用接口删除
-				String url="?cmd=UserDelete&server_ip="+ip+"&user_name="+olduser.getUserName();
-				System.out.println(url);
+				Map<String, Object> params = new HashMap<String, Object>();
+				params.put("server_ip", ip);
+				params.put("user_name", olduser.getUserName());
+				LogRecvData<UserManage> fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_DELETE,request);
+				//返回处理
+				if (fromJson.getStatus().intValue() == 200) {
+				}else{
+				}
 			}*/
 			if(StringUtil.isEmpty(entity.getUserName())){
 				entity.setUserName(olduser.getUserName());
@@ -96,59 +112,65 @@ public class UserManageService extends BaseService{
 			if(StringUtil.isEmpty(entity.getUserPwd())){
 				entity.setUserPwd(olduser.getUserPwd());
 			}
-			/*String[] newIpArray = entity.getServerIp().split(",");
+		/*	String[] newIpArray = entity.getServerIp().split(",");
 			for(String newIp :newIpArray){
 				//循环调用接口添加
-				String url="?cmd=UserCreate&server_ip="+newIp+"&user_name="+entity.getUserName()+"&user_pwd="+entity.getUserPwd();
-				System.out.println(url);
-			}*/
+				Map<String, Object> params = new HashMap<String, Object>();
+				params.put("server_ip", newIp);
+				params.put("user_name", entity.getUserName());
+				params.put("user_pwd", entity.getUserPwd());
+				LogRecvData<UserManage> fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_CREATE,request);
+				//返回处理
+				if (fromJson.getStatus().intValue() == 200) {
+				}else{
+				}
+		  }*/
+		}catch (Exception e) {
+			e.printStackTrace();
+			logger.info("获取编译ID出错");
+			throw new MaatConvertException("<spring:message code=\"request_service_failed\"/>");
+	    } 
+	  }
+	}
+	public  LogRecvData<UserManage> getUrl(Map<String, Object> params,String urlType,HttpServletRequest request){
+		LogRecvData<UserManage> fromJson = new LogRecvData<UserManage>();
+		try{ 
+			String url ="URL"+ urlType ;
+			String recv = HttpClientUtil.getCGI(url, params, request);
+			logger.info("查询结果:" + recv);
+				if (StringUtils.isNotBlank(recv)) {
+					Gson gson = new GsonBuilder().create();
+					 fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<UserManage>>(){}.getType());
+				}
+			} catch (Exception e) {
+				logger.error("查询失败", e);
 		}
+		return fromJson;
 	}
 	
-	//根据vpn服务器ip获取用户vpn服务器ip信息
+/*	//根据vpn服务器ip获取用户vpn服务器ip信息
 	public UserManage  getUser(String serverIp,HttpServletRequest request){
 		UserManage  user=new UserManage();
 		Map<String, Object> params = new HashMap<String, Object>();
 		params.put("server_ip", serverIp);
 		try{ 
-			String url ="URL"+ Constants.NTC_IP_REUSE_USER_LIST;
-			String recv = HttpClientUtil.getMsg(url, params, request);
+			String url ="URL"+ Constants.NTC_IP_REUSE_USER_LIST ;
+			//String recv = HttpClientUtil.getCGI(url, params, request);
+			String recv="{\"data\":{\"list\":[{\"userName\":\"zhangsan\",\"createOn\":\"2018-11-01 14:51:12 \",\"updatedOn\":\"2018-11-02 10:54:07 \",\"outgoingUnicastPackets\":\"537,962\",\"outgoingUnicastTotalSize\":\"278,885\",\"outgoingBroadcastPackets\":\"51,130,890\""
+					+ ",\"outgoingBroadcastTotalSize\":\"4781,154\",\"incomingUnicastPackets\":\"454,121\",\"incomingUnicastTotalSize\":\"45,565\",\"incomingBroadcastPackets\":\"454,4545\""
+					+ ",\"incomingBroadcastTotalSize\":\"4781,154\",\"numberOfLogins\":\"124\"}]}}";
+			recv=HttpClientUtil.galaxyMessageFormat(recv);
 			logger.info("查询结果:" + recv);
 				if (StringUtils.isNotBlank(recv)) {
 					Gson gson = new GsonBuilder().create();
 					LogRecvData<UserManage> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<UserManage>>(){}.getType());
-					if (fromJson.getStatus().intValue() == 200) {
-						
-					}
+					user=fromJson.getData().getList().get(0);
 				}
 			} catch (Exception e) {
 				logger.error("查询失败", e);
 		}
 		return user;
-	}
-	
-	//根据vpn服务器ip,用户名获取用户信息
-	public UserManage  getUserManage(String serverIp,String userName,HttpServletRequest request){
-		UserManage  user=new UserManage();
-		Map<String, Object> params = new HashMap<String, Object>();
-		params.put("server_ip", serverIp);
-		params.put("user_name", userName);
-		try{ 
-			String url ="URL"+ Constants.NTC_IP_REUSE_USER_GET;
-			String recv = HttpClientUtil.getMsg(url, params, request);
-			logger.info("查询结果:" + recv);
-				if (StringUtils.isNotBlank(recv)) {
-					Gson gson = new GsonBuilder().create();
-					LogRecvData<UserManage> fromJson = gson.fromJson(recv, new TypeToken<LogRecvData<UserManage>>(){}.getType());
-					if (fromJson.getStatus().intValue() == 200) {
-						
-					}
-				}
-			} catch (Exception e) {
-				logger.error("查询失败", e);
-		}
-		return user;
-	}
+	}*/
 	/**
 	 * 
 	 * @param isAudit
@@ -156,7 +178,8 @@ public class UserManageService extends BaseService{
 	 * @param ids compileIds
 	 */
 	@Transactional(readOnly=false,rollbackFor=RuntimeException.class)
-	public void delete(Integer isValid,String ids){
+	public void delete(Integer isValid,String ids,HttpServletRequest  request){
+		/*try{*/
 		String[] idArray = ids.split(",");
 		List<UserManage> userList=new ArrayList<UserManage>();
 		for(String id :idArray){
@@ -172,16 +195,27 @@ public class UserManageService extends BaseService{
 			userManageDao.update(entity);
 		}
 		//cgi接口删除旧数据
-		for (int i = 0; i < userList.size(); i++) {
+/*		for (int i = 0; i < userList.size(); i++) {
 			String[] ipArray = userList.get(i).getServerIp().split(",");
 			for(String ip :ipArray){
 				//循环调用接口删除
-				String url="?cmd=UserDelete&server_ip="+ip+"&user_name="+userList.get(i).getUserName();
-				System.out.println(url);
+				Map<String, Object> params = new HashMap<String, Object>();
+				params.put("server_ip", ip);
+				params.put("user_name",userList.get(i).getUserName());
+				LogRecvData<UserManage> fromJson=getUrl(params,Constants.NTC_IP_REUSE_USER_DELETE,request);
+				//返回处理
+				if (fromJson.getStatus().intValue() == 200) {
+				}else{
+				}
 			}
 		}
-	}
+	} catch (Exception e) {
+		logger.error("查询失败", e);
+   }*/
+  }
+	
 	public List<UserManage> findUsers() {
 		return userManageDao.findUsers();
 	}
 }
+
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index b65141967..27e3adcc3 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1319,14 +1319,14 @@ transfer_bytes=\u4F20\u8F93\u6570\u636E\u5B57\u8282
 user_info=\u7528\u6237\u4FE1\u606F
 user_list=\u7528\u6237\u5217\u8868
 equal_password=\u5BC6\u7801\u4E0D\u4E00\u81F4\uFF01
-outgoing_unicast_packets=\u8F93\u51FA\u5355\u5305
-outgoing_unicast_total_size=\u8F93\u51FA\u5355\u64AD\u603B\u5927\u5C0F
-outgoing_broadcast_packets=\u8F93\u51FA\u5E7F\u64AD\u6570\u636E\u5305
-outgoing_broadcast_total_size=\u8F93\u51FA\u5E7F\u64AD\u603B\u5927\u5C0F
-incoming_unicast_packets=\u8F93\u5165\u5355\u5305
-incoming_unicast_total_size=\u8F93\u5165\u5355\u64AD\u603B\u5927\u5C0F
-incoming_broadcast_packets=\u8F93\u5165\u5E7F\u64AD\u6570\u636E\u5305
-incoming_broadcast_total_size=\u8F93\u5165\u5E7F\u64AD\u603B\u5927\u5C0F
+outgoing_unicast_packets=\u4E0A\u4F20\u6570\u636E\u5305\u6570
+outgoing_unicast_total_size=\u4E0A\u4F20\u6570\u636E\u5305\u6570\u603B\u91CF
+outgoing_broadcast_packets=\u4E0A\u4F20\u5B57\u8282\u6570
+outgoing_broadcast_total_size=\u4E0A\u4F20\u5B57\u8282\u6570\u603B\u91CF
+incoming_unicast_packets=\u4E0B\u8F7D\u6570\u636E\u5305\u6570
+incoming_unicast_total_size=\u4E0B\u8F7D\u6570\u636E\u5305\u6570\u603B\u91CF
+incoming_broadcast_packets=\u4E0B\u8F7D\u5B57\u8282\u6570
+incoming_broadcast_total_size=\u4E0B\u8F7D\u5B57\u8282\u6570\u603B\u91CF
 address_pool=\u5730\u5740\u6C60
 ip_total=IP\u603B\u6570
 available_ip_total=\u53EF\u7528IP\u6570
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/addIpModal.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/addIpModal.jsp
new file mode 100644
index 000000000..c7b484e50
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/addIpModal.jsp
@@ -0,0 +1,69 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+
+<script type="text/javascript">
+function showVpnIp(id,serverIp){
+	$("#vpn_modal").modal({
+		backdrop:"static",
+		keyboard:false,
+		show:true
+	});
+	$("#serverIpId").val(serverIp);
+	$("#serverIpName").val(serverIp);
+	$("#userId").val(id);
+}
+
+var saveIp=function(){
+	if($("#serverIpId").val()==""){
+		 top.$.jBox.tip("<spring:message code='vpn_ip'/> <spring:message code='required'/>","");
+		return ;
+	}
+	$("#vpn_modal").modal('hide');
+	$("#importForm1").submit();
+}
+</script> 
+<div class="modal fade" id="vpn_modal" tabindex="-1" role="dialog" aria-labelledby="mo" aria-hidden="true">
+	<form id="importForm1" action="${ctx}/maintenance/userManage/save" method="post" enctype="multipart/form-data" style="margin-top: 10%;" class="form-horizontal"
+		onsubmit="loading('<spring:message code='loading'/>');">
+		<input type="hidden"  id="importTip" value="<spring:message code='import_tip_excel'/>">
+		<div class="modal-dialog" role="document" style="width:700px;">
+			<div class="modal-content">
+				<div class="modal-header">
+					<h5 class="modal-title" id="exampleModalLabel">
+						<spring:message code="vpn_ip" />
+					</h5>
+					<button type="button" class="close" data-dismiss="modal"
+						aria-label="Close">
+						<span aria-hidden="true">&times;</span>
+					</button>
+				</div>
+				<div class="modal-body">
+				<input type="hidden"  id="userId"  name="id" />
+				<div class="form-group" style="margin-top: 15px;">
+					<label class="control-label col-md-3">
+					 <spring:message code="vpn_ip" />
+					</label>
+					<div class="col-md-6">
+						<sys:treeselect id="serverIp" name="serverIp"
+													value="${user.serverIp}" labelName="user.serverIp"
+													notAllowSelectParent="true" enableSearch="true"
+													notAllowSelectRoot="true"   checkedPS="ps"  unCheckedPS="ps"
+													labelValue="${user.serverIp}" title="vpn_ip"
+													url="/maintenance/userManage/treeData?isLeafShow=false&cfgType=3&specific=true" extId="0"
+													checked="true"   cssClass="form-control required" />
+					</div>
+					<span class="help-inline"><font color="red">*</font> </span>
+					<div for="user.serverIp"></div>
+				</div>
+					<div class="modal-footer">
+					<button type="button" class="btn red" onclick="saveIp()">
+						<spring:message code="ok" />
+					</button>
+					<button type="button" class="btn" data-dismiss="modal">
+						<spring:message code="close" />
+					</button>
+				</div>
+			</div>
+		</div>
+	</form>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp
index fbe042aa5..6d23fdbbf 100644
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp
@@ -57,107 +57,55 @@
 			success:function(data){
 				$("#userTable tbody").empty("");
 					var html = ""
+						html = "<div style='width:98%;overflow: auto;margin-top: 10px;height: 417px;margin-left: 1%;'>"
+						html+="<table class='table table-bordered table-condensed text-nowrap' style='width: 100%;'>";
+	      			  	html+="<thead>";
+	      			  	html+="<th><spring:message code="user_name"/></th><th><spring:message code="vpn_ip"/></th><th><spring:message code="create_time"/></th><th><spring:message code="last_login"/></th><th><spring:message code="num_logins"/></th>";
+	      			  	html+="<th><spring:message code="outgoing_unicast_packets"/></th><th><spring:message code="outgoing_unicast_total_size"/></th><th><spring:message code="outgoing_broadcast_packets"/></th>";
+	      			  	html+="<th><spring:message code="outgoing_broadcast_total_size"/></th><th><spring:message code="incoming_unicast_packets"/></th><th><spring:message code="incoming_unicast_total_size"/></th>";
+	      			  	html+="<th><spring:message code="incoming_broadcast_packets"/></th><th><spring:message code="incoming_broadcast_total_size"/></th>";
+	      			  	html+="</thead>";
+	      			   	html+="<tbody>";
 		      			   	for(i=0;i<data.length;i++){
 		      			   		html+="<tr>";
 		      			   		if(i==0){
 		      			   		html+="<td class='taskStatus' rowspan='"+data.length+"'>"+userName;
 		      					html+="</td>";
 		      			   		}
-		      					html+="<td class='taskStatus'>";
-		      			      	html+="<a style='text-decoration: none;' href='${ctx}/maintenance/userManage/view?userName="+userName;
-		      			      	html+="&serverIp="+data[i].serverIp+"'>"+data[i].serverIp;
-		      					html+="</a></td>";
-		      					html+="<td class='taskStatus'>"+(data[i].numLogins==null?"":data[i].numLogins);
+		      					html+="<td class='taskStatus'>"+data[i].serverIp+"</td>";
+		      					html+="<td class='taskStatus'>"+(data[i].createOn==null?"":data[i].createOn);
 		      					html+="</td>";
-		      					html+="<td class='taskStatus'>"+(data[i].lastLogin==null?"":data[i].lastLogin);
+		      					html+="<td class='taskStatus'>"+(data[i].updatedOn==null?"":data[i].updatedOn);
 		      					html+="</td>";
-		      					html+="<td class='taskStatus'>"+(data[i].transferPackets==null?"":data[i].transferPackets);
+		      					html+="<td class='taskStatus'>"+(data[i].numberOfLogins==null?"":data[i].numberOfLogins);
 		      					html+="</td>";
-		      					html+="<td class='taskStatus'>"+(data[i].transferBytes==null?"":data[i].transferBytes);
+		      					html+="<td class='taskStatus'>"+(data[i].outgoingUnicastPackets==null?"":data[i].outgoingUnicastPackets);
 		      					html+="</td>";
-		      					html+="<td class='taskStatus'>"+(data[i].remarks==null?"":data[i].remarks);
+		      					html+="<td class='taskStatus'>"+(data[i].outgoingUnicastTotalSize==null?"":data[i].outgoingUnicastTotalSize);
+		      					html+="</td>";
+		      					html+="<td class='taskStatus'>"+(data[i].outgoingBroadcastPackets==null?"":data[i].outgoingBroadcastPackets);
+		      					html+="</td>";
+		      					html+="<td class='taskStatus'>"+(data[i].outgoingBroadcastTotalSize==null?"":data[i].outgoingBroadcastTotalSize);
+		      					html+="</td>";
+		      					html+="<td class='taskStatus'>"+(data[i].incomingUnicastPackets==null?"":data[i].incomingUnicastPackets);
+		      					html+="</td>";
+		      					html+="<td class='taskStatus'>"+(data[i].incomingUnicastTotalSize==null?"":data[i].incomingUnicastTotalSize);
+		      					html+="</td>";
+		      					html+="<td class='taskStatus'>"+(data[i].incomingBroadcastPackets==null?"":data[i].incomingBroadcastPackets);
+		      					html+="</td>";
+		      					html+="<td class='taskStatus'>"+(data[i].incomingBroadcastTotalSize==null?"":data[i].incomingBroadcastTotalSize);
 		      					html+="</td>";
 		      			   		html+="</tr>";
 		      			   	}
-					$("#userTable tbody").prepend(html);
-					openWindow('light');
+		      				html+="</tbody>";
+		      			 	html+="</table>";  
+		      			 	html+="</div>";
+					top.$.jBox(html,{width: $(document).width()*0.6,height: 480,title:"<spring:message code="user_info"/>", buttons:{"<spring:message code="close"/>":true}});
 		 }
 	  });
 	} 
-	 
-		 function addVpnIp(id,serverIp,userName){
-			 $("#spUserName").text(userName)
-			 $("#serverIpId").val(serverIp);
-			 $("#serverIpName").val(serverIp);
-			 $("#userId").val(id);
-			 openWindow('light2');
-		 }
-		function saveIp(){
-			 if($("#serverIpId").val()==null || $("#serverIpId").val()==''){
-				 top.$.jBox.tip("<spring:message code='vpn_ip'/> <spring:message code='required'/>","");
-			 }else{
-			 	window.location.href="${ctx}/maintenance/userManage/save?id="+$("#userId").val()+"&serverIp="+$("#serverIpId").val(); 
-			 	$("#submitIp").attr('disabled',"true");
-			 }
-		}
-		function openWindow(type){
-            document.getElementById(type).style.display='block';
-            document.getElementById('fade').style.display='block';
-        }
-        function closeWindow(type){
-            document.getElementById(type).style.display='none';
-            document.getElementById('fade').style.display='none';
-        }	
+	
 </script>
-
-<style type="text/css">
-   .black_overlay{
-             display: none; 
-             position: absolute;  
-             top: 0%;  
-             left: 0%;  
-             width: 100%;  
-             height: 100%;  
-             background-color: #0c0c0c1f;  
-             z-index:1001;  
-             -moz-opacity: 0.8;  
-             opacity:.80;  
-             filter: alpha(opacity=80);  
-        } 
-        .white_content {
-            display: none;  
-            position: absolute; 
-            top: 20%; 
-            left: 20%; 
-            width: 60%; 
-            height: 480px; 
-            border: 1px solid 42403e52; 
-            background-color: white; 
-            z-index:1002;
-            overflow: auto;
-            -moz-box-shadow: 2px 2px 10px #909090;
-  			 -webkit-box-shadow: 2px 2px 10px #909090;
-   			 box-shadow:2px 2px 10px #909090;
-        } 
-         .white_vpn{
-            display: none;  
-            position: absolute; 
-            top: 15%; 
-            left: 25%; 
-            width: 615px; 
-            height: 230px; 
-            border: 1px solid 42403e52; 
-            background-color: white; 
-            z-index:1002;
-            overflow: auto;
-            -moz-box-shadow: 2px 2px 10px #909090;
-  			 -webkit-box-shadow: 2px 2px 10px #909090;
-   			 box-shadow:2px 2px 10px #909090;
-        }
-        .input_w{
-        width: 350px;
-        }
-</style>
 </head>
 <body>
 <div class="page-content">
@@ -290,92 +238,33 @@
 									<input type="checkbox" class="i-checks child-checks" id="${indexCfg.id}"  isValid="${cfg.isValid}"  value="0" >
 									</td>
 								    <td>${indexCfg.userName }</td>
-									<td><a href="javascript:dictDetail('${indexCfg.serverIp}','${indexCfg.userName}')">${indexCfg.serverIp }</a></td>
+									<td class="no_substr" title="${indexCfg.serverIp }"><a href="javascript:dictDetail('${indexCfg.serverIp}','${indexCfg.userName}')">
+									<c:if test="${fn:length(indexCfg.serverIp)>28}">
+										${fn:substring(indexCfg.serverIp,0,20)}..
+									</c:if>
+									<c:if test="${fn:length(indexCfg.serverIp)<=28}">
+										${indexCfg.serverIp }
+									</c:if>
+									</a></td>
 									<td>${indexCfg.remarks }</td>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>
 									<td><fmt:formatDate value="${indexCfg.editTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
-									<td class="no_substr">
-										<div class="btn-group">
-									      <a class="btn btn-primary" href="#"><i class="icon-cogs"></i> <spring:message code="operation"/></a>
-									      <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
-									      <ul class="dropdown-menu">
-								        	<li><a href="javascript:addVpnIp('${indexCfg.id}','${indexCfg.serverIp}','${indexCfg.userName}')"><i class="fa fa-plus"></i><spring:message code="add"/> <spring:message code="vpn_ip"/></a></li>
-									      </ul>
-									    </div>
+									<td>
+										<a href="javascript:showVpnIp('${indexCfg.id}','${indexCfg.serverIp}')"><i class="fa fa-plus"></i> <spring:message code="vpn_ip"/></a>
 									</td>
 								</tr>
 								</c:forEach>
 							</tbody>
-						</table>
+						  </table>
 						<div class="page">${page}</div>
 					</div>
 					</div>
 				</div>
 			</div>
 </div>
- <c:set var="importPath" value="/ntc/iplist/list?functionId=${cfg.functionId}"/>
- <!-- 模板导入，start -->
-<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
-    <div id="light" class="white_content">
-    	<div class="jbox-title-panel" style="border-bottom: 1px solid #b9b9b9;height: 40px;width: 100%;padding: 11px;">
-    	 <span style="font-size: 16px;"><spring:message code="user_list"/></span>
-    		<a href="javascript:void(0)" onClick="closeWindow('light')" style="text-decoration: none;color: #777777;float: right;" > X</a>
-    	</div>
-    	<div style='font-size: 14px;height: 405px;overflow: auto;' align='center'>
-    	    <table id="userTable" class='table table-bordered table-condensed' style='width:98%;margin-top: 10px;' >
-    	    	<thead style="font-weight:bold;">
-    	    		<td><spring:message code="user_name"/></td>
-    	    		<td><spring:message code="vpn_ip"/></td>
-    	    		<td><spring:message code="num_logins"/></td>
-    	    		<td><spring:message code="last_login"/></td>
-    	    		<td><spring:message code="transfer_packets"/></td>
-    	    		<td><spring:message code="transfer_bytes"/></td>
-    	    		<td><spring:message code="desc"/></td>
-    	    	</thead>
-    	    	<tbody></tbody>
-    	    </table>
-    	</div>
-    	<div style="border-top: 1px solid #b9b9b9;padding: 4px;background: #eee;height: 35px;">
-    	  	<button onclick="closeWindow('light');" style="float: right;"><spring:message code="close"/></button>
-    	</div>
-     </div>
-     
-       <div id="light2" class="white_vpn">
-        <div class="jbox-title-panel" style="border-bottom: 1px solid #b9b9b9;height: 40px;width: 100%;padding: 11px;">
-    	 <span style="font-size: 16px;"><spring:message code="vpn_ip"/></span>
-    	 <a href="javascript:void(0)" onClick="closeWindow('light2')" style="text-decoration: none;color: #777777;float: right;" > X</a>
-    	</div>
-    	<input type="hidden"  id="userId"/>
-		<table border="0" style="width: 80%;line-height: 35px;margin-top: 15px;margin-left: 40px;">
-			<tr>
-				<td align="right"><spring:message code="user_name" />&nbsp;&nbsp;&nbsp;&nbsp;</td>
-				<td width="320px;" ><span id='spUserName'></span></td>
-			</tr>
-			<tr>
-				<td align="right"><spring:message code="vpn_ip" />&nbsp;&nbsp;&nbsp;&nbsp;</td>
-				<td width="320px;">
-										<sys:treeselect id="serverIp" name="serverIp"
-											value="${user.serverIp}" labelName="user.serverIp"
-											notAllowSelectParent="true" enableSearch="true"
-											notAllowSelectRoot="true"   checkedPS="ps"  unCheckedPS="ps"
-											labelValue="${user.serverIp}" title="vpn_ip"
-											url="/maintenance/userManage/treeData?isLeafShow=false&cfgType=3&specific=true" extId="0"
-											checked="true"   cssClass="form-control required" />
-				</td>
-				<td width="30px;"><span class="help-inline"><font color="red" id='red'>*</font> </span></td>
-			</tr>
-		</table>
-	    	<div class="form-actions" style="margin-top: 30px;">
-				<button  type="submit" class="btn green" id="submitIp"  onClick="return saveIp()" style="margin-left: 70px;" >
-					<spring:message code="submit" />
-				</button>
-				<button  type="button" class="btn default"   onClick="closeWindow('light2')">
-					<spring:message code="cancel" />
-				</button>
-			</div>
-     </div>
-    <div id="fade" class="black_overlay"></div>
+     <!-- vpn服务器Ip模板，start -->
+<%@include file="/WEB-INF/views/cfg/maintenance/userManage/addIpModal.jsp" %>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
index 731fdf38b..eab35e74c 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainList.jsp
@@ -203,7 +203,7 @@
 							
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
-								<%-- <div class="row">
+								 <div class="row">
 								
 									<div class="col-md-3">
 											
@@ -263,7 +263,7 @@
                                           
                                         </div>
 									
-								</div> --%>
+								</div>
 								
 								<div class="row">
 									<div class="col-md-2">

From 1fbc899269552b5134f1c2d29c3378db07dbd85e Mon Sep 17 00:00:00 2001
From: zhanghongqing <zhanghongqing@nismail.iie.ac.cn>
Date: Wed, 28 Nov 2018 19:23:38 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=9A=E5=9F=9F=E7=9A=84=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=A2=9E=E5=8A=A0=E5=8F=AF=E6=9F=A5=E7=9C=8B=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=AF=A6=E6=83=85=EF=BC=8C=E9=9A=90=E8=97=8F=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E4=B8=AD=E7=9A=84=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=EF=BC=8C=E6=8F=90=E4=BE=9B=E5=8F=AF=E4=BB=A5=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=BF=87=E9=95=BFtitle=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../configuration/AppCfgController.java       |  8 +--
 .../BasicProtocolController.java              |  8 +--
 .../EncryptedTunnelBehaviorController.java    |  8 +--
 .../ntc/AvContentController.java              |  6 +-
 .../configuration/ntc/BgpCfgController.java   |  8 +--
 .../ntc/FileTransferCfgController.java        | 22 ++++----
 .../configuration/ntc/IpController.java       |  8 +--
 .../configuration/ntc/MailCfgController.java  |  8 +--
 .../configuration/ntc/WebsiteController.java  | 24 ++++----
 .../ntc/WhiteListController.java              | 16 +++---
 .../proxy/HttpRedirectPolicyController.java   |  8 +--
 .../proxy/InterceptController.java            |  8 +--
 .../nis/web/dao/configuration/AppCfgDao.java  |  2 +-
 .../nis/web/dao/configuration/AppCfgDao.xml   | 11 +++-
 .../web/dao/configuration/AvContentCfgDao.xml |  2 +-
 .../nis/web/dao/configuration/BgpCfgDao.java  |  4 +-
 .../nis/web/dao/configuration/BgpCfgDao.xml   | 12 +++-
 .../dao/configuration/FileTransferCfgDao.java |  6 +-
 .../dao/configuration/FileTransferCfgDao.xml  | 24 ++++++--
 .../nis/web/dao/configuration/IpCfgDao.java   |  2 +-
 .../nis/web/dao/configuration/IpCfgDao.xml    | 12 +++-
 .../nis/web/dao/configuration/MailCfgDao.java |  4 +-
 .../nis/web/dao/configuration/MailCfgDao.xml  | 12 +++-
 .../web/dao/configuration/WebsiteCfgDao.java  |  9 +--
 .../web/dao/configuration/WebsiteCfgDao.xml   | 12 +++-
 .../service/configuration/AppCfgService.java  |  8 +--
 .../service/configuration/BgpCfgService.java  |  8 +--
 .../service/configuration/DomainService.java  |  8 +--
 .../configuration/FileTransferCfgService.java | 28 +++++-----
 .../configuration/HttpRedirectCfgService.java |  8 +--
 .../configuration/InterceptCfgService.java    |  8 +--
 .../service/configuration/IpCfgService.java   |  8 +--
 .../service/configuration/MailCfgService.java |  8 +--
 .../configuration/WebsiteCfgService.java      | 24 ++++----
 .../resources/messages/message_en.properties  |  3 +-
 .../resources/messages/message_ru.properties  |  3 +-
 .../messages/message_zh_CN.properties         |  3 +-
 .../views/log/manipulation/dkBehaviorList.jsp | 46 ++++++++++++++-
 .../webapp/WEB-INF/views/log/ntc/appList.jsp  |  2 +-
 .../webapp/WEB-INF/views/log/ntc/bgpList.jsp  | 46 ++++++++++++++-
 .../WEB-INF/views/log/ntc/collectVoipList.jsp |  2 +-
 .../webapp/WEB-INF/views/log/ntc/ddosList.jsp |  2 +-
 .../webapp/WEB-INF/views/log/ntc/dnsList.jsp  | 45 ++++++++++++++-
 .../webapp/WEB-INF/views/log/ntc/ftpList.jsp  | 44 ++++++++++++++-
 .../WEB-INF/views/log/ntc/httpKeyList.jsp     | 48 +++++++++++++++-
 .../webapp/WEB-INF/views/log/ntc/httpList.jsp | 46 ++++++++++++++-
 .../webapp/WEB-INF/views/log/ntc/ipList.jsp   | 46 ++++++++++++++-
 .../WEB-INF/views/log/ntc/ipsecList.jsp       |  2 +-
 .../WEB-INF/views/log/ntc/l2tpLogList.jsp     |  2 +-
 .../webapp/WEB-INF/views/log/ntc/mailList.jsp | 46 ++++++++++++++-
 .../WEB-INF/views/log/ntc/mmAvIpList.jsp      |  2 +-
 .../WEB-INF/views/log/ntc/mmAvUrlList.jsp     |  2 +-
 .../views/log/ntc/mmFileDigestList.jsp        | 44 ++++++++++++++-
 .../WEB-INF/views/log/ntc/mmPicIpList.jsp     |  2 +-
 .../WEB-INF/views/log/ntc/mmPicUrlList.jsp    |  2 +-
 .../views/log/ntc/mmPornAudioSampleList.jsp   |  2 +-
 .../views/log/ntc/mmPornVideoSampleList.jsp   |  2 +-
 .../views/log/ntc/mmSampleAudioList.jsp       |  2 +-
 .../views/log/ntc/mmSampleFaceList.jsp        |  2 +-
 .../views/log/ntc/mmSampleLogoList.jsp        |  2 +-
 .../WEB-INF/views/log/ntc/mmSamplePicList.jsp |  2 +-
 .../views/log/ntc/mmSampleSpeakerList.jsp     |  2 +-
 .../views/log/ntc/mmSampleVideoList.jsp       |  2 +-
 .../views/log/ntc/mmSampleVoipList.jsp        |  2 +-
 .../views/log/ntc/mmVoipAccountList.jsp       |  2 +-
 .../WEB-INF/views/log/ntc/mmVoipIpList.jsp    | 45 ++++++++++++++-
 .../WEB-INF/views/log/ntc/ntcStreamMedia.jsp  | 44 ++++++++++++++-
 .../WEB-INF/views/log/ntc/openVpnList.jsp     |  2 +-
 .../webapp/WEB-INF/views/log/ntc/p2pList.jsp  | 47 +++++++++++++++-
 .../WEB-INF/views/log/ntc/pptpLogList.jsp     |  2 +-
 .../webapp/WEB-INF/views/log/ntc/sshList.jsp  |  2 +-
 .../WEB-INF/views/log/ntc/sslLogList.jsp      | 56 +++++++++++++++++--
 .../WEB-INF/views/log/pxy/pxyHttpList.jsp     | 45 ++++++++++++++-
 .../webapp/static/global/scripts/common.js    |  6 +-
 .../webapp/static/pages/scripts/pageLogs.js   |  2 +
 75 files changed, 869 insertions(+), 192 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
index ef5701192..ee1f8a893 100644
--- a/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/AppCfgController.java
@@ -135,8 +135,8 @@ public class AppCfgController extends BaseController {
 	 * @return
 	 */
 	@RequestMapping(value = {"ajaxAppPolicyIpList"})
-	public String ajaxSslSubList(Model model,Long cfgId,Integer index) {
-		AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId);
+	public String ajaxSslSubList(Model model,Long cfgId,Integer index,Integer compileId) {
+		AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId,compileId);
 		List<String[]> tabList = new ArrayList();
 		if(cfg.getIpPortList()!=null){
 			String cfgType = null;
@@ -172,7 +172,7 @@ public class AppCfgController extends BaseController {
 	@RequiresPermissions(value={"app:policy:config"})
 	public String policyCfgForm(Model model,String ids,AppPolicyCfg entity) {
 		if(StringUtils.isNotBlank(ids)){
-			entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids));
+			entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids),entity.getCompileId());
 			initUpdateFormCondition(model,entity);
 		}else{
 			initFormCondition(model,entity);
@@ -227,7 +227,7 @@ public class AppCfgController extends BaseController {
 		AppPolicyCfg entity = new AppPolicyCfg();
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
-			entity = appCfgService.getAppPolicyCfg(Long.parseLong(id));
+			entity = appCfgService.getAppPolicyCfg(Long.parseLong(id),entity.getCompileId());
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
diff --git a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java
index e5d7ab9ef..fb4baf22b 100644
--- a/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java
+++ b/src/main/java/com/nis/web/controller/configuration/BasicProtocolController.java
@@ -71,8 +71,8 @@ public class BasicProtocolController extends BaseController {
 	 * @return
 	 */
 	@RequestMapping(value = {"ajaxIpList"})
-	public String ajaxSslSubList(Model model,Long cfgId,Integer index) {
-		AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId);
+	public String ajaxSslSubList(Model model,Long cfgId,Integer index,Integer compileId) {
+		AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId,compileId);
 		List<String[]> tabList = new ArrayList();
 		if(cfg.getIpPortList()!=null){
 			String cfgType = null;
@@ -108,7 +108,7 @@ public class BasicProtocolController extends BaseController {
 	@RequiresPermissions(value={"basicprotocol:config"})
 	public String policyCfgForm(Model model,String ids,AppPolicyCfg entity) {
 		if(StringUtils.isNotBlank(ids)){
-			entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids));
+			entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids),entity.getCompileId());
 			initUpdateFormCondition(model,entity);
 		}else{
 			initFormCondition(model,entity);
@@ -166,7 +166,7 @@ public class BasicProtocolController extends BaseController {
 		AppPolicyCfg entity = new AppPolicyCfg();
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
-			entity = appCfgService.getAppPolicyCfg(Long.parseLong(id));
+			entity = appCfgService.getAppPolicyCfg(Long.parseLong(id),entity.getCompileId());
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
diff --git a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java
index 278d1e5bd..1006493d0 100644
--- a/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java
+++ b/src/main/java/com/nis/web/controller/configuration/EncryptedTunnelBehaviorController.java
@@ -93,8 +93,8 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 	 * @return
 	 */
 	@RequestMapping(value = {"ajaxIpList"})
-	public String ajaxSslSubList(Model model,Long cfgId,Integer index) {
-		AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId);
+	public String ajaxSslSubList(Model model,Long cfgId,Integer index,Integer compileId) {
+		AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId,compileId);
 		List<String[]> tabList = new ArrayList();
 		if(cfg.getIpPortList()!=null){
 			String cfgType = null;
@@ -130,7 +130,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 	@RequiresPermissions(value={"encryptedtunnelbehav:config"})
 	public String policyCfgForm(Model model,String ids,AppPolicyCfg entity) {
 		if(StringUtils.isNotBlank(ids)){
-			entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids));
+			entity = appCfgService.getAppPolicyCfg(Long.parseLong(ids),entity.getCompileId());
 			initUpdateFormCondition(model,entity);
 		}else{
 			initFormCondition(model,entity);
@@ -187,7 +187,7 @@ public class EncryptedTunnelBehaviorController extends BaseController {
 		AppPolicyCfg entity = new AppPolicyCfg();
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
-			entity = appCfgService.getAppPolicyCfg(Long.parseLong(id));
+			entity = appCfgService.getAppPolicyCfg(Long.parseLong(id),entity.getCompileId());
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
index 34b59459d..a9ce878af 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/AvContentController.java
@@ -279,9 +279,10 @@ public class AvContentController extends BaseController  {
 	 * @return
 	 */
 	@RequestMapping(value = {"/ajaxVoipIpInfo"})
-	public String getVoipIpInfo(Model model,Long cfgId,Integer index) {
+	public String getVoipIpInfo(Model model,Long cfgId,Integer index,Integer compileId) {
 		CfgIndexInfo cfgIndexInfo = new CfgIndexInfo();
 		cfgIndexInfo.setCfgId(cfgId);
+		cfgIndexInfo.setCompileId(compileId);
 		CfgIndexInfo cfg = avContentCfgService.getCfgIndexInfo(cfgIndexInfo);
 		List<String[]> tabList = new ArrayList();
 		//获取voipIpCfg信息
@@ -663,9 +664,10 @@ public class AvContentController extends BaseController  {
 	}
 	// 获取域配置信息
 	@RequestMapping(value = {"ajaxAvContUrlList"})
-	public String ajaxAvContUrlList(Model model,Long cfgId,Integer index) {
+	public String ajaxAvContUrlList(Model model,Long cfgId,Integer index,Integer compileId) {
 		CfgIndexInfo cfgIndexInfo = new CfgIndexInfo();
 		cfgIndexInfo.setCfgId(cfgId);
+		cfgIndexInfo.setCompileId(compileId);
 		CfgIndexInfo cfg = avContentCfgService.getUrlCfgIndexInfo(cfgIndexInfo);
 		List<String[]> tabList = new ArrayList();
 		if(cfg.getIpPortList()!=null){
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java
index 9d67d9fd7..bb156b0bd 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/BgpCfgController.java
@@ -55,7 +55,7 @@ public class BgpCfgController extends BaseController{
 	@RequiresPermissions(value={"other:bgp:config"})
 	public String bgpForm(Model model,String ids,CfgIndexInfo entity,RedirectAttributes redirectAttributes) {
 		if(StringUtils.isNotBlank(ids)){
-			entity = bgpCfgService.getBgpCfg(Long.parseLong(ids));
+			entity = bgpCfgService.getBgpCfg(Long.parseLong(ids),entity.getCompileId());
 			initUpdateFormCondition(model,entity);
 		}else{
 			initFormCondition(model,entity);
@@ -74,8 +74,8 @@ public class BgpCfgController extends BaseController{
 	}
 	
 	@RequestMapping(value = {"ajaxBgpSubList"})
-	public String ajaxBgpSubList(Model model,Long cfgId,Integer index) {
-		CfgIndexInfo cfg = bgpCfgService.getBgpCfg(cfgId);
+	public String ajaxBgpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
+		CfgIndexInfo cfg = bgpCfgService.getBgpCfg(cfgId,compileId);
 		List<String[]> tabList = new ArrayList();
 		if(cfg.getIpPortList()!=null){
 			String cfgType = null;
@@ -134,7 +134,7 @@ public class BgpCfgController extends BaseController{
 		CfgIndexInfo entity = new CfgIndexInfo();
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
-			entity = bgpCfgService.getBgpCfg(Long.parseLong(id));
+			entity = bgpCfgService.getBgpCfg(Long.parseLong(id),entity.getCompileId());
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
index 63fa76e52..6d21023c4 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
@@ -66,7 +66,7 @@ public class FileTransferCfgController  extends BaseController{
 	@RequiresPermissions(value={"fileTransfer:ftp:config"})
 	public String ftpForm(Model model,String compileIds,String ids,CfgIndexInfo entity) {
 		if(StringUtils.isNotBlank(ids)){
-			entity = fileTransferCfgService.getFtpCfg(Long.parseLong(ids));
+			entity = fileTransferCfgService.getFtpCfg(Long.parseLong(ids),entity.getCompileId());
 			initUpdateFormCondition(model,entity);
 		}else{
 			initFormCondition(model,entity);
@@ -95,8 +95,8 @@ public class FileTransferCfgController  extends BaseController{
 		return "redirect:" + adminPath +"/ntc/fileTransfer/ftpList?functionId="+entity.getFunctionId();
 	}
 	@RequestMapping(value = {"ajaxFtpSubList"})
-	public String ajaxFtpSubList(Model model,Long cfgId,Integer index) {
-		CfgIndexInfo cfg = fileTransferCfgService.getFtpCfg(cfgId);
+	public String ajaxFtpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
+		CfgIndexInfo cfg = fileTransferCfgService.getFtpCfg(cfgId,compileId);
 		List<String[]> tabList = new ArrayList();
 		if(cfg.getIpPortList()!=null){
 			String cfgType = null;
@@ -163,7 +163,7 @@ public class FileTransferCfgController  extends BaseController{
 		CfgIndexInfo entity = new CfgIndexInfo();
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
-			entity = fileTransferCfgService.getFtpCfg(Long.parseLong(id));
+			entity = fileTransferCfgService.getFtpCfg(Long.parseLong(id),entity.getCompileId());
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
@@ -203,7 +203,7 @@ public class FileTransferCfgController  extends BaseController{
 	@RequiresPermissions(value={"fileTransfer:fileDigest:config"})
 	public String fileDigestForm(Model model,String ids,FileDigestCfg entity,RedirectAttributes redirectAttributes) {
 		if(StringUtils.isNotBlank(ids)){
-			entity = fileTransferCfgService.getFileDigestCfg(Long.parseLong(ids));
+			entity = fileTransferCfgService.getFileDigestCfg(Long.parseLong(ids),entity.getCompileId());
 			initUpdateFormCondition(model,entity);
 		}else{
 			initFormCondition(model,entity);
@@ -302,8 +302,8 @@ public class FileTransferCfgController  extends BaseController{
 		return "redirect:" + adminPath +"/ntc/fileTransfer/fileDigestList?functionId="+functionId;
 	}
 	@RequestMapping(value = {"ajaxFileDigestSubIdList"})
-	public String ajaxFileDigestSubIdList(Model model,Long cfgId,Integer index) {
-		FileDigestCfg cfg = fileTransferCfgService.getFileDigestSubIdCfg(cfgId);
+	public String ajaxFileDigestSubIdList(Model model,Long cfgId,Integer index,Integer compileId) {
+		FileDigestCfg cfg = fileTransferCfgService.getFileDigestSubIdCfg(cfgId,compileId);
 		List<String[]> tabList = new ArrayList();
 		//查询SubscribeId域配置
 		if(cfg.getNtcSubscribeIdCfgList()!=null){
@@ -335,7 +335,7 @@ public class FileTransferCfgController  extends BaseController{
 	public String p2pForm(Model model,String ids,CfgIndexInfo entity) {
 		// 跳转操作页面（根据ids判断是新增   or 修改）
 		if(StringUtils.isNotBlank(ids)){
-			entity = fileTransferCfgService.getP2pCfg(Long.parseLong(ids));
+			entity = fileTransferCfgService.getP2pCfg(Long.parseLong(ids),entity.getCompileId());
 			
 			// 添加配置域Key,用于修改页面区分各域配置
 			P2pHashCfg hashCfg = new P2pHashCfg();
@@ -403,8 +403,8 @@ public class FileTransferCfgController  extends BaseController{
 	}
 	
 	@RequestMapping(value = {"ajaxP2pSubList"})
-	public String ajaxP2pSubList(Model model,Long cfgId,Integer index) {
-		CfgIndexInfo cfg = fileTransferCfgService.getP2pCfg(cfgId);
+	public String ajaxP2pSubList(Model model,Long cfgId,Integer index,Integer compileId) {
+		CfgIndexInfo cfg = fileTransferCfgService.getP2pCfg(cfgId,compileId);
 		List<String[]> tabList = new ArrayList();
 		if(cfg.getIpPortList()!=null){
 			String cfgType = null;
@@ -454,7 +454,7 @@ public class FileTransferCfgController  extends BaseController{
 		CfgIndexInfo entity = new CfgIndexInfo();
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
-			entity = fileTransferCfgService.getP2pCfg(Long.parseLong(id));
+			entity = fileTransferCfgService.getP2pCfg(Long.parseLong(id),entity.getCompileId());
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
index 0da999180..3c07fccb7 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/IpController.java
@@ -73,7 +73,7 @@ public class IpController extends BaseController{
 	@RequiresPermissions(value={"iplist:config"})
 	public String form(Model model,String ids,CfgIndexInfo entity) {
 		if(StringUtils.isNotBlank(ids)){
-			entity = ipCfgService.getIpPortCfg(Long.parseLong(ids));
+			entity = ipCfgService.getIpPortCfg(Long.parseLong(ids),entity.getCompileId());
 			initUpdateFormCondition(model,entity);
 		}else{
 			initFormCondition(model,entity);
@@ -89,8 +89,8 @@ public class IpController extends BaseController{
 		return "redirect:" + adminPath +"/ntc/iplist/list?functionId="+entity.getFunctionId();
 	}
 	@RequestMapping(value = {"ajaxSubList"})
-	public String ajaxIpPortSubList(Model model,Long cfgId,Integer index) {
-		CfgIndexInfo cfg = ipCfgService.getIpPortCfg(cfgId);
+	public String ajaxIpPortSubList(Model model,Long cfgId,Integer index,Integer compileId) {
+		CfgIndexInfo cfg = ipCfgService.getIpPortCfg(cfgId,compileId);
 		/*List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(cfg.getFunctionId());
 		model.addAttribute("regionList", regionList);*/
 		List<String[]> tabList = new ArrayList();
@@ -133,7 +133,7 @@ public class IpController extends BaseController{
 		CfgIndexInfo entity = new CfgIndexInfo();
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
-			entity = ipCfgService.getIpPortCfg(Long.parseLong(id));
+			entity = ipCfgService.getIpPortCfg(Long.parseLong(id),entity.getCompileId());
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java
index bf699ba82..91d77c812 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/MailCfgController.java
@@ -61,7 +61,7 @@ public class MailCfgController  extends BaseController{
 	@RequiresPermissions(value={"mail:config"})
 	public String mailForm(Model model,String ids,CfgIndexInfo entity) {
 		if(StringUtils.isNotBlank(ids)){
-			entity = mailCfgService.getMailCfg(Long.parseLong(ids));
+			entity = mailCfgService.getMailCfg(Long.parseLong(ids),entity.getCompileId());
 			initUpdateFormCondition(model,entity);
 		}else{
 			initFormCondition(model,entity);
@@ -112,8 +112,8 @@ public class MailCfgController  extends BaseController{
 		return "redirect:" + adminPath +"/ntc/mail/mailList?functionId="+entity.getFunctionId();
 	}
 	@RequestMapping(value = {"ajaxMailSubList"})
-	public String ajaxMailSubList(Model model,Long cfgId,Integer index) {
-		CfgIndexInfo cfg = mailCfgService.getMailCfg(cfgId);
+	public String ajaxMailSubList(Model model,Long cfgId,Integer index,Integer compileId) {
+		CfgIndexInfo cfg = mailCfgService.getMailCfg(cfgId,compileId);
 		List<String[]> tabList = new ArrayList();
 		if(cfg.getIpPortList()!=null){
 			String cfgType = null;
@@ -168,7 +168,7 @@ public class MailCfgController  extends BaseController{
 		CfgIndexInfo entity = new CfgIndexInfo();
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
-			entity = mailCfgService.getMailCfg(Long.parseLong(id));
+			entity = mailCfgService.getMailCfg(Long.parseLong(id),entity.getCompileId());
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
index 8030e21fc..04065bd9e 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java
@@ -80,7 +80,7 @@ public class WebsiteController extends BaseController{
 	@RequiresPermissions(value={"website:http:config"})
 	public String httpForm(Model model,String ids,CfgIndexInfo entity) {
 		if(StringUtils.isNotBlank(ids)){
-			entity = websiteCfgService.getHttpCfg(Long.parseLong(ids));
+			entity = websiteCfgService.getHttpCfg(Long.parseLong(ids),entity.getCompileId());
 			
 			//设置http各类配置的配置域类型
 			IpPortCfg ipCfg = new IpPortCfg();
@@ -194,8 +194,8 @@ public class WebsiteController extends BaseController{
 		return "redirect:" + adminPath +"/ntc/website/httpList?functionId="+entity.getFunctionId();
 	}
 	@RequestMapping(value = {"ajaxHttpSubList"})
-	public String ajaxHttpSubList(Model model,Long cfgId,Integer index) {
-		CfgIndexInfo cfg = websiteCfgService.getHttpCfg(cfgId);
+	public String ajaxHttpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
+		CfgIndexInfo cfg = websiteCfgService.getHttpCfg(cfgId,compileId);
 		model.addAttribute("_cfg", cfg);	
 		model.addAttribute("index", index);
 		return "/cfg/website/httpSubList";
@@ -212,7 +212,7 @@ public class WebsiteController extends BaseController{
 		CfgIndexInfo entity = new CfgIndexInfo();
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
-			entity = websiteCfgService.getHttpCfg(Long.parseLong(id));
+			entity = websiteCfgService.getHttpCfg(Long.parseLong(id),entity.getCompileId());
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
@@ -243,7 +243,7 @@ public class WebsiteController extends BaseController{
 	@RequiresPermissions(value={"website:ssl:config"})
 	public String sslForm(Model model,String ids,CfgIndexInfo entity) {
 		if(StringUtils.isNotBlank(ids)){
-			entity = websiteCfgService.getSslCfg(Long.parseLong(ids));
+			entity = websiteCfgService.getSslCfg(Long.parseLong(ids),entity.getCompileId());
 			initUpdateFormCondition(model,entity);
 		}else{
 			initFormCondition(model,entity);
@@ -258,8 +258,8 @@ public class WebsiteController extends BaseController{
 		return "redirect:" + adminPath +"/ntc/website/sslList?functionId="+entity.getFunctionId();
 	}
 	@RequestMapping(value = {"ajaxSslSubList"})
-	public String ajaxSslSubList(Model model,Long cfgId,Integer index) {
-		CfgIndexInfo cfg = websiteCfgService.getSslCfg(cfgId);
+	public String ajaxSslSubList(Model model,Long cfgId,Integer index,Integer compileId) {
+		CfgIndexInfo cfg = websiteCfgService.getSslCfg(cfgId,compileId);
 		/*List<FunctionRegionDict> regionList = DictUtils.getFunctionRegionDictList(cfg.getFunctionId());
 		model.addAttribute("regionList", regionList);*/
 		List<String[]> tabList = new ArrayList();
@@ -307,7 +307,7 @@ public class WebsiteController extends BaseController{
 		CfgIndexInfo entity = new CfgIndexInfo();
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
-			entity = websiteCfgService.getSslCfg(Long.parseLong(id));
+			entity = websiteCfgService.getSslCfg(Long.parseLong(id),entity.getCompileId());
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
@@ -335,7 +335,7 @@ public class WebsiteController extends BaseController{
 	@RequiresPermissions(value={"website:dns:config"})
 	public String dnsForm(Model model,String ids,CfgIndexInfo entity) {
 		if(StringUtils.isNotBlank(ids)){
-			entity = websiteCfgService.getDnsCfg(Long.parseLong(ids));
+			entity = websiteCfgService.getDnsCfg(Long.parseLong(ids),entity.getCompileId());
 			initUpdateFormCondition(model,entity);
 		}else{
 			initFormCondition(model,entity);
@@ -353,8 +353,8 @@ public class WebsiteController extends BaseController{
 		return "redirect:" + adminPath +"/ntc/website/dnsList?functionId="+entity.getFunctionId();
 	}
 	@RequestMapping(value = {"ajaxDnsSubList"})
-	public String ajaxDnsSubList(Model model,Long cfgId,Integer index) {
-		CfgIndexInfo cfg = websiteCfgService.getDnsCfg(cfgId);
+	public String ajaxDnsSubList(Model model,Long cfgId,Integer index,Integer compileId) {
+		CfgIndexInfo cfg = websiteCfgService.getDnsCfg(cfgId,compileId);
 		List<String[]> tabList = new ArrayList();
 		if(cfg.getIpPortList()!=null){
 			String cfgType = null;
@@ -400,7 +400,7 @@ public class WebsiteController extends BaseController{
 		CfgIndexInfo entity = new CfgIndexInfo();
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
-			entity = websiteCfgService.getDnsCfg(Long.parseLong(id));
+			entity = websiteCfgService.getDnsCfg(Long.parseLong(id),entity.getCompileId());
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
index 4ae7ed5a5..4007e0cf0 100644
--- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
+++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java
@@ -50,8 +50,8 @@ public class WhiteListController extends CommonController{
 		return "/cfg/whitelist/ipList";
 	}
 	@RequestMapping(value = {"ajaxIpSubList"})
-	public String ajaxIpSubList(Model model,Long cfgId,Integer index) {
-		CfgIndexInfo cfg = ipCfgService.getIpPortCfg(cfgId);
+	public String ajaxIpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
+		CfgIndexInfo cfg = ipCfgService.getIpPortCfg(cfgId,compileId);
 		List<String[]> tabList = new ArrayList();
 		if(cfg.getIpPortList()!=null){
 			String cfgType = null;
@@ -81,7 +81,7 @@ public class WhiteListController extends CommonController{
 	public String ipForm(Model model,String ids,CfgIndexInfo entity) {
 		if(StringUtils.isNotBlank(ids)){
 			
-			entity = this.ipCfgService.getIpPortCfg(Long.parseLong(ids));
+			entity = this.ipCfgService.getIpPortCfg(Long.parseLong(ids),entity.getCompileId());
 			initUpdateFormCondition(model,entity);
 		}else{
 			initFormCondition(model,entity);
@@ -100,7 +100,7 @@ public class WhiteListController extends CommonController{
 		CfgIndexInfo entity = new CfgIndexInfo();
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
-			entity = ipCfgService.getIpPortCfg(Long.parseLong(id));
+			entity = ipCfgService.getIpPortCfg(Long.parseLong(id),entity.getCompileId());
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
@@ -157,7 +157,7 @@ public class WhiteListController extends CommonController{
 	@RequiresPermissions(value={"whitelist:domain:config"})
 	public String domainForm(Model model,String ids,CfgIndexInfo entity) {
 		if(StringUtils.isNotBlank(ids)){
-			entity = domainService.getDomainCfg(Long.parseLong(ids));
+			entity = domainService.getDomainCfg(Long.parseLong(ids),entity.getCompileId());
 			HttpUrlCfg urlCfg = new HttpUrlCfg();
 			urlCfg.setCfgType(Constants.HTTP_URL_REGION);
 			entity.setHttpUrl(urlCfg);
@@ -183,8 +183,8 @@ public class WhiteListController extends CommonController{
 		return "redirect:" + adminPath +"/ntc/whitelist/domain/list?functionId="+entity.getFunctionId();
 	}
 	@RequestMapping(value = {"domain/ajaxSubList"})
-	public String ajaxDomainSubList(Model model,Long cfgId,Integer index) {
-		CfgIndexInfo cfg = domainService.getDomainCfg(cfgId);
+	public String ajaxDomainSubList(Model model,Long cfgId,Integer index,Integer compileId) {
+		CfgIndexInfo cfg = domainService.getDomainCfg(cfgId,compileId);
 		List<String[]> tabList = new ArrayList();
 		if(cfg.getHttpUrlList()!=null){
 			String cfgType = null;
@@ -234,7 +234,7 @@ public class WhiteListController extends CommonController{
 		CfgIndexInfo entity = new CfgIndexInfo();
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
-			entity = domainService.getDomainCfg(Long.parseLong(id));
+			entity = domainService.getDomainCfg(Long.parseLong(id),entity.getCompileId());
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
index 914639112..eba86f103 100644
--- a/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/HttpRedirectPolicyController.java
@@ -70,7 +70,7 @@ public class HttpRedirectPolicyController extends BaseController{
 						,logical=Logical.OR)
 	public String form(Model model,HttpServletRequest request,HttpServletResponse response,String ids,@ModelAttribute("cfg")CfgIndexInfo entity){
 		if(StringUtils.isNotBlank(ids)){
-			entity = httpRedirectCfgService.getHttpCfg(Long.parseLong(ids));
+			entity = httpRedirectCfgService.getHttpCfg(Long.parseLong(ids),entity.getCompileId());
 			
 			HttpUrlCfg urlCfg = new HttpUrlCfg();
 			urlCfg.setCfgType(Constants.HTTP_REDIRECT_URL_REGION);
@@ -199,8 +199,8 @@ public class HttpRedirectPolicyController extends BaseController{
 		return "redirect:" + adminPath +"/proxy/control/httpRedirect/httpRedirectList?functionId="+cfg.getFunctionId();
 	}
 	@RequestMapping(value = {"ajaxHttpSubList"})
-	public String ajaxHttpSubList(Model model,Long cfgId,Integer index) {
-		CfgIndexInfo cfg = httpRedirectCfgService.getHttpCfg(cfgId);
+	public String ajaxHttpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
+		CfgIndexInfo cfg = httpRedirectCfgService.getHttpCfg(cfgId,compileId);
 		model.addAttribute("_cfg", cfg);	
 		model.addAttribute("index", index);
 		return "/cfg/proxy/control/httpRedirectSubList";
@@ -227,7 +227,7 @@ public class HttpRedirectPolicyController extends BaseController{
 		CfgIndexInfo entity = new CfgIndexInfo();
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
-			entity = httpRedirectCfgService.getHttpCfg(Long.parseLong(id));
+			entity = httpRedirectCfgService.getHttpCfg(Long.parseLong(id),entity.getCompileId());
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
index 59daec728..8618d7501 100644
--- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
+++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java
@@ -63,7 +63,7 @@ public class InterceptController extends CommonController{
 	@RequestMapping(value = {"/interceptIpForm","interceptDomainForm","interceptIpPayloadForm"})
 	public String interceptIpForm(Model model,String ids,CfgIndexInfo entity) {
 		if(StringUtils.isNotBlank(ids)){
-			entity = interceptCfgService.getInterceptCfg(Long.parseLong(ids));
+			entity = interceptCfgService.getInterceptCfg(Long.parseLong(ids),null);
 			initUpdateFormCondition(model,entity);
 		}else{
 			initFormCondition(model,entity);
@@ -98,8 +98,8 @@ public class InterceptController extends CommonController{
 	}
 	
 	@RequestMapping(value = {"/ajaxInterceptIpSubList","/ajaxInterceptDomainSubList","/ajaxInterceptIpPayloadSubList"})
-	public String ajaxInterceptIpSubList(Model model,Long cfgId,Integer index) {
-		CfgIndexInfo cfg = interceptCfgService.getInterceptCfg(cfgId);
+	public String ajaxInterceptIpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
+		CfgIndexInfo cfg = interceptCfgService.getInterceptCfg(cfgId,compileId);
 		List<String[]> tabList = new ArrayList();
 		if(cfg.getIpPortList()!=null){
 			String cfgType = null;
@@ -139,7 +139,7 @@ public class InterceptController extends CommonController{
 		CfgIndexInfo entity = new CfgIndexInfo();
 		String[] idArray = ids.split(",");
 		for(String id :idArray){
-			entity = interceptCfgService.getInterceptCfg(Long.parseLong(id));
+			entity = interceptCfgService.getInterceptCfg(Long.parseLong(id),null);
 			entity.setIsAudit(isAudit);
 			entity.setIsValid(isValid);
 			entity.setAuditorId(UserUtils.getUser().getId());
diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java
index a3c383848..2112edaf7 100644
--- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.java
@@ -37,7 +37,7 @@ import com.nis.web.dao.MyBatisDao;
 public interface AppCfgDao {
 	//app策略配置增删改查
 	public List<AppPolicyCfg> findAppPolicyList(AppPolicyCfg entity) ;
-	public AppPolicyCfg getAppPolicyCfg(Long cfgId) ;
+	public AppPolicyCfg getAppPolicyCfg(@Param("cfgId")Long cfgId,@Param("compileId")Integer compileId) ;
 	public IpPortCfg getAppPolicyIpCfg(AppPolicyCfg entity) ;
 	public List<IpPortCfg> getAppPolicyIpList(AppPolicyCfg entity);
 	public int insertAppPolicyCfg(AppPolicyCfg entity);
diff --git a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
index e0fb19f8b..1f08d8e63 100644
--- a/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AppCfgDao.xml
@@ -514,11 +514,18 @@
     #{classify,jdbcType=VARCHAR},#{attribute,jdbcType=VARCHAR},#{lable,jdbcType=VARCHAR},    
     #{areaEffectiveIds,jdbcType=VARCHAR}
   </sql> -->
-  <select id="getAppPolicyCfg" resultMap="AppPolicyCfgMap" parameterType="java.lang.Long" >
+  <select id="getAppPolicyCfg" resultMap="AppPolicyCfgMap">
     SELECT 
     <include refid="AppPolicyCfg_Column" />
     FROM app_policy_cfg r
-    WHERE CFG_ID = #{cfgId,jdbcType=BIGINT}
+    <where>
+	    <if test="cfgId !=null">
+			CFG_ID = #{cfgId,jdbcType=BIGINT}
+		</if>
+	    <if test="compileId != null">
+			AND COMPILE_ID=#{compileId,jdbcType=INTEGER}
+		</if>
+   </where> 
   </select>
   <select id="getAppIpCfg" resultMap="AppIpCfgMap" parameterType="java.lang.Long" >
     SELECT 
diff --git a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
index 04bddf8a0..0e0ae771d 100644
--- a/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/AvContentCfgDao.xml
@@ -591,7 +591,7 @@
 	    FROM cfg_index_info a
 	    <where>
   			<if test="cfgId != null">
-  				and a.CFG_ID=#{cfgId,jdbcType=INTEGER}
+  				a.CFG_ID=#{cfgId,jdbcType=INTEGER}
 	   		</if>
   			<if test="compileId != null">
   				and a.compile_Id=#{compileId,jdbcType=INTEGER}
diff --git a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.java
index 15f6853be..d503cf67a 100644
--- a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.java
@@ -2,6 +2,8 @@ package com.nis.web.dao.configuration;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.nis.domain.configuration.AvFileSampleCfg;
 import com.nis.domain.configuration.AvSignSampleCfg;
 import com.nis.domain.configuration.BaseCfg;
@@ -30,7 +32,7 @@ import com.nis.web.dao.MyBatisDao;
 @MyBatisDao
 public interface BgpCfgDao extends CrudDao<CfgIndexInfo>{
 
-	public CfgIndexInfo getCfgIndexInfo(Long id);
+	public CfgIndexInfo getCfgIndexInfo(@Param("cfgId")Long id,@Param("compileId") Integer compileId);
 	public List<CfgIndexInfo> getBgpList(CfgIndexInfo entity);
 	public List<IpPortCfg> getIpPortList(CfgIndexInfo entity);
 	public List<HttpUrlCfg> getHttpUrlList(CfgIndexInfo entity);
diff --git a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml
index d57e62943..ea4150a37 100644
--- a/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/BgpCfgDao.xml
@@ -292,10 +292,18 @@
 		</choose>
   </select>
   
-  <select id="getCfgIndexInfo" resultMap="CfgIndexInfoMap" parameterType="java.lang.Long">
+  <select id="getCfgIndexInfo" resultMap="CfgIndexInfoMap">
 		 SELECT 
 	    <include refid="ConfigIndex_Column" />
-	    FROM cfg_index_info a where cfg_id=#{cfgId}
+	    FROM cfg_index_info a 
+		<where>
+		    <if test="cfgId !=null">
+				CFG_ID = #{cfgId,jdbcType=BIGINT}
+			</if>
+		    <if test="compileId != null">
+				AND COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			</if>
+   		</where>
   </select>
   <select id="getIpPortList" resultMap="ipPortMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
 		 SELECT 
diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java
index 297a8b4e7..fc3bbb240 100644
--- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.java
@@ -2,6 +2,8 @@ package com.nis.web.dao.configuration;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
@@ -22,7 +24,7 @@ import com.nis.web.dao.MyBatisDao;
  */
 @MyBatisDao
 public interface FileTransferCfgDao extends CrudDao<CfgIndexInfo> {
-	public CfgIndexInfo getCfgIndexInfo(Long id);
+	public CfgIndexInfo getCfgIndexInfo(@Param("cfgId")Long id,@Param("compileId")Integer compileId);
 	public List<CfgIndexInfo> getFtpList(CfgIndexInfo entity);
 	public List<IpPortCfg> getIpPortList(CfgIndexInfo entity);
 	public List<BaseStringCfg> getFtpKeywordList(CfgIndexInfo entity);
@@ -36,7 +38,7 @@ public interface FileTransferCfgDao extends CrudDao<CfgIndexInfo> {
 	public void updateCfgIndex(CfgIndexInfo entity);
 	public void updateCfgValid(BaseCfg entity);
 	public void auditCfg(BaseCfg entity);
-	public FileDigestCfg getFileDigest(Long id);
+	public FileDigestCfg getFileDigest(@Param("cfgId")Long id,@Param("compileId")Integer compileId);
 	public void updateFileDigestCfg(FileDigestCfg entity);
 	public void deleteFileDigestSubscribeIdCfg(FileDigestCfg entity);
 	public List<NtcSubscribeIdCfg> getFileDigestSubscribeidList(FileDigestCfg entity);
diff --git a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
index cd2e48d35..5a81dd91a 100644
--- a/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/FileTransferCfgDao.xml
@@ -317,10 +317,18 @@
 		</choose>
   </select>
   
-  <select id="getCfgIndexInfo" resultMap="CfgIndexInfoMap" parameterType="java.lang.Long">
+  <select id="getCfgIndexInfo" resultMap="CfgIndexInfoMap">
 		 SELECT 
 	    <include refid="ConfigIndex_Column" />
-	    FROM cfg_index_info a where cfg_id=#{cfgId}
+	    FROM cfg_index_info a 
+		<where>
+		    <if test="cfgId !=null">
+				CFG_ID = #{cfgId,jdbcType=BIGINT}
+			</if>
+		    <if test="compileId != null">
+				AND COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			</if>
+   		</where>
   </select>
   <select id="getIpPortList" resultMap="ipPortMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
 		 SELECT 
@@ -1146,10 +1154,18 @@
 		</choose>
   </select>
   
-  <select id="getFileDigest" resultMap="digestCfgMap" parameterType="java.lang.Long">
+  <select id="getFileDigest" resultMap="digestCfgMap">
 		 SELECT 
 	    <include refid="DigestCfg_Column" />
-	    FROM file_digest_cfg a where cfg_id=#{cfgId}
+	    FROM file_digest_cfg a 
+		<where>
+  			<if test="cfgId != null">
+  				a.CFG_ID=#{cfgId,jdbcType=INTEGER}
+	   		</if>
+  			<if test="compileId != null">
+  				and a.compile_Id=#{compileId,jdbcType=INTEGER}
+	   		</if>
+  		</where>
   </select>
   
   <select id="getFileDigestSubscribeidList" resultMap="stringCfgMap" parameterType="com.nis.domain.configuration.FileDigestCfg">
diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
index 00c727664..26f16d559 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.java
@@ -36,7 +36,7 @@ public interface IpCfgDao extends CrudDao<BaseIpCfg>{
 	public int deleteByCompileIds(@Param("user")long user,@Param("tableName")String tableName,@Param("compileIds")String compileIds);
 	/******************************new ***********************************/
 	
-	public CfgIndexInfo getCfgIndexInfo(Long id);
+	public CfgIndexInfo getCfgIndexInfo(@Param("cfgId")Long id,@Param("compileId")Integer compileId);
 	public List<IpPortCfg> getIpPortList(CfgIndexInfo entity);
 	public void saveCfgIndex(CfgIndexInfo entity);
 	public void saveCfgIndexForBatch(CfgIndexInfo entity);
diff --git a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
index 7cd36e97d..87a0e4629 100644
--- a/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/IpCfgDao.xml
@@ -760,10 +760,18 @@
 		WHERE r.CFG_ID in (${ids}) AND r.FUNCTION_ID=#{functionId,jdbcType=INTEGER} 
   </select>
   <!-- new -->
-  <select id="getCfgIndexInfo" resultMap="CfgIndexInfoMap" parameterType="java.lang.Long">
+  <select id="getCfgIndexInfo" resultMap="CfgIndexInfoMap">
 		 SELECT 
 	    <include refid="ConfigIndex_Column" />
-	    FROM cfg_index_info a where cfg_id=#{cfgId}
+	    FROM cfg_index_info a 
+	    <where>
+		    <if test="cfgId !=null">
+				CFG_ID = #{cfgId,jdbcType=BIGINT}
+			</if>
+		    <if test="compileId != null">
+				AND COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			</if>
+   		</where>
   </select>
   <select id="getIpPortList" resultMap="ipPortMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
 		 SELECT 
diff --git a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.java b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.java
index 54a0d8a60..3b294eb12 100644
--- a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.java
@@ -2,6 +2,8 @@ package com.nis.web.dao.configuration;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.ComplexkeywordCfg;
@@ -18,7 +20,7 @@ import com.nis.web.dao.MyBatisDao;
  */
 @MyBatisDao
 public interface MailCfgDao  extends CrudDao<CfgIndexInfo>{
-	public CfgIndexInfo getCfgIndexInfo(Long id);
+	public CfgIndexInfo getCfgIndexInfo(@Param("cfgId")Long id,@Param("compileId")Integer compileId);
 	public List<CfgIndexInfo> getMailList(CfgIndexInfo entity);
 	public List<IpPortCfg> getIpPortList(CfgIndexInfo entity);
 	public List<ComplexkeywordCfg> getMailKeywordList(CfgIndexInfo entity);
diff --git a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml
index 7ded599de..16eb823eb 100644
--- a/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/MailCfgDao.xml
@@ -250,10 +250,18 @@
 		</choose>
   </select>
   
-  <select id="getCfgIndexInfo" resultMap="CfgIndexInfoMap" parameterType="java.lang.Long">
+  <select id="getCfgIndexInfo" resultMap="CfgIndexInfoMap">
 		 SELECT 
 	    <include refid="ConfigIndex_Column" />
-	    FROM cfg_index_info a where cfg_id=#{cfgId}
+	    FROM cfg_index_info a
+		<where>
+		    <if test="cfgId !=null">
+				CFG_ID = #{cfgId,jdbcType=BIGINT}
+			</if>
+		    <if test="compileId != null">
+				AND COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			</if>
+   		</where>
   </select>
   <select id="getIpPortList" resultMap="ipPortMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
 		 SELECT 
diff --git a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.java b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.java
index 3b90a05dd..4b1a45b40 100644
--- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.java
@@ -2,20 +2,17 @@ package com.nis.web.dao.configuration;
 
 import java.util.List;
 
-import com.nis.domain.configuration.AvFileSampleCfg;
-import com.nis.domain.configuration.AvSignSampleCfg;
+import org.apache.ibatis.annotations.Param;
+
 import com.nis.domain.configuration.BaseCfg;
 import com.nis.domain.configuration.BaseStringCfg;
 import com.nis.domain.configuration.CfgIndexInfo;
 import com.nis.domain.configuration.ComplexkeywordCfg;
-import com.nis.domain.configuration.DnsDomainCfg;
-import com.nis.domain.configuration.DnsIpCfg;
 import com.nis.domain.configuration.HttpBodyCfg;
 import com.nis.domain.configuration.HttpReqHeadCfg;
 import com.nis.domain.configuration.HttpResHeadCfg;
 import com.nis.domain.configuration.HttpUrlCfg;
 import com.nis.domain.configuration.IpPortCfg;
-import com.nis.domain.configuration.SslKeywordCfg;
 import com.nis.web.dao.CrudDao;
 import com.nis.web.dao.MyBatisDao;
 
@@ -29,7 +26,7 @@ import com.nis.web.dao.MyBatisDao;
 public interface WebsiteCfgDao extends CrudDao<CfgIndexInfo>{
 
 	public List<CfgIndexInfo> getCfgIndexInfos(CfgIndexInfo entity);
-	public CfgIndexInfo getCfgIndexInfo(Long id);
+	public CfgIndexInfo getCfgIndexInfo(@Param("cfgId")Long id,@Param("compileId")Integer compileId);
 	public List<CfgIndexInfo> getWebsiteList(CfgIndexInfo entity);
 	public List<IpPortCfg> getIpPortList(CfgIndexInfo entity);
 	public List<HttpUrlCfg> getHttpUrlList(CfgIndexInfo entity);
diff --git a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
index 8b301f8d9..c8c5d2e21 100644
--- a/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/WebsiteCfgDao.xml
@@ -339,10 +339,18 @@
 		</choose>
   </select>
   
-  <select id="getCfgIndexInfo" resultMap="CfgIndexInfoMap" parameterType="java.lang.Long">
+  <select id="getCfgIndexInfo" resultMap="CfgIndexInfoMap">
 		 SELECT 
 	    <include refid="ConfigIndex_Column" />
-	    FROM cfg_index_info a where cfg_id=#{cfgId}
+	    FROM cfg_index_info a 
+	    <where>
+		    <if test="cfgId !=null">
+				CFG_ID = #{cfgId,jdbcType=BIGINT}
+			</if>
+		    <if test="compileId != null">
+				AND COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			</if>
+	   </where>
   </select>
   <select id="getCfgIndexInfos" resultMap="CfgIndexInfoMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
 		 SELECT 
diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
index a54454572..7be526c4b 100644
--- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
@@ -165,8 +165,8 @@ public class AppCfgService extends BaseService {
 		return appCfgDao.getAppTcpCfg(cfgId);
 	}
 
-	public AppPolicyCfg getAppPolicyCfg(Long cfgId) {
-		AppPolicyCfg policy = appCfgDao.getAppPolicyCfg(cfgId);
+	public AppPolicyCfg getAppPolicyCfg(Long cfgId,Integer compileId) {
+		AppPolicyCfg policy = appCfgDao.getAppPolicyCfg(cfgId,compileId);
 		List<IpPortCfg> ipPortList = appCfgDao.getAppPolicyIpList(policy);
 		// 查询关键字
 		if (policy.getCompileId() != null) {
@@ -906,7 +906,7 @@ public class AppCfgService extends BaseService {
 		}
 
 		// 查询子配置并修改审核状态
-		entity = this.getAppPolicyCfg(entity.getCfgId());
+		entity = this.getAppPolicyCfg(entity.getCfgId(),entity.getCompileId());
 		if (entity.getIpPortList() != null && entity.getIpPortList().size() > 0) {
 			IpPortCfg cfg = new IpPortCfg();
 			BeanUtils.copyProperties(entity, cfg, new String[] { "cfgId" });
@@ -1697,7 +1697,7 @@ public class AppCfgService extends BaseService {
 			appCfgDao.updateCfgValid(entity);
 
 			// 查询子配置
-			entity = this.getAppPolicyCfg(Long.parseLong(id));
+			entity = this.getAppPolicyCfg(Long.parseLong(id),entity.getCompileId());
 			if (entity.getIpPortList() != null && entity.getIpPortList().size() > 0) {
 				IpPortCfg cfg = new IpPortCfg();
 				BeanUtils.copyProperties(entity, cfg, new String[] { "cfgId" });
diff --git a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java
index b0f4c0cbd..954776b36 100644
--- a/src/main/java/com/nis/web/service/configuration/BgpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/BgpCfgService.java
@@ -48,8 +48,8 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
 	@Autowired
 	protected AreaIpCfgDao areaIpCfgDao;
 	
-	public CfgIndexInfo getBgpCfg(Long cfgId){
-		CfgIndexInfo entity = bgpCfgDao.getCfgIndexInfo(cfgId);
+	public CfgIndexInfo getBgpCfg(Long cfgId,Integer compileId){
+		CfgIndexInfo entity = bgpCfgDao.getCfgIndexInfo(cfgId,compileId);
 		List<IpPortCfg> ipPortList = bgpCfgDao.getIpPortList(entity);
 		NtcSubscribeIdCfg  subscribeId = new NtcSubscribeIdCfg();
 		subscribeId.setCompileId(entity.getCompileId());
@@ -247,7 +247,7 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
 			entity.setFunctionId(functionId);
 			bgpCfgDao.updateCfgValid(entity);
 			//查询子配置
-			entity = this.getBgpCfg(Long.parseLong(id));
+			entity = this.getBgpCfg(Long.parseLong(id),entity.getCompileId());
 			if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 				IpPortCfg cfg = new IpPortCfg();
 				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -309,7 +309,7 @@ public class BgpCfgService extends CrudService<BgpCfgDao,CfgIndexInfo> {
 		List<IpCfg> areaIpRegionList = new ArrayList();
 		
 		//查询子配置并修改审核状态
-		entity = this.getBgpCfg(entity.getCfgId());
+		entity = this.getBgpCfg(entity.getCfgId(),entity.getCompileId());
 		if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 			IpPortCfg cfg = new IpPortCfg();
 			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
diff --git a/src/main/java/com/nis/web/service/configuration/DomainService.java b/src/main/java/com/nis/web/service/configuration/DomainService.java
index 33373654a..095f69102 100644
--- a/src/main/java/com/nis/web/service/configuration/DomainService.java
+++ b/src/main/java/com/nis/web/service/configuration/DomainService.java
@@ -417,8 +417,8 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 		// TODO Auto-generated method stub
 		return domainDao.getListByCfgId(ids);
 	}
-	public CfgIndexInfo getDomainCfg(Long cfgId) {
-		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
+	public CfgIndexInfo getDomainCfg(Long cfgId,Integer compileId) {
+		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId,compileId);
 		List<HttpUrlCfg> httpUrlList = websiteCfgDao.getHttpUrlList(entity);
 		List<NtcSubscribeIdCfg> subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
 		entity.setHttpUrlList(httpUrlList);
@@ -532,7 +532,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 			entity.setFunctionId(functionId);
 			websiteCfgDao.updateCfgValid(entity);
 			//查询子配置
-			entity = this.getDomainCfg(Long.parseLong(id));
+			entity = this.getDomainCfg(Long.parseLong(id),entity.getCompileId());
 			
 			if(entity.getHttpUrlList()!=null && entity.getHttpUrlList().size()>0)
 			{
@@ -576,7 +576,7 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
 				List<IpCfg> areaIpRegionList = new ArrayList();
 				
 				//查询子配置并修改审核状态
-				entity = this.getDomainCfg(entity.getCfgId());
+				entity = this.getDomainCfg(entity.getCfgId(),entity.getCompileId());
 				
 				if(entity.getHttpUrlList()!=null && entity.getHttpUrlList().size()>0){
 					HttpUrlCfg cfg = new HttpUrlCfg();
diff --git a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
index b8478c3ea..be3deb4b1 100644
--- a/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/FileTransferCfgService.java
@@ -73,8 +73,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 		page.setList(list);
 		return page;
 	}
-	public CfgIndexInfo getFtpCfg(Long cfgId){
-		CfgIndexInfo entity = fileTransferCfgDao.getCfgIndexInfo(cfgId);
+	public CfgIndexInfo getFtpCfg(Long cfgId,Integer compileId){
+		CfgIndexInfo entity = fileTransferCfgDao.getCfgIndexInfo(cfgId,compileId);
 		List<IpPortCfg> ipPortList = fileTransferCfgDao.getIpPortList(entity);
 		List<BaseStringCfg> keywordList = fileTransferCfgDao.getFtpKeywordList(entity);
 		//设置关键字
@@ -233,7 +233,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 			entity.setFunctionId(functionId);
 			fileTransferCfgDao.updateCfgValid(entity);
 			//查询子配置
-			entity = this.getFtpCfg(Long.parseLong(id));
+			entity = this.getFtpCfg(Long.parseLong(id),entity.getCompileId());
 			if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 				IpPortCfg cfg = new IpPortCfg();
 				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -282,7 +282,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 		List<IpCfg> areaIpRegionList = new ArrayList();
 		
 		//查询子配置并修改审核状态
-		entity = this.getFtpCfg(entity.getCfgId());
+		entity = this.getFtpCfg(entity.getCfgId(),entity.getCompileId());
 		if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 			IpPortCfg cfg = new IpPortCfg();
 			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -401,8 +401,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 		return page;
 	}
 	
-	public FileDigestCfg getFileDigestCfg(Long cfgId){
-		FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId);
+	public FileDigestCfg getFileDigestCfg(Long cfgId,Integer compileId){
+		FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId,compileId);
 		List<NtcSubscribeIdCfg> subscribeidList = fileTransferCfgDao.getFileDigestSubscribeidList(entity);
 		entity.setNtcSubscribeIdCfgList(subscribeidList);
 		return entity;
@@ -526,7 +526,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 			entity.setFunctionId(functionId);
 			fileTransferCfgDao.updateFileDigestCfg(entity);
 			
-			entity = this.getFileDigestCfg(Long.parseLong(id));
+			entity = this.getFileDigestCfg(Long.parseLong(id),entity.getCompileId());
 			// 修改子域配置状态
 			if((entity.getNtcSubscribeIdCfgList() != null) && (entity.getNtcSubscribeIdCfgList().size() > 0)) {
 				NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
@@ -552,7 +552,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 		entity.setAuditTime(auditTime);
 		fileTransferCfgDao.updateFileDigestCfg(entity);
 		
-		entity = this.getFileDigestCfg(Long.parseLong(id));
+		entity = this.getFileDigestCfg(Long.parseLong(id),entity.getCompileId());
 		// 修改域配置审核状态
 		if((entity.getNtcSubscribeIdCfgList() != null) && (entity.getNtcSubscribeIdCfgList().size() > 0)) {
 			NtcSubscribeIdCfg cfg = new NtcSubscribeIdCfg();
@@ -655,8 +655,8 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 		}
 	}
 	
-	public FileDigestCfg getFileDigestSubIdCfg(Long cfgId) {
-		FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId);
+	public FileDigestCfg getFileDigestSubIdCfg(Long cfgId,Integer compileId) {
+		FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId,compileId);
 		if(entity.getCompileId()!=null){
 			NtcSubscribeIdCfg ntcSubscribeIdCfg = new NtcSubscribeIdCfg();
 			ntcSubscribeIdCfg.setCompileId(entity.getCompileId());
@@ -675,9 +675,9 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 		return page;
 	}
 	
-	public CfgIndexInfo getP2pCfg(Long cfgId){
+	public CfgIndexInfo getP2pCfg(Long cfgId,Integer compileId){
 		// 查询各域配置信息
-		CfgIndexInfo entity = fileTransferCfgDao.getCfgIndexInfo(cfgId);
+		CfgIndexInfo entity = fileTransferCfgDao.getCfgIndexInfo(cfgId,compileId);
 		List<IpPortCfg> ipPortList = fileTransferCfgDao.getIpPortList(entity);
 		List<P2pHashCfg> hashList = fileTransferCfgDao.getP2pHashList(entity);
 		List<P2pKeywordCfg> keywordList = fileTransferCfgDao.getP2pKeywordList(entity);
@@ -866,7 +866,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 			entity.setFunctionId(functionId);
 			fileTransferCfgDao.updateCfgValid(entity);
 			//查询子配置
-			entity = this.getP2pCfg(Long.parseLong(id));
+			entity = this.getP2pCfg(Long.parseLong(id),entity.getCompileId());
 			if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 				IpPortCfg cfg = new IpPortCfg();
 				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -921,7 +921,7 @@ public class FileTransferCfgService extends CrudService<FileTransferCfgDao,CfgIn
 		List<IpCfg> areaIpRegionList = new ArrayList();
 		
 		//查询子配置并修改审核状态
-		entity = this.getP2pCfg(entity.getCfgId());
+		entity = this.getP2pCfg(entity.getCfgId(),entity.getCompileId());
 		if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 			IpPortCfg cfg = new IpPortCfg();
 			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
diff --git a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
index 121f6edd7..b6ec4448e 100644
--- a/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/HttpRedirectCfgService.java
@@ -54,8 +54,8 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 	@Autowired
 	protected StringCfgDao stringCfgDao;
 	
-	public CfgIndexInfo getHttpCfg(Long cfgId){
-		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
+	public CfgIndexInfo getHttpCfg(Long cfgId,Integer compileId){
+		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId,compileId);
 		List<HttpUrlCfg> httpUrlList = websiteCfgDao.getHttpUrlList(entity);
 		List<HttpReqHeadCfg> httpReqHdrList = websiteCfgDao.getHttpReqHdrList(entity);
 		List<HttpResHeadCfg> httpResHdrList = websiteCfgDao.getHttpResHdrList(entity);
@@ -284,7 +284,7 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 			entity.setFunctionId(functionId);
 			websiteCfgDao.updateCfgValid(entity);
 			//查询子配置
-			entity = this.getHttpCfg(Long.parseLong(id));
+			entity = this.getHttpCfg(Long.parseLong(id),entity.getCompileId());
 
 			if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 				IpPortCfg cfg = new IpPortCfg();
@@ -350,7 +350,7 @@ public class HttpRedirectCfgService extends CrudService<WebsiteCfgDao,CfgIndexIn
 		List<IpCfg> areaIpRegionList = new ArrayList();
 		
 		//查询子配置并修改审核状态
-		entity = this.getHttpCfg(entity.getCfgId());
+		entity = this.getHttpCfg(entity.getCfgId(),entity.getCompileId());
 
 		if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 			IpPortCfg cfg = new IpPortCfg();
diff --git a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
index 2452d11f2..bafa4d173 100644
--- a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
@@ -52,8 +52,8 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
 	@Autowired
 	protected AreaIpCfgDao areaIpCfgDao;
 	
-	public CfgIndexInfo getInterceptCfg(Long cfgId){
-		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
+	public CfgIndexInfo getInterceptCfg(Long cfgId,Integer compileId){
+		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId,compileId);
 		List<IpPortCfg> ipPortList = websiteCfgDao.getIpPortList(entity);
 		List<InterceptPktBin> pktBinList = interceptCfgDao.getInterceptPktBin(entity);
 		List<HttpUrlCfg> httpUrlList = websiteCfgDao.getHttpUrlList(entity);
@@ -219,7 +219,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
 			entity.setFunctionId(functionId);
 			websiteCfgDao.updateCfgValid(entity);
 			//查询子配置
-			entity = this.getInterceptCfg(Long.parseLong(id));
+			entity = this.getInterceptCfg(Long.parseLong(id),entity.getCompileId());
 			if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 				IpPortCfg cfg = new IpPortCfg();
 				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -273,7 +273,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
 		List<IpCfg> areaIpRegionList = new ArrayList();
 		
 		//查询子配置并修改审核状态
-		entity = this.getInterceptCfg(entity.getCfgId());
+		entity = this.getInterceptCfg(entity.getCfgId(),entity.getCompileId());
 		if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 			IpPortCfg cfg = new IpPortCfg();
 			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
diff --git a/src/main/java/com/nis/web/service/configuration/IpCfgService.java b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
index 91c74f593..e06fe9407 100644
--- a/src/main/java/com/nis/web/service/configuration/IpCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/IpCfgService.java
@@ -206,7 +206,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 			entity.setFunctionId(functionId);
 			ipCfgDao.updateCfgValid(entity);
 			//查询子配置
-			entity = this.getIpPortCfg(Long.parseLong(id));
+			entity = this.getIpPortCfg(Long.parseLong(id),entity.getCompileId());
 			if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 				IpPortCfg cfg = new IpPortCfg();
 				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -468,7 +468,7 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 		List<FunctionRegionDict> dictList =  DictUtils.getFunctionRegionDictList(entity.getFunctionId());
 		int maatType=0;
 		//查询子配置并修改审核状态
-		entity = this.getIpPortCfg(entity.getCfgId());
+		entity = this.getIpPortCfg(entity.getCfgId(),entity.getCompileId());
 		if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 			//判断下发类型是走maat还是callback
 			String regionValue=entity.getIpPortList().get(0).getCfgType();
@@ -827,8 +827,8 @@ public class IpCfgService extends CrudService<IpCfgDao,BaseIpCfg> {
 	public BaseIpCfg getIpCfgById(BaseIpCfg baseIpCfg){
 		return ipCfgDao.getById(baseIpCfg.getTableName(), baseIpCfg.getCfgId());
 	}
-	public CfgIndexInfo getIpPortCfg(Long cfgId){
-		CfgIndexInfo entity = ipCfgDao.getCfgIndexInfo(cfgId);
+	public CfgIndexInfo getIpPortCfg(Long cfgId,Integer compileId){
+		CfgIndexInfo entity = ipCfgDao.getCfgIndexInfo(cfgId,compileId);
 		List<IpPortCfg> ipPortList = ipCfgDao.getIpPortList(entity);
 		List<NtcSubscribeIdCfg> subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
 		entity.setIpPortList(ipPortList);
diff --git a/src/main/java/com/nis/web/service/configuration/MailCfgService.java b/src/main/java/com/nis/web/service/configuration/MailCfgService.java
index 6a8089acd..c3018f40a 100644
--- a/src/main/java/com/nis/web/service/configuration/MailCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/MailCfgService.java
@@ -66,8 +66,8 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
 		page.setList(list);
 		return page;
 	}
-	public CfgIndexInfo getMailCfg(Long cfgId){
-		CfgIndexInfo entity = mailCfgDao.getCfgIndexInfo(cfgId);
+	public CfgIndexInfo getMailCfg(Long cfgId,Integer compileId){
+		CfgIndexInfo entity = mailCfgDao.getCfgIndexInfo(cfgId,compileId);
 		List<IpPortCfg> ipPortList = mailCfgDao.getIpPortList(entity);
 		List<ComplexkeywordCfg> keywordList = mailCfgDao.getMailKeywordList(entity);
 		List<FileDigestCfg> digestList = mailCfgDao.getMailFileDigestList(entity);
@@ -246,7 +246,7 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
 			entity.setFunctionId(functionId);
 			mailCfgDao.updateCfgValid(entity);
 			//查询子配置
-			entity = this.getMailCfg(Long.parseLong(id));
+			entity = this.getMailCfg(Long.parseLong(id),entity.getCompileId());
 			if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 				IpPortCfg cfg = new IpPortCfg();
 				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -294,7 +294,7 @@ public class MailCfgService extends CrudService<MailCfgDao,CfgIndexInfo> {
 		List<IpCfg> areaIpRegionList = new ArrayList();
 		
 		//查询子配置并修改审核状态
-		entity = this.getMailCfg(entity.getCfgId());
+		entity = this.getMailCfg(entity.getCfgId(),entity.getCompileId());
 		if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 			IpPortCfg cfg = new IpPortCfg();
 			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
diff --git a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
index 5e51bc25f..40ec9416a 100644
--- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
@@ -69,8 +69,8 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 		}
 		return entity;
 	}
-	public CfgIndexInfo getHttpCfg(Long cfgId){
-		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
+	public CfgIndexInfo getHttpCfg(Long cfgId,Integer compileId){
+		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId,compileId);
 		List<IpPortCfg> ipPortList = websiteCfgDao.getIpPortList(entity);
 		List<HttpUrlCfg> httpUrlList = websiteCfgDao.getHttpUrlList(entity);
 		List<HttpReqHeadCfg> httpReqHdrList = websiteCfgDao.getHttpReqHdrList(entity);
@@ -144,8 +144,8 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 	
 	
 	
-	public CfgIndexInfo getSslCfg(Long cfgId){
-		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
+	public CfgIndexInfo getSslCfg(Long cfgId,Integer compileId){
+		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId,compileId);
 		List<IpPortCfg> ipPortList = websiteCfgDao.getIpPortList(entity);
 		List<BaseStringCfg> sslList = websiteCfgDao.getSslKewordList(entity);
 		List<NtcSubscribeIdCfg> subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
@@ -154,8 +154,8 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 		entity.setSslList(sslList);
 		return entity;
 	}
-	public CfgIndexInfo getDnsCfg(Long cfgId){
-		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
+	public CfgIndexInfo getDnsCfg(Long cfgId,Integer compileId){
+		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId,compileId);
 		List<IpPortCfg> ipPortList = websiteCfgDao.getIpPortList(entity);
 		List<ComplexkeywordCfg> domainList = websiteCfgDao.getDnsDomainList(entity);
 		List<NtcSubscribeIdCfg> subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
@@ -372,7 +372,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			entity.setFunctionId(functionId);
 			websiteCfgDao.updateCfgValid(entity);
 			//查询子配置
-			entity = this.getHttpCfg(Long.parseLong(id));
+			entity = this.getHttpCfg(Long.parseLong(id),entity.getCompileId());
 			if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 				IpPortCfg cfg = new IpPortCfg();
 				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -437,7 +437,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 		List<IpCfg> areaIpRegionList = new ArrayList();
 		
 		//查询子配置并修改审核状态
-		entity = this.getHttpCfg(entity.getCfgId());
+		entity = this.getHttpCfg(entity.getCfgId(),entity.getCompileId());
 		if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 			IpPortCfg cfg = new IpPortCfg();
 			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -802,7 +802,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			entity.setFunctionId(functionId);
 			websiteCfgDao.updateCfgValid(entity);
 			//查询子配置
-			entity = this.getSslCfg(Long.parseLong(id));
+			entity = this.getSslCfg(Long.parseLong(id),entity.getCompileId());
 			if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 				IpPortCfg cfg = new IpPortCfg();
 				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -850,7 +850,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 		List<IpCfg> areaIpRegionList = new ArrayList();
 		
 		//查询子配置并修改审核状态
-		entity = this.getSslCfg(entity.getCfgId());
+		entity = this.getSslCfg(entity.getCfgId(),entity.getCompileId());
 		if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 			IpPortCfg cfg = new IpPortCfg();
 			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -1087,7 +1087,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 			entity.setFunctionId(functionId);
 			websiteCfgDao.updateCfgValid(entity);
 			//查询子配置
-			entity = this.getDnsCfg(Long.parseLong(id));
+			entity = this.getDnsCfg(Long.parseLong(id),entity.getCompileId());
 			if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 				IpPortCfg cfg = new IpPortCfg();
 				BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
@@ -1141,7 +1141,7 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
 		List<IpCfg> areaIpRegionList = new ArrayList();
 		
 		//查询子配置并修改审核状态
-		entity = this.getDnsCfg(entity.getCfgId());
+		entity = this.getDnsCfg(entity.getCfgId(),entity.getCompileId());
 		if(entity.getIpPortList()!=null && entity.getIpPortList().size()>0){
 			IpPortCfg cfg = new IpPortCfg();
 			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index b50e49b3a..a7330c301 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -1334,4 +1334,5 @@ incoming_broadcast_total_size=Incoming Broadcast Total Size
 address_pool=Address Pool
 ip_total=IP Total
 available_ip_total=Available IP Total
-address_pool_id=Address Pool ID
\ No newline at end of file
+address_pool_id=Address Pool ID
+log_to_cfg=Config
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index 17460b785..0171d8d72 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -1334,4 +1334,5 @@ incoming_broadcast_total_size=Incoming Broadcast Total Size
 address_pool=Address Pool
 ip_total=IP Total
 available_ip_total=Available IP Total
-address_pool_id=Address Pool ID
\ No newline at end of file
+address_pool_id=Address Pool ID
+log_to_cfg=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 27e3adcc3..b148832ba 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -1330,4 +1330,5 @@ incoming_broadcast_total_size=\u4E0B\u8F7D\u5B57\u8282\u6570\u603B\u91CF
 address_pool=\u5730\u5740\u6C60
 ip_total=IP\u603B\u6570
 available_ip_total=\u53EF\u7528IP\u6570
-address_pool_id=\u5730\u5740\u6C60ID
\ No newline at end of file
+address_pool_id=\u5730\u5740\u6C60ID
+log_to_cfg=\u914D\u7F6E
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
index 720bd02e4..75aedb004 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -21,6 +21,49 @@ $(document).ready(function(){
 	});
 	//筛选功能
 	filterActionInit();
+	
+	//异步获取策略ip相关信息
+	$("span[id^=open]").click(function(){
+		var openId=$(this).attr("id");
+		var closeId=$(this).attr("id").replace("open","close");
+		var index=$(this).attr("id").replace("open","");
+		$("#"+openId).hide();
+		$("#"+closeId).show();
+		var compileId=$(this).attr("compileId");
+// 		var cfgId=$(this).attr("cfgId");
+		if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+			$("#"+openId).parent().parent().next("tr").show();
+		}else{
+			$.ajax({
+				type:'post',
+				async:false,
+				url:'${ctx}/app/ajaxAppPolicyIpList',
+				data:{"compileId":compileId,"index":index},
+				dataType:"html",
+				success:function(data){
+					var subTab="<tr class='child'>"+
+				 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+					var html="";
+					html+="<div class='row'>";
+					html = html+data;
+					subTab=subTab+html;
+					subTab+="</td>";
+					subTab+="</tr>";
+					$("#"+openId).parent().parent().after(subTab);
+					$("div[name='tabTitle"+index+"']").eq(0).click();
+				}
+			});
+		}
+		
+	});
+	
+	$("span[id^=close]").on("click",function(){
+		var closeId=$(this).attr("id");
+		var openId=$(this).attr("id").replace("close","open");
+		$("#"+closeId).hide();
+		$("#"+openId).show();
+		$("#"+closeId).parent().parent().next("tr").hide();
+	}); 
 });
 
 </script>
@@ -178,7 +221,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -223,6 +266,7 @@ $(document).ready(function(){
 							<c:forEach var="log" items="${page.list }" varStatus="status">
 								<tr>
 									<td>
+										<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
index 1c9f17097..62f4e8206 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
@@ -169,7 +169,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
index ef3930390..ad29dd7e9 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp
@@ -22,6 +22,49 @@
 		});
 		//筛选功能
 		filterActionInit();
+		
+		//异步获取voip相关信息
+		$("span[id^=open]").click(function(){
+			var openId=$(this).attr("id");
+			var closeId=$(this).attr("id").replace("open","close");
+			var index=$(this).attr("id").replace("open","");
+			$("#"+openId).hide();
+			$("#"+closeId).show();
+			var compileId=$(this).attr("compileId");
+// 			var cfgId=$(this).attr("cfgId");
+			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+				$("#"+openId).parent().parent().next("tr").show();
+			}else{
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/ntc/other/ajaxBgpSubList',
+					data:{"compileId":compileId,"index":index},
+					dataType:"html",
+					success:function(data){
+						var subTab="<tr class='child'>"+
+					 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+						var html="";
+						html+="<div class='row'>";
+						html = html+data;
+						subTab=subTab+html;
+						subTab+="</td>";
+						subTab+="</tr>";
+						$("#"+openId).parent().parent().after(subTab);
+						$("div[name='tabTitle"+index+"']").get(0).click();
+					}
+				});
+			}
+			
+		});
+		
+		$("span[id^=close]").on("click",function(){
+			var closeId=$(this).attr("id");
+			var openId=$(this).attr("id").replace("close","open");
+			$("#"+closeId).hide();
+			$("#"+openId).show();
+			$("#"+closeId).parent().parent().next("tr").hide();
+		}); 
 	});
 </script>
 </head>
@@ -167,7 +210,7 @@
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-							 	<th><spring:message code="log"/></th>
+							 	<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -208,6 +251,7 @@
 							<c:forEach var="log" items="${page.list }" varStatus="status">
 								<tr>
 									<td>
+									<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/collectVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/collectVoipList.jsp
index d8f684edb..9053042af 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/collectVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/collectVoipList.jsp
@@ -140,7 +140,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column pid"><spring:message code="pid"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
 								<th class="sort-column recv_time"><spring:message code="recv_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
index b39d2b458..3723d44e0 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -161,7 +161,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
index 5759046c7..b11215813 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
@@ -22,6 +22,48 @@
 		});
 		//筛选功能
 		filterActionInit();
+		//异步获取voip相关信息
+		$("span[id^=open]").click(function(){
+			var openId=$(this).attr("id");
+			var closeId=$(this).attr("id").replace("open","close");
+			var index=$(this).attr("id").replace("open","");
+			$("#"+openId).hide();
+			$("#"+closeId).show();
+			var compileId=$(this).attr("compileId");
+// 			var cfgId=$(this).attr("cfgId");
+			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+				$("#"+openId).parent().parent().next("tr").show();
+			}else{
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/ntc/website/ajaxDnsSubList',
+					data:{"compileId":compileId,"index":index},
+					dataType:"html",
+					success:function(data){
+						var subTab="<tr class='child'>"+
+					 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+						var html="";
+						html+="<div class='row'>";
+						html = html+data;
+						subTab=subTab+html;
+						subTab+="</td>";
+						subTab+="</tr>";
+						$("#"+openId).parent().parent().after(subTab);
+						$("div[name='tabTitle"+index+"']").get(0).click();
+					}
+				});
+			}
+			
+		});
+		
+		$("span[id^=close]").on("click",function(){
+			var closeId=$(this).attr("id");
+			var openId=$(this).attr("id").replace("close","open");
+			$("#"+closeId).hide();
+			$("#"+openId).show();
+			$("#"+closeId).parent().parent().next("tr").hide();
+		}); 
 	});
 </script>  
 
@@ -176,7 +218,7 @@
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -225,6 +267,7 @@
 							<c:forEach var="log" items="${page.list }" varStatus="status">
 								<tr>
 									<td>
+									<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
index 3cd664614..0655a6a03 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -20,7 +20,48 @@ $(document).ready(function(){
 		.attr("value",'');
 		$("#searchForm")[0].reset();
 	});
+	//异步获取voip相关信息
+	$("span[id^=open]").click(function(){
+		var openId=$(this).attr("id");
+		var closeId=$(this).attr("id").replace("open","close");
+		var index=$(this).attr("id").replace("open","");
+		$("#"+openId).hide();
+		$("#"+closeId).show();
+		var compileId=$(this).attr("compileId");
+// 		var cfgId=$(this).attr("cfgId");
+		if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+			$("#"+openId).parent().parent().next("tr").show();
+		}else{
+			$.ajax({
+				type:'post',
+				async:false,
+				url:'${ctx}/ntc/fileTransfer/ajaxFtpSubList',
+				data:{"compileId":compileId,"index":index},
+				dataType:"html",
+				success:function(data){
+					var subTab="<tr class='child'>"+
+				 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+					var html="";
+					html+="<div class='row'>";
+					html = html+data;
+					subTab=subTab+html;
+					subTab+="</td>";
+					subTab+="</tr>";
+					$("#"+openId).parent().parent().after(subTab);
+					$("div[name='tabTitle"+index+"']").get(0).click();
+				}
+			});
+		}
+		
+	});
 	
+	$("span[id^=close]").on("click",function(){
+		var closeId=$(this).attr("id");
+		var openId=$(this).attr("id").replace("close","open");
+		$("#"+closeId).hide();
+		$("#"+openId).show();
+		$("#"+closeId).parent().parent().next("tr").hide();
+	}); 
 });
 
 </script>
@@ -170,7 +211,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -211,6 +252,7 @@ $(document).ready(function(){
 							<c:forEach var="log" items="${page.list }" varStatus="status">
 								<tr>
 									<td>
+									<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
index 9f0033b74..6da8e0b59 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp
@@ -44,6 +44,51 @@
 		//筛选功能
 		filterActionInit();
 		
+		//异步获取voip相关信息
+		$("span[id^=open]").click(function(){
+			var openId=$(this).attr("id");
+			var closeId=$(this).attr("id").replace("open","close");
+			var index=$(this).attr("id").replace("open","");
+			$("#"+openId).hide();
+			$("#"+closeId).show();
+			var compileId=$(this).attr("compileId2");
+// 			var cfgId=$(this).attr("cfgId");
+			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+				$("#"+openId).parent().parent().next("tr").show();
+			}else{
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/ntc/website/ajaxHttpSubList',
+					data:{"compileId":compileId,"index":index},
+					dataType:"html",
+					success:function(data){
+						var subTab="<tr class='child'>"+
+						"<td style='border-right: 1px solid #FFFFFF;'>"+
+				 		"<input type='checkbox' hidden='hidden'/>"+
+				 		"</td>"+
+					 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+						var html="";
+						html+="<div class='row'>";
+						html = html+data;
+						subTab=subTab+html;
+						subTab+="</td>";
+						subTab+="</tr>";
+						$("#"+openId).parent().parent().after(subTab);
+						$("div[name='tabTitle"+index+"']").get(0).click();
+					}
+				});
+			}
+			
+		});
+		
+		$("span[id^=close]").on("click",function(){
+			var closeId=$(this).attr("id");
+			var openId=$(this).attr("id").replace("close","open");
+			$("#"+closeId).hide();
+			$("#"+openId).show();
+			$("#"+closeId).parent().parent().next("tr").hide();
+		}); 
 	});
 </script>
 </head>
@@ -200,7 +245,7 @@
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><input type="checkbox" class="i-checks" id="checkAll"><spring:message code="log"/></th>
+								<th><input type="checkbox" class="i-checks" id="checkAll"> <spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -243,6 +288,7 @@
 								<tr>
 									<td>
 										<input type="checkbox" class="i-checks child-checks" compileId="${log.cfgId }" url="${log.url}" value="${log.cfgId }">
+										<span id="open${status.index}" class="log-open-cfg" compileId2="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
index 869590051..91721170e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
@@ -23,6 +23,49 @@
 		
 		//筛选功能
 		filterActionInit();
+		
+		//异步获取voip相关信息
+		$("span[id^=open]").click(function(){
+			var openId=$(this).attr("id");
+			var closeId=$(this).attr("id").replace("open","close");
+			var index=$(this).attr("id").replace("open","");
+			$("#"+openId).hide();
+			$("#"+closeId).show();
+			var compileId=$(this).attr("compileId");
+// 			var cfgId=$(this).attr("cfgId");
+			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+				$("#"+openId).parent().parent().next("tr").show();
+			}else{
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/ntc/website/ajaxHttpSubList',
+					data:{"compileId":compileId,"index":index},
+					dataType:"html",
+					success:function(data){
+						var subTab="<tr class='child'>"+
+					 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+						var html="";
+						html+="<div class='row'>";
+						html = html+data;
+						subTab=subTab+html;
+						subTab+="</td>";
+						subTab+="</tr>";
+						$("#"+openId).parent().parent().after(subTab);
+						$("div[name='tabTitle"+index+"']").get(0).click();
+					}
+				});
+			}
+			
+		});
+		
+		$("span[id^=close]").on("click",function(){
+			var closeId=$(this).attr("id");
+			var openId=$(this).attr("id").replace("close","open");
+			$("#"+closeId).hide();
+			$("#"+openId).show();
+			$("#"+closeId).parent().parent().next("tr").hide();
+		}); 
 	});
 </script>
 </head>
@@ -176,7 +219,7 @@
 					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -225,6 +268,7 @@
 							<c:forEach var="log" items="${page.list }" varStatus="status">
 								<tr>
 									<td>
+									<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
index 1dad32a9b..716b67a39 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
@@ -22,6 +22,49 @@
 		});
 		//筛选功能
 		filterActionInit();
+		
+		//异步获取voip相关信息
+		$("span[id^=open]").click(function(){
+			var openId=$(this).attr("id");
+			var closeId=$(this).attr("id").replace("open","close");
+			var index=$(this).attr("id").replace("open","");
+			$("#"+openId).hide();
+			$("#"+closeId).show();
+			var compileId=$(this).attr("compileId");
+// 			var cfgId=$(this).attr("cfgId");
+			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+				$("#"+openId).parent().parent().next("tr").show();
+			}else{
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/ntc/iplist/ajaxSubList',
+					data:{"compileId":compileId,"index":index},
+					dataType:"html",
+					success:function(data){
+						var subTab="<tr class='child'>"+
+					 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+						var html="";
+						html+="<div class='row'>";
+						html = html+data;
+						subTab=subTab+html;
+						subTab+="</td>";
+						subTab+="</tr>";
+						$("#"+openId).parent().parent().after(subTab);
+						$("div[name='tabTitle"+index+"']").get(0).click();
+					}
+				});
+			}
+			
+		});
+		
+		$("span[id^=close]").on("click",function(){
+			var closeId=$(this).attr("id");
+			var openId=$(this).attr("id").replace("close","open");
+			$("#"+closeId).hide();
+			$("#"+openId).show();
+			$("#"+closeId).parent().parent().next("tr").hide();
+		});
 	});
 </script>
 </head>
@@ -169,7 +212,7 @@
 					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -205,6 +248,7 @@
 							<c:forEach var="log" items="${page.list }" varStatus="status">
 								<tr>
 									<td>
+									<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
index ffa051d14..35f1c54bd 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
@@ -156,7 +156,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service"  isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
index 7f70a5e28..f9d53a999 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -168,7 +168,7 @@
 								<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
index fdd185d20..fb1288442 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -22,6 +22,49 @@
 		});
 		//筛选功能
 		filterActionInit();
+		
+		//异步获取voip相关信息
+		$("span[id^=open]").click(function(){
+			var openId=$(this).attr("id");
+			var closeId=$(this).attr("id").replace("open","close");
+			var index=$(this).attr("id").replace("open","");
+			$("#"+openId).hide();
+			$("#"+closeId).show();
+			var compileId=$(this).attr("compileId");
+// 			var cfgId=$(this).attr("cfgId");
+			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+				$("#"+openId).parent().parent().next("tr").show();
+			}else{
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/ntc/mail/ajaxMailSubList',
+					data:{"compileId":compileId,"index":index},
+					dataType:"html",
+					success:function(data){
+						var subTab="<tr class='child'>"+
+					 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+						var html="";
+						html+="<div class='row'>";
+						html = html+data;
+						subTab=subTab+html;
+						subTab+="</td>";
+						subTab+="</tr>";
+						$("#"+openId).parent().parent().after(subTab);
+						$("div[name='tabTitle"+index+"']").get(0).click();
+					}
+				});
+			}
+			
+		});
+		
+		$("span[id^=close]").on("click",function(){
+			var closeId=$(this).attr("id");
+			var openId=$(this).attr("id").replace("close","open");
+			$("#"+closeId).hide();
+			$("#"+openId).show();
+			$("#"+closeId).parent().parent().next("tr").hide();
+		});
 	});
 </script>
 </head>
@@ -167,7 +210,7 @@
 					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -211,6 +254,7 @@
 							<c:forEach var="log" items="${page.list }" varStatus="status">
 								<tr>
 									<td>
+									<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
index 26770d74b..d7901d132 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -168,7 +168,7 @@ $(document).ready(function(){
 					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
index 11383fea8..2fb534be0 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -167,7 +167,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
index b5b97459e..1a7e59907 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
@@ -20,7 +20,48 @@ $(document).ready(function(){
 		.attr("value",'');
 		$("#searchForm")[0].reset();
 	});
+	//异步获取voip相关信息
+	$("span[id^=open]").click(function(){
+		var openId=$(this).attr("id");
+		var closeId=$(this).attr("id").replace("open","close");
+		var index=$(this).attr("id").replace("open","");
+		$("#"+openId).hide();
+		$("#"+closeId).show();
+		var compileId=$(this).attr("compileId");
+// 		var cfgId=$(this).attr("cfgId");
+		if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+			$("#"+openId).parent().parent().next("tr").show();
+		}else{
+			$.ajax({
+				type:'post',
+				async:false,
+				url:'${ctx}/ntc/fileTransfer/ajaxFileDigestSubIdList',
+				data:{"compileId":compileId,"index":index},
+				dataType:"html",
+				success:function(data){
+					var subTab="<tr class='child'>"+
+				 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+					var html="";
+					html+="<div class='row'>";
+					html = html+data;
+					subTab=subTab+html;
+					subTab+="</td>";
+					subTab+="</tr>";
+					$("#"+openId).parent().parent().after(subTab);
+					$("div[name='tabTitle"+index+"']").get(0).click();
+				}
+			});
+		}
+		
+	});
 	
+	$("span[id^=close]").on("click",function(){
+		var closeId=$(this).attr("id");
+		var openId=$(this).attr("id").replace("close","open");
+		$("#"+closeId).hide();
+		$("#"+openId).show();
+		$("#"+closeId).parent().parent().next("tr").hide();
+	});
 });
 
 </script>
@@ -168,7 +209,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -213,6 +254,7 @@ $(document).ready(function(){
 							<c:forEach var="log" items="${page.list }" varStatus="status">
 								<tr>
 									<td>
+										<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
index 45a58fb4b..3cdeb0e7a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -167,7 +167,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
index 3c54b0dd4..5d3a93714 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -164,7 +164,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
index 936c933dd..e291e0344 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
@@ -167,7 +167,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
index 424e810d4..6448689c5 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
@@ -167,7 +167,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
index bc6c97691..d414c41b4 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -224,7 +224,7 @@
 							<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
index cb74747a8..f6584639a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp
@@ -167,7 +167,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
index 914e47346..c8446a73c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp
@@ -167,7 +167,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
index a23f4a536..bf1aab3e6 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -166,7 +166,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
index 628476b2e..77ea2bfc8 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp
@@ -167,7 +167,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
index 8979ac207..9abf1b4e8 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -167,7 +167,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>	
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
index b7629237c..44f9f59c5 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
@@ -167,7 +167,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
index 8fc16e78f..8a2904329 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -167,7 +167,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
index 37c4038e2..3b1330fa5 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -20,6 +20,48 @@ $(document).ready(function(){
 		.attr("value",'');
 		$("#searchForm")[0].reset();
 	});
+	//异步获取voip相关信息
+	$("span[id^=open]").click(function(){
+		var openId=$(this).attr("id");
+		var closeId=$(this).attr("id").replace("open","close");
+		var index=$(this).attr("id").replace("open","");
+		$("#"+openId).hide();
+		$("#"+closeId).show();
+		var compileId=$(this).attr("compileId");
+// 		var cfgId=$(this).attr("cfgId");
+		if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+			$("#"+openId).parent().parent().next("tr").show();
+		}else{
+			$.ajax({
+				type:'post',
+				async:false,
+				url:'${ctx}/ntc/av/ajaxVoipIpInfo',
+				data:{"compileId":compileId,"index":index},
+				dataType:"html",
+				success:function(data){
+					var subTab="<tr class='child'>"+
+				 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+					var html="";
+					html+="<div class='row'>";
+					html = html+data;
+					subTab=subTab+html;
+					subTab+="</td>";
+					subTab+="</tr>";
+					$("#"+openId).parent().parent().after(subTab);
+					$("div[name='tabTitle"+index+"']").eq(0).click();
+				}
+			});
+		}
+		
+	});
+	
+	$("span[id^=close]").on("click",function(){
+		var closeId=$(this).attr("id");
+		var openId=$(this).attr("id").replace("close","open");
+		$("#"+closeId).hide();
+		$("#"+openId).show();
+		$("#"+closeId).parent().parent().next("tr").hide();
+	}); 
 	
 });
 
@@ -167,7 +209,7 @@ $(document).ready(function(){
 							<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -220,6 +262,7 @@ $(document).ready(function(){
 							<c:forEach var="log" items="${page.list }" varStatus="status">
 								<tr>
 									<td>
+										<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
index 298a8bc45..20c4a0825 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp
@@ -20,7 +20,48 @@ $(document).ready(function(){
 		.attr("value",'');
 		$("#searchForm")[0].reset();
 	});
+	//异步获取voip相关信息
+	$("span[id^=open]").click(function(){
+		var openId=$(this).attr("id");
+		var closeId=$(this).attr("id").replace("open","close");
+		var index=$(this).attr("id").replace("open","");
+		$("#"+openId).hide();
+		$("#"+closeId).show();
+		var compileId=$(this).attr("compileId");
+// 		var cfgId=$(this).attr("cfgId");
+		if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+			$("#"+openId).parent().parent().next("tr").show();
+		}else{
+			$.ajax({
+				type:'post',
+				async:false,
+				url:'${ctx}/ntc/av/ajaxAvContUrlList',
+				data:{"compileId":compileId,"index":index},
+				dataType:"html",
+				success:function(data){
+					var subTab="<tr class='child'>"+
+				 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+					var html="";
+					html+="<div class='row'>";
+					html = html+data;
+					subTab=subTab+html;
+					subTab+="</td>";
+					subTab+="</tr>";
+					$("#"+openId).parent().parent().after(subTab);
+					$("div[name='tabTitle"+index+"']").eq(0).click();
+				}
+			});
+		}
+		
+	});
 	
+	$("span[id^=close]").on("click",function(){
+		var closeId=$(this).attr("id");
+		var openId=$(this).attr("id").replace("close","open");
+		$("#"+closeId).hide();
+		$("#"+openId).show();
+		$("#"+closeId).parent().parent().next("tr").hide();
+	}); 
 });
 
 </script>
@@ -167,7 +208,7 @@ $(document).ready(function(){
 							<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -206,6 +247,7 @@ $(document).ready(function(){
 							<c:forEach var="log" items="${page.list }" varStatus="status">
 								<tr>
 									<td>
+										<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
index 600edf5d8..a85f07740 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -169,7 +169,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
index 581fd224a..85b8aa578 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
@@ -22,7 +22,49 @@
 			$("#searchForm")[0].reset();
 		});
 		//筛选功能
-		filterActionInit();	 
+		filterActionInit();
+		//异步获取voip相关信息
+		$("span[id^=open]").click(function(){
+			var openId=$(this).attr("id");
+			var closeId=$(this).attr("id").replace("open","close");
+			var index=$(this).attr("id").replace("open","");
+			$("#"+openId).hide();
+			$("#"+closeId).show();
+			var compileId=$(this).attr("compileId");
+// 			var cfgId=$(this).attr("cfgId");
+			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+				$("#"+openId).parent().parent().next("tr").show();
+			}else{
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/ntc/fileTransfer/ajaxP2pSubList',
+					data:{"compileId":compileId,"index":index},
+					dataType:"html",
+					success:function(data){
+						var subTab="<tr class='child'>"+
+					 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+						var html="";
+						html+="<div class='row'>";
+						html = html+data;
+						subTab=subTab+html;
+						subTab+="</td>";
+						subTab+="</tr>";
+						$("#"+openId).parent().parent().after(subTab);
+						$("div[name='tabTitle"+index+"']").get(0).click();
+					}
+				});
+			}
+			
+		});
+		
+		$("span[id^=close]").on("click",function(){
+			var closeId=$(this).attr("id");
+			var openId=$(this).attr("id").replace("close","open");
+			$("#"+closeId).hide();
+			$("#"+openId).show();
+			$("#"+closeId).parent().parent().next("tr").hide();
+		}); 
 	});
 </script>
 </head>
@@ -168,7 +210,7 @@
 					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -209,6 +251,7 @@
 							<c:forEach var="log" items="${page.list }" varStatus="status">
 								<tr>
 									<td>
+										<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
index 986f64264..799e6a3eb 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -166,7 +166,7 @@
 							<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
index 7e8522e04..66db839c8 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -169,7 +169,7 @@ $(document).ready(function(){
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
index d58b91e74..0d1daaded 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -2,7 +2,11 @@
 <%@ include file="/WEB-INF/include/taglib.jsp"%>
 <html>
 <head>
-
+<style>
+	.Wdate {
+   width:180px !important; 
+}
+</style>
 <script type="text/javascript">
 	$(document).ready(function() {
 		// 筛选
@@ -20,6 +24,49 @@
 			.attr("value",'');
 			$("#searchForm")[0].reset();
 		});
+		
+		//异步获取voip相关信息
+		$("span[id^=open]").click(function(){
+			var openId=$(this).attr("id");
+			var closeId=$(this).attr("id").replace("open","close");
+			var index=$(this).attr("id").replace("open","");
+			$("#"+openId).hide();
+			$("#"+closeId).show();
+			var compileId=$(this).attr("compileId");
+// 			var cfgId=$(this).attr("cfgId");
+			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+				$("#"+openId).parent().parent().next("tr").show();
+			}else{
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/ntc/website/ajaxSslSubList',
+					data:{"compileId":compileId,"index":index},
+					dataType:"html",
+					success:function(data){
+						var subTab="<tr class='child'>"+
+					 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+						var html="";
+						html+="<div class='row'>";
+						html = html+data;
+						subTab=subTab+html;
+						subTab+="</td>";
+						subTab+="</tr>";
+						$("#"+openId).parent().parent().after(subTab);
+						$("div[name='tabTitle"+index+"']").get(0).click();
+					}
+				});
+			}
+			
+		});
+		
+		$("span[id^=close]").on("click",function(){
+			var closeId=$(this).attr("id");
+			var openId=$(this).attr("id").replace("close","open");
+			$("#"+closeId).hide();
+			$("#"+openId).show();
+			$("#"+closeId).parent().parent().next("tr").hide();
+		});
 	});
 	
 </script>
@@ -77,7 +124,7 @@
 											<div class="input-group-btn">
 												<span class="selectpicker form-control"><spring:message code="begin_date"/></span>
 											</div>
-											<input id="startTime" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
+											<input id="startTime" name="searchFoundStartTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" data-options="buttons:buttons"
 													value="${log.searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div>
@@ -86,7 +133,7 @@
 											<div class="input-group-btn">
 												<span class="selectpicker form-control"><spring:message code="end_date"/></span>
 											</div>
-											<input id="endTime" name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control input-medium Wdate" data-options="buttons:buttons"
+											<input id="endTime" name="searchFoundEndTime" type="text" readonly="readonly" maxlength="20" class="form-control Wdate" data-options="buttons:buttons"
 													value="${log.searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
 										</div>
 									</div>
@@ -176,7 +223,7 @@
 							<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -218,6 +265,7 @@
 							<c:forEach var="log" items="${page.list }" varStatus="status">
 								<tr>
 									<td>
+									<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
index bdf549229..95a43ccaf 100644
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -22,6 +22,48 @@
 		});
 		//筛选功能
 		filterActionInit();
+		//异步获取voip相关信息
+		$("span[id^=open]").click(function(){
+			var openId=$(this).attr("id");
+			var closeId=$(this).attr("id").replace("open","close");
+			var index=$(this).attr("id").replace("open","");
+			$("#"+openId).hide();
+			$("#"+closeId).show();
+			var compileId=$(this).attr("compileId");
+// 			var cfgId=$(this).attr("cfgId");
+			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
+				$("#"+openId).parent().parent().next("tr").show();
+			}else{
+				$.ajax({
+					type:'post',
+					async:false,
+					url:'${ctx}/proxy/control/httpRedirect/ajaxHttpSubList',
+					data:{"compileId":compileId,"index":index},
+					dataType:"html",
+					success:function(data){
+						var subTab="<tr class='child'>"+
+					 	"<td colspan='"+($(".table tr").eq(0).children("th").length-1)+"'>";
+						var html="";
+						html+="<div class='row'>";
+						html = html+data;
+						subTab=subTab+html;
+						subTab+="</td>";
+						subTab+="</tr>";
+						$("#"+openId).parent().parent().after(subTab);
+						$("div[name='tabTitle"+index+"']").get(0).click();
+					}
+				});
+			}
+			
+		});
+		
+		$("span[id^=close]").on("click",function(){
+			var closeId=$(this).attr("id");
+			var openId=$(this).attr("id").replace("close","open");
+			$("#"+closeId).hide();
+			$("#"+openId).show();
+			$("#"+closeId).parent().parent().next("tr").hide();
+		}); 
 	});
 </script>
 </head>
@@ -154,7 +196,7 @@
 					<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
-								<th><spring:message code="log"/></th>
+								<th><spring:message code="log_to_cfg"/></th>
 								<th class="sort-column cfg_id "  isVisible="false" ><spring:message code="cfg_id"/></th>
 								<th class="sort-column service" isVisible="false"><spring:message code="action"/></th>
 								<th class="sort-column found_time"><spring:message code="found_time"/></th>
@@ -207,6 +249,7 @@
 							<c:forEach var="log" items="${page.list }" varStatus="status">
 								<tr>
 									<td>
+										<span id="open${status.index}" class="log-open-cfg" compileId="${log.cfgId }"> ▷ </span><span  style="display: none" id="close${status.index}" > ▼ </span>
 										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index bdab68fc1..173fa5943 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -110,19 +110,19 @@ $(function(){
 	    });
 	});
 	//表格中的title鼠标点击复制完整内容
-	/*$("td[title]").on("click",function(){
+	$("table.logTb td[title]").on("click",function(){
 		//$(this).attr("data-clipboard-action","copy");
 		$(this).attr("data-clipboard-text",$(this).attr("title"));
 		var clipboard = new ClipboardJS('td[title]');
 		clipboard.on('success', function(e) {
 			top.$.jBox.tip("Copyied!",'copy',{opacity:0.5,persistent:false});
-	        console.log(e);
+//	        console.log(e);
 	        e.clearSelection();
 	    });
 	    clipboard.on('error', function(e) {
 	        console.log(e);
 	    });
-	});*/
+	});
 	var tree2 = $("select[name=lableTest]").treeMultiselect({
         searchable: true,
         hideSidePanel:true,
diff --git a/src/main/webapp/static/pages/scripts/pageLogs.js b/src/main/webapp/static/pages/scripts/pageLogs.js
index 6271da2f6..970aa3380 100644
--- a/src/main/webapp/static/pages/scripts/pageLogs.js
+++ b/src/main/webapp/static/pages/scripts/pageLogs.js
@@ -1,4 +1,6 @@
 $(document).ready(function() {
+	// 隱藏日誌詳情
+	$("table.logTb .icon-book-open").hide();
 	// 界面鼠标悬停事件
 /*	$("table.logTb").find("td").not(":has(a)").bind("mouseover", function(){
 		var str = $(this).html(this.innerHTML.trim()).text();

From 3983ad4658dbc53088eb20619ba9b0297b188973 Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Wed, 28 Nov 2018 19:58:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0APP=E7=AD=96=E7=95=A5?=
 =?UTF-8?q?=EF=BC=8CAPP=E5=A4=9A=E5=9F=9F=E7=89=B9=E5=BE=81=E7=9A=84?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8B=E5=8F=91=E6=95=B0=E6=8D=AE=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigSynchronizationDao.java             |   8 +-
 .../ConfigSynchronizationDao.xml              | 199 ++++-
 .../ConfigSynchronizationService.java         | 843 +++++++++++++++++-
 3 files changed, 990 insertions(+), 60 deletions(-)

diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java
index 91abb322c..e8f1301b2 100644
--- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java
+++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.java
@@ -11,6 +11,7 @@ import com.nis.domain.basics.AsnIpCfg;
 import com.nis.domain.configuration.AppByteCfg;
 import com.nis.domain.configuration.AppComplexKeywordCfg;
 import com.nis.domain.configuration.AppDomainCfg;
+import com.nis.domain.configuration.AppFeatureIndex;
 import com.nis.domain.configuration.AppHeaderCfg;
 import com.nis.domain.configuration.AppHttpCfg;
 import com.nis.domain.configuration.AppIdCfg;
@@ -73,7 +74,6 @@ public interface ConfigSynchronizationDao {
 	public List<BaseStringCfg> getStrList(@Param("tableName")String tableName,@Param("compileIds")List compileIds);
 	public List<ComplexkeywordCfg> getComplexStrList(@Param("tableName")String tableName,@Param("compileIds")List compileIds);
 	public List<FileDigestCfg> getFileDigestList(@Param("tableName")String tableName,@Param("compileIds")List compileIds);
-	
 	public List<DdosIpCfg> getDdosIpCfgList(BaseCfg entity);
 	
 	public List<AvFileSampleCfg> getAvFileCfgList(BaseCfg entity);
@@ -83,4 +83,10 @@ public interface ConfigSynchronizationDao {
 	public List<DnsResStrategy> getDnsStrategyList(BaseCfg entity);
 	public List<DnsIpCfg> getDnsIpCfgList(BaseCfg entity);
 	public List<IpPortCfg> getIpPortListByService(BaseCfg entity);
+	
+	public List<AppPolicyCfg> getAppPolicyList(BaseCfg entity);
+	public List<AppFeatureIndex> getAppFeatureIndexList(BaseCfg entity);
+	public List<BaseStringCfg> getStrListByService(BaseCfg entity);
+	public List<ComplexkeywordCfg> getComplexStrListByService(BaseCfg entity);
+	public List<IpPortCfg> getAppIpPortList(@Param("tableName")String tableName,@Param("compileIds")List compileIds);
 }
diff --git a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
index 011d2209e..d2a854923 100644
--- a/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
+++ b/src/main/java/com/nis/web/dao/configuration/ConfigSynchronizationDao.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mappea.dtd" >
 <mapper namespace="com.nis.web.dao.configuration.ConfigSynchronizationDao" >
 
-  <!-- <resultMap id="AppPolicyCfgMap" type="com.nis.domain.configuration.AppPolicyCfg" >
+	<resultMap id="AppPolicyCfgMap" type="com.nis.domain.configuration.AppPolicyCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
     <result column="spec_service_id" property="specServiceId" jdbcType="INTEGER" />
     <result column="app_code" property="appCode" jdbcType="INTEGER" />
@@ -37,6 +37,41 @@
     <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
     <result column="do_log" property="doLog" jdbcType="INTEGER" />
   </resultMap>
+  <resultMap id="AppFeatureIndexMap" type="com.nis.domain.configuration.AppFeatureIndex" >
+    <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
+    <result column="cfg_desc" property="cfgDesc" jdbcType="VARCHAR" />
+    <result column="action" property="action" jdbcType="INTEGER" />
+    <result column="is_valid" property="isValid" jdbcType="INTEGER" />
+    <result column="is_audit" property="isAudit" jdbcType="INTEGER" />
+    <result column="creator_id" property="creatorId" jdbcType="INTEGER" />
+    <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
+    <result column="editor_id" property="editorId" jdbcType="INTEGER" />
+    <result column="edit_time" property="editTime" jdbcType="TIMESTAMP" />
+    <result column="auditor_id" property="auditorId" jdbcType="INTEGER" />
+    <result column="audit_time" property="auditTime" jdbcType="TIMESTAMP" />
+    <result column="service_id" property="serviceId" jdbcType="INTEGER" />
+    <result column="request_id" property="requestId" jdbcType="INTEGER" />
+    <result column="compile_id" property="compileId" jdbcType="INTEGER" />
+    <result column="is_area_effective" property="isAreaEffective" jdbcType="INTEGER" />
+    <result column="classify" property="classify" jdbcType="VARCHAR" />
+    <result column="attribute" property="attribute" jdbcType="VARCHAR" />
+    <result column="lable" property="lable" jdbcType="VARCHAR" />
+    <result column="area_effective_ids" property="areaEffectiveIds" jdbcType="VARCHAR" />
+    <result column="function_id" property="functionId" jdbcType="INTEGER" />
+    <result column="do_log" property="doLog" jdbcType="INTEGER" />
+    <result column="user_region1" property="userRegion1" jdbcType="VARCHAR" />
+    <result column="user_region2" property="userRegion2" jdbcType="VARCHAR" />
+    <result column="user_region3" property="userRegion3" jdbcType="VARCHAR" />
+    <result column="user_region4" property="userRegion4" jdbcType="VARCHAR" />
+    <result column="user_region5" property="userRegion5" jdbcType="VARCHAR" />
+    <result column="spec_service_id" property="specServiceId" jdbcType="INTEGER" />
+    <result column="app_code" property="appCode" jdbcType="INTEGER" />
+    <result column="behav_code" property="behavCode" jdbcType="INTEGER" />
+    <result column="cfg_region_type" property="cfgRegionType" jdbcType="VARCHAR" />
+    <result column="cfg_region_value" property="cfgRegionValue" jdbcType="VARCHAR" />
+    <result column="cfg_region_code" property="cfgRegionCode1" jdbcType="VARCHAR" />
+  </resultMap>
+  <!-- 
   
   <resultMap id="AppIpCfgMap" type="com.nis.domain.configuration.AppIpCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -402,6 +437,9 @@
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
+    <result column="spec_service_id" property="specServiceId" jdbcType="INTEGER" />
+    <result column="app_code" property="appCode" jdbcType="INTEGER" />
+    <result column="behav_code" property="behavCode" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="complexCfgMap" type="com.nis.domain.configuration.ComplexkeywordCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -432,6 +470,9 @@
     <result column="function_id" property="functionId" jdbcType="INTEGER" />
     <result column="cfg_region_code" property="cfgRegionCode" jdbcType="INTEGER" />
     <result column="cfg_type" property="cfgType" jdbcType="VARCHAR" />
+    <result column="spec_service_id" property="specServiceId" jdbcType="INTEGER" />
+    <result column="app_code" property="appCode" jdbcType="INTEGER" />
+    <result column="behav_code" property="behavCode" jdbcType="INTEGER" />
   </resultMap>
   <resultMap id="digestCfgMap" type="com.nis.domain.configuration.FileDigestCfg" >
     <id column="cfg_id" property="cfgId" jdbcType="BIGINT" />
@@ -712,11 +753,11 @@
     a.user_region1
   </sql>
   <sql id="StrCfg_Column" >
-  a.cfg_desc,a.cfg_keywords,a.cfg_type,
+  a.cfg_keywords,a.cfg_type,
   a.expr_type,a.match_method,a.is_hexbin,a.compile_id
   </sql>
   <sql id="ComplexCfg_Column" >
-  a.cfg_desc,a.cfg_keywords,a.district,a.cfg_type,
+  a.cfg_keywords,a.district,a.cfg_type,
   a.expr_type,a.match_method,a.is_hexbin,a.compile_id
   </sql>
   <sql id="DigestCfg_Column" >
@@ -795,10 +836,7 @@
 		a.compile_id,a.is_area_effective,a.classify,a.attribute,a.lable
 		,a.area_effective_ids,a.function_id,a.cfg_region_code,a.dns_strategy_id
     </sql>
-  <!-- <sql id="WebsiteDomainTopic_Column">
-		id,website_service_id websiteServiceId,domain,topic_id topicId,create_time createTime,creator_id creatorId,is_valid isValid
-  </sql>
-  <sql id="AppPolicyCfg_Column" >
+    <sql id="AppPolicyCfg_Column" >
     a.CFG_ID, a.APP_CODE,a.BEHAV_CODE,a.SPEC_SERVICE_ID,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT,
     a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
     a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
@@ -806,6 +844,22 @@
     a.CFG_TYPE,a.CFG_REGION_CODE,a.EXPR_TYPE,a.MATCH_METHOD,a.IS_HEXBIN,a.USER_REGION1,a.USER_REGION2,
     a.USER_REGION3,a.USER_REGION4,a.USER_REGION5,a.DO_LOG
   </sql>
+   <sql id="AppFeatureIndex_Column" >
+	    a.CFG_ID,a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT,
+	    a.CREATOR_ID,a.CREATE_TIME,a.EDITOR_ID,a.EDIT_TIME,a.AUDITOR_ID,a.AUDIT_TIME,
+	    a.SERVICE_ID,a.REQUEST_ID,a.COMPILE_ID,a.IS_AREA_EFFECTIVE,a.CLASSIFY,
+	    a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.function_id,a.CFG_REGION_TYPE,a.CFG_REGION_VALUE,a.user_region1,
+	    a.user_region2,a.user_region3,a.user_region4,a.user_region5,a.do_log,a.feature_table,
+	    a.feature_table_type,a.app_code,a.spec_service_id,a.cfg_region_code
+   </sql>
+   <sql id="AppIpCfg_Column" >
+    a.ip_type,a.src_ip_address,a.ip_pattern,a.port_pattern,a.src_port
+    ,a.protocol,a.direction,a.dest_port,a.dest_ip_address,a.cfg_type,a.compile_id
+  </sql>
+  <!-- <sql id="WebsiteDomainTopic_Column">
+		id,website_service_id websiteServiceId,domain,topic_id topicId,create_time createTime,creator_id creatorId,is_valid isValid
+  </sql>
+  
   
   <sql id="AppIpCfg_Column" >
     a.CFG_ID, a.APP_CODE,a.BEHAV_CODE,a.SPEC_SERVICE_ID, a.CFG_DESC,a.ACTION,a.IS_VALID,a.IS_AUDIT,
@@ -837,7 +891,52 @@
     a.ATTRIBUTE,a.LABLE,a.AREA_EFFECTIVE_IDS,a.RATELIMIT,a.FUNCTION_ID,a.CFG_TYPE,a.CFG_REGION_CODE,
     a.BYTES,a.EXPR_TYPE,a.MATCH_METHOD,a.IS_HEXBIN,a.DO_LOG
   </sql> -->
-  
+  <select id="getAppPolicyList" resultMap="AppPolicyCfgMap" parameterType="com.nis.domain.configuration.AppPolicyCfg" >
+		select 
+		<include refid="AppPolicyCfg_Column"/>	
+		<trim prefix="," prefixOverrides=",">
+			, s.name as creator_name,u.name as auditor_name
+		</trim>
+		from app_policy_cfg a 
+		left join sys_user s on a.creator_id=s.id
+		left join sys_user u on a.auditor_id=u.id
+		<trim prefix="WHERE" prefixOverrides="AND |OR ">
+	    	<if test="serviceId != null">
+	    		AND a.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="functionId != null">
+	    		AND a.function_id=#{functionId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="action != null">
+	    		AND a.action=#{action,jdbcType=INTEGER}
+	    	</if>
+	    	and a.is_valid=#{isValid} and a.is_audit=#{isAudit} and a.is_valid!=-1
+	    </trim>
+		ORDER BY a.CFG_ID
+  </select>
+  <select id="getAppFeatureIndexList" resultMap="AppFeatureIndexMap">
+		select 
+		<include refid="AppFeatureIndex_Column"/>	
+		<trim prefix="," prefixOverrides=",">
+			, s.name as creator_name,u.name as auditor_name
+		</trim>
+		from app_feature_index a
+		left join sys_user s on a.creator_id=s.id
+		left join sys_user u on a.auditor_id=u.id
+		<trim prefix="WHERE" prefixOverrides="AND |OR ">
+	    	<if test="serviceId != null">
+	    		AND a.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="functionId != null">
+	    		AND a.function_id=#{functionId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="action != null">
+	    		AND a.action=#{action,jdbcType=INTEGER}
+	    	</if>
+	    	and a.is_valid=#{isValid} and a.is_audit=#{isAudit} and a.is_valid!=-1
+	    </trim>
+		ORDER BY a.CFG_ID
+  </select>
   <select id="getCfgIndexList" resultMap="CfgIndexInfoMap" parameterType="com.nis.domain.configuration.CfgIndexInfo" >
 		SELECT 
 	    <include refid="BaseCfg_Column" />
@@ -871,22 +970,24 @@
   </select>
   <select id="getIpPortList" resultMap="ipPortMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
 		 SELECT 
-	     <include refid="IpCfg_Column" />
+			 <include refid="IpCfg_Column" />
+	    FROM ${tableName} a 
+	    <where>
+	    	and a.compile_id in 	
+	    	<foreach collection="compileIds" index="index" item="compileId" open="(" separator="," close=")">
+                #{compileId}       
+        	</foreach>
+	    </where>
+  </select>
+  <select id="getAppIpPortList" resultMap="ipPortMap" parameterType="com.nis.domain.configuration.CfgIndexInfo">
+		 SELECT 
+				<include refid="AppIpCfg_Column" />
 	    FROM ${tableName} a 
 	    <where>
 	    	and a.compile_id in 	
 	    	<foreach collection="compileIds" index="index" item="compileId" open="(" separator="," close=")">
                 #{compileId}       
         	</foreach>
-		    <!-- <if test="compileId != null">
-	    		AND a.compile_id =#{compileId}
-	    	</if>
-		    <if test="functionId != null">
-	    		AND a.function_id =#{functionId}
-	    	</if>
-	    	<if test="serviceId!= null">
-	    		AND a.service_id =#{serviceId}
-	    	</if> -->
 	    </where>
   </select>
   <select id="getAsnIpList" resultType="com.nis.domain.basics.AsnIpCfg">
@@ -1117,11 +1218,15 @@
     
     <select id="getIpPortListByService" resultMap="ipPortMap" >
 		 select 
+		 	<include refid="BaseCfg_Column"></include>,
     		<include refid="IpCfg_Column"></include>
     		 <trim prefix="," prefixOverrides=",">
 				,s.name as creator_name,u.name as auditor_name
+				<if test="serviceId=1028">
+	     		,a.app_code,a.spec_service_id,a.behav_code
+	     		</if>
 			</trim>
-    	from ip_port_cfg a
+    	from ${tableName} a
     	left join sys_user s on a.creator_id=s.id
 		left join sys_user u on a.auditor_id=u.id
     	<trim prefix="WHERE" prefixOverrides="AND |OR ">
@@ -1163,6 +1268,62 @@
 	    </trim>
 		ORDER BY a.CFG_ID
   </select>
+  <select id="getStrListByService" resultMap="stringCfgMap" >
+		 select 
+		 	<include refid="BaseCfg_Column"></include>,
+    		<include refid="StrCfg_Column"></include>
+    		 <trim prefix="," prefixOverrides=",">
+				,s.name as creator_name,u.name as auditor_name
+				<if test="serviceId=1024 or serviceId=1026 or serviceId=1029">
+	     		,a.app_code,a.spec_service_id,a.behav_code
+	     		</if>
+			</trim>
+    	from ${tableName} a
+    	left join sys_user s on a.creator_id=s.id
+		left join sys_user u on a.auditor_id=u.id
+    	<trim prefix="WHERE" prefixOverrides="AND |OR ">
+	    	<if test="serviceId != null">
+	    		AND a.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="functionId != null">
+	    		AND a.function_id=#{functionId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="action != null">
+	    		AND a.action=#{action,jdbcType=INTEGER}
+	    	</if>
+	    	and a.is_valid=#{isValid} and a.is_audit=#{isAudit}
+	    	and a.is_valid!=-1
+	    </trim>
+		ORDER BY a.CFG_ID
+  </select>
+  <select id="getComplexStrListByService" resultMap="complexCfgMap" >
+		 select 
+		 	<include refid="BaseCfg_Column"></include>,
+    		<include refid="ComplexCfg_Column"></include>
+    		 <trim prefix="," prefixOverrides=",">
+				,s.name as creator_name,u.name as auditor_name
+				<if test="serviceId=1024 or serviceId=1026 or serviceId=1029">
+	     			,a.app_code,a.spec_service_id,a.behav_code
+	     		</if>
+			</trim>
+    	from ${tableName} a
+    	left join sys_user s on a.creator_id=s.id
+		left join sys_user u on a.auditor_id=u.id
+    	<trim prefix="WHERE" prefixOverrides="AND |OR ">
+	    	<if test="serviceId != null">
+	    		AND a.SERVICE_ID=#{serviceId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="functionId != null">
+	    		AND a.function_id=#{functionId,jdbcType=INTEGER}
+	    	</if>
+	    	<if test="action != null">
+	    		AND a.action=#{action,jdbcType=INTEGER}
+	    	</if>
+	    	and a.is_valid=#{isValid} and a.is_audit=#{isAudit}
+	    	and a.is_valid!=-1
+	    </trim>
+		ORDER BY a.CFG_ID
+  </select>
   <!-- <select id="findAppPolicyList" resultMap="AppPolicyCfgMap" parameterType="com.nis.domain.configuration.AppPolicyCfg" >
 		select 
 		<include refid="AppPolicyCfg_Column"/>	
diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
index a6cf1f8b5..92987958e 100644
--- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
+++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
@@ -23,6 +23,7 @@ import com.google.common.collect.Lists;
 import com.nis.domain.FunctionServiceDict;
 import com.nis.domain.Page;
 import com.nis.domain.basics.AsnIpCfg;
+import com.nis.domain.configuration.AppFeatureIndex;
 import com.nis.domain.configuration.AppPolicyCfg;
 import com.nis.domain.configuration.AvFileSampleCfg;
 import com.nis.domain.configuration.BaseCfg;
@@ -89,16 +90,30 @@ public class ConfigSynchronizationService  extends BaseService{
 				entity.setServiceId(Integer.valueOf(serviceId));
 				entity.setIsAudit(1);
 				entity.setIsValid(1);
+				entity.setTableName(tableName);
 				if("1".equals(serviceType)){//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");
-					if("cfg_index_info".equals(tableName)){
+					if(cfgList.size()>0){
+						Page page=new Page(request,response,Constants.MAAT_JSON_SEND_SIZE,"a");
+						handleNtcMaatData(cfgList,userRegionList,page,entity,request,response,false,tableName);
+					}else{
+						int cfgType = Integer.parseInt(service.get("cfgType").toString());
+						 if("ddos_ip_cfg".equals(tableName)){
+								Page<DdosIpCfg> page=new Page<DdosIpCfg>(request,response,Constants.MAAT_JSON_SEND_SIZE,"a");
+								handleDdosMaatData(cfgList,userRegionList,page,entity,request,response,false);
+						}else{
+							Page<T> page=new Page<T>(request,response,Constants.MAAT_JSON_SEND_SIZE,"a");
+							handleSingleMaatData(cfgType,userRegionList,page,entity,request,response,false);
+						}
+					}
+					/*if("cfg_index_info".equals(tableName)){
 						Page<CfgIndexInfo> page=new Page<CfgIndexInfo>(request,response,Constants.MAAT_JSON_SEND_SIZE,"a");
 						handleNtcMaatData(cfgList,userRegionList,page,entity,request,response,false);
 					}else if("ddos_ip_cfg".equals(tableName)){
 						Page<DdosIpCfg> page=new Page<DdosIpCfg>(request,response,Constants.MAAT_JSON_SEND_SIZE,"a");
 						handleDdosMaatData(cfgList,userRegionList,page,entity,request,response,false);
-					}
+					}*/
 				}else if("2".equals(serviceType)){//回调类配置
 					entity.setTableName(tableName);
 					entity.setServiceId(Integer.valueOf(serviceId));
@@ -127,21 +142,48 @@ public class ConfigSynchronizationService  extends BaseService{
 	 * @throws IllegalArgumentException 
 	 */
 	public void handleNtcMaatData(List<Map<String,Object>>cfgList,List<Map<String,Object>>userRegionList,
-			Page<CfgIndexInfo> page,BaseCfg entity,HttpServletRequest request,HttpServletResponse response,
-			boolean isUpdateCfg) throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException{
+			Page<T> page,BaseCfg entity,HttpServletRequest request,HttpServletResponse response,
+			boolean isUpdateCfg,String tableName) throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException{
 		
 		boolean hasData = true;
 		while(hasData){
 			entity.setPage(page);
-			List<CfgIndexInfo> list = configSynchronizationDao.getCfgIndexList(entity);
-			if(!StringUtil.isEmpty(list)){
-				hasData=auditNtcMaatData(cfgList,userRegionList,page,entity,list,hasData,isUpdateCfg);
-				if(hasData) {
-					page.setPageNo(page.getNext());
+			List list = Lists.newArrayList();
+			if("cfg_index_info".equals(tableName)){
+				list = configSynchronizationDao.getCfgIndexList(entity);
+				if(!StringUtil.isEmpty(list)){
+					hasData=auditNtcMaatData(cfgList,userRegionList,page,entity,list,hasData,isUpdateCfg);
+					if(hasData) {
+						page.setPageNo(page.getNext());
+					}
+				}else{
+					hasData = false;
+				}
+			}else if("app_policy_cfg".equals(tableName)){
+				list = configSynchronizationDao.getAppPolicyList(entity);
+				if(!StringUtil.isEmpty(list)){
+					hasData=auditAppPolicyData(cfgList,userRegionList,page,entity,list,hasData,isUpdateCfg);
+					if(hasData) {
+						page.setPageNo(page.getNext());
+					}
+				}else{
+					hasData = false;
+				}
+			}else if("app_feature_index".equals(tableName)){
+				list = configSynchronizationDao.getAppFeatureIndexList(entity);
+				if(!StringUtil.isEmpty(list)){
+					hasData=auditAppFeatureData(cfgList,userRegionList,page,entity,list,hasData,isUpdateCfg);
+					if(hasData) {
+						page.setPageNo(page.getNext());
+					}
+				}else{
+					hasData = false;
 				}
 			}else{
+				logger.info("全量同步未知业务");
 				hasData = false;
 			}
+			
 		}
 	}
 	/**
@@ -284,12 +326,12 @@ public class ConfigSynchronizationService  extends BaseService{
 				for(int index=0;index<ipList.size();index++){
 					IpPortCfg ip = ipList.get(index);
 					if(ip.getCompileId().equals(cfg.getCompileId())){
-						BeanUtils.copyProperties(cfg, ip);
-						ip.setRegionId(regionIds.get(index));
-						regionIds.remove(index);
+//						BeanUtils.copyProperties(cfg, ip);
+						ip.setRegionId(regionIds.get(0));
+						regionIds.remove(0);
 						ip.setGroupId(ipGroupId.get(0));
 						ip.setIsValid(entity.getIsValid());
-						ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? entity.getAuditTime():ip.getAuditTime());
+						ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? cfg.getAuditTime():ip.getAuditTime());
 						list1.add(ip);
 					}
 				}
@@ -298,20 +340,20 @@ public class ConfigSynchronizationService  extends BaseService{
 			for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId
 				if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应
 					ip.setIsValid(entity.getIsValid());
-					ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? entity.getAuditTime():ip.getAuditTime());
+					ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? cfg.getAuditTime():ip.getAuditTime());
 					list1.add(ip);
 				}
 			}
 			for(int index=0;index<strList.size();index++){
 				BaseStringCfg str = strList.get(index);
 				if(str.getCompileId().equals(cfg.getCompileId())){
-					BeanUtils.copyProperties(cfg, str);
-					str.setRegionId(regionIds.get(index));
-					regionIds.remove(index);
-					str.setGroupId(groupIds.get(index));
-					groupIds.remove(index);
+//					BeanUtils.copyProperties(cfg, str);
+					str.setRegionId(regionIds.get(0));
+					regionIds.remove(0);
+					str.setGroupId(groupIds.get(0));
+					groupIds.remove(0);
 					str.setIsValid(entity.getIsValid());
-					str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? entity.getAuditTime():str.getAuditTime());
+					str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime());
 					list2.add(str);
 					if(entity.getServiceId().equals(513)||entity.getServiceId().equals(515)){
 						if(userRegion.equals("")){
@@ -325,13 +367,13 @@ public class ConfigSynchronizationService  extends BaseService{
 			for(int index=0;index<complexStrList.size();index++){
 				ComplexkeywordCfg str = complexStrList.get(index);
 				if(str.getCompileId().equals(cfg.getCompileId())){
-					BeanUtils.copyProperties(cfg, str);
-					str.setRegionId(regionIds.get(index));
-					regionIds.remove(index);
-					str.setGroupId(groupIds.get(index));
-					groupIds.remove(index);
+//					BeanUtils.copyProperties(cfg, str);
+					str.setRegionId(regionIds.get(0));
+					regionIds.remove(0);
+					str.setGroupId(groupIds.get(0));
+					groupIds.remove(0);
 					str.setIsValid(entity.getIsValid());
-					str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? entity.getAuditTime():str.getAuditTime());
+					str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime());
 					list3.add(str);
 					if(entity.getServiceId().equals(129) && str.getDistrict()!=null){//http监测
 						String dictValue = DictUtils.getDictCode(Constants.HTTP_HEADER_DICT_MODULE, str.getDistrict());
@@ -348,26 +390,26 @@ public class ConfigSynchronizationService  extends BaseService{
 			for(int index=0;index<numList.size();index++){
 				com.nis.domain.configuration.NumBoundaryCfg num = numList.get(index);
 				if(num.getCompileId().equals(cfg.getCompileId())){
-					BeanUtils.copyProperties(cfg, num);
-					num.setRegionId(regionIds.get(index));
-					regionIds.remove(index);
-					num.setGroupId(groupIds.get(index));
-					groupIds.remove(index);
+//					BeanUtils.copyProperties(cfg, num);
+					num.setRegionId(regionIds.get(0));
+					regionIds.remove(0);
+					num.setGroupId(groupIds.get(0));
+					groupIds.remove(0);
 					num.setIsValid(entity.getIsValid());
-					num.setAuditTime(StringUtil.isEmpty(num.getAuditTime()) ? entity.getAuditTime():num.getAuditTime());
+					num.setAuditTime(StringUtil.isEmpty(num.getAuditTime()) ? cfg.getAuditTime():num.getAuditTime());
 					list4.add(num);
 				}
 			}
 			for(int index=0;index<fileList.size();index++){
 				FileDigestCfg file = fileList.get(index);
 				if(file.getCompileId().equals(cfg.getCompileId())){
-					BeanUtils.copyProperties(cfg, file);
-					file.setRegionId(regionIds.get(index));
-					regionIds.remove(index);
-					file.setGroupId(groupIds.get(index));
-					groupIds.remove(index);
+//					BeanUtils.copyProperties(cfg, file);
+					file.setRegionId(regionIds.get(0));
+					regionIds.remove(0);
+					file.setGroupId(groupIds.get(0));
+					groupIds.remove(0);
 					file.setIsValid(entity.getIsValid());
-					file.setAuditTime(StringUtil.isEmpty(file.getAuditTime()) ? entity.getAuditTime():file.getAuditTime());
+					file.setAuditTime(StringUtil.isEmpty(file.getAuditTime()) ? cfg.getAuditTime():file.getAuditTime());
 					list5.add(file);
 				}
 			}
@@ -453,12 +495,543 @@ public class ConfigSynchronizationService  extends BaseService{
 				}
 			}else {
 				//调用服务接口配置全量更新
-				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(hasData?null:"FINISHED"));
+//				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(hasData?null:"FINISHED"));
 			}
 		}
 		return hasData;
 	}
 	
+	/**
+	 * APP策略配置批量下发
+	 * @param cfgList
+	 * @param userRegionList
+	 * @param page
+	 * @param entity
+	 * @param list
+	 * @param hasData
+	 * @param isUpdateCfg  业务配置全部生效时需同步更新库表配置状态
+	 * @return
+	 * @throws NoSuchFieldException
+	 * @throws SecurityException
+	 * @throws IllegalArgumentException
+	 * @throws IllegalAccessException
+	 */
+	public boolean auditAppPolicyData(List<Map<String,Object>> cfgList,
+										List<Map<String,Object>> userRegionList,
+										Page page,
+										BaseCfg entity,
+										List<AppPolicyCfg> list,
+										boolean hasData,
+										boolean isUpdateCfg)throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException{
+		ToMaatBean maatBean;		
+		MaatCfg maatCfg;
+		List<MaatCfg> configCompileList;
+		List<GroupCfg> groupRelationList;
+		List<IpCfg> ipRegionList;
+		List<StringCfg> strRegionList;
+		List<NumBoundaryCfg> numRegionList;
+		List<DigestCfg> digestRegionList;
+		List<IpCfg> areaIpRegionList;
+		
+		List<IpPortCfg> ipList = new ArrayList();
+		List<BaseStringCfg> strList = new ArrayList();
+		List<ComplexkeywordCfg> complexStrList = new ArrayList();
+		List<com.nis.domain.configuration.NumBoundaryCfg> numList = new ArrayList();
+		List<FileDigestCfg> fileList = new ArrayList();
+		maatBean = new ToMaatBean();		
+		configCompileList = new ArrayList();
+		List<Integer> compileIds = new ArrayList();
+		List<String> asnGroupIds = new ArrayList();
+		for(AppPolicyCfg cfg:list){
+			compileIds.add(cfg.getCompileId());
+		}
+		if(cfgList!=null){
+			for(Map<String,Object> m:cfgList){
+				String tableName = m.get("tableName").toString();
+				if("1".equals(m.get("cfgType"))){
+					ipList.addAll(configSynchronizationDao.getIpPortList(tableName, compileIds));
+				}else if("2".equals(m.get("cfgType"))){
+					strList.addAll(configSynchronizationDao.getStrList(tableName,compileIds));
+				}else if("3".equals(m.get("cfgType"))){
+					complexStrList.addAll(configSynchronizationDao.getComplexStrList(tableName,compileIds));
+				}else if("4".equals(m.get("cfgType"))){
+					
+				}else if("5".equals(m.get("cfgType"))){
+					fileList.addAll(configSynchronizationDao.getFileDigestList(tableName, compileIds));
+				}
+			}
+		}
+		//批量获取regionId,groupId(相同编译下的IP类配置多条ip只获取一个组号），compileIds.size()表示app策略本身有一个字符串域
+		List<Integer> regionIds = ConfigServiceUtil.getId(3, ipList.size()+strList.size()+compileIds.size()+complexStrList.size()+numList.size()+fileList.size());
+		List<Integer> groupIds = ConfigServiceUtil.getId(2, strList.size()+compileIds.size()+complexStrList.size()+numList.size()+fileList.size());
+		for(AppPolicyCfg cfg:list){
+			maatCfg = new MaatCfg();
+			maatCfg.initDefaultValue();
+			groupRelationList = new ArrayList();
+			ipRegionList = new ArrayList();
+			strRegionList = new ArrayList();
+			numRegionList = new ArrayList();
+			digestRegionList = new ArrayList();
+			areaIpRegionList = new ArrayList();
+			List list1 = new ArrayList();
+			List<BaseStringCfg> list2 = new ArrayList();
+			List<ComplexkeywordCfg> list3 = new ArrayList();
+			List<com.nis.domain.configuration.NumBoundaryCfg> list4 = new ArrayList();
+			List<FileDigestCfg> list5 = new ArrayList();
+			String userRegion = "";
+			//处理自定义域
+			if(userRegionList!=null){
+				for(Map<String,Object> n:userRegionList){
+					Object userRegionPosition = n.get("userRegionPosition");
+					if(userRegionPosition!=null && (userRegionPosition.toString().equals("1")||userRegionPosition.toString().equals("0"))){
+						//通过反射机制获取自定义域字段值
+						String regionColumn = n.get("regionColumn").toString();
+						Class aClass = null;
+						if(userRegionPosition.toString().equals(("0"))){
+							aClass = BaseCfg.class;
+						}else{
+							aClass = AppPolicyCfg.class;
+						}
+						Object value = "";
+						Field field = aClass.getDeclaredField(regionColumn);
+						field.setAccessible(true);
+						value = field.get(cfg);
+						if(!StringUtil.isEmpty(value)){
+							if(StringUtil.isEmpty(n.get("regionKey"))){
+								userRegion = value.toString();
+							}else{
+								userRegion += n.get("regionKey")+"="+value+Constants.USER_REGION_SPLIT;
+							}
+						}
+					}
+				}
+				if(userRegion.endsWith(Constants.USER_REGION_SPLIT)){
+					userRegion = userRegion.substring(0, userRegion.length()-1);
+				}
+			}
+			//将app码与行为码设置为字符串域
+			StringBuffer cfgKeywords = new StringBuffer();
+			BaseStringCfg strCfg = new BaseStringCfg();
+			if(cfg.getServiceId().equals(35)||cfg.getServiceId().equals(147)||cfg.getServiceId().equals(1059)){//基础协议
+				cfgKeywords.append(Constants.PROTO_ID_REGION + "=" + cfg.getAppCode());
+			}else if(cfg.getServiceId().equals(33)||cfg.getServiceId().equals(145)||cfg.getServiceId().equals(1056)){
+				cfgKeywords.append(Constants.APP_ID_REGION + "=" + cfg.getAppCode());
+				if(cfg.getBehavCode()!=null){
+					cfgKeywords.append(Constants.KEYWORD_EXPR);
+					cfgKeywords.append(Constants.BEHAV_ID_REGION + "=" + cfg.getBehavCode());
+				}
+			}else if(cfg.getServiceId().equals(36)||cfg.getServiceId().equals(148)||cfg.getServiceId().equals(1060)){//隧道加密协议
+				cfgKeywords.append(Constants.PROTO_ID_REGION + "=" + cfg.getAppCode());
+				if(cfg.getBehavCode()!=null){
+					cfgKeywords.append(Constants.KEYWORD_EXPR);
+					cfgKeywords.append(Constants.BEHAV_ID_REGION + "=" + cfg.getBehavCode());
+				}
+			}
+			cfg.setCfgKeywords(cfgKeywords.toString());
+			BeanUtils.copyProperties(cfg, strCfg);
+			strList.add(strCfg);
+			
+			
+			if(ipList.size()>0){
+				List<Integer> ipGroupId = ConfigServiceUtil.getId(2,1);//多条IP只获取一个groupId
+				for(int index=0;index<ipList.size();index++){
+					IpPortCfg ip = ipList.get(index);
+					if(ip.getCompileId().equals(cfg.getCompileId())){
+//						BeanUtils.copyProperties(cfg, ip);
+						ip.setRegionId(regionIds.get(0));
+						regionIds.remove(0);
+						ip.setGroupId(ipGroupId.get(0));
+						ip.setIsValid(entity.getIsValid());
+						ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? cfg.getAuditTime():ip.getAuditTime());
+						list1.add(ip);
+					}
+				}
+			}
+			for(int index=0;index<strList.size();index++){
+				BaseStringCfg str = strList.get(index);
+				if(str.getCompileId().equals(cfg.getCompileId())){
+//					BeanUtils.copyProperties(cfg, str);
+					str.setRegionId(regionIds.get(0));
+					regionIds.remove(0);
+					str.setGroupId(groupIds.get(0));
+					groupIds.remove(0);
+					str.setIsValid(entity.getIsValid());
+					str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime());
+					list2.add(str);
+				}
+			}
+			for(int index=0;index<complexStrList.size();index++){
+				ComplexkeywordCfg str = complexStrList.get(index);
+				if(str.getCompileId().equals(cfg.getCompileId())){
+//					BeanUtils.copyProperties(cfg, str);
+					str.setRegionId(regionIds.get(0));
+					regionIds.remove(0);
+					str.setGroupId(groupIds.get(0));
+					groupIds.remove(0);
+					str.setIsValid(entity.getIsValid());
+					str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime());
+					list3.add(str);
+				}
+			}
+			for(int index=0;index<numList.size();index++){
+				com.nis.domain.configuration.NumBoundaryCfg num = numList.get(index);
+				if(num.getCompileId().equals(cfg.getCompileId())){
+//					BeanUtils.copyProperties(cfg, num);
+					num.setRegionId(regionIds.get(0));
+					regionIds.remove(0);
+					num.setGroupId(groupIds.get(0));
+					groupIds.remove(0);
+					num.setIsValid(entity.getIsValid());
+					num.setAuditTime(StringUtil.isEmpty(num.getAuditTime()) ? cfg.getAuditTime():num.getAuditTime());
+					list4.add(num);
+				}
+			}
+			for(int index=0;index<fileList.size();index++){
+				FileDigestCfg file = fileList.get(index);
+				if(file.getCompileId().equals(cfg.getCompileId())){
+//					BeanUtils.copyProperties(cfg, file);
+					file.setRegionId(regionIds.get(0));
+					regionIds.remove(0);
+					file.setGroupId(groupIds.get(0));
+					groupIds.remove(0);
+					file.setIsValid(entity.getIsValid());
+					file.setAuditTime(StringUtil.isEmpty(file.getAuditTime()) ? cfg.getAuditTime():file.getAuditTime());
+					list5.add(file);
+				}
+			}
+			if(list1.size()>0){
+				ipList.removeAll(list1);
+				Map<String,List> map = cfgToMaatConvert(ipRegionList,list1,1,groupRelationList);
+				groupRelationList=map.get("groupList");
+				ipRegionList=map.get("dstList");
+				if(map.get("numRegionList")!=null){
+					numRegionList.addAll(map.get("numRegionList"));
+				}
+			}
+			if(list2.size()>0){
+				strList.removeAll(list2);
+				Map<String,List> map = cfgToMaatConvert(strRegionList,list2,2,groupRelationList);
+				groupRelationList=map.get("groupList");
+				strRegionList=map.get("dstList");
+			}
+			
+			if(list3.size()>0){
+				complexStrList.removeAll(list3);
+				Map<String,List> map = cfgToMaatConvert(strRegionList,list3,3,groupRelationList);
+				groupRelationList=map.get("groupList");
+				strRegionList=map.get("dstList");
+			}
+			if(list4.size()>0){
+				numList.removeAll(list4);
+				Map<String,List> map = cfgToMaatConvert(numRegionList,list4,4,groupRelationList);
+				groupRelationList=map.get("groupList");
+				numRegionList=map.get("dstList");
+			}
+			if(list5.size()>0){
+				fileList.removeAll(list5);
+				Map<String,List> map = cfgToMaatConvert(digestRegionList,list5,5,groupRelationList);
+				groupRelationList=map.get("groupList");
+				digestRegionList=map.get("dstList");
+			}
+			
+			BeanUtils.copyProperties(cfg, maatCfg);
+			maatCfg.setAction(cfg.getAction());
+			maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime());
+			maatCfg.setIpRegionList(ipRegionList);
+			maatCfg.setStrRegionList(strRegionList);
+			maatCfg.setNumRegionList(numRegionList);
+			maatCfg.setDigestRegionList(digestRegionList);
+			maatCfg.setGroupRelationList(groupRelationList);
+			maatCfg.setGroupNum(groupRelationList.size());
+			maatCfg.setAreaIpRegionList(areaIpRegionList);
+			maatCfg.setIsValid(entity.getIsValid());
+			maatCfg.setAuditTime(new Date());
+			if(!StringUtil.isEmpty(userRegion)){
+				maatCfg.setUserRegion(userRegion);
+			}
+			configCompileList.add(maatCfg);
+		}
+		page.setList(list);
+		if(page.isLastPage()){
+			hasData = false;
+		}
+		if(!StringUtil.isEmpty(configCompileList.size())){
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(new Date());
+			maatBean.setCreatorName(UserUtils.getUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.INSERT_ACTION);
+			String json=gsonToJson(maatBean);
+			//调用服务接口下发配置数据
+			if(isUpdateCfg) {
+				logger.info("配置批量下发："+json);
+				//调用服务接口同步回调类配置
+				ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+				if(result!=null){
+					logger.info("配置批量下发响应信息："+result.getMsg());
+				}
+			}else {
+				//调用服务接口配置全量更新
+//				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(hasData?null:"FINISHED"));
+			}
+		}
+		return hasData;
+	}
+	/**
+	 * APP特征批量下发
+	 * @param cfgList
+	 * @param userRegionList
+	 * @param page
+	 * @param entity
+	 * @param list
+	 * @param hasData
+	 * @param isUpdateCfg  业务配置全部生效时需同步更新库表配置状态
+	 * @return
+	 * @throws NoSuchFieldException
+	 * @throws SecurityException
+	 * @throws IllegalArgumentException
+	 * @throws IllegalAccessException
+	 */
+	public boolean auditAppFeatureData(List<Map<String,Object>> cfgList,
+										List<Map<String,Object>> userRegionList,
+										Page page,
+										BaseCfg entity,
+										List<AppFeatureIndex> list,
+										boolean hasData,
+										boolean isUpdateCfg)throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException{
+		ToMaatBean maatBean;		
+		MaatCfg maatCfg;
+		List<MaatCfg> configCompileList;
+		List<GroupCfg> groupRelationList;
+		List<IpCfg> ipRegionList;
+		List<StringCfg> strRegionList;
+		List<NumBoundaryCfg> numRegionList;
+		List<DigestCfg> digestRegionList;
+		List<IpCfg> areaIpRegionList;
+		
+		List<IpPortCfg> ipList = new ArrayList();
+		List<BaseStringCfg> strList = new ArrayList();
+		List<ComplexkeywordCfg> complexStrList = new ArrayList();
+		List<com.nis.domain.configuration.NumBoundaryCfg> numList = new ArrayList();
+		List<FileDigestCfg> fileList = new ArrayList();
+		maatBean = new ToMaatBean();		
+		configCompileList = new ArrayList();
+		List<Integer> compileIds = new ArrayList();
+		List<String> asnGroupIds = new ArrayList();
+		for(AppFeatureIndex cfg:list){
+			compileIds.add(cfg.getCompileId());
+			if(entity.getServiceId().equals(37)||entity.getServiceId().equals(149)){
+				asnGroupIds.add(cfg.getUserRegion4());
+			}
+		}
+		if(cfgList!=null){
+			for(Map<String,Object> m:cfgList){
+				String tableName = m.get("tableName").toString();
+				if("1".equals(m.get("cfgType"))){
+					ipList.addAll(configSynchronizationDao.getAppIpPortList(tableName, compileIds));
+				}else if("2".equals(m.get("cfgType"))){
+					strList.addAll(configSynchronizationDao.getStrList(tableName,compileIds));
+				}else if("3".equals(m.get("cfgType"))){
+					complexStrList.addAll(configSynchronizationDao.getComplexStrList(tableName,compileIds));
+				}else if("4".equals(m.get("cfgType"))){
+					
+				}else if("5".equals(m.get("cfgType"))){
+					fileList.addAll(configSynchronizationDao.getFileDigestList(tableName, compileIds));
+				}
+			}
+		}
+		//批量获取regionId,groupId(相同编译下的IP类配置多条ip只获取一个组号），分组复用的域配置不需要重新获取regionId,groupId
+		List<Integer> regionIds = ConfigServiceUtil.getId(3, ipList.size()+strList.size()+complexStrList.size()+numList.size()+fileList.size());
+		List<Integer> groupIds = ConfigServiceUtil.getId(2, strList.size()+complexStrList.size()+numList.size()+fileList.size());
+		for(AppFeatureIndex cfg:list){
+			maatCfg = new MaatCfg();
+			maatCfg.initDefaultValue();
+			groupRelationList = new ArrayList();
+			ipRegionList = new ArrayList();
+			strRegionList = new ArrayList();
+			numRegionList = new ArrayList();
+			digestRegionList = new ArrayList();
+			areaIpRegionList = new ArrayList();
+			List list1 = new ArrayList();
+			List<BaseStringCfg> list2 = new ArrayList();
+			List<ComplexkeywordCfg> list3 = new ArrayList();
+			List<com.nis.domain.configuration.NumBoundaryCfg> list4 = new ArrayList();
+			List<FileDigestCfg> list5 = new ArrayList();
+			String userRegion = "";
+			//处理自定义域
+			if(userRegionList!=null){
+				for(Map<String,Object> n:userRegionList){
+					Object userRegionPosition = n.get("userRegionPosition");
+					if(userRegionPosition!=null && (userRegionPosition.toString().equals("1")||userRegionPosition.toString().equals("0"))){
+						//通过反射机制获取自定义域字段值
+						String regionColumn = n.get("regionColumn").toString();
+						Class aClass = null;
+						if(userRegionPosition.toString().equals(("0"))){
+							aClass = BaseCfg.class;
+						}else{
+							aClass = AppFeatureIndex.class;
+						}
+						Object value = "";
+						Field field = aClass.getDeclaredField(regionColumn);
+						field.setAccessible(true);
+						value = field.get(cfg);
+						if(!StringUtil.isEmpty(value)){
+							if(StringUtil.isEmpty(n.get("regionKey"))){
+								userRegion = value.toString();
+							}else{
+								userRegion += n.get("regionKey")+"="+value+Constants.USER_REGION_SPLIT;
+							}
+						}
+					}
+				}
+				if(userRegion.endsWith(Constants.USER_REGION_SPLIT)){
+					userRegion = userRegion.substring(0, userRegion.length()-1);
+				}
+			}
+			if(ipList.size()>0){
+				List<Integer> ipGroupId = ConfigServiceUtil.getId(2,1);//多条IP只获取一个groupId
+				for(int index=0;index<ipList.size();index++){
+					IpPortCfg ip = ipList.get(index);
+					if(ip.getCompileId().equals(cfg.getCompileId())){
+//						BeanUtils.copyProperties(cfg, ip);
+						ip.setRegionId(regionIds.get(0));
+						regionIds.remove(0);
+						ip.setGroupId(ipGroupId.get(0));
+						ip.setIsValid(entity.getIsValid());
+						ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? cfg.getAuditTime():ip.getAuditTime());
+						list1.add(ip);
+					}
+				}
+			}
+			for(int index=0;index<strList.size();index++){
+				BaseStringCfg str = strList.get(index);
+				if(str.getCompileId().equals(cfg.getCompileId())){
+//					BeanUtils.copyProperties(cfg, str);
+					str.setRegionId(regionIds.get(0));
+					regionIds.remove(0);
+					str.setGroupId(groupIds.get(0));
+					groupIds.remove(0);
+					str.setIsValid(entity.getIsValid());
+					str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime());
+					list2.add(str);
+				}
+			}
+			for(int index=0;index<complexStrList.size();index++){
+				ComplexkeywordCfg str = complexStrList.get(index);
+				if(str.getCompileId().equals(cfg.getCompileId())){
+//					BeanUtils.copyProperties(cfg, str);
+					str.setRegionId(regionIds.get(0));
+					regionIds.remove(0);
+					str.setGroupId(groupIds.get(0));
+					groupIds.remove(0);
+					str.setIsValid(entity.getIsValid());
+					str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime());
+					list3.add(str);
+				}
+			}
+			for(int index=0;index<numList.size();index++){
+				com.nis.domain.configuration.NumBoundaryCfg num = numList.get(index);
+				if(num.getCompileId().equals(cfg.getCompileId())){
+//					BeanUtils.copyProperties(cfg, num);
+					num.setRegionId(regionIds.get(0));
+					regionIds.remove(0);
+					num.setGroupId(groupIds.get(0));
+					groupIds.remove(0);
+					num.setIsValid(entity.getIsValid());
+					num.setAuditTime(StringUtil.isEmpty(num.getAuditTime()) ? cfg.getAuditTime():num.getAuditTime());
+					list4.add(num);
+				}
+			}
+			for(int index=0;index<fileList.size();index++){
+				FileDigestCfg file = fileList.get(index);
+				if(file.getCompileId().equals(cfg.getCompileId())){
+//					BeanUtils.copyProperties(cfg, file);
+					file.setRegionId(regionIds.get(0));
+					regionIds.remove(0);
+					file.setGroupId(groupIds.get(0));
+					groupIds.remove(0);
+					file.setIsValid(entity.getIsValid());
+					file.setAuditTime(StringUtil.isEmpty(file.getAuditTime()) ? cfg.getAuditTime():file.getAuditTime());
+					list5.add(file);
+				}
+			}
+			if(list1.size()>0){
+				ipList.removeAll(list1);
+				Map<String,List> map = cfgToMaatConvert(ipRegionList,list1,1,groupRelationList);
+				groupRelationList=map.get("groupList");
+				ipRegionList=map.get("dstList");
+				if(map.get("numRegionList")!=null){
+					numRegionList.addAll(map.get("numRegionList"));
+				}
+			}
+			if(list2.size()>0){
+				strList.removeAll(list2);
+				Map<String,List> map = cfgToMaatConvert(strRegionList,list2,2,groupRelationList);
+				groupRelationList=map.get("groupList");
+				strRegionList=map.get("dstList");
+			}
+			if(list3.size()>0){
+				complexStrList.removeAll(list3);
+				Map<String,List> map = cfgToMaatConvert(strRegionList,list3,3,groupRelationList);
+				groupRelationList=map.get("groupList");
+				strRegionList=map.get("dstList");
+			}
+			if(list4.size()>0){
+				numList.removeAll(list4);
+				Map<String,List> map = cfgToMaatConvert(numRegionList,list4,4,groupRelationList);
+				groupRelationList=map.get("groupList");
+				numRegionList=map.get("dstList");
+			}
+			if(list5.size()>0){
+				fileList.removeAll(list5);
+				Map<String,List> map = cfgToMaatConvert(digestRegionList,list5,5,groupRelationList);
+				groupRelationList=map.get("groupList");
+				digestRegionList=map.get("dstList");
+			}
+			
+			BeanUtils.copyProperties(cfg, maatCfg);
+			maatCfg.setAction(cfg.getAction());
+			maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime());
+			maatCfg.setIpRegionList(ipRegionList);
+			maatCfg.setStrRegionList(strRegionList);
+			maatCfg.setNumRegionList(numRegionList);
+			maatCfg.setDigestRegionList(digestRegionList);
+			maatCfg.setGroupRelationList(groupRelationList);
+			maatCfg.setGroupNum(groupRelationList.size());
+			maatCfg.setAreaIpRegionList(areaIpRegionList);
+			maatCfg.setIsValid(entity.getIsValid());
+			maatCfg.setAuditTime(new Date());
+			if(!StringUtil.isEmpty(userRegion)){
+				maatCfg.setUserRegion(userRegion);
+			}
+			configCompileList.add(maatCfg);
+		}
+		page.setList(list);
+		if(page.isLastPage()){
+			hasData = false;
+		}
+		if(!StringUtil.isEmpty(configCompileList.size())){
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(new Date());
+			maatBean.setCreatorName(UserUtils.getUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.INSERT_ACTION);
+			String json=gsonToJson(maatBean);
+			//调用服务接口下发配置数据
+			if(isUpdateCfg) {
+				logger.info("配置批量下发："+json);
+				//调用服务接口同步回调类配置
+				ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+				if(result!=null){
+					logger.info("配置批量下发响应信息："+result.getMsg());
+				}
+			}else {
+				//调用服务接口配置全量更新
+//				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(hasData?null:"FINISHED"));
+			}
+		}
+		return hasData;
+	}
 	/**
 	 * 处理ddos配置
 	 * @param serviceId
@@ -488,7 +1061,42 @@ public class ConfigSynchronizationService  extends BaseService{
 			}
 		}
 	}
-	
+	/**
+	 * 处理单域maat配置
+	 * @param serviceId
+	 * @param request
+	 * @param response
+	 * @throws SecurityException 
+	 * @throws NoSuchFieldException 
+	 * @throws IllegalAccessException 
+	 * @throws IllegalArgumentException 
+	 */
+	public void handleSingleMaatData(int cfgType,List<Map<String,Object>>userRegionList,
+			Page<T> page,BaseCfg entity,HttpServletRequest request,HttpServletResponse response,
+			boolean isUpdateCfg) throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException{
+		
+		boolean hasData = true;
+		while(hasData){
+			entity.setPage(page);
+			List list = Lists.newArrayList();
+			if(cfgType==1){
+				list = configSynchronizationDao.getIpPortListByService(entity);
+			}else if(cfgType==2){
+				list = configSynchronizationDao.getStrListByService(entity);
+			}else if(cfgType==3){
+				list = configSynchronizationDao.getComplexStrListByService(entity);
+			}
+			if(!StringUtil.isEmpty(list)){
+				hasData=auditSingleMaatData(cfgType,userRegionList,
+						page,entity,list,hasData,isUpdateCfg);
+				if(hasData) {
+					page.setPageNo(page.getNext());
+				}
+			}else{
+				hasData = false;
+			}
+		}
+	}
 	/**
 	 * ddos配置批量下发
 	 * @param cfgList
@@ -627,6 +1235,161 @@ public class ConfigSynchronizationService  extends BaseService{
 		}
 		return hasData;
 	}
+	/**
+	 * 单域配置批量下发
+	 * @param cfgList
+	 * @param userRegionList
+	 * @param page
+	 * @param entity
+	 * @param list
+	 * @param hasData
+	 * @param isUpdateCfg 业务配置全部生效时需同步更新库表配置状态
+	 * @return
+	 * @throws NoSuchFieldException
+	 * @throws SecurityException
+	 * @throws IllegalArgumentException
+	 * @throws IllegalAccessException
+	 */
+	public boolean auditSingleMaatData(int cfgType,
+										List<Map<String,Object>>userRegionList,
+										Page<T> page,
+										BaseCfg entity,
+										List<T> list,
+										boolean hasData,
+										boolean isUpdateCfg) throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException{
+		ToMaatBean maatBean;		
+		MaatCfg maatCfg;
+		List<MaatCfg> configCompileList;
+		List<GroupCfg> groupRelationList;
+		List<IpCfg> ipRegionList;
+		List<StringCfg> strRegionList;
+		List<NumBoundaryCfg> numRegionList;
+		List<DigestCfg> digestRegionList;
+		List<IpCfg> areaIpRegionList;
+		
+		
+		List<IpPortCfg> ipList = new ArrayList();
+		maatBean = new ToMaatBean();		
+		configCompileList = new ArrayList();
+		//批量获取regionId,groupId
+		List<Integer> regionIds = ConfigServiceUtil.getId(3, list.size());
+		List<Integer> groupIds = ConfigServiceUtil.getId(2, list.size());
+		IpPortCfg ipCfg = null;
+		BaseStringCfg strCfg = null;
+		ComplexkeywordCfg complexStr = null;
+		for(int i=0;i<list.size();i++){
+			BaseCfg cfg = new BaseCfg();
+			BeanUtils.copyProperties(list.get(i), cfg);
+			cfg.setRegionId(regionIds.get(i));
+			cfg.setGroupId(groupIds.get(i));
+			cfg.setIsValid(entity.getIsValid());
+			cfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? entity.getAuditTime():cfg.getAuditTime());
+			maatCfg = new MaatCfg();
+			maatCfg.initDefaultValue();
+			groupRelationList = new ArrayList();
+			ipRegionList = new ArrayList();
+			strRegionList = new ArrayList();
+			numRegionList = new ArrayList();
+			digestRegionList = new ArrayList();
+			areaIpRegionList = new ArrayList();
+			List list1 = new ArrayList();
+			String userRegion = "";
+			//处理自定义域
+			if(userRegionList!=null){
+				for(Map<String,Object> n:userRegionList){
+					Object userRegionPosition = n.get("userRegionPosition");
+					if(userRegionPosition!=null && (userRegionPosition.toString().equals("1")||userRegionPosition.toString().equals("0"))){
+						//通过反射机制获取自定义域字段值
+						String regionColumn = n.get("regionColumn").toString();
+						Class aClass = null;
+						if(userRegionPosition.toString().equals(("0"))){
+							aClass = BaseCfg.class;
+						}else{
+							if(cfgType==1){
+								aClass = IpPortCfg.class;
+							}else if(cfgType==2){
+								aClass = BaseStringCfg.class;
+							}else if(cfgType==3){
+								aClass = ComplexkeywordCfg.class;
+							}
+							
+						}
+						Object value = "";
+						Field field = aClass.getDeclaredField(regionColumn);
+						field.setAccessible(true);
+						value = field.get(cfg);
+						if(!StringUtil.isEmpty(value)){
+							if(StringUtil.isEmpty(n.get("regionKey"))){
+								userRegion = value.toString();
+							}else{
+								userRegion += n.get("regionKey")+"="+value+Constants.USER_REGION_SPLIT;
+							}
+						}
+					}
+				}
+				if(userRegion.endsWith(Constants.USER_REGION_SPLIT)){
+					userRegion = userRegion.substring(0, userRegion.length()-1);
+				}
+			}
+			list1.add(cfg);
+			if(list1.size()>0){
+				ipList.removeAll(list1);
+				if(cfgType==1){
+					Map<String,List> map = cfgToMaatConvert(ipRegionList,list1,1,groupRelationList);
+					groupRelationList=map.get("groupList");
+					ipRegionList=map.get("dstList");
+					if(map.get("numRegionList")!=null){
+						numRegionList.addAll(map.get("numRegionList"));
+					}
+				}else if(cfgType==2||cfgType==3){
+					Map<String,List> map = cfgToMaatConvert(strRegionList,list1,2,groupRelationList);
+					groupRelationList=map.get("groupList");
+					strRegionList=map.get("dstList");
+				}
+			}
+			BeanUtils.copyProperties(cfg, maatCfg);
+			maatCfg.setAction(cfg.getAction());
+			maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime());
+			maatCfg.setIpRegionList(ipRegionList);
+			maatCfg.setStrRegionList(strRegionList);
+			maatCfg.setNumRegionList(numRegionList);
+			maatCfg.setDigestRegionList(digestRegionList);
+			maatCfg.setGroupRelationList(groupRelationList);
+			maatCfg.setGroupNum(groupRelationList.size());
+			maatCfg.setAreaIpRegionList(areaIpRegionList);
+			maatCfg.setIsValid(entity.getIsValid());
+			if(!StringUtil.isEmpty(userRegion)){
+				maatCfg.setUserRegion(userRegion);
+			}
+			configCompileList.add(maatCfg);
+		}
+		page.setList(list);
+		if(page.isLastPage()){
+			hasData = false;
+		}
+		if(!StringUtil.isEmpty(configCompileList.size())){
+			maatBean.setConfigCompileList(configCompileList);
+			maatBean.setAuditTime(new Date());
+			maatBean.setCreatorName(UserUtils.getUser().getName());
+			maatBean.setVersion(Constants.MAAT_VERSION);
+			maatBean.setOpAction(Constants.INSERT_ACTION);
+			String json=gsonToJson(maatBean);
+			//调用服务接口下发配置数据
+			if(isUpdateCfg) {
+				logger.info("配置批量下发："+json);
+				//调用服务接口同步回调类配置
+				ToMaatResult result = ConfigServiceUtil.postMaatCfg(json);
+				if(result!=null){
+					logger.info("配置批量下发响应信息："+result.getMsg());
+				}
+			}else {
+				//调用服务接口配置全量更新
+				JSONObject result = ConfigServiceUtil.configSync(json,1,entity.getServiceId(),null,(hasData?null:"FINISHED"));
+			}
+			
+		}
+		return hasData;
+	}
 	/**
 	 * 处理app业务maat类配置
 	 * @param serviceId

From a99fe7e83565b0f58db7a0c04e9b4d7d9155511e Mon Sep 17 00:00:00 2001
From: zhangwei <zhangwei2@iie.ac.cn>
Date: Thu, 29 Nov 2018 09:23:31 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=97=B6=E9=97=B4=E7=9A=84=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ConfigSynchronizationService.java         | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
index 92987958e..5a55368f3 100644
--- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
+++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
@@ -331,7 +331,7 @@ public class ConfigSynchronizationService  extends BaseService{
 						regionIds.remove(0);
 						ip.setGroupId(ipGroupId.get(0));
 						ip.setIsValid(entity.getIsValid());
-						ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? cfg.getAuditTime():ip.getAuditTime());
+						ip.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 						list1.add(ip);
 					}
 				}
@@ -340,7 +340,7 @@ public class ConfigSynchronizationService  extends BaseService{
 			for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId
 				if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应
 					ip.setIsValid(entity.getIsValid());
-					ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? cfg.getAuditTime():ip.getAuditTime());
+					ip.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 					list1.add(ip);
 				}
 			}
@@ -353,7 +353,7 @@ public class ConfigSynchronizationService  extends BaseService{
 					str.setGroupId(groupIds.get(0));
 					groupIds.remove(0);
 					str.setIsValid(entity.getIsValid());
-					str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime());
+					str.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 					list2.add(str);
 					if(entity.getServiceId().equals(513)||entity.getServiceId().equals(515)){
 						if(userRegion.equals("")){
@@ -373,7 +373,7 @@ public class ConfigSynchronizationService  extends BaseService{
 					str.setGroupId(groupIds.get(0));
 					groupIds.remove(0);
 					str.setIsValid(entity.getIsValid());
-					str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime());
+					str.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 					list3.add(str);
 					if(entity.getServiceId().equals(129) && str.getDistrict()!=null){//http监测
 						String dictValue = DictUtils.getDictCode(Constants.HTTP_HEADER_DICT_MODULE, str.getDistrict());
@@ -396,7 +396,7 @@ public class ConfigSynchronizationService  extends BaseService{
 					num.setGroupId(groupIds.get(0));
 					groupIds.remove(0);
 					num.setIsValid(entity.getIsValid());
-					num.setAuditTime(StringUtil.isEmpty(num.getAuditTime()) ? cfg.getAuditTime():num.getAuditTime());
+					num.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 					list4.add(num);
 				}
 			}
@@ -409,7 +409,7 @@ public class ConfigSynchronizationService  extends BaseService{
 					file.setGroupId(groupIds.get(0));
 					groupIds.remove(0);
 					file.setIsValid(entity.getIsValid());
-					file.setAuditTime(StringUtil.isEmpty(file.getAuditTime()) ? cfg.getAuditTime():file.getAuditTime());
+					file.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 					list5.add(file);
 				}
 			}
@@ -420,7 +420,7 @@ public class ConfigSynchronizationService  extends BaseService{
 					groupCfg.setCompileId(cfg.getCompileId());
 					groupCfg.setGroupId(Integer.parseInt(cfg.getUserRegion4()));
 					groupCfg.setIsValid(entity.getIsValid());
-					groupCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime());
+					groupCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 					groupRelationList.add(groupCfg);
 					ipRegionList.addAll(groupReuseCfgAddRemoveConvert(list1,Constants.VALID_YES,null));
 				}else{
@@ -459,7 +459,7 @@ public class ConfigSynchronizationService  extends BaseService{
 			
 			BeanUtils.copyProperties(cfg, maatCfg);
 			maatCfg.setAction(cfg.getAction());
-			maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime());
+			maatCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 			maatCfg.setIpRegionList(ipRegionList);
 			maatCfg.setStrRegionList(strRegionList);
 			maatCfg.setNumRegionList(numRegionList);
@@ -642,7 +642,7 @@ public class ConfigSynchronizationService  extends BaseService{
 						regionIds.remove(0);
 						ip.setGroupId(ipGroupId.get(0));
 						ip.setIsValid(entity.getIsValid());
-						ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? cfg.getAuditTime():ip.getAuditTime());
+						ip.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 						list1.add(ip);
 					}
 				}
@@ -656,7 +656,7 @@ public class ConfigSynchronizationService  extends BaseService{
 					str.setGroupId(groupIds.get(0));
 					groupIds.remove(0);
 					str.setIsValid(entity.getIsValid());
-					str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime());
+					str.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 					list2.add(str);
 				}
 			}
@@ -669,7 +669,7 @@ public class ConfigSynchronizationService  extends BaseService{
 					str.setGroupId(groupIds.get(0));
 					groupIds.remove(0);
 					str.setIsValid(entity.getIsValid());
-					str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime());
+					str.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 					list3.add(str);
 				}
 			}
@@ -682,7 +682,7 @@ public class ConfigSynchronizationService  extends BaseService{
 					num.setGroupId(groupIds.get(0));
 					groupIds.remove(0);
 					num.setIsValid(entity.getIsValid());
-					num.setAuditTime(StringUtil.isEmpty(num.getAuditTime()) ? cfg.getAuditTime():num.getAuditTime());
+					num.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 					list4.add(num);
 				}
 			}
@@ -695,7 +695,7 @@ public class ConfigSynchronizationService  extends BaseService{
 					file.setGroupId(groupIds.get(0));
 					groupIds.remove(0);
 					file.setIsValid(entity.getIsValid());
-					file.setAuditTime(StringUtil.isEmpty(file.getAuditTime()) ? cfg.getAuditTime():file.getAuditTime());
+					file.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 					list5.add(file);
 				}
 			}
@@ -736,7 +736,7 @@ public class ConfigSynchronizationService  extends BaseService{
 			
 			BeanUtils.copyProperties(cfg, maatCfg);
 			maatCfg.setAction(cfg.getAction());
-			maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime());
+			maatCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 			maatCfg.setIpRegionList(ipRegionList);
 			maatCfg.setStrRegionList(strRegionList);
 			maatCfg.setNumRegionList(numRegionList);
@@ -898,7 +898,7 @@ public class ConfigSynchronizationService  extends BaseService{
 						regionIds.remove(0);
 						ip.setGroupId(ipGroupId.get(0));
 						ip.setIsValid(entity.getIsValid());
-						ip.setAuditTime(StringUtil.isEmpty(ip.getAuditTime()) ? cfg.getAuditTime():ip.getAuditTime());
+						ip.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 						list1.add(ip);
 					}
 				}
@@ -912,7 +912,7 @@ public class ConfigSynchronizationService  extends BaseService{
 					str.setGroupId(groupIds.get(0));
 					groupIds.remove(0);
 					str.setIsValid(entity.getIsValid());
-					str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime());
+					str.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 					list2.add(str);
 				}
 			}
@@ -925,7 +925,7 @@ public class ConfigSynchronizationService  extends BaseService{
 					str.setGroupId(groupIds.get(0));
 					groupIds.remove(0);
 					str.setIsValid(entity.getIsValid());
-					str.setAuditTime(StringUtil.isEmpty(str.getAuditTime()) ? cfg.getAuditTime():str.getAuditTime());
+					str.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 					list3.add(str);
 				}
 			}
@@ -938,7 +938,7 @@ public class ConfigSynchronizationService  extends BaseService{
 					num.setGroupId(groupIds.get(0));
 					groupIds.remove(0);
 					num.setIsValid(entity.getIsValid());
-					num.setAuditTime(StringUtil.isEmpty(num.getAuditTime()) ? cfg.getAuditTime():num.getAuditTime());
+					num.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 					list4.add(num);
 				}
 			}
@@ -951,7 +951,7 @@ public class ConfigSynchronizationService  extends BaseService{
 					file.setGroupId(groupIds.get(0));
 					groupIds.remove(0);
 					file.setIsValid(entity.getIsValid());
-					file.setAuditTime(StringUtil.isEmpty(file.getAuditTime()) ? cfg.getAuditTime():file.getAuditTime());
+					file.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 					list5.add(file);
 				}
 			}
@@ -991,7 +991,7 @@ public class ConfigSynchronizationService  extends BaseService{
 			
 			BeanUtils.copyProperties(cfg, maatCfg);
 			maatCfg.setAction(cfg.getAction());
-			maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime());
+			maatCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 			maatCfg.setIpRegionList(ipRegionList);
 			maatCfg.setStrRegionList(strRegionList);
 			maatCfg.setNumRegionList(numRegionList);
@@ -1141,7 +1141,7 @@ public class ConfigSynchronizationService  extends BaseService{
 			cfg.setRegionId(regionIds.get(i));
 			cfg.setGroupId(groupIds.get(i));
 			cfg.setIsValid(entity.getIsValid());
-			cfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? entity.getAuditTime():cfg.getAuditTime());
+			cfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 			maatCfg = new MaatCfg();
 			maatCfg.initDefaultValue();
 			groupRelationList = new ArrayList();
@@ -1194,7 +1194,7 @@ public class ConfigSynchronizationService  extends BaseService{
 			}
 			BeanUtils.copyProperties(cfg, maatCfg);
 			maatCfg.setAction(cfg.getAction());
-			maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime());
+			maatCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 			maatCfg.setIpRegionList(ipRegionList);
 			maatCfg.setStrRegionList(strRegionList);
 			maatCfg.setNumRegionList(numRegionList);
@@ -1283,7 +1283,7 @@ public class ConfigSynchronizationService  extends BaseService{
 			cfg.setRegionId(regionIds.get(i));
 			cfg.setGroupId(groupIds.get(i));
 			cfg.setIsValid(entity.getIsValid());
-			cfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? entity.getAuditTime():cfg.getAuditTime());
+			cfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 			maatCfg = new MaatCfg();
 			maatCfg.initDefaultValue();
 			groupRelationList = new ArrayList();
@@ -1349,7 +1349,7 @@ public class ConfigSynchronizationService  extends BaseService{
 			}
 			BeanUtils.copyProperties(cfg, maatCfg);
 			maatCfg.setAction(cfg.getAction());
-			maatCfg.setAuditTime(StringUtil.isEmpty(cfg.getAuditTime()) ? new Date():cfg.getAuditTime());
+			maatCfg.setAuditTime(StringUtil.isEmpty(entity.getAuditTime()) ? cfg.getAuditTime():entity.getAuditTime());
 			maatCfg.setIpRegionList(ipRegionList);
 			maatCfg.setStrRegionList(strRegionList);
 			maatCfg.setNumRegionList(numRegionList);