From 25d8f5450b470381d10f8e99f0f3323a42ed54e7 Mon Sep 17 00:00:00 2001
From: DuanDongmei <DuanDongmei@192.168.11.156>
Date: Sun, 9 Dec 2018 14:06:56 +0800
Subject: [PATCH] =?UTF-8?q?https=E6=97=A5=E5=BF=97=E7=8E=B0=E5=9C=BA?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=94=B9=E4=B8=BAadmin=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=EF=BC=8Cvoip=E7=9A=84=E6=97=A5=E5=BF=97title?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E7=94=B1av=5Fvoip=5Fip=5Fcontrol?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BAav=5Fvoip=5Fcontrol?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp | 2 +-
 src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
index e42debdd4..0c3351681 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -73,7 +73,7 @@ $(document).ready(function(){
 	<div class="theme-panel hidden-xs hidden-sm">
 	</div>
 	<h3 class="page-title">
-	<spring:message code="av_voip_ip_control"/>
+	<spring:message code="av_voip_control"/>
 	</h3>
 	
 	<h5 class="page-header"></h5>
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 fd2e0d09f..423eadf85 100644
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -205,8 +205,10 @@
 								<th class="sort-column entrance_id" isVisible="false"><spring:message code="entrance_id"/></th>
 								
 								<th class="sort-column url"> URL  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
+								<c:if test="${fns:getUser().isAdmin()}">
 								<th class="sort-column req_line"><spring:message code="req_line"/></th>
 								<th class="sort-column res_line"><spring:message code="res_line"/></th>
+								</c:if>
 								<th class="sort-column cookie"><spring:message code="cookie"/></th>
 								<th class="sort-column referer"><spring:message code="referer"/></th>
 								<th class="sort-column user_agent"><spring:message code="user_agent"/></th>
@@ -284,8 +286,10 @@
 													http://${log.url}
 												</c:if> --%>
 								</td>
+								<c:if test="${fns:getUser().isAdmin()}">
 								<td>${log.reqLine }</td>
 								<td>${log.resLine }</td>
+								</c:if>
 								<td>${log.cookie }</td>
 								<td>${log.referer }</td>
 								<td>${log.userAgent }</td>