From 2692c2656864eea1b98b2a2926f48a4414ec7bc7 Mon Sep 17 00:00:00 2001 From: leijun Date: Wed, 12 Dec 2018 18:47:49 +0800 Subject: [PATCH 01/22] =?UTF-8?q?RADIUS=E5=8D=8F=E8=AE=AE=E6=97=A5?= =?UTF-8?q?=E5=BF=97=20=E6=8A=A5=E6=96=87=E7=B1=BB=E5=9E=8Bsql=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/sql/20181212/add_data_dictionary.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/sql/20181212/add_data_dictionary.sql b/src/main/resources/sql/20181212/add_data_dictionary.sql index 8f7d27c76..90e0bf60d 100644 --- a/src/main/resources/sql/20181212/add_data_dictionary.sql +++ b/src/main/resources/sql/20181212/add_data_dictionary.sql @@ -7,8 +7,8 @@ INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_d INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3948', '4', 'Accounting-Request', '', '0', '1', '1', '149'); INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3949', '5', 'Accounting-Response', '', '0', '1', '1', '149'); INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3950', '11', 'Access-Challenge', '', '0', '1', '1', '149'); -INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3951', '12', 'Status-Server (experimental)', '', '0', '1', '1', '149'); -INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3952', '13', 'Status-Client (experimental)', '', '0', '1', '1', '149'); +INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3951', '12', 'Status-Server—Experimental', '', '0', '1', '1', '149'); +INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3952', '13', 'Status-Client—Experimental', '', '0', '1', '1', '149'); INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3953', '40', 'Disconnect-Request', '', '0', '1', '1', '149'); INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3954', '41', 'Disconnect-ACK', '', '0', '1', '1', '149'); INSERT INTO `sys_data_dictionary_item` (`id`, `item_code`, `item_value`, `item_desc`, `item_sort`, `status`, `type`, `dictionary_id`) VALUES ('3955', '42', 'Disconnect-NAK', '', '0', '1', '1', '149'); From d944c1a29432af2092823eefb40762009d4e94ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AE=B5=E5=86=AC=E6=A2=85?= Date: Wed, 12 Dec 2018 18:55:07 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=BC=A0=E8=BE=93=E5=B1=82=E5=8D=8F=E8=AE=AE=E7=9A=84title?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/log/manipulation/dkBehaviorList.jsp | 6 +++--- src/main/webapp/WEB-INF/views/log/ntc/appList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/httpKeyList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/irDnatLogList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/irSnatLogList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/mmFileDigestList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp | 2 +- .../webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp | 2 +- .../webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/mmSampleFaceList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/mmSampleLogoList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp | 2 +- .../webapp/WEB-INF/views/log/ntc/mmSampleSpeakerList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/ntcStreamMedia.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/radiusLogList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp | 2 +- src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp | 2 +- 37 files changed, 39 insertions(+), 39 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 63d212a5d..01193ded9 100644 --- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp +++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp @@ -239,7 +239,7 @@ $(document).ready(function(){ <%-- --%> - + @@ -329,9 +329,9 @@ $(document).ready(function(){ - + <%-- ${log.labelAppSource} - + --%> ${fns:abbr(log.capIp, 42)} ${log.transProto } 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 f68257ff7..0749ce63f 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp @@ -185,7 +185,7 @@ $(document).ready(function(){ - + 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 aabbf3125..539bab8d8 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/bgpList.jsp @@ -218,7 +218,7 @@ - + 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 eeda67563..455e042e8 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -132,7 +132,7 @@ $(document).ready(function(){