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

src/main/webapp/WEB-INF/sitemesh3.xml

@@ -38,6 +38,7 @@
   <mapping path="/nis/ntc/whitelist/ajax*" exclue="true"/>
   <mapping path="/nis/app/feature/ajax*" exclue="true"/>
   <mapping path="/nis/proxy/cache/ajax*" exclue="true"/>
+  <mapping path="/nis/manipulation/ddos/ajax*" exclue="true"/>
   <!-- 对同一路径，启用多个装饰器 -->
   <mapping>
     <path>/articles/*</path>

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

@@ -378,7 +378,7 @@
 								    <th><spring:message code="behaviour_type"/></th>
 								    <th><spring:message code="is_audit"/></th>
 								    <th><spring:message code="do_log"/></th>
-								    <th><spring:message code="log_total"/></th>
+								    <%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -446,7 +446,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">

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

@@ -357,7 +357,7 @@
 									<th><spring:message code="label"/></th>
 									<th class="sort-column r.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -500,7 +500,7 @@
 											<span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
 											</c:when></c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

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

@@ -373,7 +373,7 @@
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -421,7 +421,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">

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

@@ -299,7 +299,7 @@
 									<th><spring:message code="sample_file"/></th>
 									<th><spring:message code="harm_level"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
 									<th><spring:message code="attribute"/></th>
@@ -350,7 +350,7 @@
 											<span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
 											</c:when></c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									
 									
 									<td>${cfg.requestName }</td>

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

@@ -0,0 +1,54 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<script src="${pageContext.request.contextPath}/static/global/scripts/app.min.js" type="text/javascript"></script>
+<script>
+	 $(document).ready(function() {
+		 //$("div[name='tabTitle"+index+"']").get(0).click();
+	 })
+</script>
+<style type="text/css">
+</style>
+</head>
+
+<c:forEach items="${tabList}" var="region" varStatus="regionStatus">
+	<div id="${region[1]}Title${index}" onclick="switchSubCfgTabInfo('${region[1]}',${index})"
+		class="col-md-1 tabInfo" name="tabTitle${index }">
+			<spring:message code='${region[1]}' />
+			<i id="${region[1]}${index}" class="fa" name="tabFlag${index}"></i>
+	</div>
+</c:forEach>
+</div>
+<c:forEach items="${tabList}" var="region">
+	<c:if test="${region[0] eq 5 }">
+		<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">
+						<div class="col-md-8">
+							<div class="form-group">
+								<label><spring:message code='src_file' />:</label>
+								<a href="javascript:;" data-original-title="${cfg.srcUrl}"
+								 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+									${fns:abbr(cfg.srcUrl,100)}
+								</a>
+							</div>
+						</div>
+					</div>
+					<div class="row">
+						<div class="col-md-8">
+							<div class="form-group">
+								<label><spring:message code='sample_file' />:</label>
+								<a href="${cfg.sampleUrl }" target="_blank" data-original-title="${cfg.sampleUrl }"
+								 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+									${fn:substring(cfg.sampleUrl,0,100) }
+								</a>
+							</div>
+						</div>
+					</div>
+				</div>
+			</c:if>
+	</c:if>
+</c:forEach>
+</html>

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

@@ -358,7 +358,7 @@
 									<th><spring:message code="label"/></th>
 									<th class="sort-column r.is_valid" ><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -502,7 +502,7 @@
 											</c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

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

@@ -345,7 +345,7 @@
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -419,7 +419,7 @@
 											<span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
 											</c:when></c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">

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

@@ -305,7 +305,7 @@
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -416,7 +416,7 @@
 											<span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span>
 											</c:when></c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>

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

@@ -0,0 +1,41 @@
+<%@ page contentType="text/html;charset=UTF-8"%>
+<%@ include file="/WEB-INF/include/taglib.jsp"%>
+<html>
+<head>
+<script src="${pageContext.request.contextPath}/static/global/scripts/app.min.js" type="text/javascript"></script>
+<script>
+	 $(document).ready(function() {
+		 //$("div[name='tabTitle"+index+"']").get(0).click();
+	 })
+</script>
+<style type="text/css">
+</style>
+</head>
+
+<c:forEach items="${tabList}" var="region" varStatus="regionStatus">
+	<div id="${region[1]}Title${index}" onclick="switchSubCfgTabInfo('${region[1]}',${index})"
+		class="col-md-1 tabInfo" name="tabTitle${index }">
+			<spring:message code='level' />
+			<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 5 }">
+		<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">
+						<div class="col-md-8">
+							<div class="form-group">
+								<label><spring:message code='level'/>:</label>
+									${cfg.level}
+							</div>
+						</div>
+					</div>
+					
+				</div>
+			</c:if>
+	</c:if>
+</c:forEach>
+</html>

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

@@ -365,7 +365,7 @@
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -412,7 +412,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">

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

@@ -380,7 +380,7 @@
 									<th><spring:message code="basic_protocol"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -439,7 +439,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">

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

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

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

@@ -324,7 +324,7 @@
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									
 									<th><spring:message code="antiddos_protocol"/></th>
@@ -383,7 +383,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>

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

@@ -0,0 +1,133 @@
+<%@ 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">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='ip_type'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
+										<c:if test="${cfg.ipType==ipTypeC.itemCode}"> <spring:message code="${ipTypeC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='server_port'/>:</label> <label>${cfg.destPort }</label>
+							</div>
+						</div>
+						</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='ip_pattern'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPatternC">
+										<c:if test="${cfg.ipPattern==ipPatternC.itemCode}"> <spring:message code="${ipPatternC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='antiddos_protocol'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('ANTIDDOS_PROTOCOL')}" var="dicC">
+										<c:if test="${cfg.antiddosProtocol eq dicC.itemCode}"> <spring:message code="${dicC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						<%-- <div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='client_ip'/>:</label>
+								<label>
+									${cfg.srcIpAddress}
+								</label>
+							</div>
+						</div> --%>
+					</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='port_pattern'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPatternC">
+										<c:if test="${cfg.portPattern eq portPatternC.itemCode}"> <spring:message code="${portPatternC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='bps_threadshold'/>:</label> <label> ${cfg.bpsThreadshold}</label>
+							</div>
+						</div>
+						</div>
+					<div class="row">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='server_ip'/>:</label> <label> ${cfg.destIpAddress }</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='pps_threadshold'/>:</label> <label> ${cfg.ppsThreadshold }</label>
+							</div>
+						</div>
+						
+						
+					</div>
+					<div class="row hidden">
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='direction'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
+										<c:if test="${cfg.direction eq directionC.itemCode}"> <spring:message code="${directionC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+						<div class="col-md-4">
+							<div class="form-group">
+								<label><spring:message code='protocol'/>:</label>
+								<label>
+									<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
+										<c:if test="${cfg.protocol eq protocolC.itemCode}"> <spring:message code="${protocolC.itemValue }"/></c:if>
+									</c:forEach>
+								</label>
+							</div>
+						</div>
+					</div>
+				</div>
+			</c:if>
+	</c:if>
+</c:forEach>
+</html>

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

@@ -377,7 +377,7 @@
 								    <th><spring:message code="behaviour_type"/></th>
 								   <th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -434,7 +434,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">

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

@@ -345,7 +345,7 @@
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -391,7 +391,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">

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

@@ -359,7 +359,7 @@
 								    <th class="sort-column a.action"><spring:message code="block_type"/></th>
 								    <th><spring:message code="is_audit"/></th>
 								    <th><spring:message code="do_log"/></th>
-								    <th><spring:message code="log_total"/></th>
+								    <%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -405,7 +405,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">

src/main/webapp/WEB-INF/views/cfg/mail/mailList.jsp

@@ -360,7 +360,7 @@
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -407,7 +407,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="35" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="35" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">

src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatlist2.jsp

@@ -37,7 +37,42 @@
 				$("#exportValue").val($("#intype").val());
 		  	} 
 		}
+ 	
+ 	
+ 	$("td[addrPoolId]").each(function(){
+ 		var td = $(this);
+ 		var audit = $(this).attr("audit")
+ 		var addrPoolId = $(this).attr("addrPoolId");
+ 		var timeout=$.validator.messages.timeout;
+ 		var failed=$.validator.messages.failed;
+ 		// 判断是否为审核通过状态
+ 		if(audit == 1){
+		 	$.ajax({
+				type:'get',
+				timeout:10000,// 超时时间
+				url:'http://192.168.11.137:8090/command/?cmd=IpNumGet&addr_pool_id='+addrPoolId,
+				dataType:'json',
+				async:true,
+				success:function(data){
+					//alert(JSON.stringify(data));
+					$(td).html(data.num);
+						
+				},
+				complete:function(XMLHttpRequest,status){
+					if(status=="timeout"){
+						$(td).html(timeout);
+					}else if(status !="success"){
+						$(td).html(failed);
+					}
+				}
+			});
+ 			
+ 		}else {
+ 			$(td).html(0);
+ 			
+ 		}
  	});
+ });
 </script>
 </head>
 <body>
@@ -323,7 +358,7 @@
 										</a>
 									</td>
 									<td>${cfg.ipTotal }</td>
-									<td>${cfg.availableIpTotal }</td>
+									<td audit="${cfg.isAudit}" addrPoolId="${cfg.addrPoolId }"><div class="loading-total"></div></td>
 									
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

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

@@ -61,9 +61,10 @@
 						html+="<table class='table table-bordered table-condensed text-nowrap' style='width: 100%;'>";
 	      			  	html+="<thead>";
 	      			  	html+="<th><spring:message code="user_name"/></th><th><spring:message code="vpn_ip"/></th><th><spring:message code="create_time"/></th><th><spring:message code="last_login"/></th><th><spring:message code="num_logins"/></th>";
-	      			  	html+="<th><spring:message code="outgoing_unicast_packets"/></th><th><spring:message code="outgoing_unicast_total_size"/></th><th><spring:message code="outgoing_broadcast_packets"/></th>";
-	      			  	html+="<th><spring:message code="outgoing_broadcast_total_size"/></th><th><spring:message code="incoming_unicast_packets"/></th><th><spring:message code="incoming_unicast_total_size"/></th>";
-	      			  	html+="<th><spring:message code="incoming_broadcast_packets"/></th><th><spring:message code="incoming_broadcast_total_size"/></th>";
+	      			  	html+="<th><spring:message code="outgoing_unicast_packets"/></th><th><spring:message code="outgoing_unicast_total_size"/></th>";
+	      			  	/* html+="<th><spring:message code="outgoing_broadcast_packets"/></th><th><spring:message code="outgoing_broadcast_total_size"/></th>"; */
+	      			  	html+="<th><spring:message code="incoming_unicast_packets"/></th><th><spring:message code="incoming_unicast_total_size"/></th>";
+	      			  	/* html+="<th><spring:message code="incoming_broadcast_packets"/></th><th><spring:message code="incoming_broadcast_total_size"/></th>"; */
 	      			  	html+="</thead>";
 	      			   	html+="<tbody>";
 		      			   	for(i=0;i<data.length;i++){
@@ -83,18 +84,18 @@
 		      					html+="</td>";
 		      					html+="<td class='taskStatus'>"+(data[i].Outgoing_Unicast_Total_Size==null?"":data[i].Outgoing_Unicast_Total_Size);
 		      					html+="</td>";
-		      					html+="<td class='taskStatus'>"+(data[i].Outgoing_Broadcast_Packets==null?"":data[i].Outgoing_Broadcast_Packets);
+		      					/* html+="<td class='taskStatus'>"+(data[i].Outgoing_Broadcast_Packets==null?"":data[i].Outgoing_Broadcast_Packets);
 		      					html+="</td>";
 		      					html+="<td class='taskStatus'>"+(data[i].Outgoing_Broadcast_Total_Size==null?"":data[i].Outgoing_Broadcast_Total_Size);
-		      					html+="</td>";
+		      					html+="</td>"; */
 		      					html+="<td class='taskStatus'>"+(data[i].Incoming_Unicast_Packets==null?"":data[i].Incoming_Unicast_Packets);
 		      					html+="</td>";
 		      					html+="<td class='taskStatus'>"+(data[i].Incoming_Unicast_Total_Size==null?"":data[i].Incoming_Unicast_Total_Size);
 		      					html+="</td>";
-		      					html+="<td class='taskStatus'>"+(data[i].Incoming_Broadcast_Packets==null?"":data[i].Incoming_Broadcast_Packets);
+		      					/* html+="<td class='taskStatus'>"+(data[i].Incoming_Broadcast_Packets==null?"":data[i].Incoming_Broadcast_Packets);
 		      					html+="</td>";
 		      					html+="<td class='taskStatus'>"+(data[i].Incoming_Broadcast_Total_Size==null?"":data[i].Incoming_Broadcast_Total_Size);
-		      					html+="</td>";
+		      					html+="</td>"; */
 		      			   		html+="</tr>";
 		      			   	}
 		      				html+="</tbody>";

