From 3d35fd56f6006349098344b7cd01b6533055135e Mon Sep 17 00:00:00 2001
From: dongxiaoyan <dongxiaoyan@192.168.11.154>
Date: Sun, 6 Jan 2019 19:35:49 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9logs=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E3=80=81=E6=8D=A2=E8=A1=8C=E5=AF=B9=E9=BD=90=E3=80=81=E7=81=AB?=
 =?UTF-8?q?=E7=8B=90=E5=A2=9E=E5=87=8F=E8=8F=9C=E5=8D=95=E5=88=97=E5=A4=B4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=81http=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=B1=9E=E6=80=A7=E9=97=AE=E9=A2=98=EF=BC=9B=202?=
 =?UTF-8?q?=E3=80=81=E9=BD=BF=E8=BD=AE=E9=A6=96=E9=A1=B5=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E9=97=AE=E9=A2=98=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E7=AC=94=E8=AE=B0=E6=9C=AC1920*1080?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/dynamicpage/dynamicIndex.jsp        |   3 +-
 .../views/dynamicpage/dynamicIndex.jsp.bak    |   2 +-
 .../views/log/ntc/connRecordLogList.jsp       |  16 +-
 .../webapp/WEB-INF/views/log/ntc/httpList.jsp | 157 +++++++++---------
 .../webapp/WEB-INF/views/log/ntc/ipList.jsp   |   6 +-
 .../WEB-INF/views/log/ntc/openVpnList.jsp     |   6 +-
 .../WEB-INF/views/log/pxy/pxyHttpList.jsp     |   6 +-
 7 files changed, 104 insertions(+), 92 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp b/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp
index db097ec39..3e9757b32 100644
--- a/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp
@@ -268,7 +268,8 @@
 				font-size:18px;
 				color:#ffffff;
 				position: relative;
-				top: 2.45%;
+				/*top: 2.45%;*/				
+				top: 2.95%;
     			left: 33%;
     			font-size: 24px;
 			}
diff --git a/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp.bak b/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp.bak
index b892bffc8..1634c9831 100644
--- a/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp.bak
+++ b/src/main/webapp/WEB-INF/views/dynamicpage/dynamicIndex.jsp.bak
@@ -268,7 +268,7 @@
 				font-size:18px;
 				color:#ffffff;
 				position: relative;
-				top: 2.45%;
+				top: 2.95%;
     			left: 33%;
     			font-size: 24px;
 			}
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
index 829682acf..58cb96daf 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
@@ -226,15 +226,6 @@
 										</form:select>
 									</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">
@@ -243,6 +234,13 @@
 									</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>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
index a8b7f6873..e9a15517f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
@@ -163,29 +163,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">
@@ -208,10 +185,15 @@
 								
 								<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">
@@ -219,21 +201,41 @@
 										<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>
 										<input name="url" type="text" class="form-control" value="${log.url }"/>
 									</div>
 								</div>
-								<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-2">
 									<div class="form-group">
@@ -260,17 +262,19 @@
 								<th class="sort-column recv_time" isVisible="false" column="recv_time"><spring:message code="recv_time"/></th>
 								<th class="sort-column entrance_id" isVisible="false" column="entrance_id"><spring:message code="entrance_id"/></th>
 								
-								 <th class="sort-column url"  column="URL">  URL  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th> 
+								 <th class="sort-column url"  column="URL">  URL </th> 
 								<c:if test="${fns:getUser().isAdmin()}">
 									<th class="sort-column req_hdr_key" isVisible="false" column="req_hdr_key"><spring:message code="req_hdr_key"/></th>
 									<th class="sort-column req_hdr_file" column="req_hdr_file"><spring:message code="req_hdr_file"/></th>
 									<th class="sort-column req_body_key" isVisible="false" column="req_body_key"><spring:message code="req_body_key"/></th>
-									<th class="sort-column req_body_file" column="req_body_file"><spring:message code="req_body_file"/></th>
+								</c:if>								
+									<th class="sort-column req_body_file" isVisible="false" column="req_body_file"><spring:message code="req_body_file"/></th>
+								<c:if test="${fns:getUser().isAdmin()}">
 									<th class="sort-column res_hdr_key" isVisible="false" column="res_hdr_key"><spring:message code="res_hdr_key"/></th>
 									<th class="sort-column res_hdr_file" column="res_hdr_file"><spring:message code="res_hdr_file"/></th>
-									<th class="sort-column res_body_key" isVisible="false" column="res_body_key"><spring:message code="res_body_key"/></th>
-									<th class="sort-column res_body_file" column="res_body_file"><spring:message code="res_body_file"/></th>
+									<th class="sort-column res_body_key" isVisible="false" column="res_body_key"><spring:message code="res_body_key"/></th>								
 								</c:if>
+									<th class="sort-column res_body_file" isVisible="false" column="res_body_file"><spring:message code="res_body_file"/></th>
 								<th class="sort-column website" column="website"><spring:message code="website"/></th>
 
 								<th class="sort-column cap_ip" isVisible="false" column="clj_ip"><spring:message code="clj_ip"/></th>
@@ -340,52 +344,55 @@
 												</c:if> --%>
 									</td>
 									<c:if test="${fns:getUser().isAdmin()}">
