From 107d9b295f5a4557be55a1a750f39d698ee33714 Mon Sep 17 00:00:00 2001
From: wangwei <wangwei@nismail.iie.ac.cn>
Date: Sun, 6 Jan 2019 17:57:02 +0800
Subject: [PATCH] =?UTF-8?q?1.logs-Stream=20=E3=80=81Multimedia=20=E3=80=81?=
 =?UTF-8?q?Anti=20DDOS=E3=80=81IP=20Reuse=E3=80=81Proxy=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E4=B8=8B=E6=89=80=E6=9C=89=E7=95=8C=E9=9D=A2=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=202.proxy=20=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=EF=BC=9Areq=5Fbody=20=E4=B8=8Eresp=5Fbody=E5=88=97?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/log/manipulation/dkBehaviorList.jsp | 55 ++++++++--------
 .../webapp/WEB-INF/views/log/ntc/ddosList.jsp | 61 +++++++++--------
 .../WEB-INF/views/log/ntc/irDnatLogList.jsp   | 64 +++++++++---------
 .../WEB-INF/views/log/ntc/irSnatLogList.jsp   | 65 +++++++++----------
 .../views/log/ntc/mmFileDigestList.jsp        | 40 ++++++------
 .../views/log/ntc/mmPornVideoSampleList.jsp   | 60 +++++++++--------
 .../views/log/ntc/mmSampleAudioList.jsp       | 53 ++++++++-------
 .../WEB-INF/views/log/ntc/mmSamplePicList.jsp | 38 ++++++-----
 .../views/log/ntc/mmSampleVideoList.jsp       | 37 ++++++-----
 .../views/log/ntc/mmSampleVoipList.jsp        | 59 +++++++++--------
 .../WEB-INF/views/log/pxy/pxyHttpList.jsp     | 58 ++++++++---------
 11 files changed, 302 insertions(+), 288 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