src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/userForm.jsp

@@ -14,14 +14,15 @@
 						    return this.optional(element) || (tel.test(value));
 						}, "用户名仅支持英文大小写、数字");	
 						$("#no").focus();
-						$("#inputForm")
+						
+	$("#inputForm")
 								.validate(
 										{
 											rules : {
 												userName : {
 													remote : "${ctx}/maintenance/userManage/checkLoginName?oldUserName="
 															+ encodeURIComponent('${user.userName}'),
-													userCheck:true		
+													userCheck : true
 												},
 											},
 											messages : {
@@ -32,31 +33,23 @@
 													equalTo : "<spring:message code='equal_password'/>"
 												}
 											},
+											errorPlacement : function(error,element) {
+												/* $("#messageBox").text("<spring:message code='enter_error'/>");
+												if (element.is(":checkbox")|| element.is(":radio")|| element.parent().is(".input-append")) {
+													error.appendTo(element.parent().parent());
+												} else {
+													error.insertAfter(element);
+												} */
+												$(element).parents(".form-group").find("div[for='"+ element.attr("name")+ "']").append(error);
+											},
 											submitHandler : function(form) {
 												loading('onloading...');
 												form.submit();
 											},
-											errorContainer : "#messageBox",
-											errorPlacement : function(error,
-													element) {
-												$("#messageBox")
-														.text(
-																"<spring:message code='enter_error'/>");
-												if (element.is(":checkbox")
-														|| element.is(":radio")
-														|| element
-																.parent()
-																.is(
-																		".input-append")) {
-													error.appendTo(element
-															.parent().parent());
-												} else {
-													error.insertAfter(element);
-												}
-											}
+											errorContainer : "#messageBox"
 										});
