From e08208077241fc5fc634e67f573aa52cd19765f5 Mon Sep 17 00:00:00 2001
From: chenjinsong <chenjinsong@intranet.com>
Date: Thu, 2 Aug 2018 20:41:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8A=E6=97=A5=E6=8F=90=E5=87=BA=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=92=8Cbug=E7=9A=84=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=9A=201.action=E5=AD=97=E5=85=B8=202.=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=97=E6=98=BE=E7=A4=BA=E8=A7=84=E5=88=99=EF=BC=8C=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AEId=EF=BC=8Caction,=E5=8F=91=E7=8E=B0=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=EF=BC=8Cisp=EF=BC=8C=E7=A7=81=E6=9C=89=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8C=E5=85=AC=E6=9C=89=E5=AD=97=E6=AE=B5=EF=BC=88=E5=85=AC?=
 =?UTF-8?q?=E6=9C=89=E5=AD=97=E6=AE=B5=E9=A1=BA=E5=BA=8F=E4=BF=9D=E6=8C=81?=
 =?UTF-8?q?=E4=B8=80=E8=87=B4=EF=BC=89=203.=E9=9F=B3=E8=A7=86=E9=A2=91?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=EF=BC=9A=E5=85=AC=E5=85=B1=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=9A=84Device,Direction,Nested=20address=20list=EF=BC=8C?=
 =?UTF-8?q?=E7=A7=81=E6=9C=89=E5=AD=97=E6=AE=B5av=5Fprotocol=EF=BC=8CFrom?=
 =?UTF-8?q?=20To=20Store=20IP,From=20To=20Store=20URL,To=20From=20Store=20?=
 =?UTF-8?q?IP=EF=BC=8CTo=20From=20Store=20URL=EF=BC=8C=E5=9C=A8=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=B3=A8=E9=87=8A=E6=8E=89=204.=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=9A=84=E5=85=AC=E5=85=B1=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=8CNested=20address=20list=E6=B3=A8=E9=87=8A=E6=8E=89=205?=
 =?UTF-8?q?.DNS=E6=97=A5=E5=BF=97=E7=9A=84=E7=A7=81=E6=9C=89=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E9=99=A4=E4=BA=86Qname=EF=BC=8C=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E6=B3=A8=E9=87=8A=E6=8E=89=206.proxy=E7=9A=84?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=EF=BC=8Curl=E6=94=BE=E5=88=B0isp=E5=90=8E?=
 =?UTF-8?q?=E9=9D=A2=207.=E6=97=A5=E5=BF=97=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=AF=A6=E6=83=85=E6=9F=A5=E7=9C=8B=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=208.=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=90=8D=E5=92=8C=E5=88=97=E5=90=8D=E4=BF=9D=E6=8C=81=E4=B8=80?=
 =?UTF-8?q?=E8=87=B4=20=20entrance=E3=80=81protocol=209.=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AEentranceId=E4=BB=8E=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=8F=96=2010.dns=E7=BF=BB=E8=AF=91=EF=BC=9Aqtype=E3=80=81qcla?=
 =?UTF-8?q?ss=E3=80=81opcode=E3=80=81cname=E5=85=A8=E5=A4=A7=E5=86=99?=
 =?UTF-8?q?=EF=BC=8CRecursion=20Desired=20->=20Recursion=20Desured?=
 =?UTF-8?q?=EF=BC=9BAvailable=20Recursion=20->=20Recursion=20Available=201?=
 =?UTF-8?q?1.=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E4=B8=AD=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/nis/web/test/LogTest.java   |  2 +
 .../resources/messages/message_en.properties  |  6 +--
 .../webapp/WEB-INF/views/log/ntc/dnsList.jsp  | 34 +++++++++-------
 .../webapp/WEB-INF/views/log/ntc/httpList.jsp | 18 ++++++---
 .../webapp/WEB-INF/views/log/ntc/ipList.jsp   | 14 +++++--
 .../views/log/ntc/mmPornAudioSampleList.jsp   | 39 ++++++++++++-------
 .../views/log/ntc/mmPornVideoSampleList.jsp   | 37 +++++++++++-------
 .../views/log/ntc/mmSampleVoipList.jsp        | 33 ++++++++++------
 .../WEB-INF/views/log/pxy/pxyHttpList.jsp     | 22 +++++++----
 9 files changed, 135 insertions(+), 70 deletions(-)

