Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

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

@@ -59,6 +59,7 @@
 											var isHexbin=$(this).val();
 											if(isHexbin == 1){ //十六进制 
 												var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
+												keywords=keywords.replace("***and***","")
 												if(keywords != ''){
 													if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
 														$(this).parents(".boxSolid").find(

src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp

@@ -192,7 +192,6 @@
 							<input type="hidden" name="compileId" value="${_cfg.compileId}">
 							<input type="hidden" name="functionId" value="${_cfg.functionId}">
 							<input type="hidden" id="serviceId" name="serviceId" value="${_cfg.serviceId}">
-							<input type="hidden" name="doLog" value="0">
 							<input type="hidden" id="regionSize" name="regionSize"
 								value="${fn:length(regionList)}">
 
@@ -237,6 +236,30 @@
 										</div>
 									</div>
 								</div>
+								<!-- dolog begin-->
+								<div class="row">
+									<div class="col-md-6">
+										<div class="form-group">
+											<label class="control-label col-md-3"><spring:message code="do_log" /></label>
+											<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
+														<c:choose>
+															<c:when test="${dict.itemCode eq _cfg.doLog}">
+																<label class="radio-inline">
+															<input type="radio" name="doLog" checked value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:when>
+															<c:otherwise>
+																<label class="radio-inline">
+																	<input type="radio" name="doLog" value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/>
+																</label>
+															</c:otherwise>
+														</c:choose>
+													
+											</c:forEach>
+										</div>
+									</div>
+								</div>
+								<!-- dolog end-->
 								<%--   action 为1 监测时 可以选择证书--%>
 								<div class="row monitAction hidden">
 									<div class="col-md-6">

src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp

@@ -338,7 +338,7 @@
 							    		<th><spring:message code="replace_content"/></th>
 							    	</c:if>
 									<th class="sort-column a.action"><spring:message code="block_type"/></th>
-									<%-- <th><spring:message code="do_log"/></th> --%>
+									<th><spring:message code="do_log"/></th>
 									<th><spring:message code="whether_area_block"/></th>
 									<th><spring:message code="letter"/></th>
 									<th><spring:message code="classification"/></th>
@@ -408,13 +408,13 @@
 											</c:if>
 										</c:forEach>
 									</td>
-									<%-- <td>
+									<td>
 										<c:forEach items="${fns:getDictList('DO_LOG') }" var="dict">
 											<c:if test="${dict.itemCode eq indexCfg.doLog }">
 												<spring:message code="${dict.itemValue }"/>
 											</c:if>
 										</c:forEach>
-									</td> --%>
+									</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/mailSubList.jsp

@@ -48,8 +48,6 @@
 								</label>
 							</div>
 						</div>
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_ip'/>:</label>
@@ -70,8 +68,6 @@
 								</label>
 							</div>
 						</div>
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
@@ -84,8 +80,6 @@
 								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
 							</div>
 						</div>
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
@@ -103,8 +97,6 @@
 								</label>
 							</div>
 						</div>
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='protocol'/>:</label>

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

@@ -48,8 +48,6 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_ip'/>:</label>
@@ -70,8 +68,6 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
@@ -84,8 +80,6 @@
 								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
 							</div>
 						</div>
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
@@ -103,8 +97,6 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='protocol'/>:</label>

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

@@ -48,8 +48,6 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_ip'/>:</label>
@@ -70,8 +68,6 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='client_port'/>:</label><label>${cfg.srcPort }</label>
@@ -84,8 +80,6 @@
 								<label><spring:message code='server_ip'/>:</label><label>${cfg.destIpAddress }</label>
 							</div>
 						</div>
-					</div>
-					<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='server_port'/>:</label><label>${cfg.destPort }</label>
@@ -103,8 +97,6 @@
 								</label>
 							</div>
 						</div>
-						</div>
-						<div class="row">
 						<div class="col-md-4">
 							<div class="form-group">
 								<label><spring:message code='protocol'/>:</label>

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

@@ -52,7 +52,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -42,7 +42,6 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-						<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->

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

@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -42,7 +42,6 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-						<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->

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

@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -42,7 +42,6 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-						<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->

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

@@ -42,7 +42,6 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-						<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->

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

@@ -43,7 +43,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -47,7 +47,6 @@
 								<!-- 筛选按钮展开状态-->
 								<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction}"/>
 								<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-								<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 								<!-- 搜索内容与操作按钮栏 -->
 								<div class="col-md-12">
 									<div class="pull-left">

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

@@ -42,7 +42,6 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-						<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->

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

@@ -43,7 +43,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -57,7 +57,6 @@
 									value="${page.pageSize}" />
 								<input id="functionId" name="functionId" type="hidden"
 									value="${log.functionId}" />
-								<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 								<!-- 筛选按钮展开状态-->
 								<input id="isFilterAction" name="isFilterAction" type="hidden"
 									value="${log.isFilterAction }" />

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

@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -43,7 +43,6 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-						<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->

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

@@ -47,7 +47,6 @@
 								<!-- 筛选按钮展开状态-->
 								<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction}"/>
 								<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-								<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 								<!-- 搜索内容与操作按钮栏 -->
 								<div class="col-md-12">
 									<div class="pull-left">

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

@@ -44,7 +44,6 @@ $(document).ready(function(){
 							<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 							<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 							<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-							<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 							<!-- 筛选按钮展开状态-->
 							<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 							

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

@@ -48,7 +48,6 @@
 								<!-- 筛选按钮展开状态-->
 								<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction}"/>
 								<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-								<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 								<!-- 搜索内容与操作按钮栏 -->
 								<div class="col-md-12">
 									<div class="pull-left">

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

@@ -42,7 +42,6 @@
 						<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
 						<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
 						<input id="functionId" name="functionId" type="hidden" value="${log.functionId}"/>
-						<input id="cfgId" name="cfgId" type="hidden" value="${log.cfgId}"/>
 						<!-- 筛选按钮展开状态-->
 						<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
 						<!-- 搜索内容与操作按钮栏 -->

src/main/webapp/WEB-INF/views/report/list.jsp

@@ -295,7 +295,7 @@ function customColumnClick(){
 		}
 		    trtotal+=""
 	 	$('#total').remove();
-		$('#'+tableId).prepend("<tr id='total'></tr>");
+		$('#'+tableId+" tbody").prepend("<tr id='total'></tr>");
 		$('#total').html(trtotal);
  	  } 
 }	  

src/main/webapp/static/pages/scripts/pageLogs.js

@@ -50,7 +50,7 @@ $(document).ready(function() {
 	});
 	
 	// 添加由配置界面跳转到日志查询界面后的返回按钮
-	var cfgId = $("#cfgId").val();
+	var cfgId = $("input[name=cfgId]").val();
 	if(cfgId != undefined && cfgId != ''){
 		$(".theme-panel").html("<button type='button' onclick='back()' class='btn btn-primary'>"+$.validator.messages.go_back+"</button>");
 	}