From 40fb042232e5590028f9d2f4c949bbfbc65a03b9 Mon Sep 17 00:00:00 2001 From: chenjinsong Date: Wed, 1 Aug 2018 14:35:15 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=8E=BB=E6=8E=89=E6=97=A5=E5=BF=97=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E8=A1=A8=E5=A4=B4=E7=9A=84log=202.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=97=A5=E5=BF=97=E9=83=A8=E5=88=86=E9=BC=A0=E6=A0=87?= =?UTF-8?q?=E6=82=AC=E5=81=9C=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/views/log/ntc/dnsList.jsp | 2 +- .../webapp/WEB-INF/views/log/ntc/httpList.jsp | 2 +- .../webapp/WEB-INF/views/log/ntc/ipList.jsp | 2 +- .../WEB-INF/views/log/ntc/l2tpLogList.jsp | 2 +- .../webapp/WEB-INF/views/log/ntc/mailList.jsp | 2 +- .../views/log/ntc/mmPornAudioSampleList.jsp | 8 +++--- .../views/log/ntc/mmPornVideoSampleList.jsp | 6 ++--- .../views/log/ntc/mmSampleVoipList.jsp | 27 +++++++++++-------- .../WEB-INF/views/log/ntc/pptpLogList.jsp | 2 +- .../WEB-INF/views/log/ntc/sslLogList.jsp | 2 +- .../WEB-INF/views/log/pxy/pxyHttpList.jsp | 2 +- 11 files changed, 31 insertions(+), 26 deletions(-) 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 435c0e764..ac9386c0f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp @@ -31,7 +31,7 @@

- DNS + DNS

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 132a6811d..d7982ce53 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -31,7 +31,7 @@

- HTTP + HTTP

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 fa46cdcf5..6dc233cf5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp @@ -31,7 +31,7 @@

- IP + IP

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp index 4a0068efb..205806fdf 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp @@ -29,7 +29,7 @@

- L2TP + L2TP

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp index aed0ef4e5..7d15b3b5a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp @@ -31,7 +31,7 @@

- MAIL + MAIL

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 def4e881e..2f8d3c28c 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp @@ -215,7 +215,7 @@ $(document).ready(function(){ - + ${fns:stringFormat(url,30)} @@ -226,13 +226,13 @@ $(document).ready(function(){ - + ${fns:stringFormat(logUri,30)} <%-- ${log.logUri } http://${log.logUri }'>http://${log.logUri } --%> - ${fns:stringFormat(log.refer,30)} + ${fns:stringFormat(log.refer,30)} ${log.level} @@ -264,7 +264,7 @@ $(document).ready(function(){ - ${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 52cc098bb..7c37dd018 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp @@ -215,7 +215,7 @@ $(document).ready(function(){ - + ${fns:stringFormat(url,30)} @@ -226,13 +226,13 @@ $(document).ready(function(){ - + ${fns:stringFormat(logUri,30)} <%-- ${log.logUri } http://${log.logUri }'>http://${log.logUri } --%> - ${log.refer} + ${fns:stringFormat(log.refer,30)} ${log.level} 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 9b83a815d..26f33b434 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp @@ -38,7 +38,7 @@ $(document).ready(function(){

- +

@@ -214,19 +214,24 @@ $(document).ready(function(){ ${log.duation} ${log.voipProtocol} - ${log.callingAccount} - ${log.calledAccount} - ${log.callingNumber} - ${log.calledNumber} + ${fn:substring(log.callingAccount,0,30) } + ${fn:substring(log.calledAccount,0,30) } + ${fn:substring(log.callingNumber,0,30) } + ${fn:substring(log.calledNumber,0,30) } ${log.fromToStoreIp} - ${log.fromToStoreUrl} + ${fn:substring(log.fromToStoreUrl,0,30) } ${log.toFromStoreIp} - ${log.toFromStoreUrl} + ${fn:substring(log.toFromStoreUrl,0,30) } ${log.pid} - - http://${fn:substring(log.logUri,0,20) } + + + + + + + + ${fns:stringFormat(logUri,30)} ${log.level} @@ -259,7 +264,7 @@ $(document).ready(function(){ - ${log.addrList} + ${fns:stringFormat(log.addrList,30)} ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp index e5b309913..ba5a32719 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp @@ -29,7 +29,7 @@

- PPTP + PPTP

diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp index 605530b66..2403a8899 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp @@ -30,7 +30,7 @@

- SSL + SSL

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 9fc878c45..b75c9e8d0 100644 --- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp @@ -31,7 +31,7 @@

- ${logTitle } + ${logTitle }