-						
-			});
+
+					});
 </script>
 </head>
 <body>
@@ -93,6 +86,7 @@
 									</c:set>
 									<label class="control-label col-md-3"><spring:message
 											code="vpn_ip" /></label>
+									<span class="help-inline"><font color="red">*</font> </span>
 									<div class="col-md-4">
 										<sys:treeselect id="serverIp" name="serverIp"
 											value="${user.serverIp}" labelName="user.serverIp"
@@ -102,13 +96,13 @@
 											url="/maintenance/userManage/treeData?isLeafShow=false&cfgType=3&specific=true" extId="0"
 											checked="true"   cssClass="form-control required" />
 									</div>
-									<span class="help-inline"><font color="red">*</font> </span>
-									<div for="user.serverIp"></div>
+									 <div for="user.serverIp"></div>
 								</div>
 								
 								<div class="form-group hidden">
 									<label class="col-md-3 control-label"><spring:message
 											code="user_name" /></label>
+											<span class="help-inline"><font color="red">*</font> </span>
 									<div class="col-md-4">
 										<select name="userType" data-live-search="true" class="selectpicker form-control required">
 											<c:forEach items="${fns:getDictList('USER_TYPE')}" var="userTypes">
@@ -116,12 +110,12 @@
 											</c:forEach>
 										</select>
 									</div>