diff --git a/src/main/java/com/nis/web/test/LogTest.java b/src/main/java/com/nis/web/test/LogTest.java
index 319baa456..d9e18bfce 100644
--- a/src/main/java/com/nis/web/test/LogTest.java
+++ b/src/main/java/com/nis/web/test/LogTest.java
@@ -2,6 +2,7 @@ package com.nis.web.test;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -48,6 +49,7 @@ public class LogTest {
 		
 		Page<NtcIpLog> data = fromJson.getData();
 		System.out.println(data.getPageNo());
+		List<NtcIpLog> list = data.getList();
 		NtcIpLog object = data.getList().get(0);
 		System.out.print(object.getsPort());
 	}
diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index c1a5fb867..a3e7e7a16 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -582,11 +582,11 @@ sample_sign=Sample Sign
 click_detail=Please click the "view details" button to send the detailed error message to the system Management clerk. Thank you!
 return_lastpage=Return to the last page
 show_detail=View details
-hidden_detail=\u9690\u85CF\u4FE1\u606F\u4FE1\u606F
+hidden_detail=Hide detail
 notfound_page=Page does not exist
 no_permission=Lack of authority
-param_error=\u53C2\u6570\u6709\u8BEF,\u670D\u52A1\u5668\u65E0\u6CD5\u89E3\u6790.
-request_service_failed=\u8BF7\u6C42\u670D\u52A1\u63A5\u53E3\u5931\u8D25
+param_error=Param error,server can't analyze
+request_service_failed=Request server failed
 request_error=Request Error
 av_voip_ip_title=Voip Ip
 av_voip_account_title=Voip Account
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
index 3cf0782b1..93a1db32e 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
@@ -169,19 +169,19 @@
 								<th><spring:message code='cfg_id'/></th>
 								<th><spring:message code="action"/></th>
 								<th><spring:message code="found_time"/></th>
-								<th><spring:message code="entrance_id"/></th>
+								<th><spring:message code="entrance"/></th>
 								
-								<%-- <th>ip<spring:message code="type"/></th> --%>
+								<%-- <th>ip<spring:message code="type"/></th>
 								<th><spring:message code="qr"/></th>
 								<th><spring:message code="rd"/></th>
 								<th><spring:message code="ra"/></th>
 								<th><spring:message code="rr"/></th>
 								<th><spring:message code="qtype"/></th>
 								<th><spring:message code="qclass"/></th>
-								<th><spring:message code="opcode"/></th>
+								<th><spring:message code="opcode"/></th> --%>
 								<th><spring:message code="qname"/></th>
-								<th><spring:message code="cname"/></th>
-								<%-- <th><spring:message code="dns_sub"/></th> --%>
+								<%-- <th><spring:message code="cname"/></th>
+								<th><spring:message code="dns_sub"/></th> --%>
 								
 								<th><spring:message code="clj_ip"/></th>
 								<th><spring:message code="protocol"/></th>
@@ -193,7 +193,7 @@
 								<th><spring:message code="deviceid"/></th>
 								<th><spring:message code="direction"/></th>
 								<th><spring:message code="stream_type"/></th>
-								<th><spring:message code="nest_addr_list"/></th>
+								<%-- <th><spring:message code="nest_addr_list"/></th> --%>
 								<th><spring:message code='server_locate'/></th>
 								<th><spring:message code='client_locate'/></th>
 							</tr>
@@ -201,7 +201,9 @@
 						<tbody>
 							<c:forEach var="_log" items="${page.list }">
 								<tr>
-									<td>${_log.cfgId }</td>
+									<td>${_log.cfgId }
+										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
 											<c:if test="${dict.itemCode eq _log.action}">
@@ -210,13 +212,19 @@
 										</c:forEach>
 									</td>
 									<td>${_log.foundTime }</td>
