日志查询添加配置信息

src/main/java/com/nis/web/controller/configuration/manipulation/IpMultiplexController.java

@@ -234,6 +234,45 @@ public class IpMultiplexController extends CommonController {
 		return "redirect:" + adminPath +"/manipulation/ipmulitiplex/snatPolicyList?functionId="+functionId;
 	}
 	
+	
+	@RequestMapping(value = {"/ajaxSnatInfo"})
+	public String ajaxSnatInfo(Model model,Long cfgId,Integer index,Integer compileId) {
+		IpReusePolicyCfg cfg = ipMultiplexService.getSnatCfg(cfgId, compileId);
+		List<String[]> tabList = new ArrayList();
+			String cfgType = null;
+				if(!cfg.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"1",cfg.getCfgType()});
+					cfgType = cfg.getCfgType();
+				}
+		
+		List<UserManage> users = userManageService.findUsers();
+		List<IpAddrPoolCfg> addrPools = ipAddrPoolCfgService.getEffectiveAddrPool();
+		model.addAttribute("users", users);
+		model.addAttribute("addrPools", addrPools);
+		model.addAttribute("_cfg", cfg);	
+		model.addAttribute("index", index);
+		model.addAttribute("tabList", tabList);
+		return "/cfg/manipulation/ipmulitiplex/snatSubList";
+	}
+	
+	
+	
+	@RequestMapping(value = {"/ajaxDnatInfo"})
+	public String ajaxDnatInfo(Model model,Long cfgId,Integer index,Integer compileId) {
+		IpReuseDnatPolicyCfg cfg = ipMultiplexService.getDnatCfg(cfgId, compileId);
+		List<String[]> tabList = new ArrayList();
+			String cfgType = null;
+				if(!cfg.getCfgType().equals(cfgType)){
+					tabList.add(new String[]{"1",cfg.getCfgType()});
+					cfgType = cfg.getCfgType();
+				}
+		model.addAttribute("_cfg", cfg);	
+		model.addAttribute("index", index);
+		model.addAttribute("tabList", tabList);
+		return "/cfg/manipulation/ipmulitiplex/dnatSubList";
+	}
+	
+	
 	/**
 	 * 异步获取地址池信息
 	 * @param request

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

@@ -132,6 +132,8 @@ public class FileTransferCfgController  extends BaseController{
 		model.addAttribute("tabList", tabList);
 		return "/cfg/fileTransfer/ftpSubList";
 	}
+	
+	
 	/**
 	 * 做删除操作
 	 * @param isValid
@@ -371,6 +373,24 @@ public class FileTransferCfgController  extends BaseController{
 		return "/cfg/fileTransfer/fileDigestSubList";
 	}
 	
+	@RequestMapping(value = {"ajaxFileDigestLogSubIdList"})
+	public String ajaxFileDigestLogSubIdList(Model model,Long cfgId,Integer index,Integer compileId) {
+		FileDigestCfg cfg = fileTransferCfgService.getFileDigestSubIdCfg(cfgId,compileId);
+		List<String[]> tabList = new ArrayList();
+		String cfgType = null;
+			if(!cfg.getCfgType().equals(cfgType)){
+				tabList.add(new String[]{"1",cfg.getCfgType()});
+				cfgType = cfg.getCfgType();
+			}
+		model.addAttribute("_cfg", cfg);	
+		model.addAttribute("index", index);
+		model.addAttribute("tabList", tabList);
+		return "/cfg/fileTransfer/fileDigestLogSubList";
+	}
+	
+	
+	
+	
 	@RequestMapping(value = {"p2pList"})
 	public String p2pList(Model model,@ModelAttribute("cfg")CfgIndexInfo cfg,HttpServletRequest request,HttpServletResponse response) {
 		Page<CfgIndexInfo> searchPage=new Page<CfgIndexInfo>(request,response,"a");

src/main/java/com/nis/web/dao/configuration/IpMultiplexDao.java

@@ -41,4 +41,7 @@ public interface IpMultiplexDao extends CrudDao<IpMultiplexDao>{
 
 	List<IpReuseDnatPolicyCfg> findDnatList(@Param("cfgId")Long cfgId, @Param("isValid")Integer isValid);
 	
+	IpReusePolicyCfg getSnatCfg(@Param("cfgId")Long cfgId,@Param("compileId")Integer compileId);
+	
+	IpReuseDnatPolicyCfg getDnatCfg(@Param("cfgId")Long cfgId,@Param("compileId")Integer compileId);
 }

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

@@ -711,4 +711,32 @@
 	   	</where>
 	    ORDER BY a.cfg_id
 	</select>
+	
+	 <select id="getSnatCfg" resultMap="policyMap">
+    	select 
+    		<include refid="policyColumns"></include>
+    	from ip_reuse_policy_cfg r
+    	<where>
+		    <if test="cfgId !=null">
+				r.CFG_ID = #{cfgId,jdbcType=BIGINT}
+			</if>
+		    <if test="compileId != null">
+				AND r.COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			</if>
+   		</where>
+    </select>
+	
+		 <select id="getDnatCfg" resultMap="dnatPolicyMap">
+    	select 
+    		<include refid="dnatPolicyColumns"></include>
+    	from ip_reuse_dnat_policy a
+    	<where>
+		    <if test="cfgId !=null">
+				a.CFG_ID = #{cfgId,jdbcType=BIGINT}
+			</if>
+		    <if test="compileId != null">
+				AND a.COMPILE_ID=#{compileId,jdbcType=INTEGER}
+			</if>
+   		</where>
+    </select>
 </mapper>

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

@@ -16,6 +16,7 @@ import org.springframework.transaction.annotation.Transactional;
 import com.beust.jcommander.internal.Lists;
 import com.nis.domain.Page;
 import com.nis.domain.configuration.BaseIpCfg;
+import com.nis.domain.configuration.DdosIpCfg;
 import com.nis.domain.configuration.IpReuseDnatPolicyCfg;
 import com.nis.domain.configuration.IpReusePolicyCfg;
 import com.nis.domain.maat.ToMaatResult;
@@ -308,4 +309,11 @@ public class IpMultiplexService extends BaseService{
 		}
 	}
 	
+	public IpReusePolicyCfg getSnatCfg(Long cfgId,Integer compileId) {
+		return ipMultiplexDao.getSnatCfg(cfgId,compileId);
+	}
+	
+	public IpReuseDnatPolicyCfg getDnatCfg(Long cfgId,Integer compileId) {
+		return ipMultiplexDao.getDnatCfg(cfgId,compileId);
+	}
 }

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

@@ -109,7 +109,6 @@
 						</div>
 					</div>
 				</div>
-			</div>
 			</c:if>
 			</c:forEach>
 	</c:if>

src/main/webapp/WEB-INF/views/cfg/fileTransfer/fileDigestLogSubList.jsp

@@ -0,0 +1,75 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<script>
+	 $(document).ready(function() {
+		 //$("div[name='tabTitle"+index+"']").get(0).click();
+	 })
+</script>
+<style type="text/css">
+</style>
+</head>
+<c:forEach items="${tabList}" var="region" varStatus="regionStatus">
+	<div id="${region[1]}Title${index}" onclick="switchSubCfgTabInfo('${region[1]}',${index})"
+		class="col-md-1 tabInfo" name="tabTitle${index }">
+			<spring:message code='${region[1]}' />
+			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>
+	</div>
+</c:forEach>
+</div>
+<c:forEach items="${tabList}" var="region">
+	<c:if test="${region[0] eq 1 }">
+		<c:set value="${_cfg}" var="cfg"></c:set>
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+						<div class="row" style="margin-top: 5px;">
+						<div class="col-md-8">
+							<div class="form-group">
+								<label><spring:message code='digest' />:</label>
+								<a href="javascript:;" title="${cfg.digest}"
+										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+											${fns:abbr(cfg.digest,40)}
+										</a>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-8">
+							<div class="form-group">
+								<label><spring:message code='file_url' />:</label>
+								<a href="${cfg.fileUrl }" target="_blank" title="${cfg.fileUrl }"
+								 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+									${fn:substring(cfg.fileUrl,0,40) }
+								</a>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='harm_level'/>:</label> 
+								<label> 
+									<c:if test="${cfg.cfdsLevel > 1 && cfg.cfdsLevel <= 10}">
+								    		${(cfg.cfdsLevel*10)}
+								    	</c:if>
+								    	<c:if test="${cfg.cfdsLevel eq 1 || cfg.cfdsLevel > 10}">
+								    		${cfg.cfdsLevel }
+								    	</c:if>
+								</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='raw_len'/>:</label> 
+								<label>
+									${cfg.rawLen }（B）
+								</label>
+							</div>
+						</div>
+					</div>
+				</div>
+		</c:if>
+	</c:if>
+</c:forEach>
+</html>

src/main/webapp/WEB-INF/views/cfg/ipaddr/ipSubList.jsp

@@ -4,7 +4,7 @@
 <head>
 <script>
 	 $(document).ready(function() {
-		 //$("div[name='tabTitle"+index+"']").get(0).click();
+		 //$("div[name='tabTitle0']").get(0).click();
 	 })
 </script>
 <style type="text/css">

src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/dnatSubList.jsp

@@ -0,0 +1,79 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<script>
+	 $(document).ready(function() {
+		 //$("div[name='tabTitle"+index+"']").get(0).click();
+	 })
+</script>
+<style type="text/css">
+</style>
+</head>
+
+<c:forEach items="${tabList}" var="region" varStatus="regionStatus">
+	<div id="${region[1]}Title${index}" onclick="switchSubCfgTabInfo('${region[1]}',${index})"
+		class="col-md-1 tabInfo" name="tabTitle${index }">
+			<spring:message code='${region[1]}' />
+			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>
+	</div>
+</c:forEach>
+
+</div>
+<c:forEach items="${tabList}" var="region">
+	<c:if test="${region[0] eq 1 }">
+		<c:set value="${_cfg}" var="cfg"></c:set>
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+					<div class="row" style="margin-top: 5px;">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='original_dest_ip'/>:</label>
+								<label>
+									${cfg.srcIpAddress }
+								</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='original_dest_port'/>:</label> 
+								<label>
+									${cfg.srcPort }
+								</label>
+							</div>
+						</div>
+						</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='translated_dest_ip'/>:</label> 
+								<label> 
+									${cfg.destIpAddress }
+								</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='translated_dest_port'/>:</label> <label> ${cfg.destPort }</label>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='protocol'/>:</label> 
+								<label> 
+									<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+											<c:if test="${cfg.protocol==protocolC.itemCode}">
+												<spring:message code="${protocolC.itemValue }"/>
+											</c:if>
+										</c:forEach>
+								</label>
+							</div>
+						</div>
+					</div>
+				</div>
+		</c:if>
+	</c:if>
+</c:forEach>
+</html>

src/main/webapp/WEB-INF/views/cfg/manipulation/ipmulitiplex/snatSubList.jsp

@@ -0,0 +1,81 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<script>
+	 $(document).ready(function() {
+		 //$("div[name='tabTitle"+index+"']").get(0).click();
+	 })
+</script>
+<style type="text/css">
+</style>
+</head>
+
+<c:forEach items="${tabList}" var="region" varStatus="regionStatus">
+	<div id="${region[1]}Title${index}" onclick="switchSubCfgTabInfo('${region[1]}',${index})"
+		class="col-md-1 tabInfo" name="tabTitle${index }">
+			<spring:message code='${region[1]}' />
+			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>
+	</div>
+</c:forEach>
+
+</div>
+<c:forEach items="${tabList}" var="region">
+	<c:if test="${region[0] eq 1 }">
+		<c:set value="${_cfg}" var="cfg"></c:set>
+			<c:if test="${region[1] eq cfg.cfgType }">
+				<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
+					<div class="row" style="margin-top: 5px;">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='address_pool'/>:</label>
+								<label>
+									<c:forEach items="${addrPools }" var="addrPool">
+											<c:if test="${cfg.addrPoolId eq addrPool.cfgId }">
+												<spring:message code="${addrPool.addrPoolName }"/>
+											</c:if>
+				              			</c:forEach>
+								</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='user_type'/>:</label> 
+								<label>
+									<c:if test="${cfg.userType eq 'VPN' }">
+											<spring:message code="policy_vpn_user"/>
+										</c:if>
+										<c:if test="${cfg.userType eq 'SIPv4' }">
+											<spring:message code="policy_sipv4_user"/>
+										</c:if>
+										<c:if test="${cfg.userType eq 'SIPv6' }">
+											<spring:message code="policy_sipv6_user"/>
+										</c:if>
+								</label>
+							</div>
+						</div>
+						</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='user'/>:</label> 
+								<label> 
+									<c:forEach items="${users }" var="user">
+											<c:if test="${cfg.userName eq user.userName }">
+												<spring:message code="${user.userName }"/>
+											</c:if>
+				              			</c:forEach>
+								</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='ip'/>:</label> <label> ${cfg.srcIpAddress }</label>
+							</div>
+						</div>
+					</div>
+				</div>
+		</c:if>
+	</c:if>
+</c:forEach>
+</html>

src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectSubList.jsp

@@ -61,7 +61,6 @@
 	</div>
 </c:if>
 </div>
-</div>
 
 <c:forEach items="${_cfg.ipPortList}" var="cfg">
 <div id="ipInfo${index}" class="content" name="subCfg${index}">

src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp

@@ -267,7 +267,7 @@ $(document).ready(function(){
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/app/ajaxAppPolicyIpList"    compileId="${log.cfgId }"  ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -252,7 +252,7 @@
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/other/ajaxBgpSubList"  compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -249,7 +249,7 @@ $(document).ready(function(){
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/manipulation/ddos/ajaxDdosInfo" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -268,7 +268,7 @@
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/website/ajaxDnsSubList"  compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -253,7 +253,7 @@ $(document).ready(function(){
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo"  url="${ctx}/ntc/fileTransfer/ajaxFtpSubList" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -289,7 +289,7 @@
 									<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/website/ajaxHttpSubList" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -271,7 +271,7 @@
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/website/ajaxHttpSubList"  compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -31,6 +31,7 @@
 			$("#"+openId).hide();
 			$("#"+closeId).show();
 			var compileId=$(this).attr("compileId");
+			compileId="839066";
 // 			var cfgId=$(this).attr("cfgId");
 			if($("#"+openId).parent().parent().next("tr").hasClass("child")){
 				$("#"+openId).parent().parent().next("tr").show();
@@ -249,7 +250,7 @@
 								<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>
+										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/iplist/ajaxSubList"    compileId="838948" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -23,40 +23,6 @@
 		//筛选功能
 		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");
@@ -260,7 +226,7 @@
 								<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>
+										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/manipulation/ipmulitiplex/ajaxDnatInfo" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -23,40 +23,6 @@
 		//筛选功能
 		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");
@@ -260,7 +226,7 @@
 								<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>
+										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/manipulation/ipmulitiplex/ajaxSnatInfo"  compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -255,7 +255,7 @@
 								<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>
+										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/mail/ajaxMailSubList"  compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -35,7 +35,7 @@ $(document).ready(function(){
 			$.ajax({
 				type:'post',
 				async:false,
-				url:'${ctx}/ntc/fileTransfer/ajaxFileDigestSubIdList',
+				url:'${ctx}/ntc/fileTransfer/ajaxFileDigestLogSubIdList',
 				data:{"compileId":compileId,"index":index},
 				dataType:"html",
 				success:function(data){
@@ -255,7 +255,7 @@ $(document).ready(function(){
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/fileTransfer/ajaxFileDigestLogSubIdList" compileId="${log.cfgId }"  ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -254,7 +254,7 @@ $(document).ready(function(){
 								<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>
+										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/av/ajaxSignSampleList" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -314,7 +314,7 @@
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo"  url="${ctx}/ntc/av/ajaxfileSampleList"  compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -254,7 +254,7 @@ $(document).ready(function(){
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/av/ajaxfileSampleList" compileId="${log.cfgId } ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -254,7 +254,7 @@ $(document).ready(function(){
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo"  url="${ctx}/ntc/av/ajaxfileSampleList"  compileId="${log.cfgId }"><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -254,7 +254,7 @@ $(document).ready(function(){
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/av/ajaxfileSampleList" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -254,7 +254,7 @@ $(document).ready(function(){
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/av/ajaxfileSampleList" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -255,7 +255,7 @@ $(document).ready(function(){
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/av/ajaxfileSampleList" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -260,7 +260,7 @@ $(document).ready(function(){
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/av/ajaxfileSampleList" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -263,7 +263,7 @@ $(document).ready(function(){
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo"  url="${ctx}/ntc/av/ajaxVoipIpInfo" compileId="${log.cfgId }"  ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -248,7 +248,7 @@ $(document).ready(function(){
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/av/ajaxAvContUrlList" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -252,7 +252,7 @@
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/ntc/fileTransfer/ajaxP2pSubList" compileId="${log.cfgId }"  ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

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

@@ -266,7 +266,7 @@
 								<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>
+										<a href="javascript:void(0)" name="viewLogInfo"  url="${ctx}/ntc/website/ajaxSslSubList" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp

@@ -252,7 +252,7 @@
 								<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>
+ --%>										<a href="javascript:void(0)" name="viewLogInfo" url="${ctx}/proxy/control/httpRedirect/ajaxHttpSubList" compileId="${log.cfgId }" ><i class="icon-book-open"></i></a>
 									</td>
 									<td>${log.cfgId }</td>
 									<td>

src/main/webapp/static/global/scripts/common.js

@@ -67,6 +67,28 @@ $(function(){
 		setIsHexBin(this);
 	});
 	$("a[name=viewLogInfo]>i").on("click",function(){
+		
+		var url=$(this).parents("a").attr("url");
+		var compileId=$(this).parents("a").attr("compileId");
+		var pzhtml="";
+		var index="0";
+		if((url!=null && url!='') && (compileId !=null && compileId!='')){
+		$.ajax({
+			type:'post',
+			async:false,
+			url:url,
+			data:{"compileId":compileId,"index":index},
+			dataType:"html",
+			success:function(data){
+				var subTab="";
+				var htmls="";
+				htmls+="<div class='row'>";
+				htmls = htmls+data;
+				subTab=subTab+htmls;
+				pzhtml=subTab;
+				}
+			});
+		}
 		var html = "<div class='logInfo'>";
 		$(this).parents("tr").find("td").each(function(index,element){
 			if(index >0){
@@ -88,12 +110,21 @@ $(function(){
 				html+="<div class='col-md-4'><label>"+$(".table tr th").eq(index).text().trim()+":</label></div>";
 				html+="<div class='col-md-6' style='width:330px;display:block;word-break:break-all;word-wrap:break-word;'><label>"+text+"</label></div>";
 				html+="</div>";
-				
 			}
 		})
-		html +="</div>";
+		if(pzhtml!=null && pzhtml!=""){
-		
+		html+="<hr style='width: 105%;margin-left: -5%;border-top: 1px solid #c5c5c5;' />";
-		top.$.jBox(html,{height:450,width:600,title:"<i class='icon-book-open'></i> Log Info",showIcon:false,opacity:0.5});
+		html+="<div style='width:100%'>"
+		html+=pzhtml;
+		html +='<script>';
+		html +='$(document).ready(function() {'
+		html +=" document.getElementsByName('tabTitle0')[0].click();";
+		html +="})";
+		html +="</script>";
+		html+="</div>"
+		}
+		html +="</br></div>";
+		top.$.jBox(html,{height:450,width:700,title:"<i class='icon-book-open'></i> Log Info",showIcon:false,opacity:0.5});
 	});
 	//表格中的tooltips鼠标点击复制完整的内容
 	$("td>.tooltips").not(".addrPool").on("click",function(){