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 data = fromJson.getData(); System.out.println(data.getPageNo()); + List 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 @@ - + - <%-- ip --%> + <%-- ip - + --%> - - <%-- --%> + <%-- + --%> @@ -193,7 +193,7 @@ - + <%-- --%> @@ -201,7 +201,9 @@ - ${_log.cfgId } + ${_log.cfgId } + + @@ -210,13 +212,19 @@ ${_log.foundTime } - ${_log.entranceId} + + + + + + + <%-- ${ipType.itemValue} - --%> + @@ -245,10 +253,10 @@ ${opcode.itemValue} - + --%> ${fns:abbr(_log.qname, 30)} - ${_log.cname } - <%-- ${_log.dnsSub } --%> + <%-- ${_log.cname } + ${_log.dnsSub } --%> ${_log.capIp } ${_log.transProto } @@ -276,7 +284,7 @@ ${streamType.itemValue} - ${_log.addrList } + <%-- ${_log.addrList } --%> ${fns:abbr(_log.serverLocate,20)} ${fns:abbr(_log.clientLocate,20)} 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 @@ - + URL @@ -188,7 +188,7 @@ - + <%-- --%> @@ -196,7 +196,9 @@ - ${_log.cfgId } + ${_log.cfgId } + + @@ -205,7 +207,13 @@ ${_log.foundTime } - ${_log.entranceId} + + + + + + + ${fns:abbr(_log.url, 30)} ${_log.reqHdrFile} @@ -239,7 +247,7 @@ ${streamType.itemValue} - ${_log.addrList } + <%-- ${_log.addrList } --%> ${fns:abbr(_log.serverLocate,20)} ${fns:abbr(_log.clientLocate,20)} 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 @@ - + @@ -172,7 +172,7 @@ - + <%-- --%> @@ -191,7 +191,13 @@ ${_log.foundTime } - ${_log.entranceId } + + + + + + + ${_log.capIp } ${_log.transProto } @@ -218,7 +224,7 @@ ${streamType.itemValue} - ${_log.addrList } + <%-- ${_log.addrList } --%> ${fns:abbr(_log.serverLocate,20)} ${fns:abbr(_log.clientLocate,20)} 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(){ - + @@ -180,7 +180,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -189,10 +189,10 @@ $(document).ready(function(){ - - + <%-- + --%> - + <%-- --%> @@ -200,13 +200,24 @@ $(document).ready(function(){ - ${log.cfgId} - - - + ${log.cfgId} + + + + + + + + ${log.foundTime} - ${log.entranceId} + + + + + + + ${log.pid} @@ -243,7 +254,7 @@ $(document).ready(function(){ - ${log.protocol} + <%-- ${log.protocol} --%> ${log.capIp} ${log.transProto} @@ -256,18 +267,18 @@ $(document).ready(function(){ ${log.sIp} ${log.dPort} ${log.sPort} - ${log.deviceId} + <%-- ${log.deviceId} - + --%> - ${fns:stringFormat(log.addrList,30)} + <%-- ${fns:stringFormat(log.addrList,30)} --%> ${log.serverLocate} ${log.clientLocate} 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(){ - + @@ -180,7 +180,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -189,10 +189,10 @@ $(document).ready(function(){ - - + <%-- + --%> - + <%-- --%> @@ -200,13 +200,24 @@ $(document).ready(function(){ - ${log.cfgId} + ${log.cfgId} + + - - + + + + + ${log.foundTime} - ${log.entranceId} + + + + + + + ${log.pid} @@ -243,7 +254,7 @@ $(document).ready(function(){ - ${log.protocol} + <%-- ${log.protocol} --%> ${log.capIp} ${log.transProto} @@ -256,18 +267,18 @@ $(document).ready(function(){ ${log.sIp} ${log.dPort} ${log.sPort} - ${log.deviceId} + <%-- ${log.deviceId} - + --%> - ${fns:stringFormat(log.addrList,30)} + <%-- ${fns:stringFormat(log.addrList,30)} --%> ${log.serverLocate} ${log.clientLocate} 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(){ - + @@ -199,7 +199,7 @@ $(document).ready(function(){ - + <%-- --%> @@ -207,13 +207,24 @@ $(document).ready(function(){ - ${log.cfgId} + ${log.cfgId} + + - - + + + + + ${log.foundTime} - ${log.entranceId} + + + + + + + ${log.duation} ${log.voipProtocol} @@ -221,10 +232,10 @@ $(document).ready(function(){ ${fn:substring(log.calledAccount,0,30) } ${fn:substring(log.callingNumber,0,30) } ${fn:substring(log.calledNumber,0,30) } - ${log.fromToStoreIp} + <%-- ${log.fromToStoreIp} ${fn:substring(log.fromToStoreUrl,0,30) } ${log.toFromStoreIp} - ${fn:substring(log.toFromStoreUrl,0,30) } + ${fn:substring(log.toFromStoreUrl,0,30) } --%> ${log.pid} @@ -256,18 +267,18 @@ $(document).ready(function(){ ${log.sIp} ${log.dPort} ${log.sPort} - ${log.deviceId} + <%-- ${log.deviceId} - + --%> - ${fns:stringFormat(log.addrList,30)} + <%-- ${fns:stringFormat(log.addrList,30)} --%> ${log.serverLocate} ${log.clientLocate} 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 @@ - + + URL - url - + <%-- --%> @@ -169,16 +169,24 @@ - ${_log.cfgId } + ${_log.cfgId } + + ${_log.foundTime } - ${_log.entranceId } + + + + + + + + ${fns:stringFormat(_log.url,30)} ${_log.capIp } ${_log.transProto } ${_log.dIp } ${_log.sIp } ${_log.dPort } ${_log.sPort } - ${fns:stringFormat(_log.url,30)} @@ -194,7 +202,7 @@ ${streamType.itemValue} - ${fns:stringFormat(_log.addrList,30)} + <%-- ${fns:stringFormat(_log.addrList,30)} --%> ${fns:abbr(_log.serverLocate,20)} ${fns:abbr(_log.clientLocate,20)}