-									<td>${_log.entranceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">
+											<c:if test="${dic.itemCode eq _log.entranceId}">
+												<spring:message code="${dic.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									
 									<%-- <td>
 										<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
 											<c:if test="${ipType.itemCode eq _log.addrType}">${ipType.itemValue}</c:if>
 					                	</c:forEach>
-				                    </td> --%>
+				                    </td>
 									<td>
 										<c:forEach items="${fns:getDictList('DNS_QR')}" var="qr">
 											<c:if test="${qr.itemCode eq _log.qr}"><spring:message code="${qr.itemValue}"/></c:if>
@@ -245,10 +253,10 @@
 										<c:forEach items="${fns:getDictList('DNS_OPCODE')}" var="opcode">
 											<c:if test="${opcode.itemCode eq _log.opcode}">${opcode.itemValue}</c:if>
 					                	</c:forEach>
-									</td>
+									</td> --%>
 									<td title="${_log.qname }">${fns:abbr(_log.qname, 30)}</td>
-									<td>${_log.cname }</td>
-									<%-- <td>${_log.dnsSub }</td> --%>
+									<%-- <td>${_log.cname }</td>
+									<td>${_log.dnsSub }</td> --%>
 									
 									<td>${_log.capIp }</td>
 									<td>${_log.transProto }</td>
@@ -276,7 +284,7 @@
 											<c:if test="${streamType.itemCode eq _log.streamDir}">${streamType.itemValue}</c:if>
 					                	</c:forEach>
 									</td>
-									<td>${_log.addrList }</td>
+									<%-- <td>${_log.addrList }</td> --%>
 									<td title="${_log.serverLocate}">${fns:abbr(_log.serverLocate,20)}</td>
 									<td title="${_log.clientLocate}">${fns:abbr(_log.clientLocate,20)}</td>
 								</tr>
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 e559c3c67..c8c0e7533 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
@@ -170,7 +170,7 @@
 								<th><spring:message code='cfg_id'/></th>
 								<th><spring:message code="action"/></th>
 								<th><spring:message code="found_time"/></th>
-								<th><spring:message code="entrance_id"/></th>
+								<th><spring:message code="entrance"/></th>
 								
 								<th>URL</th>
 								<th><spring:message code="req_hdr_file"/></th>
@@ -188,7 +188,7 @@
 								<th><spring:message code="deviceid"/></th>
 								<th><spring:message code="direction"/></th>
 								<th><spring:message code="stream_type"/></th>
-								<th><spring:message code="nest_addr_list"/></th>
+								<%-- <th><spring:message code="nest_addr_list"/></th> --%>
 								<th><spring:message code='server_locate'/></th>
 								<th><spring:message code='client_locate'/></th>
 							</tr>
@@ -196,7 +196,9 @@
 						<tbody>
 							<c:forEach var="_log" items="${page.list }">
 								<tr>
-									<td>${_log.cfgId }</td>
+									<td>${_log.cfgId }
+										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
+									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
 											<c:if test="${dict.itemCode eq _log.action}">
@@ -205,7 +207,13 @@
 										</c:forEach>
 									</td>
 									<td>${_log.foundTime }</td>
-									<td>${_log.entranceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">
+											<c:if test="${dic.itemCode eq _log.entranceId}">
+												<spring:message code="${dic.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									
 									<td title="${_log.url }">${fns:abbr(_log.url, 30)}</td>
 									<td>${_log.reqHdrFile}</td>
@@ -239,7 +247,7 @@
 											<c:if test="${streamType.itemCode eq _log.streamDir}">${streamType.itemValue}</c:if>
 					                	</c:forEach>
 									</td>
-									<td>${_log.addrList }</td>
+									<%-- <td>${_log.addrList }</td> --%>
 									<td title="${_log.serverLocate}">${fns:abbr(_log.serverLocate,20)}</td>
 									<td title="${_log.clientLocate}">${fns:abbr(_log.clientLocate,20)}</td>
 								</tr>
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 bcfac6e3e..72d011fab 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
@@ -161,7 +161,7 @@
 								<th><spring:message code="cfg_id"/></th>
 								<th><spring:message code="action"/></th>
 								<th><spring:message code="found_time"/></th>
-								<th><spring:message code="entrance_id"/></th>
+								<th><spring:message code="entrance"/></th>
 								<th><spring:message code="clj_ip"/></th>
 								<th><spring:message code="protocol"/></th>
 								<th><spring:message code='addr_type'/></th>
@@ -172,7 +172,7 @@
 								<th><spring:message code="deviceid"/></th>
 								<th><spring:message code="direction"/></th>
 								<th><spring:message code="stream_type"/></th>
-								<th><spring:message code="nest_addr_list"/></th>
+								<%-- <th><spring:message code="nest_addr_list"/></th> --%>
 								<th><spring:message code='server_locate'/></th>
 								<th><spring:message code='client_locate'/></th>
 							</tr>
@@ -191,7 +191,13 @@
 										</c:forEach>
 									</td>
 									<td>${_log.foundTime }</td>
-									<td>${_log.entranceId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">
+											<c:if test="${dic.itemCode eq _log.entranceId}">
+												<spring:message code="${dic.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									<td>${_log.capIp }</td>
 									<td>${_log.transProto }</td>
 									<td>
@@ -218,7 +224,7 @@
 											<c:if test="${streamType.itemCode eq _log.streamDir}">${streamType.itemValue}</c:if>
 					                	</c:forEach>
 									</td>
-									<td>${_log.addrList }</td>
+									<%-- <td>${_log.addrList }</td> --%>
 									<td title="${_log.serverLocate}">${fns:abbr(_log.serverLocate,20)}</td>
 									<td title="${_log.clientLocate}">${fns:abbr(_log.clientLocate,20)}</td>
 								</tr>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
index 80579c675..4eeec1f21 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
@@ -172,7 +172,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id'/></th>
 									<th><spring:message code="action"/></th>
 									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='pid'/></th>
 									<th><spring:message code='access_url'/></th>
@@ -180,7 +180,7 @@ $(document).ready(function(){
 									<th><spring:message code='refer'/></th>
 									<th><spring:message code='harm_level'/></th>
 									<th><spring:message code='fd_type'/></th>
-									<th><spring:message code='av_protocol'/></th>
+									<%-- <th><spring:message code='av_protocol'/></th> --%>
 									
 									<th><spring:message code='clj_ip'/></th>
 									<th><spring:message code='protocol'/></th>
@@ -189,10 +189,10 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
-									<th><spring:message code='deviceid'/></th>
-									<th><spring:message code='direct'/></th>
+									<%-- <th><spring:message code='deviceid'/></th>
+									<th><spring:message code='direct'/></th> --%>
 									<th><spring:message code='stream_type'/></th>
-									<th><spring:message code='nest_addr_list'/></th>
+									<%-- <th><spring:message code='nest_addr_list'/></th> --%>
 									<th><spring:message code='server_locate'/></th>
 									<th><spring:message code='client_locate'/></th>
 								</tr>
@@ -200,13 +200,24 @@ $(document).ready(function(){
 							<tbody>
 							<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 								<tr>
-									<td>${log.cfgId}<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a></td> 
-									<td>
-										<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
-										<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
+									<td>${log.cfgId}
+										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
 									</td>
+									<td>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+											<c:if test="${dict.itemCode eq log.action}">
+												<spring:message code="${dict.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td> 
 									<td>${log.foundTime}</td>
-									<td>${log.entranceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">
+											<c:if test="${dic.itemCode eq _log.entranceId}">
+												<spring:message code="${dic.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									
 									<td>${log.pid}</td>
 									<td>
@@ -243,7 +254,7 @@ $(document).ready(function(){
 										<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block"/></c:if>
 										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
 									</td>
-									<td>${log.protocol}</td>
+									<%-- <td>${log.protocol}</td> --%>
 									
 									<td>${log.capIp}</td>
 									<td>${log.transProto}</td>
@@ -256,18 +267,18 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<%-- <td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
-									</td>
+									</td> --%>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
 											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
-									<td title="${fns:escapeHtml(log.addrList)}">${fns:stringFormat(log.addrList,30)}</td>
+									<%-- <td title="${fns:escapeHtml(log.addrList)}">${fns:stringFormat(log.addrList,30)}</td> --%>
 									<td>${log.serverLocate}</td>
 									<td>${log.clientLocate}</td>
 								</tr>
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 41d68658b..2553ce93f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
@@ -172,7 +172,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id'/></th>
 									<th><spring:message code="action"/></th>
 									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='pid'/></th>
 									<th><spring:message code='access_url'/></th>
@@ -180,7 +180,7 @@ $(document).ready(function(){
 									<th><spring:message code='refer'/></th>
 									<th><spring:message code='harm_level'/></th>
 									<th><spring:message code='fd_type'/></th>
-									<th><spring:message code='av_protocol'/></th>
+									<%-- <th><spring:message code='av_protocol'/></th> --%>
 									
 									<th><spring:message code='clj_ip'/></th>
 									<th><spring:message code='protocol'/></th>
@@ -189,10 +189,10 @@ $(document).ready(function(){
 									<th><spring:message code='clientip'/></th>
 									<th><spring:message code='serverport'/></th>
 									<th><spring:message code='clientport'/></th>
-									<th><spring:message code='deviceid'/></th>
-									<th><spring:message code='direct'/></th>
+									<%-- <th><spring:message code='deviceid'/></th>
+									<th><spring:message code='direct'/></th> --%>
 									<th><spring:message code='stream_type'/></th>
-									<th><spring:message code='nest_addr_list'/></th>
+									<%-- <th><spring:message code='nest_addr_list'/></th> --%>
 									<th><spring:message code='server_locate'/></th>
 									<th><spring:message code='client_locate'/></th>
 								</tr>
@@ -200,13 +200,24 @@ $(document).ready(function(){
 							<tbody>
 							<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 								<tr>
-									<td>${log.cfgId}<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a></td> 
+									<td>${log.cfgId}
+										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
+									</td> 
 									<td>
-										<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
-										<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+											<c:if test="${dict.itemCode eq log.action}">
+												<spring:message code="${dict.itemValue}"/>
+											</c:if>
+										</c:forEach>
 									</td>
 									<td>${log.foundTime}</td>
-									<td>${log.entranceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">
+											<c:if test="${dic.itemCode eq _log.entranceId}">
+												<spring:message code="${dic.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									
 									<td>${log.pid}</td>
 									<td>
@@ -243,7 +254,7 @@ $(document).ready(function(){
 										<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block"/></c:if>
 										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
 									</td>
-									<td>${log.protocol}</td>
+									<%-- <td>${log.protocol}</td> --%>
 									
 									<td>${log.capIp}</td>
 									<td>${log.transProto}</td>
@@ -256,18 +267,18 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<%-- <td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
-									</td>
+									</td> --%>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
 											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
-									<td title="${fns:escapeHtml(log.addrList)}">${fns:stringFormat(log.addrList,30)}</td>
+									<%-- <td title="${fns:escapeHtml(log.addrList)}">${fns:stringFormat(log.addrList,30)}</td> --%>
 									<td>${log.serverLocate}</td>
 									<td>${log.clientLocate}</td>
 								</tr>
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 af12c96e6..054cbbaa4 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
@@ -172,7 +172,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id'/></th>
 									<th><spring:message code="action"/></th>
 									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='duation'/></th>
 									<th><spring:message code='voip_protocol'/></th>
@@ -199,7 +199,7 @@ $(document).ready(function(){
 									<th><spring:message code='deviceid'/></th>
 									<th><spring:message code='direct'/></th>
 									<th><spring:message code='stream_type'/></th>
-									<th><spring:message code='nest_addr_list'/></th>
+									<%-- <th><spring:message code='nest_addr_list'/></th> --%>
 									<th><spring:message code='server_locate'/></th>
 									<th><spring:message code='client_locate'/></th>
 								</tr>
@@ -207,13 +207,24 @@ $(document).ready(function(){
 							<tbody>
 							<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 								<tr>
-									<td>${log.cfgId}<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a></td> 
+									<td>${log.cfgId}
+										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
+									</td> 
 									<td>
-										<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
-										<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+											<c:if test="${dict.itemCode eq log.action}">
+												<spring:message code="${dict.itemValue}"/>
+											</c:if>
+										</c:forEach>
 									</td>
 									<td>${log.foundTime}</td>
-									<td>${log.entranceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">
+											<c:if test="${dic.itemCode eq _log.entranceId}">
+												<spring:message code="${dic.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									
 									<td>${log.duation}</td>
 									<td>${log.voipProtocol}</td>
@@ -221,10 +232,10 @@ $(document).ready(function(){
 									<td title="${fns:escapeHtml(log.calledAccount)}">${fn:substring(log.calledAccount,0,30) }</td>
 									<td title="${fns:escapeHtml(log.callingNumber)}">${fn:substring(log.callingNumber,0,30) }</td>
 									<td title="${fns:escapeHtml(log.calledNumber)}">${fn:substring(log.calledNumber,0,30) }</td>
-									<td>${log.fromToStoreIp}</td>
+									<%-- <td>${log.fromToStoreIp}</td>
 									<td title="${fns:escapeHtml(log.fromToStoreUrl)}">${fn:substring(log.fromToStoreUrl,0,30) }</td>
 									<td>${log.toFromStoreIp}</td>
-									<td title="${fns:escapeHtml(log.toFromStoreUrl)}">${fn:substring(log.toFromStoreUrl,0,30) }</td>
+									<td title="${fns:escapeHtml(log.toFromStoreUrl)}">${fn:substring(log.toFromStoreUrl,0,30) }</td> --%>
 									<td>${log.pid}</td>
 									<td>
 										<c:if test="${fn:startsWith(log.logUri, 'http')}">
@@ -256,18 +267,18 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<%-- <td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
-									</td>
+									</td> --%>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
 											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
-									<td title="${fns:escapeHtml(log.addrList)}">${fns:stringFormat(log.addrList,30)}</td>
+									<%-- <td title="${fns:escapeHtml(log.addrList)}">${fns:stringFormat(log.addrList,30)}</td> --%>
 									<td>${log.serverLocate}</td>
 									<td>${log.clientLocate}</td>
 								</tr>
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 a7c583de0..e0390a421 100644
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -150,18 +150,18 @@
 							<tr>
 								<th><spring:message code="cfg_id"/></th>
 								<th><spring:message code="found_time"/></th>
-								<th><spring:message code="entrance_id"/></th>
+								<th><spring:message code="entrance"/></th>
+								<th>URL</th>
 								<th><spring:message code="clj_ip"/></th>
 								<th><spring:message code="protocol"/></th>
 								<th><spring:message code="server_ip"/></th>
 								<th><spring:message code="client_ip"/></th>
 								<th><spring:message code="server_port"/></th>
 								<th><spring:message code="client_port"/></th>
-								<th>url</th>
 								<th><spring:message code="deviceid"/></th>
 								<th><spring:message code="direction"/></th>
 								<th><spring:message code="stream_type"/></th>
-								<th><spring:message code="nest_addr_list"/></th>
+								<%-- <th><spring:message code="nest_addr_list"/></th> --%>
 								<th><spring:message code='server_locate'/></th>
 								<th><spring:message code='client_locate'/></th>
 							</tr>
@@ -169,16 +169,24 @@
 						<tbody>
 							<c:forEach var="_log" items="${page.list }" varStatus="status">
 								<tr>
-									<td>${_log.cfgId }</td>
+									<td>${_log.cfgId }
+										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
+									</td>
 									<td>${_log.foundTime }</td>
-									<td>${_log.entranceId }</td>
+									<td>
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dic">
+											<c:if test="${dic.itemCode eq _log.entranceId}">
+												<spring:message code="${dic.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
+									<td title="${fns:escapeHtml(_log.url)}">${fns:stringFormat(_log.url,30)}</td>
 									<td>${_log.capIp }</td>
 									<td>${_log.transProto }</td>
 									<td>${_log.dIp }</td>
 									<td>${_log.sIp }</td>
 									<td>${_log.dPort }</td>
 									<td>${_log.sPort }</td>
-									<td title="${fns:escapeHtml(_log.url)}">${fns:stringFormat(_log.url,30)}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DEVICE')}" var="device">
 											<c:if test="${device.itemCode eq _log.deviceId}"><spring:message code="${device.itemValue}"/></c:if>
@@ -194,7 +202,7 @@
 											<c:if test="${streamType.itemCode eq _log.streamDir}">${streamType.itemValue}</c:if>
 					                	</c:forEach>
 									</td>
-									<td title="${fns:escapeHtml(_log.addrList)}">${fns:stringFormat(_log.addrList,30)}</td>
+									<%-- <td title="${fns:escapeHtml(_log.addrList)}">${fns:stringFormat(_log.addrList,30)}</td> --%>
 									<td title="${_log.serverLocate}">${fns:abbr(_log.serverLocate,20)}</td>
 									<td title="${_log.clientLocate}">${fns:abbr(_log.clientLocate,20)}</td>
 								</tr>