-									<span class="help-inline"><font color="red">*</font> </span>
 								</div>
 								
 								<div class="form-group">
 									<label class="col-md-3 control-label"><spring:message
 											code="user_name" /></label>
+											<span class="help-inline"><font color="red">*</font> </span>
 									<div class="col-md-4">
 										<input id="oldUserName" name="oldUserName" type="hidden"
 											value="${user.userName}">
@@ -133,35 +127,37 @@
 											<form:input path="userName" htmlEscape="false" maxlength="50"
 												class="required   form-control" />
 									</div>
-									<span class="help-inline"><font color="red">*</font> </span>
+									<div for="userName"></div>
 								</div>
 
 								<div class="form-group">
 									<label class="col-md-3 control-label"><spring:message
 											code="password" /></label>
+									<c:if test="${empty user.id}">
+										<span class="help-inline"><font color="red">*</font> </span>
+									</c:if>
 									<div class="col-md-4">
 										<input id="userPwd" name="userPwd" type="password" value=""
 											maxlength="50" minlength="3"
 											class="${empty user.id?'required':''} form-control" />
 									</div>
-									<c:if test="${empty user.id}">
-										<span class="help-inline"><font color="red">*</font> </span>
-									</c:if>
 									<c:if test="${not empty user.id}">
 										<span class="help-inline"><spring:message
 												code="nochange_blank" /></span>
 									</c:if>
+									<div for="userPwd"></div>
 								</div>
 								<div class="form-group">
 									<label class="col-md-3 control-label"><spring:message
 											code="confirm_password"></spring:message></label>
+									<span class="help-inline"><font color="red">*</font> </span>
 									<div class="col-md-4">
 										<input id="newUserPwd" name="newUserPwd" type="password"
 											value="" maxlength="50" minlength="3" equalTo="#userPwd"
 											class="form-control" />
 										<c:if test="${empty user.id}"></c:if>
 									</div>