index 248dba0a8..0dadadcb9 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -166,30 +166,6 @@ $(document).ready(function(){
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
-									<div class="col-md-2">
-										<div class="form-group">
-										<label><spring:message code="transport_layer_protocol"/>：</label>
-										<c:set var="select"><spring:message code='select'/></c:set>
-                                            <form:select path="transProto" class="selectpicker form-control" >
-												<form:option value=""><spring:message code="select"/></form:option>
-												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
-										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
-							             		</c:forEach>
-											</form:select>
-										</div>
-									</div>
-									
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="direction"/>：</label>
-											<form:select path="direction" class="selectpicker select2 form-control">
-	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
-											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
-								             </c:forEach>
-	                                    	</form:select>
-									</div>
-									</div>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -209,9 +185,15 @@ $(document).ready(function(){
 									</div>
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="clientip"/>：</label>
-											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
-									</div>
+										<label><spring:message code="transport_layer_protocol"/>：</label>
+										<c:set var="select"><spring:message code='select'/></c:set>
+                                            <form:select path="transProto" class="selectpicker form-control" >
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
+										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
+							             		</c:forEach>
+											</form:select>
+										</div>
 									</div>
 									<div class="col-md-2">
 										<div class="form-group">
@@ -219,12 +201,31 @@ $(document).ready(function(){
 											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
 									</div>
 									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="clientip"/>：</label>
+											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="direction"/>：</label>
+											<form:select path="direction" class="selectpicker select2 form-control">
+	                                        <form:option value=""><spring:message code="select"/></form:option>
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
+											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+								             </c:forEach>
+	                                    	</form:select>
+									</div>
+									</div>
 								</div>
 							<div class="row">
 								<div class="col-md-2">
+								<div class="form-group">
 									<label><spring:message code="cfg_id"></spring:message>：</label>
 									<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
 								</div>
+								</div>
 							</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
index 802516419..4c2171a28 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -157,30 +157,6 @@ $(document).ready(function(){
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
-									<div class="col-md-2 hidden">
-										<div class="form-group">
-										<label><spring:message code="transport_layer_protocol"/>：</label>
-										<c:set var="select"><spring:message code='select'/></c:set>
-                                            <form:select path="transProto" class="selectpicker form-control" >
-												<form:option value=""><spring:message code="select"/></form:option>
-												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
-										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
-							             		</c:forEach>
-											</form:select>
-										</div>
-									</div>
-									
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="direction"/>：</label>
-											<form:select path="direction" class="selectpicker select2 form-control">
-	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
-											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
-								             </c:forEach>
-	                                    	</form:select>
-									</div>
-									</div>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -197,7 +173,25 @@ $(document).ready(function(){
 	                                            <label><spring:message code="clj_ip"/>：</label>
 	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
 	                                        </div>
+									</div>
+									<div class="col-md-2 hidden">
+										<div class="form-group">
+										<label><spring:message code="transport_layer_protocol"/>：</label>
+										<c:set var="select"><spring:message code='select'/></c:set>
+                                            <form:select path="transProto" class="selectpicker form-control" >
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
+										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
+							             		</c:forEach>
+											</form:select>
 										</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="serverip"/>：</label>
+											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
+									</div>
+									</div>
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="clientip"/>：</label>
@@ -206,19 +200,24 @@ $(document).ready(function(){
 									</div>
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="serverip"/>：</label>
-											<input id="dIp" name="dIp" class="form-control" type="text" value="${log.dIp}"/>
+											<label><spring:message code="direction"/>：</label>
+											<form:select path="direction" class="selectpicker select2 form-control">
+	                                        <form:option value=""><spring:message code="select"/></form:option>
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
+											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+								             </c:forEach>
+	                                    	</form:select>
 									</div>
 									</div>
-									
+									</div>
+									<div class="row">
 									<div class="col-md-2">
+										<div class="form-group">
 										<label><spring:message code="cfg_id"></spring:message>：</label>
 										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
 									</div>
-								</div>
-								
-									
-								
+									</div>
+									</div>
 							</div>
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp
index a05570726..6f4be31a7 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp
@@ -118,31 +118,7 @@
 						
 						<!-- 筛选搜索内容栏默认隐藏-->
 						<div class="col-md-12 filter-action-select-panle hide" >
-							<div class="row">
-								<div class="col-md-2">
-									<div class="form-group">
-                                		<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
-                                       	<form:select path="transProto" class="selectpicker form-control">
-											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
-												<form:option value="${protocol.itemCode}"><spring:message code="${protocol.itemValue}"></spring:message></form:option>
-											</c:forEach>
-										</form:select>
-									</div>
-                                </div>
-                                   
-								<div class="col-md-2">
-									<div class="form-group">
-                                		<label class="control-label"><spring:message code="direction"/>：</label>
-                                       	<form:select path="direction" class="selectpicker form-control">
-											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
-												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
-											</c:forEach>
-										</form:select>
-									</div>
-                                </div>
-								
+							<div class="row">                                   
 								<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -161,26 +137,48 @@
 										<input name="capIp" type="text" class="form-control" value="${log.capIp }"/>
 									</div>
 								</div>
-								
+								<div class="col-md-2">
+									<div class="form-group">
+                                		<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
+                                       	<form:select path="transProto" class="selectpicker form-control">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
+												<form:option value="${protocol.itemCode}"><spring:message code="${protocol.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+                                </div>
+                                <div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="serverip"></spring:message>：</label>
+										<input name="dIp" type="text" class="form-control" value="${log.dIp }"/>
+									</div>
+								</div>
 								<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="clientip"></spring:message>：</label>
 										<input name="sIp" type="text" class="form-control" value="${log.sIp }"/>
 									</div>
 								</div>
-								
 								<div class="col-md-2">
 									<div class="form-group">
-										<label><spring:message code="serverip"></spring:message>：</label>
-										<input name="dIp" type="text" class="form-control" value="${log.dIp }"/>
+                                		<label class="control-label"><spring:message code="direction"/>：</label>
+                                       	<form:select path="direction" class="selectpicker form-control">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
+												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
 									</div>
-								</div>
+                            </div>
 							</div>
 							<div class="row">
 								<div class="col-md-2">
+								<div class="form-group">
 									<label><spring:message code="cfg_id"></spring:message>：</label>
 									<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
 								</div>
+								</div>
 							</div>
 						</div>
 						<!-- /筛选搜索内容栏    结束-->
@@ -203,11 +201,11 @@
 								<th column="nat_ip"  class="sort-column nat_ip"><spring:message code="nat_ip"/></th>
 								<th column="creat_time"  class="sort-column creat_time"><spring:message code="creat_time"/></th>
 								<th column="close_time"  class="sort-column close_time"><spring:message code='close_time'/></th>
-								<th column="c2s_pkt_num"  class="sort-column c2s_pkt_num"><spring:message code="c2s_pkt_num"/></th>
 								<th column="s2c_pkt_num"  class="sort-column s2c_pkt_num"><spring:message code="s2c_pkt_num"/></th>
-								<th column="c2s_byte_num"  class="sort-column c2s_byte_num"><spring:message code="c2s_byte_num"/></th>
+								<th column="c2s_pkt_num"  class="sort-column c2s_pkt_num"><spring:message code="c2s_pkt_num"/></th>
 								<th column="s2c_byte_num"  class="sort-column s2c_byte_num"><spring:message code="s2c_byte_num"/></th>
-
+								<th column="c2s_byte_num"  class="sort-column c2s_byte_num"><spring:message code="c2s_byte_num"/></th>
+								
 								<th column="clj_ip"  class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
 								<th column="transport_layer_protocol"  class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
 								<th column="addr_type"  class="sort-column addr_type"><spring:message code='addr_type'/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp
index 1a1d7a55c..3b8b65304 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp
@@ -119,31 +119,7 @@
 						
 						<!-- 筛选搜索内容栏默认隐藏-->
 						<div class="col-md-12 filter-action-select-panle hide" >
-							<div class="row">
-								<div class="col-md-2">
-									<div class="form-group">
-                                		<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
-                                       	<form:select path="transProto" class="selectpicker form-control">
-											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
-												<form:option value="${protocol.itemCode}"><spring:message code="${protocol.itemValue}"></spring:message></form:option>
-											</c:forEach>
-										</form:select>
-									</div>
-                                </div>
-                                   
-								<div class="col-md-2">
-									<div class="form-group">
-                                		<label class="control-label"><spring:message code="direction"/>：</label>
-                                       	<form:select path="direction" class="selectpicker form-control">
-											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
-												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
-											</c:forEach>
-										</form:select>
-									</div>
-                                </div>
-								
+							<div class="row"> 					
 								<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -155,33 +131,54 @@
 										</form:select>
 									</div>
 								</div>
-								
 								<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="clj_ip"></spring:message>：</label>
 										<input name="capIp" type="text" class="form-control" value="${log.capIp }"/>
 									</div>
 								</div>
-								
 								<div class="col-md-2">
 									<div class="form-group">
-										<label><spring:message code="clientip"></spring:message>：</label>
-										<input name="sIp" type="text" class="form-control" value="${log.sIp }"/>
+                                		<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
+                                       	<form:select path="transProto" class="selectpicker form-control">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
+												<form:option value="${protocol.itemCode}"><spring:message code="${protocol.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
 									</div>
-								</div>
-								
+                                </div>							
 								<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="serverip"></spring:message>：</label>
 										<input name="dIp" type="text" class="form-control" value="${log.dIp }"/>
 									</div>
 								</div>
+								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="clientip"></spring:message>：</label>
+										<input name="sIp" type="text" class="form-control" value="${log.sIp }"/>
+									</div>
+								</div>
+								<div class="col-md-2">
+									<div class="form-group">
+                                		<label class="control-label"><spring:message code="direction"/>：</label>
+                                       	<form:select path="direction" class="selectpicker form-control">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
+												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+                                </div>
 							</div>
 							<div class="row">
 								<div class="col-md-2">
+								<div class="form-group">
 									<label><spring:message code="cfg_id"></spring:message>：</label>
 									<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
 								</div>
+								</div>
 							</div>
 						</div>
 						<!-- /筛选搜索内容栏    结束-->
@@ -203,11 +200,11 @@
 								<th column="nat_ip"  class="sort-column nat_ip"><spring:message code="nat_ip"/></th>
 								<th column="creat_time"  class="sort-column creat_time"><spring:message code="creat_time"/></th>
 								<th column="close_time"  class="sort-column close_time"><spring:message code='close_time'/></th>
-								<th column="c2s_pkt_num"  class="sort-column c2s_pkt_num"><spring:message code="c2s_pkt_num"/></th>
 								<th column="s2c_pkt_num"  class="sort-column s2c_pkt_num"><spring:message code="s2c_pkt_num"/></th>
-								<th column="c2s_byte_num"  class="sort-column c2s_byte_num"><spring:message code="c2s_byte_num"/></th>
+								<th column="c2s_pkt_num"  class="sort-column c2s_pkt_num"><spring:message code="c2s_pkt_num"/></th>
 								<th column="s2c_byte_num"  class="sort-column s2c_byte_num"><spring:message code="s2c_byte_num"/></th>
-
+								<th column="c2s_byte_num"  class="sort-column c2s_byte_num"><spring:message code="c2s_byte_num"/></th>
+								
 								<th column="clj_ip"  class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
 								<th column="transport_layer_protocol"  class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
 								<th column="addr_type"  class="sort-column addr_type"><spring:message code='addr_type'/></th>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
index f93afe476..ce366910b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp
@@ -154,19 +154,6 @@ $(document).ready(function(){
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
-									<div class="col-md-2">
-										<div class="form-group">
-										<label><spring:message code="transport_layer_protocol"/>：</label>
-										<c:set var="select"><spring:message code='select'/></c:set>
-                                            <form:select path="transProto" class="selectpicker form-control" >
-												<form:option value=""><spring:message code="select"/></form:option>
-												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
-										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
-							             		</c:forEach>
-											</form:select>
-										</div>
-									</div>
-									
 									<%-- <div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="direction"/>：</label>
@@ -194,12 +181,18 @@ $(document).ready(function(){
 	                                            <label><spring:message code="clj_ip"/>：</label>
 	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
 	                                        </div>
-										</div>
+										</div>									
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="clientip"/>：</label>
-											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
-									</div>
+										<label><spring:message code="transport_layer_protocol"/>：</label>
+										<c:set var="select"><spring:message code='select'/></c:set>
+                                            <form:select path="transProto" class="selectpicker form-control" >
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
+										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
+							             		</c:forEach>
+											</form:select>
+										</div>
 									</div>
 									<div class="col-md-2">
 										<div class="form-group">
@@ -208,11 +201,20 @@ $(document).ready(function(){
 									</div>
 									</div>
 									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="clientip"/>：</label>
+											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+									</div>
+									</div>
+									</div>
+									<div class="row">
+									<div class="col-md-2">
+										<div class="form-group">
 										<label><spring:message code="cfg_id"></spring:message>：</label>
 										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
 									</div>
-								</div>
-									
+									</div>
+								</div>	
 							</div>
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
index b5a164f5b..99e3cde13 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
@@ -156,30 +156,6 @@ $(document).ready(function(){
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
-									<div class="col-md-2">
-										<div class="form-group">
-										<label><spring:message code="transport_layer_protocol"/>：</label>
-										<c:set var="select"><spring:message code='select'/></c:set>
-                                            <form:select path="transProto" class="selectpicker form-control" >
-												<form:option value=""><spring:message code="select"/></form:option>
-												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
-										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
-							             		</c:forEach>
-											</form:select>
-										</div>
-									</div>
-									
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="direction"/>：</label>
-											<form:select path="direction" class="selectpicker select2 form-control">
-	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
-											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
-								             </c:forEach>
-	                                    	</form:select>
-										</div>
-									</div>
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="entrance"/>：</label>
@@ -199,9 +175,15 @@ $(document).ready(function(){
 									</div>
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="clientip"/>：</label>
-											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
-									</div>
+										<label><spring:message code="transport_layer_protocol"/>：</label>
+										<c:set var="select"><spring:message code='select'/></c:set>
+                                            <form:select path="transProto" class="selectpicker form-control" >
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
+										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
+							             		</c:forEach>
+											</form:select>
+										</div>
 									</div>
 									<div class="col-md-2">
 										<div class="form-group">
@@ -210,10 +192,32 @@ $(document).ready(function(){
 									</div>
 									</div>
 									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="clientip"/>：</label>
+											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="direction"/>：</label>
+											<form:select path="direction" class="selectpicker select2 form-control">
+	                                        <form:option value=""><spring:message code="select"/></form:option>
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
+											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+								             </c:forEach>
+	                                    	</form:select>
+										</div>
+									</div>
+								</div>
+									<div class="row">
+									<div class="col-md-2">
+									<div class="form-group">
 										<label><spring:message code="cfg_id"></spring:message>：</label>
 										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
 									</div>
-								</div>
+									</div>
+									</div>
+
 							</div>
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
index 7710faf5f..97c1428c8 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -183,27 +183,6 @@
 								<!-- 筛选搜索内容栏默认隐藏-->
 								<div class="col-md-12 filter-action-select-panle hide">
 									<div class="row">
-										<div class="col-md-2">
-											<div class="form-group">
-												<label><spring:message code="transport_layer_protocol" />：</label>
-												<c:set var="select">
-													<spring:message code='select' />
-												</c:set>
-												<form:select path="transProto"
-													class="selectpicker select2 form-control" >
-													<form:option value="">
-														<spring:message code="select" />
-													</form:option>
-													<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}"
-														var="dict">
-														<form:option value="${dict.itemCode}">
-															<spring:message code="${dict.itemValue}" />
-														</form:option>
-													</c:forEach>
-												</form:select>
-											</div>
-										</div>
-
 										<%-- <div class="col-md-2">
 											<div class="form-group">
 												<label><spring:message code="direction" />：</label>
@@ -248,9 +227,22 @@
 										</div>
 										<div class="col-md-2">
 											<div class="form-group">
-												<label><spring:message code="clientip" />：</label> <input
-													id="sIp" name="sIp" class="form-control" type="text"
-													value="${log.sIp}" />
+												<label><spring:message code="transport_layer_protocol" />：</label>
+												<c:set var="select">
+													<spring:message code='select' />
+												</c:set>
+												<form:select path="transProto"
+													class="selectpicker select2 form-control" >
+													<form:option value="">
+														<spring:message code="select" />
+													</form:option>
+													<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}"
+														var="dict">
+														<form:option value="${dict.itemCode}">
+															<spring:message code="${dict.itemValue}" />
+														</form:option>
+													</c:forEach>
+												</form:select>
 											</div>
 										</div>
 										<div class="col-md-2">
@@ -261,10 +253,21 @@
 											</div>
 										</div>
 										<div class="col-md-2">
+											<div class="form-group">
+												<label><spring:message code="clientip" />：</label> <input
+													id="sIp" name="sIp" class="form-control" type="text"
+													value="${log.sIp}" />
+											</div>
+										</div>
+									</div>
+										<div class="row">
+										<div class="col-md-2">
+										<div class="form-group">
 											<label><spring:message code="cfg_id"></spring:message>：</label>
 											<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
 										</div>
-									</div>
+										</div>
+										</div>							
 							</div>
 								<!-- /筛选搜索内容栏    结束-->
 							</form:form>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
index 75385dba8..e75c4e36c 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -155,19 +155,6 @@ $(document).ready(function(){
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
-									<div class="col-md-2">
-										<div class="form-group">
-										<label><spring:message code="transport_layer_protocol"/>：</label>
-										<c:set var="select"><spring:message code='select'/></c:set>
-                                            <form:select path="transProto" class="selectpicker form-control" >
-												<form:option value=""><spring:message code="select"/></form:option>
-												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
-										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
-							             		</c:forEach>
-											</form:select>
-										</div>
-									</div>
-									
 									<%-- <div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="direction"/>：</label>
@@ -198,9 +185,15 @@ $(document).ready(function(){
 									</div>
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="clientip"/>：</label>
-											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
-									</div>
+										<label><spring:message code="transport_layer_protocol"/>：</label>
+										<c:set var="select"><spring:message code='select'/></c:set>
+                                            <form:select path="transProto" class="selectpicker form-control" >
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
+										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
+							             		</c:forEach>
+											</form:select>
+										</div>
 									</div>
 									<div class="col-md-2">
 										<div class="form-group">
@@ -209,10 +202,21 @@ $(document).ready(function(){
 									</div>
 									</div>
 									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="clientip"/>：</label>
+											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+									</div>
+								</div>
+									</div>
+									<div class="row">
+									<div class="col-md-2">
+									<div class="form-group">
 										<label><spring:message code="cfg_id"></spring:message>：</label>
 										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
 									</div>
-								</div>
+									</div>
+									</div>
+
 							</div>
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
index afb82965f..9de207ee7 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -156,19 +156,6 @@ $(document).ready(function(){
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
-									<div class="col-md-2">
-										<div class="form-group">
-										<label><spring:message code="transport_layer_protocol"/>：</label>
-										<c:set var="select"><spring:message code='select'/></c:set>
-                                            <form:select path="transProto" class="selectpicker form-control" >
-												<form:option value=""><spring:message code="select"/></form:option>
-												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
-										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
-							             		</c:forEach>
-											</form:select>
-										</div>
-									</div>
-									
 									<%-- <div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="direction"/>：</label>
@@ -199,9 +186,15 @@ $(document).ready(function(){
 									</div>
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="clientip"/>：</label>
-											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
-									</div>
+										<label><spring:message code="transport_layer_protocol"/>：</label>
+										<c:set var="select"><spring:message code='select'/></c:set>
+                                            <form:select path="transProto" class="selectpicker form-control" >
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
+										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
+							             		</c:forEach>
+											</form:select>
+										</div>
 									</div>
 									<div class="col-md-2">
 										<div class="form-group">
@@ -210,10 +203,20 @@ $(document).ready(function(){
 									</div>
 									</div>
 									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="clientip"/>：</label>
+											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+									</div>
+									</div>
+									</div>
+									<div class="row">
+									<div class="col-md-2">
+									<div class="form-group">
 										<label><spring:message code="cfg_id"></spring:message>：</label>
 										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
 									</div>
-								</div>
+									</div>
+									</div>								
 							</div>
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
index 9a11889e2..b7a48d297 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
@@ -155,30 +155,6 @@ $(document).ready(function(){
 							<!-- 筛选搜索内容栏默认隐藏-->
 							<div class="col-md-12 filter-action-select-panle hide" >
 								<div class="row">
-									<div class="col-md-2">
-										<div class="form-group">
-										<label><spring:message code="transport_layer_protocol"/>：</label>
-										<c:set var="select"><spring:message code='select'/></c:set>
-                                            <form:select path="transProto" class="selectpicker form-control" >
-												<form:option value=""><spring:message code="select"/></form:option>
-												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
-										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
-							             		</c:forEach>
-											</form:select>
-										</div>
-									</div>
-									
-									<div class="col-md-2">
-										<div class="form-group">
-											<label><spring:message code="direction"/>：</label>
-											<form:select path="direction" class="selectpicker select2 form-control">
-	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
-											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
-								             </c:forEach>
-	                                    	</form:select>
-										</div>
-									</div>
 									<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="entrance"/>：</label>
@@ -198,9 +174,15 @@ $(document).ready(function(){
 									</div>
 									<div class="col-md-2">
 										<div class="form-group">
-											<label><spring:message code="clientip"/>：</label>
-											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
-									</div>
+										<label><spring:message code="transport_layer_protocol"/>：</label>
+										<c:set var="select"><spring:message code='select'/></c:set>
+                                            <form:select path="transProto" class="selectpicker form-control" >
+												<form:option value=""><spring:message code="select"/></form:option>
+												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
+										 			<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
+							             		</c:forEach>
+											</form:select>
+										</div>
 									</div>
 									<div class="col-md-2">
 										<div class="form-group">
@@ -209,10 +191,31 @@ $(document).ready(function(){
 									</div>
 									</div>
 									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="clientip"/>：</label>
+											<input id="sIp" name="sIp" class="form-control" type="text" value="${log.sIp}"/>
+									</div>
+									</div>
+									<div class="col-md-2">
+										<div class="form-group">
+											<label><spring:message code="direction"/>：</label>
+											<form:select path="direction" class="selectpicker select2 form-control">
+	                                        <form:option value=""><spring:message code="select"/></form:option>
+	                                        <c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="dict">
+											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
+								             </c:forEach>
+	                                    	</form:select>
+										</div>
+									</div>
+									</div>
+									<div class="row">
+									<div class="col-md-2">
+									<div class="form-group">
 										<label><spring:message code="cfg_id"></spring:message>：</label>
 										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
 									</div>
-								</div>
+									</div>
+									</div>								
 							</div>
 							<!-- /筛选搜索内容栏    结束-->
 						</form:form>
diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
index 9e30384d1..f0d517639 100644
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -138,30 +138,6 @@
 						<!-- 筛选搜索内容栏默认隐藏-->
 						<div class="col-md-12 filter-action-select-panle hide" >
 							<div class="row">
-								<div class="col-md-2">
-									<div class="form-group">
-                                		<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
-                                       	<form:select path="transProto" class="selectpicker form-control">
-											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
-												<form:option value="${protocol.itemCode}"><spring:message code="${protocol.itemValue}"></spring:message></form:option>
-											</c:forEach>
-										</form:select>
-									</div>
-                                </div>
-                                   
-								<div class="col-md-2">
-									<div class="form-group">
-                                		<label class="control-label"><spring:message code="direction"/>：</label>
-                                       	<form:select path="direction" class="selectpicker form-control">
-											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
-												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
-											</c:forEach>
-										</form:select>
-									</div>
-                                </div>
-								
 								<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -180,26 +156,48 @@
 										<input name="capIp" type="text" class="form-control" value="${log.capIp }"/>
 									</div>
 								</div>
-								
 								<div class="col-md-2">
 									<div class="form-group">
-										<label><spring:message code="clientip"></spring:message>：</label>
-										<input name="sIp" type="text" class="form-control" value="${log.sIp }"/>
+                                		<label class="control-label"><spring:message code='transport_layer_protocol'/>：</label>
+                                       	<form:select path="transProto" class="selectpicker form-control">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="protocol" >
+												<form:option value="${protocol.itemCode}"><spring:message code="${protocol.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
 									</div>
-								</div>
-								
+                                </div>
 								<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="serverip"></spring:message>：</label>
 										<input name="dIp" type="text" class="form-control" value="${log.dIp }"/>
 									</div>
 								</div>
+								<div class="col-md-2">
+									<div class="form-group">
+										<label><spring:message code="clientip"></spring:message>：</label>
+										<input name="sIp" type="text" class="form-control" value="${log.sIp }"/>
+									</div>
+								</div>
+								<div class="col-md-2">
+									<div class="form-group">
+                                		<label class="control-label"><spring:message code="direction"/>：</label>
+                                       	<form:select path="direction" class="selectpicker form-control">
+											<form:option value=""><spring:message code="select"/></form:option>
+											<c:forEach items="${fns:getDictList('LOG_DIRECTION')}" var="direction" >
+												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
+											</c:forEach>
+										</form:select>
+									</div>
+                                </div>
 							</div>
 							<div class="row">
 								<div class="col-md-2">
+								<div class="form-group">
 										<label><spring:message code="cfg_id"></spring:message>：</label>
 										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
 								</div>
+								</div>
 								<div class="col-md-4">
 									<div class="form-group">
 										<label>URL：</label>
@@ -272,6 +270,8 @@
 								<th class="sort-column d_subscribe_id" isVisible="false" column="d_subscribe_id" ><spring:message code='d_subscribe_id'/></th>
 								<%-- <th class="sort-column user_region" isVisible="false" column="user_region" ><spring:message code='user_region'/></th> --%>
 								<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column scene_file" column="scene_file" ><spring:message code='scene_file'/></th></c:if>
+                                <c:if test="${fns:getUser().isAdmin()}"><th class="sort-column req_body" column="req_body" ><spring:message code='req_body'/></th></c:if>
+								<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column resp_body" column="resp_body" ><spring:message code='resp_body'/></th></c:if>								
 							</tr>
 						</thead>
 						<tbody>