From a7b7a32948860fa91f376564fb9837a54313c2e2 Mon Sep 17 00:00:00 2001 From: leijun Date: Sat, 8 Dec 2018 13:44:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AD=97=E5=85=B8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/log/manipulation/dkBehaviorList.jsp | 63 +++++++++++---- .../webapp/WEB-INF/views/log/ntc/appList.jsp | 60 +++++++++++--- .../webapp/WEB-INF/views/log/ntc/bgpList.jsp | 54 ++++++++++--- .../webapp/WEB-INF/views/log/ntc/ddosList.jsp | 58 +++++++++++--- .../webapp/WEB-INF/views/log/ntc/dnsList.jsp | 78 +++++++++++++++---- .../webapp/WEB-INF/views/log/ntc/ftpList.jsp | 48 +++++++++--- .../WEB-INF/views/log/ntc/httpKeyList.jsp | 48 +++++++++--- .../webapp/WEB-INF/views/log/ntc/httpList.jsp | 48 +++++++++--- .../webapp/WEB-INF/views/log/ntc/ipList.jsp | 48 +++++++++--- .../WEB-INF/views/log/ntc/ipsecList.jsp | 50 +++++++++--- .../WEB-INF/views/log/ntc/irDnatLogList.jsp | 48 +++++++++--- .../WEB-INF/views/log/ntc/irSnatLogList.jsp | 52 ++++++++++--- .../WEB-INF/views/log/ntc/l2tpLogList.jsp | 50 +++++++++--- .../webapp/WEB-INF/views/log/ntc/mailList.jsp | 48 +++++++++--- .../WEB-INF/views/log/ntc/mmAvIpList.jsp | 49 +++++++++--- .../WEB-INF/views/log/ntc/mmAvUrlList.jsp | 48 +++++++++--- .../views/log/ntc/mmFileDigestList.jsp | 48 +++++++++--- .../WEB-INF/views/log/ntc/mmPicIpList.jsp | 50 +++++++++--- .../WEB-INF/views/log/ntc/mmPicUrlList.jsp | 48 +++++++++--- .../views/log/ntc/mmPornAudioSampleList.jsp | 42 ++++++++-- .../views/log/ntc/mmPornVideoSampleList.jsp | 50 +++++++++--- .../views/log/ntc/mmSampleAudioList.jsp | 42 ++++++++-- .../views/log/ntc/mmSampleFaceList.jsp | 49 +++++++++--- .../views/log/ntc/mmSampleLogoList.jsp | 49 +++++++++--- .../WEB-INF/views/log/ntc/mmSamplePicList.jsp | 48 +++++++++--- .../views/log/ntc/mmSampleSpeakerList.jsp | 49 +++++++++--- .../views/log/ntc/mmSampleVideoList.jsp | 49 +++++++++--- .../views/log/ntc/mmSampleVoipList.jsp | 49 +++++++++--- .../views/log/ntc/mmVoipAccountList.jsp | 42 ++++++++-- .../WEB-INF/views/log/ntc/mmVoipIpList.jsp | 18 ++++- .../WEB-INF/views/log/ntc/ntcStreamMedia.jsp | 48 +++++++++--- .../WEB-INF/views/log/ntc/openVpnList.jsp | 49 ++++++++---- .../webapp/WEB-INF/views/log/ntc/p2pList.jsp | 50 +++++++++--- .../WEB-INF/views/log/ntc/pptpLogList.jsp | 48 +++++++++--- .../webapp/WEB-INF/views/log/ntc/sshList.jsp | 49 +++++++++--- .../WEB-INF/views/log/ntc/sslLogList.jsp | 50 +++++++++--- .../WEB-INF/views/log/pxy/pxyHttpList.jsp | 48 +++++++++--- 37 files changed, 1473 insertions(+), 352 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp index 5c0a7f969..7d0a25c39 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -271,98 +271,133 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + + ${log.labelProtoId } - + ${dic.item} + ${log.labelProtoSource} + ${log.labelBehavId } - + ${dic.item} + ${log.labelBehavSource} + ${log.labelAppId } - + ${dic.item} + ${log.labelAppSource} ${fns:abbr(log.capIp, 42)} - + + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + - ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp index 50b0a7737..e78da4a49 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp @@ -219,64 +219,80 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + + ${log.labelProtoId } - + ${dic.item} + ${log.labelProtoSource} + ${log.labelBehavId } - + ${dic.item} + ${log.labelBehavSource} + ${log.labelAppId } - + ${dic.item} + ${log.labelAppSource} ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} @@ -284,31 +300,51 @@ $(document).ready(function(){ ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp index b14de0212..b391616ef 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -256,65 +256,95 @@ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } ${log.serverLocate} @@ -326,9 +356,13 @@ ${log.userRegion} ${log.sceneFile} + ${log.type } - ${type.itemValue} + + ${type.itemValue} + + ${log.asNum} ${log.route} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp index de8852bf0..cec819083 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -253,29 +253,35 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + + ${log.attackType } - + ${dic.itemValue} + @@ -284,53 +290,83 @@ $(document).ready(function(){ ${log.attackTotalPkt} ${log.attackTotalByte} + ${log.isBlock } - + + ${dic.itemValue} + + ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } 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 649c8640e..29d69bebb 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp @@ -272,27 +272,35 @@ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + + ${log.qr } - + + ${qr.itemValue} + + @@ -304,70 +312,112 @@ ${log.rr } + ${log.qType } - ${qtype.itemValue} + + ${qtype.itemValue} + + + ${log.qclass } - ${qclass.itemValue} + + ${qclass.itemValue} + + + ${log.opcode } - ${opcode.itemValue} + + ${opcode.itemValue} + + ${fns:abbr(log.qname, 30)} ${log.cname } + ${log.dnsSub } - ${dnsSub.itemValue} + + ${dnsSub.itemValue} + + ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp index a40b9a914..b7983aa2f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp @@ -257,21 +257,25 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + @@ -298,47 +302,73 @@ $(document).ready(function(){ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp index 627740012..1b1566e3e 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp @@ -293,21 +293,25 @@ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + @@ -322,47 +326,73 @@ ${log.website } ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } 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 851ea4ba9..c846794f4 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp @@ -273,21 +273,25 @@ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + @@ -362,47 +366,73 @@ ${log.website } ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } ${log.serverLocate} 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 6203f7834..2de192542 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp @@ -253,64 +253,94 @@ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } ${log.serverLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp index adc06ab65..bf64b4092 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp @@ -202,21 +202,25 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + @@ -231,48 +235,74 @@ $(document).ready(function(){ nat_main ${fns:abbr(log.capIp, 42)} - + + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp index e67ca4fb0..8682074d5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp @@ -264,20 +264,24 @@ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.natIp } @@ -290,47 +294,73 @@ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } ${log.serverLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp index 9b7fbf723..71f0476bb 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp @@ -88,7 +88,8 @@ - +
@@ -263,20 +264,24 @@ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.natIp } @@ -289,47 +294,74 @@ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } ${log.serverLocate} 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 d62e802b5..48db9dbf5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp @@ -213,21 +213,25 @@ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + @@ -244,49 +248,75 @@ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + - ${log.addrList } ${log.serverLocate} ${log.clientLocate} 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 0316b4b85..ac67daa3e 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp @@ -259,21 +259,25 @@ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.mailProto } @@ -301,47 +305,73 @@ ${fns:abbr(log.emlKey, 42)} ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } ${log.serverLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp index 506810626..0b51199c4 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp @@ -219,21 +219,25 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.pid} @@ -281,47 +285,74 @@ $(document).ready(function(){ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + <%-- + ${log.direction } - + + ${direction.itemValue} + + --%> ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp index 2604a3744..cdfa30970 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp @@ -216,20 +216,24 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.pid} @@ -277,47 +281,73 @@ $(document).ready(function(){ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + <%-- + ${log.direction } - + + ${direction.itemValue} + + --%> ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp index 653eb04b9..9d26d82cd 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp @@ -259,21 +259,25 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.pid} @@ -320,47 +324,73 @@ $(document).ready(function(){ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + <%-- + ${log.direction } - + + ${direction.itemValue} + + --%> ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp index 43b1d566a..0a3ce1bf5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp @@ -215,21 +215,26 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.pid} @@ -277,47 +282,74 @@ $(document).ready(function(){ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + <%-- + ${log.direction } - + + ${direction.itemValue} + + --%> + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp index ed2f9e81c..f52a3d279 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp @@ -214,21 +214,25 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.pid} @@ -276,47 +280,73 @@ $(document).ready(function(){ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + <%-- + ${log.direction } - + + ${direction.itemValue} + + --%> ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } 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 b201428b7..c5df287f9 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp @@ -216,21 +216,25 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.pid} @@ -278,40 +282,62 @@ $(document).ready(function(){ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } 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 fe6879204..c474a7f38 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp @@ -258,21 +258,25 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.pid} @@ -319,49 +323,75 @@ $(document).ready(function(){ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + - ${log.addrList } ${log.serverLocate} ${log.clientLocate} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp index ea22a9466..29c4c9af5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp @@ -318,21 +318,25 @@ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.pid} @@ -378,40 +382,62 @@ ${avProtocol } ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + <%-- + ${log.direction } - + + ${direction.itemValue} + + --%> ${log.innerSmac } ${log.innerDmac } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp index 50a344b51..48326cd46 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp @@ -258,21 +258,25 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.pid} @@ -318,47 +322,74 @@ $(document).ready(function(){ ${avProtocol } ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + <%-- + ${log.direction } - + + ${direction.itemValue} + + --%> ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp index a17a7a128..335a7777d 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp @@ -258,23 +258,26 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + - ${log.pid} @@ -318,47 +321,73 @@ $(document).ready(function(){ ${avProtocol } ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + <%-- + ${log.direction } - + + ${direction.itemValue} + + --%> ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp index 770bc9c02..9f4b424f0 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp @@ -258,21 +258,25 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.pid} @@ -318,47 +322,73 @@ $(document).ready(function(){ ${avProtocol } ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + <%-- + ${log.direction } - + + ${direction.itemValue} + + --%> ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp index f441f12ae..24a051698 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp @@ -258,21 +258,26 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.pid} @@ -318,47 +323,73 @@ $(document).ready(function(){ ${avProtocol } ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + <%-- + ${log.direction } - + + ${direction.itemValue} + + --%> ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp index 8a5123522..5ca66f96a 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp @@ -259,21 +259,25 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.pid} @@ -318,48 +322,75 @@ $(document).ready(function(){ ${avProtocol } ${fns:abbr(log.capIp, 42)} + + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + <%-- + ${log.direction } - + + ${direction.itemValue} + + --%> ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } 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 6110804f9..bca5f59ce 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp @@ -264,21 +264,26 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.duation} ${log.voipProtocol} @@ -315,47 +320,73 @@ $(document).ready(function(){ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp index d295b7947..221ec6a06 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp @@ -223,21 +223,25 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.duation} ${log.voipProtocol} @@ -274,40 +278,62 @@ $(document).ready(function(){ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + <%-- + ${log.direction } - + + ${direction.itemValue} + + --%> ${log.innerSmac } ${log.innerDmac } 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 81e7c3d5b..b266e5730 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp @@ -267,21 +267,25 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.duation} ${log.voipProtocol} @@ -318,16 +322,22 @@ $(document).ready(function(){ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp index 7e584483b..0e9dec92b 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp @@ -252,21 +252,25 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + @@ -280,47 +284,73 @@ $(document).ready(function(){ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } 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 bad2c852e..a339f021b 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp @@ -215,21 +215,25 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.version} @@ -245,47 +249,62 @@ $(document).ready(function(){ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - - - - ${log.innerSmac } - ${log.innerDmac } - - - ${streamType.itemValue} + + ${direction.itemValue} + + ${log.addrList } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp index c02fea121..53004b890 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp @@ -256,21 +256,26 @@ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + + ${log.entranceId } - + ${dic.itemValue} + ${log.p2pProto} @@ -278,47 +283,74 @@ ${log.p2pKeyword} ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } 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 272b23e35..41ec52f88 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp @@ -210,21 +210,25 @@ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + @@ -237,47 +241,73 @@ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp index cdece1971..1b7b0a94f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp @@ -217,20 +217,25 @@ $(document).ready(function(){ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.version } ${log.hostKey } @@ -244,47 +249,73 @@ $(document).ready(function(){ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } 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 d70e271df..be446aad5 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp @@ -270,21 +270,26 @@ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + ${log.version } @@ -292,48 +297,75 @@ ${log.san } ${log.cn } ${fns:abbr(log.capIp, 42)} + + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList } 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 84fc96043..83ce1ad1e 100644 --- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp @@ -254,21 +254,25 @@ ${log.cfgId } + ${log.action } - + ${dict.itemValue} + ${log.foundTime } ${log.recvTime } + ${log.entranceId } - + ${dic.itemValue} + @@ -294,47 +298,73 @@ ${fns:abbr(log.capIp, 42)} + ${log.transProto } - + ${dic.itemValue} + + ${log.addrType } - + + ${dic.itemValue} + + ${fns:abbr(log.dIp, 42)} ${fns:abbr(log.sIp, 42)} ${log.dPort } ${log.sPort } + ${log.deviceId } - + + ${device.itemValue} + + + ${log.linkId } - + + ${link.itemValue} + + + ${log.encapType } - + + ${encapType.itemValue} + + + ${log.direction } - + + ${direction.itemValue} + + ${log.innerSmac } ${log.innerDmac } + ${log.streamDir } - ${streamType.itemValue} + + ${streamType.itemValue} + + ${log.addrList }