-									<span class="help-inline"><font color="red">*</font> </span>
+									<div for="newUserPwd"></div>
 								</div>
 								<div class="form-group">
 									<label class="col-md-3 control-label"><spring:message

src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp

@@ -359,7 +359,7 @@
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -405,7 +405,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">

src/main/webapp/WEB-INF/views/cfg/other/xmppList.jsp

@@ -334,7 +334,7 @@
 									<th><spring:message code="label"/></th>
 									<th class="sort-column a.is_valid"><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column a.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -446,7 +446,7 @@
 											<c:when test="${indexCfg.isAudit eq '3'}"><span indexTable="${indexCfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 								    <td>${indexCfg.creatorName }</td>
 									<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${indexCfg.editorName }</td>

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

@@ -567,7 +567,7 @@
 										<th><spring:message code="do_log"/></th>
 									</c:if>
 									<c:if test="${action ne 128}">
-										<th><spring:message code="log_total"/></th>
+										<%-- <th><spring:message code="log_total"/></th> --%>
 									</c:if>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
@@ -672,7 +672,7 @@
 										</td>
 									</c:if>
 									<c:if test="${action ne 128}">
-										<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 									</c:if>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>

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

@@ -279,7 +279,7 @@
 									<th><spring:message code="match_method"/></th>
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -343,7 +343,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">

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

@@ -281,7 +281,7 @@
 									<th><spring:message code="match_method"/></th>
 									<th class="sort-column r.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -346,7 +346,7 @@
 											<c:when test="${cfg.isAudit eq '3'}"><span indexTable="${cfg.indexTable}" data-placement="right" data-original-title="<spring:message code='letter_cancel_info'/>: " class="label le-ca-fo label-warning tooltips" data-icon="&#xe01e;"> <spring:message code="cancel_approved"/></span></c:when>
 										</c:choose>
 									</td>
-									<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${cfg.isAreaEffective==1}">

src/main/webapp/WEB-INF/views/cfg/website/dnsList.jsp

@@ -358,7 +358,7 @@
 								    <th><spring:message code="policy_name"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -409,7 +409,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">

src/main/webapp/WEB-INF/views/cfg/website/httpList.jsp

@@ -515,7 +515,7 @@
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -561,7 +561,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">

src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp

@@ -356,7 +356,7 @@
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -402,7 +402,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">

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

@@ -337,7 +337,7 @@
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
 									<th><spring:message code="is_audit"/></th>
 									<th><spring:message code="do_log"/></th>
-									<th><spring:message code="log_total"/></th>
+									<%-- <th><spring:message code="log_total"/></th> --%>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -384,7 +384,7 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<td audit="${indexCfg.isAudit}" functionId="8" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
+									<%-- <td audit="${indexCfg.isAudit}" functionId="8" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
 									<td>
 										<c:if test="${indexCfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
 										<c:if test="${indexCfg.isAreaEffective==1}">

src/main/webapp/WEB-INF/views/log/ntc/ddosList.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}/manipulation/ddos/ajaxDdosInfo',
+				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>
@@ -157,7 +198,6 @@ $(document).ready(function(){
 					</div> 
 					<sys:message content="${message}"  type="${messageTypes }"/>
 					<div class="table-responsive">
-					
 						<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
 						<thead>
 							<tr>
@@ -208,6 +248,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/mmPornVideoSampleList.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/ajaxSignSampleList',
+				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>
@@ -212,6 +253,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/mmSampleAudioList.jsp

@@ -29,6 +29,49 @@
 									"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/ajaxfileSampleList',
+							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>
@@ -270,6 +313,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/mmSampleFaceList.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/ajaxfileSampleList',
+				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>
@@ -212,6 +253,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/mmSampleLogoList.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/ajaxfileSampleList',
+				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>
@@ -212,6 +253,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/mmSamplePicList.jsp

@@ -21,6 +21,48 @@ $(document).ready(function(){
 		$("#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/ajaxfileSampleList',
+				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>
@@ -211,6 +253,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/mmSampleSpeakerList.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/ajaxfileSampleList',
+				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>
@@ -212,6 +253,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/mmSampleVideoList.jsp

@@ -21,6 +21,48 @@ $(document).ready(function(){
 		$("#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/ajaxfileSampleList',
+				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>
@@ -212,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/mmSampleVoipList.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/ajaxfileSampleList',
+				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>
@@ -218,6 +259,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>