多域的日志增加可查看配置详情，隐藏日志中的查看详情，提供可以复制日志过长title功能

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) {
+	public String ajaxSslSubList(Model model,Long cfgId,Integer index,Integer compileId) {
-		AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId);
+		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());

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) {
+	public String ajaxSslSubList(Model model,Long cfgId,Integer index,Integer compileId) {
-		AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId);
+		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());

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) {
+	public String ajaxSslSubList(Model model,Long cfgId,Integer index,Integer compileId) {
-		AppPolicyCfg cfg = appCfgService.getAppPolicyCfg(cfgId);
+		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());

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){

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) {
+	public String ajaxBgpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
-		CfgIndexInfo cfg = bgpCfgService.getBgpCfg(cfgId);
+		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());

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) {
+	public String ajaxFtpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
-		CfgIndexInfo cfg = fileTransferCfgService.getFtpCfg(cfgId);
+		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) {
+	public String ajaxFileDigestSubIdList(Model model,Long cfgId,Integer index,Integer compileId) {
-		FileDigestCfg cfg = fileTransferCfgService.getFileDigestSubIdCfg(cfgId);
+		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) {
+	public String ajaxP2pSubList(Model model,Long cfgId,Integer index,Integer compileId) {
-		CfgIndexInfo cfg = fileTransferCfgService.getP2pCfg(cfgId);
+		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());

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) {
+	public String ajaxIpPortSubList(Model model,Long cfgId,Integer index,Integer compileId) {
-		CfgIndexInfo cfg = ipCfgService.getIpPortCfg(cfgId);
+		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());

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) {
+	public String ajaxMailSubList(Model model,Long cfgId,Integer index,Integer compileId) {
-		CfgIndexInfo cfg = mailCfgService.getMailCfg(cfgId);
+		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());

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) {
+	public String ajaxHttpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
-		CfgIndexInfo cfg = websiteCfgService.getHttpCfg(cfgId);
+		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) {
+	public String ajaxSslSubList(Model model,Long cfgId,Integer index,Integer compileId) {
-		CfgIndexInfo cfg = websiteCfgService.getSslCfg(cfgId);
+		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) {
+	public String ajaxDnsSubList(Model model,Long cfgId,Integer index,Integer compileId) {
-		CfgIndexInfo cfg = websiteCfgService.getDnsCfg(cfgId);
+		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());

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) {
+	public String ajaxIpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
-		CfgIndexInfo cfg = ipCfgService.getIpPortCfg(cfgId);
+		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) {
+	public String ajaxDomainSubList(Model model,Long cfgId,Integer index,Integer compileId) {
-		CfgIndexInfo cfg = domainService.getDomainCfg(cfgId);
+		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());

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) {
+	public String ajaxHttpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
-		CfgIndexInfo cfg = httpRedirectCfgService.getHttpCfg(cfgId);
+		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());

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) {
+	public String ajaxInterceptIpSubList(Model model,Long cfgId,Integer index,Integer compileId) {
-		CfgIndexInfo cfg = interceptCfgService.getInterceptCfg(cfgId);
+		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());

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);

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 

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}

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);

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 

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);

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

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);

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 

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);

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 

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 org.apache.ibatis.annotations.Param;
-import com.nis.domain.configuration.AvSignSampleCfg;
+
 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);

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 

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) {
+	public AppPolicyCfg getAppPolicyCfg(Long cfgId,Integer compileId) {
-		AppPolicyCfg policy = appCfgDao.getAppPolicyCfg(cfgId);
+		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" });

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){
+	public CfgIndexInfo getBgpCfg(Long cfgId,Integer compileId){
-		CfgIndexInfo entity = bgpCfgDao.getCfgIndexInfo(cfgId);
+		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"});

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) {
+	public CfgIndexInfo getDomainCfg(Long cfgId,Integer compileId) {
-		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
+		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();

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){
+	public CfgIndexInfo getFtpCfg(Long cfgId,Integer compileId){
-		CfgIndexInfo entity = fileTransferCfgDao.getCfgIndexInfo(cfgId);
+		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){
+	public FileDigestCfg getFileDigestCfg(Long cfgId,Integer compileId){
-		FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId);
+		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) {
+	public FileDigestCfg getFileDigestSubIdCfg(Long cfgId,Integer compileId) {
-		FileDigestCfg entity = fileTransferCfgDao.getFileDigest(cfgId);
+		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"});

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){
+	public CfgIndexInfo getHttpCfg(Long cfgId,Integer compileId){
-		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
+		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();

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){
+	public CfgIndexInfo getInterceptCfg(Long cfgId,Integer compileId){
-		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
+		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"});

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){
+	public CfgIndexInfo getIpPortCfg(Long cfgId,Integer compileId){
-		CfgIndexInfo entity = ipCfgDao.getCfgIndexInfo(cfgId);
+		CfgIndexInfo entity = ipCfgDao.getCfgIndexInfo(cfgId,compileId);
 		List<IpPortCfg> ipPortList = ipCfgDao.getIpPortList(entity);
 		List<NtcSubscribeIdCfg> subscribeIdList = stringCfgDao.findSubscribeIdCfgListByCfgIndexInfo(entity);
 		entity.setIpPortList(ipPortList);

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){
+	public CfgIndexInfo getMailCfg(Long cfgId,Integer compileId){
-		CfgIndexInfo entity = mailCfgDao.getCfgIndexInfo(cfgId);
+		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"});

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){
+	public CfgIndexInfo getHttpCfg(Long cfgId,Integer compileId){
-		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
+		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){
+	public CfgIndexInfo getSslCfg(Long cfgId,Integer compileId){
-		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
+		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){
+	public CfgIndexInfo getDnsCfg(Long cfgId,Integer compileId){
-		CfgIndexInfo entity = websiteCfgDao.getCfgIndexInfo(cfgId);
+		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"});

src/main/resources/messages/message_en.properties

@@ -1335,3 +1335,4 @@ address_pool=Address Pool
 ip_total=IP Total
 available_ip_total=Available IP Total
 address_pool_id=Address Pool ID
+log_to_cfg=Config

src/main/resources/messages/message_ru.properties

@@ -1335,3 +1335,4 @@ address_pool=Address Pool
 ip_total=IP Total
 available_ip_total=Available IP Total
 address_pool_id=Address Pool ID
+log_to_cfg=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F

src/main/resources/messages/message_zh_CN.properties

@@ -1331,3 +1331,4 @@ address_pool=\u5730\u5740\u6C60
 ip_total=IP\u603B\u6570
 available_ip_total=\u53EF\u7528IP\u6570
 address_pool_id=\u5730\u5740\u6C60ID
+log_to_cfg=\u914D\u7F6E

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp

@@ -23,6 +23,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/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>

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>

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>

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>

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>

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,

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();