-									<td>${log.reqHdrKey }</td>
-									<td>
-										<c:if test="${fn:startsWith(log.reqHdrFile, 'http')}">
-										<a href="${log.reqHdrFile}" data-original-title="${log.reqHdrFile}" target="_blank"
-										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
-											${fn:substring(log.reqHdrFile,0,20) }
-										</a>
-										</c:if>
-										<c:if test="${!fn:startsWith(log.reqHdrFile, 'http') and !empty log.reqHdrFile}">
-											<a href="http://${log.reqHdrFile}" data-original-title="http://${log.reqHdrFile}" target="_blank"
-										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
-											http://${fn:substring(log.reqHdrFile,0,20) }
-										</a>
-										</c:if>
-									</td>
-									<td>${log.reqBodyKey }</td>
+										<td>${log.reqHdrKey }</td>
+										<td>
+											<c:if test="${fn:startsWith(log.reqHdrFile, 'http')}">
+											<a href="${log.reqHdrFile}" data-original-title="${log.reqHdrFile}" target="_blank"
+											 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+												${fn:substring(log.reqHdrFile,0,20) }
+											</a>
+											</c:if>
+											<c:if test="${!fn:startsWith(log.reqHdrFile, 'http') and !empty log.reqHdrFile}">
+												<a href="http://${log.reqHdrFile}" data-original-title="http://${log.reqHdrFile}" target="_blank"
+											 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+												http://${fn:substring(log.reqHdrFile,0,20) }
+											</a>
+											</c:if>
+										</td>
+										<td>${log.reqBodyKey }</td>									
+									</c:if>	
 									<td>	
-									<c:if test="${fn:startsWith(log.reqBodyFile, 'http')}">
-											<a href="${log.reqBodyFile}" data-original-title="${log.reqBodyFile}" target="_blank"
-										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
-											${fn:substring(log.reqBodyFile,0,20) }
-										</a>
-									</c:if>
+										<c:if test="${fn:startsWith(log.reqBodyFile, 'http')}">
+												<a href="${log.reqBodyFile}" data-original-title="${log.reqBodyFile}" target="_blank"
+											 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+												${fn:substring(log.reqBodyFile,0,20) }
+											</a>
+										</c:if>	
 									<c:if test="${!fn:startsWith(log.reqBodyFile, 'http') and !empty log.reqBodyFile}">
 											<a href="http://${log.reqBodyFile}" data-original-title="http://${log.reqBodyFile}" target="_blank"
 										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
 											http://${fn:substring(log.reqBodyFile,0,20) }
 										</a>
 									</c:if>
-									</td>
-									<td>${log.resHdrKey }</td>
-									<td>
-									<c:if test="${fn:startsWith(log.resHdrFile, 'http')}">
-											<a href="${log.resHdrFile}" data-original-title="${log.resHdrFile}" target="_blank"
-										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
-											${fn:substring(log.resHdrFile,0,20) }
-										</a>
+									</td>																	
+									<c:if test="${fns:getUser().isAdmin()}">
+										<td>${log.resHdrKey }</td>
+										<td>
+										<c:if test="${fn:startsWith(log.resHdrFile, 'http')}">
+												<a href="${log.resHdrFile}" data-original-title="${log.resHdrFile}" target="_blank"
+											 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+												${fn:substring(log.resHdrFile,0,20) }
+											</a>
+										</c:if>
+										<c:if test="${!fn:startsWith(log.resHdrFile, 'http') and !empty log.resHdrFile}">
+											<a href="http://${log.resHdrFile}" data-original-title="http://${log.resHdrFile}" target="_blank"
+											 class="tooltips" data-flag="false" data-html="true" data-placement="top">
+												http://${fn:substring(log.resHdrFile,0,20) }
+											</a>
+										</c:if>
+										</td>
+										<td>${log.resBodyKey }</td>
 									</c:if>
-									<c:if test="${!fn:startsWith(log.resHdrFile, 'http') and !empty log.resHdrFile}">
-										<a href="http://${log.resHdrFile}" data-original-title="http://${log.resHdrFile}" target="_blank"
-										 class="tooltips" data-flag="false" data-html="true" data-placement="top">
-											http://${fn:substring(log.resHdrFile,0,20) }
-										</a>
-									</c:if>
-									</td>
-									<td>${log.resBodyKey }</td>
 									<td>
 									<c:if test="${fn:startsWith(log.resBodyFile, 'http')}">
 											<a href="${log.resBodyFile}" data-original-title="${log.resBodyFile}" target="_blank"
@@ -399,7 +406,7 @@
 											http://${fn:substring(log.resBodyFile,0,20) }
 										</a>
 									</c:if>
-									</td>  </c:if>
+									</td>
 									<td>${log.website }</td>
 									<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
 									<td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
index 9917e63b2..b7f70f74f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
@@ -212,8 +212,10 @@
 							</div>
 							<div class="row">
 								<div class="col-md-2">
-									<label><spring:message code="cfg_id"></spring:message>：</label>
-									<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+									<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/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
index cfd2f1559..e23b5a067 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -183,8 +183,10 @@ $(document).ready(function(){
 								</div>
 								<div class="row">
 									<div class="col-md-2">
-										<label><spring:message code="cfg_id"></spring:message>：</label>
-										<input name="cfgId" type="text" class="form-control logCfgId number" value="${log.cfgId }"/>
+										<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/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
index f0d517639..054ead867 100644
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -270,8 +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>								
+                                <c:if test="${fns:getUser().isAdmin()}"></c:if><th class="sort-column req_body" isVisible="false" column="req_body" ><spring:message code='req_body'/></th>
+								<c:if test="${fns:getUser().isAdmin()}"></c:if><th class="sort-column resp_body" isVisible="false" column="resp_body" ><spring:message code='resp_body'/></th>							
 							</tr>
 						</thead>
 						<tbody>
@@ -408,6 +408,8 @@
 									<td>${log.dSubscribeId}</td>
 									<%-- <td>${log.userRegion}</td> --%>
 									<c:if test="${fns:getUser().isAdmin()}"><td>${log.sceneFile}</td></c:if>
+									<td>${log.reqBody}</td>
+									<td>${log.resBody}</td>
 								</tr>
 							</c:forEach>
 						</tbody>