From 0d754f594984d3b43bca3c4514f3bcf8339754cb Mon Sep 17 00:00:00 2001 From: zhangwei Date: Tue, 18 Dec 2018 06:00:42 +0600 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=95=B0=E6=8D=AE=E5=88=97=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=AF=BC=E5=87=BA=E5=BF=BD=E7=95=A5=E7=9A=84=E5=88=97?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8Aip=20range=20list=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nis/web/controller/report/ReportController.java | 4 ++-- src/main/resources/messages/message_en.properties | 4 ++-- src/main/resources/messages/message_ru.properties | 4 ++-- src/main/resources/messages/message_zh_CN.properties | 4 ++-- .../webapp/WEB-INF/views/report/asnRecordList.jsp | 12 +++++++----- .../webapp/WEB-INF/views/report/urlReportList.jsp | 4 ++-- 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/nis/web/controller/report/ReportController.java b/src/main/java/com/nis/web/controller/report/ReportController.java index 06fa91cf9..e7d75a5ab 100644 --- a/src/main/java/com/nis/web/controller/report/ReportController.java +++ b/src/main/java/com/nis/web/controller/report/ReportController.java @@ -176,7 +176,7 @@ public class ReportController extends BaseController { params.put("searchCountry", log.getSearchCountry()); } //查询开始IP - if (StringUtils.isNotBlank(log.getSearchStartIp())) { + if (StringUtils.isNotBlank(log.getSearchIp())) { params.put("searchIp", log.getSearchIp()); } // @@ -429,7 +429,7 @@ public class ReportController extends BaseController { + "stream_type,nest_addr_list,server_locate,client_locate,s_subscribe_id,d_subscribe_id,user_region,scene_file,";*/ hColumns += ",s_asn,d_asn,cfg_id,action,found_time,recv_time,entrance_id,clj_ip,transport_layer_protocol,addr_type,server_ip," + "client_ip,server_port,client_port,deviceid,link_id,encap_type,direction,inner_smac,inner_dmac," - + "stream_type,nest_addr_list,server_locate,client_locate,s_subscribe_id,d_subscribe_id,user_region,scene_file,"; + + "stream_type,nest_addr_list,server_locate,client_locate,s_subscribe_id,d_subscribe_id,user_region,scene_file,reportTime,"; String cfgIndexInfoNoExport = "," + hColumns; noExportMap.put("Ntc_HTTPS_Report", cfgIndexInfoNoExport); dataMap.put("Ntc_HTTPS_Report", list); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 4b93862f6..f48450909 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1370,7 +1370,7 @@ keyword_log_tips=Deduplicate http body keywords log,for the control status of ht conn_record=Connection Records bps=Gbps bps_percent=Bps Percent -pps=pps +pps=PPS pps_percent=pps Percent spoofing_ip_object=Spoofing IP Pool spoofing_ip_policy=IP Spoofing @@ -1405,7 +1405,7 @@ max_tcp=Max APP_TCP_SESSION_BYTE=Session ip_count=Unique IP Count counnection_count=Connection Count -asn=asn +asn=ASN Unique_num=Unique ip=IP country=Country diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 210a0017e..3cec416e6 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1374,7 +1374,7 @@ keyword_log_tips=\u041a\u043e\u0433\u0434\u0430 \u0440\u0435\u0437\u0443\u043b\u conn_record=Connection Records bps=Gbps bps_percent=Bps Percent -pps=pps +pps=PPS pps_percent=pps Percent spoofing_ip_object=Spoofing IP Pool spoofing_ip_policy=IP Spoofing @@ -1409,7 +1409,7 @@ max_tcp=Max APP_TCP_SESSION_BYTE=Session ip_count=Unique IP Count counnection_count=Connection Count -asn=asn +asn=ASN Unique_num=Unique ip=IP country=Country diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 247dd407b..e829fa168 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1370,7 +1370,7 @@ keyword_log_tips=\u6e05\u6d17\u540e\u7f51\u9875\u5173\u952e\u5b57\u65e5\u5fd7\uf conn_record=\u901a\u8054\u5173\u7cfb bps=Gbps bps_percent=Bps Percent -pps=pps +pps=PPS pps_percent=pps Percent spoofing_ip_object=Spoofing IP Pool spoofing_ip_policy=IP Spoofing @@ -1405,7 +1405,7 @@ max_tcp=Max APP_TCP_SESSION_BYTE=Session ip_count=Unique IP Count counnection_count=Connection Count -asn=asn +asn=ASN Unique_num=Unique ip=IP country=Country diff --git a/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp b/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp index 13529290f..b852dae39 100644 --- a/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp +++ b/src/main/webapp/WEB-INF/views/report/asnRecordList.jsp @@ -106,9 +106,9 @@ <%-- --%> <%-- --%> - - + + @@ -117,10 +117,12 @@ <%-- ▷ - --%> + --%> + ${log.asn} + ${log.pps } ${log.bps } - ${log.pps } - ${log.asn} + + diff --git a/src/main/webapp/WEB-INF/views/report/urlReportList.jsp b/src/main/webapp/WEB-INF/views/report/urlReportList.jsp index ab958b1f3..a3833e583 100644 --- a/src/main/webapp/WEB-INF/views/report/urlReportList.jsp +++ b/src/main/webapp/WEB-INF/views/report/urlReportList.jsp @@ -130,7 +130,7 @@ - + <%-- --%> @@ -139,7 +139,7 @@ ${log.url } ${log.ipCount } ${log.connCount } - ${log.reportTime} + <%-- ${log.reportTime} --%>