From 2be0bfc1d9cb56e86e3eab9bda9759cb138ddbcd Mon Sep 17 00:00:00 2001 From: lihaochen Date: Thu, 27 Dec 2018 18:54:37 +0800 Subject: [PATCH 01/28] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=EF=BC=9A=E5=A2=9E=E5=8A=A0=E4=BA=8B=E4=BB=B6=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=20=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=B8=8A=E6=98=BE=E7=A4=BA=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E9=97=B4=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/NtcEventBlockController.java | 5 +++++ .../controller/report/NtcEventKeyProtectionController.java | 5 +++++ .../nis/web/controller/report/NtcEventMonitorController.java | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/src/main/java/com/nis/web/controller/report/NtcEventBlockController.java b/src/main/java/com/nis/web/controller/report/NtcEventBlockController.java index 6e4e2a813..5192b6522 100644 --- a/src/main/java/com/nis/web/controller/report/NtcEventBlockController.java +++ b/src/main/java/com/nis/web/controller/report/NtcEventBlockController.java @@ -94,6 +94,11 @@ public class NtcEventBlockController extends BaseController { params.put("taskIds", log.getTaskIds()); } + log.setSearchReportStartTime(searchReportStartTime); + log.setSearchReportEndTime(searchReportEndTime); + log.setSearchTaskStartTime(searchTaskStartTime); + log.setSearchTaskEndTime(searchTaskEndTime); + params.put("reportType", 1); String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_MONITOR_OR_BLOCK_Report; diff --git a/src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java b/src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java index e3fe6edf7..3f37dfbb6 100644 --- a/src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java +++ b/src/main/java/com/nis/web/controller/report/NtcEventKeyProtectionController.java @@ -93,6 +93,11 @@ public class NtcEventKeyProtectionController extends BaseController { if (StringUtils.isNotBlank(log.getTaskIds())) { params.put("taskIds", log.getTaskIds()); } + + log.setSearchReportStartTime(searchReportStartTime); + log.setSearchReportEndTime(searchReportEndTime); + log.setSearchTaskStartTime(searchTaskStartTime); + log.setSearchTaskEndTime(searchTaskEndTime); String url = Constants.LOG_BASE_URL + Constants.NTC_EVENT_KEYPROTECTION_Report; // String url = diff --git a/src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java b/src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java index 014d3fd04..cc13a89dc 100644 --- a/src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java +++ b/src/main/java/com/nis/web/controller/report/NtcEventMonitorController.java @@ -97,6 +97,11 @@ public class NtcEventMonitorController extends BaseController { if (StringUtils.isNotBlank(log.getTaskIds())) { params.put("taskIds", log.getTaskIds()); } + + log.setSearchReportStartTime(searchReportStartTime); + log.setSearchReportEndTime(searchReportEndTime); + log.setSearchTaskStartTime(searchTaskStartTime); + log.setSearchTaskEndTime(searchTaskEndTime); params.put("reportType", 2); From 1efe1a21c508d5c9641193f2b5c8ca6eed762050 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Thu, 27 Dec 2018 19:06:23 +0800 Subject: [PATCH 02/28] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=8E=BB=E6=8E=89=E6=BB=9A=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp | 1 + .../webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp index e6ac4867a..349c723ed 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficDomainTrans.jsp @@ -149,6 +149,7 @@ function showDomainTrans(xData,series){ }, plotOptions: { series: { + lineWidth:1, marker: { radius: 2, hover: { diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp index 51a02f508..f995e92a6 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/trafficWebTypeList.jsp @@ -367,10 +367,13 @@ top: '1%', draggable:false, width: $(document).width()*0.9, - height:$(document).height()*0.9, + height:$(document).height()*0.8, showScrolling: false, /* 是否显示浏览的滚动条 */ iframeScrolling: 'no', - buttons: { 'close': true } + buttons: { 'close': true }, + loaded:function(h){ + $(".jbox-content,top.document").css("overflow-y","hidden") + } }); } /** From fdddf572f648f557c9451d4547da69356adca334 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Thu, 27 Dec 2018 20:40:47 +0600 Subject: [PATCH 03/28] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BF=84=E8=AF=AD?= =?UTF-8?q?=E7=9A=84=E7=89=B9=E6=AE=8A=E7=AC=A6=E5=8F=B7=E4=B9=B1=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_ru.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 88876c992..4cf9229bd 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1366,7 +1366,7 @@ framed_ip=Framed IP Address log_user_name=User Name av_tips=\u041a\u043e\u0433\u0434\u0430 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u0438\u043d\u0434\u0435\u043a\u0441\u0430 \u043a\u043e\u0434\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0430\u0443\u0434\u0438\u043e \u0438 \u0432\u0438\u0434\u0435\u043e \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u0441\u044f \u0432 \u043a\u043e\u043d\u0446\u0435 \u0444\u0430\u0439\u043b\u0430 \u0438\u043b\u0438 \u0432\u0438\u0434\u0435\u043e \u0441 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0435\u043c \u0431\u043e\u043b\u0435\u0435 1080p.\u0441\u0438\u0441\u0442\u0435\u043c\u0430 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f. asn_ip_group_delete=\uff08IP configuration under this ASN group will also be deleted.) -keyword_log_tips=\u041a\u043e\u0433\u0434\u0430 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043a\u043b\u044e\u0447\u0435\u0432\u044b\u043c\u0438 \u0441\u043b\u043e\u0432\u0430\u043c\u0438 \u0432\u0435\u0431-\u0441\u0442\u0440\u0430\u043d\u0438\u0446\u044b \u043f\u043b\u043e\u0445\u0438\u043c, \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0434\u0435\u0434\u0443\u043f\u043b\u0438\u043a\u0430\u0446\u0438\u043e\u043d\u043d\u043e\u0433\u043e \u0436\u0443\u0440\u043d\u0430\u043b\u0430 \u0434\u0430\u043d\u043d\u043e\u0439 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e \ufffd\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 URL\ufffd \u0434\u043b\u044f \u043f\u043e\u0434\u0430\u0432\u0448\u0435\u0433\u043e \u0432\u0435\u0431-\u0441\u0430\u0439\u0442\u0430. +keyword_log_tips=\u041A\u043E\u0433\u0434\u0430 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442 \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u044F \u043A\u043B\u044E\u0447\u0435\u0432\u044B\u043C\u0438 \u0441\u043B\u043E\u0432\u0430\u043C\u0438 \u0432\u0435\u0431-\u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B \u043F\u043B\u043E\u0445\u0438\u043C, \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u0434\u0435\u0434\u0443\u043F\u043B\u0438\u043A\u0430\u0446\u0438\u043E\u043D\u043D\u043E\u0433\u043E \u0436\u0443\u0440\u043D\u0430\u043B\u0430 \u0434\u0430\u043D\u043D\u043E\u0439 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0432\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044E \u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 URL \u0434\u043B\u044F \u043F\u043E\u0434\u0430\u0432\u0448\u0435\u0433\u043E \u0432\u0435\u0431-\u0441\u0430\u0439\u0442\u0430. conn_record=Connection Records bps=Gbps bps_percent=Bps Percent From c46f0f5f431faede306a0fa1a57989ca8d577620 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Thu, 27 Dec 2018 20:51:35 +0600 Subject: [PATCH 04/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=84=E8=AF=AD?= =?UTF-8?q?=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/messages/message_ru.properties | 68 +++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 4cf9229bd..5c47926be 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1359,56 +1359,56 @@ translated_dest_ip=\u041f\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043d\u043d\ translated_dest_port=\u041f\u0435\u0440\u0435\u0432\u0435\u0434\u0435\u043d\u043d\u044b\u0439 \u041f\u043e\u0440\u0442 \u041d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u044f show_ips=\u041f\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0412\u0441\u0435 IP show_available_ips=\u041f\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0414\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0439 IP -radius_log=Radius Identify -message_type=Code -nas_ip=NAS IP Address -framed_ip=Framed IP Address -log_user_name=User Name -av_tips=\u041a\u043e\u0433\u0434\u0430 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f \u0438\u043d\u0434\u0435\u043a\u0441\u0430 \u043a\u043e\u0434\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0430\u0443\u0434\u0438\u043e \u0438 \u0432\u0438\u0434\u0435\u043e \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u0441\u044f \u0432 \u043a\u043e\u043d\u0446\u0435 \u0444\u0430\u0439\u043b\u0430 \u0438\u043b\u0438 \u0432\u0438\u0434\u0435\u043e \u0441 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043d\u0438\u0435\u043c \u0431\u043e\u043b\u0435\u0435 1080p.\u0441\u0438\u0441\u0442\u0435\u043c\u0430 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442\u0441\u044f. -asn_ip_group_delete=\uff08IP configuration under this ASN group will also be deleted.) +radius_log=Radius \u0418\u0434\u0435\u043D\u0442\u0438\u0444\u0438\u0446\u0438\u0440\u043E\u0432\u0430\u0442\u044C +message_type=\u041A\u043E\u0434 +nas_ip=NAS IP-\u0430\u0434\u0440\u0435\u0441 +framed_ip=Framed IP-\u0430\u0434\u0440\u0435\u0441 +log_user_name=\u0418\u043C\u044F \u041F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u0442\u0435\u043B\u044F +av_tips=\u0421\u0438\u0441\u0442\u0435\u043C\u0430 \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0438\u043D\u0434\u0435\u043A\u0441\u043D\u0443\u044E \u0438\u043D\u0444\u043E\u0440\u043C\u0430\u0446\u0438\u044E \u0430\u0443\u0434\u0438\u043E \u0438 \u0432\u0438\u0434\u0435\u043E \u043A\u043E\u0434\u0438\u0440\u043E\u0432\u0430\u043D\u0438\u044F \u0432 \u0445\u0432\u043E\u0441\u0442\u0435 \u0430\u0443\u0434\u0438\u043E \u0438 \u0432\u0438\u0434\u0435\u043E \u0444\u0430\u0439\u043B\u043E\u0432. \u0421\u0438\u0441\u0442\u0435\u043C\u0430 \u043D\u0435 \u043F\u043E\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0432\u0438\u0434\u0435\u043E \u0441 \u0440\u0430\u0437\u0440\u0435\u0448\u0435\u043D\u0438\u0435\u043C \u0432\u044B\u0448\u0435 1080P. +asn_ip_group_delete=\u041A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044F IP \u0432 \u044D\u0442\u043E\u0439 \u0433\u0440\u0443\u043F\u043F\u0435 ASN \u0442\u0430\u043A\u0436\u0435 \u0431\u0443\u0434\u0435\u0442 \u0443\u0434\u0430\u043B\u0435\u043D\u0430. keyword_log_tips=\u041A\u043E\u0433\u0434\u0430 \u0440\u0435\u0437\u0443\u043B\u044C\u0442\u0430\u0442 \u0443\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u044F \u043A\u043B\u044E\u0447\u0435\u0432\u044B\u043C\u0438 \u0441\u043B\u043E\u0432\u0430\u043C\u0438 \u0432\u0435\u0431-\u0441\u0442\u0440\u0430\u043D\u0438\u0446\u044B \u043F\u043B\u043E\u0445\u0438\u043C, \u0441 \u043F\u043E\u043C\u043E\u0449\u044C\u044E \u0434\u0435\u0434\u0443\u043F\u043B\u0438\u043A\u0430\u0446\u0438\u043E\u043D\u043D\u043E\u0433\u043E \u0436\u0443\u0440\u043D\u0430\u043B\u0430 \u0434\u0430\u043D\u043D\u043E\u0439 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 \u0432\u044B \u043C\u043E\u0436\u0435\u0442\u0435 \u0434\u043E\u0431\u0430\u0432\u0438\u0442\u044C \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044E \u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 URL \u0434\u043B\u044F \u043F\u043E\u0434\u0430\u0432\u0448\u0435\u0433\u043E \u0432\u0435\u0431-\u0441\u0430\u0439\u0442\u0430. -conn_record=Connection Records +conn_record=\u0417\u0430\u043F\u0438\u0441\u0438 \u041F\u043E\u0434\u043A\u044E\u0447\u0435\u043D\u0438\u0439 bps=Gbps bps_percent=Bps Percent pps=PPS pps_percent=pps Percent -spoofing_ip_object=Spoofing IP Pool -spoofing_ip_policy=IP Spoofing -action_spoofing=Spoofing -spoofing=spoofing +spoofing_ip_object=\u041F\u0443\u043B IP \u0421\u043F\u0443\u0444\u0438\u043D\u0433 +spoofing_ip_policy=IP \u0421\u043F\u0443\u0444\u0438\u043D\u0433 +action_spoofing=\u0421\u043F\u0443\u0444\u0438\u043D\u0433 +spoofing=\u0421\u043F\u0443\u0444\u0438\u043D\u0433 service=\u0421\u0435\u0440\u0432\u0438\u0441 s_asn=SASN d_asn=DASN -asn_conn_report=ASN Statistics -https_url_report=Http(s) URL Statistics +asn_conn_report=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0430 ASN +https_url_report=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0430 Http(s) URL url=URL sum=SUM -url_count=URL Count -ip_range_report=IN/EX Host Identity -ip_start=Start IP -ip_end=End IP +url_count=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E URL +ip_range_report=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043A\u0430 \u0425\u043E\u0441\u0442\u043E\u0432 \u0432 \u0433\u0440\u0430\u043D\u0438\u0446\u0430\u0445 \u0438 \u0437\u0430 \u0433\u0440\u0430\u043D\u0438\u0446\u0435\u0439 +ip_start=\u041D\u0430\u0447\u0430\u043B\u044C\u043D\u044B\u0439 IP +ip_end=\u041A\u043E\u043D\u0435\u0447\u043D\u044B\u0439 IP ip_start_num=IP Start Num ip_end_num=IP End Num -ip_sub=IP Subnet -start_ip=Start IP -end_ip=End IP -action_detail=Action Detail -pass=\u041f\u0430\u0441 +ip_sub=IP-\u043F\u043E\u0434\u0441\u0435\u0442\u044C +start_ip=\u041D\u0430\u0447\u0430\u043B\u044C\u043D\u044B\u0439 IP +end_ip=\u041A\u043E\u043D\u0435\u0447\u043D\u044B\u0439 IP +action_detail=\u0414\u0435\u0442\u0430\u043B\u044C \u0414\u0435\u0439\u0441\u0442\u0432\u0438\u044F +pass=\u041F\u0430\u0441 live_link=\u0410\u043a\u0442\u0438\u0432\u043d\u0430\u044f \u0421\u0441\u044b\u043b\u043a\u0430 -area_type=Area Type -dns_group_manage=DNS Group Manage -asn_group_manage=ASN Group Manage -ip_group_manage=IP Group Manage -ip_spoofing_group_manage=IP Spoofing Group Manage -min_tcp=Min -max_tcp=Max -APP_TCP_SESSION_BYTE=Session -ip_count=Unique IP Count -counnection_count=Connection Count +area_type=\u0422\u0438\u043F \u0417\u043E\u043D\u044B +dns_group_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 DNS \u0433\u0440\u0443\u043F\u043F\u043E\u0439 +asn_group_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 ASN \u0433\u0440\u0443\u043F\u043F\u043E\u0439 +ip_group_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 IP \u0433\u0440\u0443\u043F\u043F\u043E\u0439 +ip_spoofing_group_manage=\u0423\u043F\u0440\u0430\u0432\u043B\u0435\u043D\u0438\u0435 \u041F\u0443\u043B\u043E\u043C IP \u0421\u043F\u0443\u0444\u0438\u043D\u0433 +min_tcp=\u041C\u0438\u043D. +max_tcp=\u041C\u0430\u043A\u0441. +APP_TCP_SESSION_BYTE=\u0421\u0435\u0430\u043D\u0441 +ip_count=Uniq-IP +counnection_count=\u041A\u043E\u043B\u0438\u0447\u0435\u0441\u0442\u0432\u043E \u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0439 asn=ASN Unique_num=Unique ip=IP -country=Country +country=\u0421\u0442\u0440\u0430\u043D\u0430 desc=Desc unique_num=Unique import_limit_is=The maximum import size is From 6b189ec76821443af26857e637eaf714e83212bc Mon Sep 17 00:00:00 2001 From: zhangwei Date: Thu, 27 Dec 2018 21:00:23 +0600 Subject: [PATCH 05/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9ip=20spoofing=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=80=BB=E8=BE=91=EF=BC=8C=E5=88=A0=E9=99=A4spoofing?= =?UTF-8?q?=20ip=20pool=E9=85=8D=E7=BD=AE=E8=8F=9C=E5=8D=95=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=EF=BC=8C=E5=9C=A8ip=20spoofing=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8A=9F=E8=83=BD=E4=B8=AD=EF=BC=8C=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=88=9B=E5=BB=BAip=20pool=E9=85=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?ip=20spoofing=E7=AD=96=E7=95=A5=E5=AE=A1=E6=A0=B8=E4=B8=8B?= =?UTF-8?q?=E5=8F=91=E4=B8=8E=E5=8F=96=E6=B6=88=E5=AE=A1=E6=A0=B8=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=90=8C=E6=97=B6=E5=AE=A1=E6=A0=B8=E4=B8=8B=E5=8F=91?= =?UTF-8?q?=E6=88=96=E5=8F=96=E6=B6=88ip=20pool=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/PxyObjSpoofingIpPool.java | 3 + .../proxy/InterceptController.java | 21 ++- .../proxy/PxyObjSpoofingIpPoolController.java | 4 +- .../configuration/PxyObjSpoofingIpPoolDao.xml | 7 +- .../configuration/InterceptCfgService.java | 137 +++++++++++++++++- .../PxyObjSpoofingIpPoolService.java | 1 + .../views/cfg/intercept/interceptForm.jsp | 10 +- .../views/cfg/intercept/interceptList.jsp | 9 +- .../views/cfg/proxy/spoofingIpPool/form.jsp | 5 +- 9 files changed, 173 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/nis/domain/configuration/PxyObjSpoofingIpPool.java b/src/main/java/com/nis/domain/configuration/PxyObjSpoofingIpPool.java index 7c712c3b8..3ad6d3760 100644 --- a/src/main/java/com/nis/domain/configuration/PxyObjSpoofingIpPool.java +++ b/src/main/java/com/nis/domain/configuration/PxyObjSpoofingIpPool.java @@ -52,6 +52,9 @@ public class PxyObjSpoofingIpPool extends BaseIpCfg{ this.ipAddress = ipAddress; } public Integer getGroupId() { + if(groupId==null || groupId==0){ + groupId=cfgId.intValue(); + } return groupId; } public void setGroupId(Integer groupId) { diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java index 7ac57414d..cec2841c1 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/InterceptController.java @@ -26,6 +26,7 @@ import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.InterceptPktBin; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.PxyObjKeyring; +import com.nis.domain.configuration.PxyObjSpoofingIpPool; import com.nis.exceptions.MaatConvertException; import com.nis.util.Constants; import com.nis.util.DictUtils; @@ -60,9 +61,18 @@ public class InterceptController extends CommonController { certificateList = pxyObjKeyringService.findPxyObjKeyrings(null, 1, 1, "domain"); } model.addAttribute("certificateList", certificateList); - // IP地址仿冒策略使用策略组 - List policyGroups = policyGroupInfoService.findPolicyGroupInfosByType(6); - model.addAttribute("policyGroups", policyGroups); + /*if(cfg.getFunctionId().equals(214)){ + // IP地址仿冒策略使用策略组 + //List policyGroups = policyGroupInfoService.findPolicyGroupInfosByType(6); + List list = page.getList(); + for(CfgIndexInfo c:list){ + Long cfgId = Long.parseLong(c.getUserRegion2());//user_region2字段存储的为IP仿冒池的ID信息(策略组ID） + PxyObjSpoofingIpPool pool = pxyObjSpoofingIpPoolService.getPxyObjSpoofingIpPool(cfgId); + c.setUserRegion2(pool.getGroupName());//将IP仿冒池的策略组名重新赋给user_region2 + } + +// model.addAttribute("policyGroups", policyGroups); + }*/ return "/cfg/intercept/interceptList"; } @@ -86,8 +96,9 @@ public class InterceptController extends CommonController { model.addAttribute("_cfg", entity); // IP地址仿冒策略使用策略组 - List policyGroups = policyGroupInfoService.findPolicyGroupInfosByType(6); - model.addAttribute("policyGroups", policyGroups); +// List policyGroups = policyGroupInfoService.findPolicyGroupInfosByType(6); +// List pools = pxyObjSpoofingIpPoolService.findPxyObjSpoofingIpPools(new PxyObjSpoofingIpPool()); +// model.addAttribute("policyGroups", pools); return "/cfg/intercept/interceptForm"; } diff --git a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.java b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.java index 1587ce73e..50bba33a1 100644 --- a/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.java +++ b/src/main/java/com/nis/web/controller/configuration/proxy/PxyObjSpoofingIpPoolController.java @@ -89,7 +89,7 @@ public class PxyObjSpoofingIpPoolController extends BaseController { model.addAttribute("isAdd", true); } - List groups=policyGroupInfoService.findPolicyGroupInfosByType(6); + /*List groups=policyGroupInfoService.findPolicyGroupInfosByType(6); List policyGroups = new ArrayList(); //解决目前一个分组只能有一个生效IP for(PolicyGroupInfo group:groups){ @@ -101,7 +101,7 @@ public class PxyObjSpoofingIpPoolController extends BaseController { policyGroups.add(group); } } - model.addAttribute("policyGroups", policyGroups); + model.addAttribute("policyGroups", policyGroups);*/ model.addAttribute("_cfg", cfg); return "/cfg/proxy/spoofingIpPool/form"; } diff --git a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml index a1519f23f..399c7a143 100644 --- a/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/PxyObjSpoofingIpPoolDao.xml @@ -138,7 +138,7 @@ *
- + + <%-- + --%>
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp index 8a9f10f67..b53a9cc5e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -397,7 +397,7 @@ - + @@ -437,7 +437,7 @@ - + @@ -511,11 +511,12 @@ - + ${indexCfg.userRegion2 } + <%-- ${policyGroup.groupName } - + --%> diff --git a/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp b/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp index 89d184c8c..9e2559c3e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/proxy/spoofingIpPool/form.jsp @@ -89,11 +89,12 @@ $(function(){
- + <%-- + --%>
From a143f953c4c996f6c4e801da24ad4370bcb82282 Mon Sep 17 00:00:00 2001 From: chenjinsong Date: Fri, 28 Dec 2018 09:34:17 +0800 Subject: [PATCH 06/28] =?UTF-8?q?login=E9=A1=B5=EF=BC=8C=E9=BD=BF=E8=BD=AE?= =?UTF-8?q?=E5=9B=BE=E9=80=82=E9=85=8D=E7=81=AB=E7=8B=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/login.jsp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/views/login.jsp b/src/main/webapp/WEB-INF/views/login.jsp index 132b8641b..3f3c57132 100644 --- a/src/main/webapp/WEB-INF/views/login.jsp +++ b/src/main/webapp/WEB-INF/views/login.jsp @@ -527,9 +527,20 @@ }; lines_Chart_chu.setOption(line_chu_option); + var url = window.location.href; + var parm = parseInt(Math.random() * 10); + if (url.lastIndexOf('?') > -1) { + 　　url = url + parm; + } else { + 　　url = url + "?" + parm; + } + $(window).resize(function(){ - window.location.reload(); + window.location.href = url; }); + /* $(window).resize(function(){ + window.location.reload(); + }); */ From 6669ea9b0e5e20ef7da40cba60b4a733122a23ff Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 28 Dec 2018 09:44:36 +0800 Subject: [PATCH 07/28] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E5=9B=BE=E6=A0=87=E7=BC=A9=E5=B0=8F?= =?UTF-8?q?=E6=94=BE=E5=88=B0=E6=A0=87=E9=A2=98=E4=B8=80=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../webapp/static/pages/css/data_text.css | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/main/webapp/static/pages/css/data_text.css b/src/main/webapp/static/pages/css/data_text.css index b4dc52869..ef0fdee30 100644 --- a/src/main/webapp/static/pages/css/data_text.css +++ b/src/main/webapp/static/pages/css/data_text.css @@ -47,13 +47,14 @@ p{ .data_content .data_info .fr_fc .fl_visual{ margin-left: 2px; float: left; - height: 110px; + height: 50px; width: 28%; - font-size: 40px; + font-size: 25px; /* color: #d9ffff !important; */ /* color: linear-gradient(to right, #ffcc99, #77b5dc); */ - position: relative; - margin-top: 25px; +/* position: relative; */ + margin-top: 2px; + position: absolute; /*background: -webkit-linear-gradient(left,#d9ffff, #77b5dc);*/ /* background: -webkit-linear-gradient(left,#d9ffff,#77b5dc); */ @@ -90,7 +91,7 @@ p{ -webkit-text-fill-color: transparent; } */ .data_content .data_info .fr_fc .fl_fc{ - width: 70%; + width: 100%; height: 110px; border-width: 0 1px; margin-left: 0px; @@ -136,111 +137,110 @@ p{ } .data_content .data_info .info_2 p:nth-child(1){ color:#fff; - font-size: 18px; + font-size: 16px; text-align: center; overflow: hidden; white-space: nowrap; /* text-overflow: ellipsis; */ - margin-left: -12px; + margin-left: 28px; } .data_content .data_info .info_1 label:nth-child(1){ width:100%; color:#fff; - font-size: 18px; + font-size: 16px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; margin: -2px; - margin-left: -20px; } .data_content .data_info>div.info_1 p:nth-child(2){ width:100%; font-weight: 600; - font-size: 16px; + font-size: 14px; /*color:#288dce;*/ color:#ffffff; - margin-top: 2.1em; + margin-top: 2.5em; margin-left: 0px; } .data_content .data_info .info_2 .fr_fc .numberRun2{ width:100%; font-weight: 600; - font-size: 16px; + font-size: 14px; /*color:#288dce;*/ color:#ffffff; - margin-top: 2.1em; + margin-top: 2.5em; margin-left: 0px; } .data_content .data_info .info_2 .fr_fc .numberRun3{ width:100%; font-weight: 600; - font-size: 16px; + font-size: 14px; /*color:#288dce;*/ color:#ffffff; - margin-top: 2.1em; + margin-top: 2.5em; margin-left: 0px; } .data_content .data_info .info_2 .fr_fc .numberRun5{ width:100%; font-weight: 600; - font-size: 16px; + font-size: 14px; /*color:#288dce;*/ color:#ffffff; - margin-top: 2.1em; + margin-top: 2.5em; margin-left: 0px; } .data_content .data_info .info_2 .fr_fc .numberRun6{ width:100%; font-weight: 600; - font-size: 16px; + font-size: 14px; /*color:#288dce;*/ color:#ffffff; - margin-top: 2.1em; + margin-top: 2.5em; margin-left: 0px; } .data_content .data_info .info_2 .fr_fc .numberRun7{ width:100%; font-weight: 600; - font-size: 16px; + font-size: 14px; /*color:#288dce;*/ color:#ffffff; - margin-top: 2.1em; + margin-top: 2.5em; margin-left: 0px; } .data_content .data_info .info_2 .fr_fc .numberRun8{ width:100%; font-weight: 600; - font-size: 16px; + font-size: 14px; /*color:#288dce;*/ color:#ffffff; - margin-top: 2.1em; + margin-top: 2.5em; margin-left: 0px; } .data_content .data_info .info_2 .fr_fc .numberRun{ width:100%; font-weight: 600; - font-size: 16px; + font-size: 14px; /*color:#288dce;*/ color:#ffffff; - margin-top: 2.1em; + margin-top: 2.5em; margin-left: 0px; } .data_content .data_info>div.info_1 .fl_fc .numberRun4{ width:100%; font-weight: 600; - font-size: 16px; + font-size: 14px; /*color:#288dce;*/ color:#ffffff; - margin-top: 1px; + margin-top: 3px; margin-left: 0px; } .data_content .data_info>div.info_1 .fl_fc .numberRun1{ width:100%; font-weight: 600; - font-size: 16px; + font-size: 14px; /*color:#288dce;*/ color:#ffffff; - margin-top: 33px; + margin-top: 35px; margin-left: 0px; } .data_content .data_info>div.info_1 .fl_fc .numberRun4-unit{ @@ -254,7 +254,7 @@ p{ font-size: 11px; /*color:#337ab7 !important;*/ color:#ffffff !important; - margin-top: -6px; + margin-top: -3px; text-align: center; margin-left: 1.3px; } From 10e8d76426d100111e650e46e69736f752d7c7e0 Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Fri, 28 Dec 2018 11:52:58 +0800 Subject: [PATCH 08/28] =?UTF-8?q?=E4=BB=A3=E7=90=86=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B9=B6=E4=B8=8B=E5=8F=91=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E5=9F=9F=E5=8F=82?= =?UTF-8?q?=E6=95=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/web/service/BaseService.java | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) diff --git a/src/main/java/com/nis/web/service/BaseService.java b/src/main/java/com/nis/web/service/BaseService.java index 1a9e2ab7b..83a3ed2fc 100644 --- a/src/main/java/com/nis/web/service/BaseService.java +++ b/src/main/java/com/nis/web/service/BaseService.java @@ -2123,6 +2123,22 @@ public abstract class BaseService { umap.put("bps_threadshold", _cfg.getBpsThreadshold()); umap.put("pps_threadshold", _cfg.getPpsThreadshold()); maatCfg.setUserRegion(new Gson().toJson(umap)); + }else if(regionDict.getFunctionId()==200) {// IP Intercept + maatCfg.setUserRegion(Constants.USER_REGION_PLACEHOLDER); + if(_cfg.getAction().equals(Constants.MONIT_ACTION)) { + maatCfg.setUserRegion(Constants.INTERCEPT_IP_MONIT_USER_REGION_KEY+"="+Constants.USER_REGION_PLACEHOLDER); + } + }else if(regionDict.getFunctionId()==207 || regionDict.getFunctionId()==208 || regionDict.getFunctionId()==209) {// HTTP(s)阻断、重定向、替换 + String userRegion = Constants.USER_REGION_PLACEHOLDER; + if(_cfg.getAction().equals(Constants.REJECT_ACTION)) {// 阻断 + userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+_cfg.getUserRegion1()+";"+Constants.REDIRECT_CONTENT_KEY+"="+_cfg.getUserRegion2(); + }else if(_cfg.getAction().equals(48)) {// 重定向 + userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+_cfg.getUserRegion1()+";"+Constants.REDIRECT_URL_KEY+"="+_cfg.getUserRegion2();; + }else if(_cfg.getAction().equals(Constants.REPLACE_ACTION)) {// 替换 + String substitute = "/"+_cfg.getUserRegion2()+"/"+_cfg.getUserRegion3(); + userRegion = Constants.REPLACE_ZONE_KEY+"="+_cfg.getUserRegion1()+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute; + } + maatCfg.setUserRegion(userRegion); } configCompileList.add(maatCfg); @@ -2214,6 +2230,25 @@ public abstract class BaseService { } }else if(regionDict.getDictId()==159) { maatCfg.setUserRegion(Constants.P2P_HASH_TYPE_USER_REGION_KEY+"="+_cfg.getUserRegion1()); + }else if(regionDict.getFunctionId()==201) {// Domain Intercept + String userRegion = Constants.USERREGION_DOMAIN_ID+"="+_cfg.getCompileId()+";"+Constants.USERREGION_DOMAIN_STR+"="+_cfg.getCfgKeywords(); + if(_cfg.getAction().equals(Constants.MONIT_ACTION)) {// 监测 需要发keyring_id、拦截强度 + userRegion = Constants.INTERCEPT_IP_MONIT_USER_REGION_KEY+"=0"+";"+Constants.INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY+"="+_cfg.getUserRegion5()+";" + userRegion; + }else if(_cfg.getAction().equals(Constants.RATELIMIT_ACTION)) {// 限速 需要发Droprate + userRegion = Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+_cfg.getUserRegion2()+";" + userRegion; + } + maatCfg.setUserRegion(userRegion); + }else if(regionDict.getFunctionId()==207 || regionDict.getFunctionId()==208 || regionDict.getFunctionId()==209) {// HTTP(s)阻断、重定向、替换 + String userRegion = Constants.USER_REGION_PLACEHOLDER; + if(_cfg.getAction().equals(Constants.REJECT_ACTION)) {// 阻断 + userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+_cfg.getUserRegion1()+";"+Constants.REDIRECT_CONTENT_KEY+"="+_cfg.getUserRegion2(); + }else if(_cfg.getAction().equals(48)) {// 重定向 + userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+_cfg.getUserRegion1()+";"+Constants.REDIRECT_URL_KEY+"="+_cfg.getUserRegion2();; + }else if(_cfg.getAction().equals(Constants.REPLACE_ACTION)) {// 替换 + String substitute = "/"+_cfg.getUserRegion2()+"/"+_cfg.getUserRegion3(); + userRegion = Constants.REPLACE_ZONE_KEY+"="+_cfg.getUserRegion1()+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute; + } + maatCfg.setUserRegion(userRegion); } configCompileList.add(maatCfg); } @@ -2294,6 +2329,17 @@ public abstract class BaseService { if(StringUtil.isEmpty(dictValue) || dictValue.equals("默认")){ maatCfg.setUserRegion(Constants.HTTP_HEADER_USER_REGION_KEY+"="+cfg.getDistrict()); } + }else if(regionDict.getFunctionId()==207 || regionDict.getFunctionId()==208 || regionDict.getFunctionId()==209) {// HTTP(s)阻断、重定向、替换 + String userRegion = Constants.USER_REGION_PLACEHOLDER; + if(cfg.getAction().equals(Constants.REJECT_ACTION)) {// 阻断 + userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+cfg.getUserRegion1()+";"+Constants.REDIRECT_CONTENT_KEY+"="+cfg.getUserRegion2(); + }else if(cfg.getAction().equals(48)) {// 重定向 + userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+cfg.getUserRegion1()+";"+Constants.REDIRECT_URL_KEY+"="+cfg.getUserRegion2();; + }else if(cfg.getAction().equals(Constants.REPLACE_ACTION)) {// 替换 + String substitute = "/"+cfg.getUserRegion2()+"/"+cfg.getUserRegion3(); + userRegion = Constants.REPLACE_ZONE_KEY+"="+cfg.getUserRegion1()+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute; + } + maatCfg.setUserRegion(userRegion); } configCompileList.add(maatCfg); } From 620810c1f15171f79d7f8541d574cf18e32193b1 Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 28 Dec 2018 12:58:46 +0600 Subject: [PATCH 09/28] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BA=E6=8F=90=E7=A4=BA=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E5=A4=9A=E5=85=B3=E9=94=AE=E5=AD=97=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/util/excel/ExportExcel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index ac9216b9e..50c9bdb4c 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -1042,7 +1042,7 @@ public class ExportExcel { //expr type if("key_word".equals(headerStr)){ if(!StringUtil.isEmpty(region.getConfigMultiKeywords())){ - if(region.getConfigMultiKeywords().equals(1)){//多关键字输入TODO + if(region.getConfigMultiKeywords().equals("1")){//多关键字输入TODO commentStr=commentStr+msgProp.getProperty("rule_desc_tip")+":\n"; index++; //允许输入多关键字，多个关键字用换行表示 From 1ab978fb3395110d4d831a812e3469c7140a06cf Mon Sep 17 00:00:00 2001 From: wangxin Date: Fri, 28 Dec 2018 13:58:43 +0600 Subject: [PATCH 10/28] =?UTF-8?q?=EF=BC=881=EF=BC=89=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=9D=A5=E5=87=BD=EF=BC=8C=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=AA=8C=E8=AF=81=E6=8F=90=E7=A4=BA=E4=B8=BA?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5=20=EF=BC=882=EF=BC=89?= =?UTF-8?q?=E6=9D=A5=E5=87=BD=EF=BC=8C=E4=B8=93=E9=A1=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E9=AA=8C=E8=AF=81=E6=8E=92=E9=99=A4=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/web/controller/basics/TaskInfoController.java | 3 ++- .../web/controller/configuration/RequestInfoController.java | 3 ++- src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml | 2 +- src/main/java/com/nis/web/dao/configuration/TaskInfoDao.xml | 2 +- src/main/resources/messages/message_en.properties | 3 ++- src/main/resources/messages/message_ru.properties | 3 ++- src/main/resources/messages/message_zh_CN.properties | 3 ++- 7 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java index 59cfc7d21..1d2e298d9 100644 --- a/src/main/java/com/nis/web/controller/basics/TaskInfoController.java +++ b/src/main/java/com/nis/web/controller/basics/TaskInfoController.java @@ -77,7 +77,8 @@ public class TaskInfoController extends BaseController{ }else{ if (!"true".equals(checkTaskName(taskInfo.getTaskName()))){ logger.info(taskInfo.getTaskName()+"重复数据"); - addMessage("error",model,"save_failed"); + Properties props=this.getMsgProp(); + addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("task_name", "Task Name")); return form(taskInfo, model); } // 保存用户信息 diff --git a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java index 4b1239c34..ae3f0ce6d 100644 --- a/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java +++ b/src/main/java/com/nis/web/controller/configuration/RequestInfoController.java @@ -83,7 +83,8 @@ public class RequestInfoController extends BaseController{ }else{ if (!"true".equals(checkRequestNumber(requestInfo.getRequestNumber()))){ logger.info(requestInfo.getRequestNumber()+"重复数据"); - addMessage("error",model,"save_failed"); + Properties props=this.getMsgProp(); + addMessage("error",model,props.getProperty("duplicate", "Duplicate")+" "+props.getProperty("title", "Title")); return form(requestInfo, model); } // 保存用户信息 diff --git a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml index 7f5f94cd3..8c0e0c100 100644 --- a/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml +++ b/src/main/java/com/nis/web/dao/configuration/RequestInfoDao.xml @@ -99,7 +99,7 @@ select from request_info - where request_number = #{requestNumber,jdbcType=VARCHAR} + where request_number = #{requestNumber,jdbcType=VARCHAR} and is_valid !=-1 - +
@@ -106,7 +167,9 @@
    • - +
    + +
    href="javascript:;"> @@ -151,6 +214,7 @@
    ${page}
    +
    diff --git a/src/main/webapp/WEB-INF/views/report/list.jsp b/src/main/webapp/WEB-INF/views/report/list.jsp index 026f57216..3a7d17c53 100644 --- a/src/main/webapp/WEB-INF/views/report/list.jsp +++ b/src/main/webapp/WEB-INF/views/report/list.jsp @@ -5,6 +5,7 @@ + <spring:message code="${bean.cfgName}"></spring:message> <%@ include file="/WEB-INF/include/form/pageGroup.jsp"%> @@ -142,7 +155,7 @@ body {
    -

    " +

    " class="tooltips" data-flag="false" data-html="true" data-placement="top">

    0

     diff --git a/src/main/webapp/static/pages/css/data_text.css b/src/main/webapp/static/pages/css/data_text.css index ef0fdee30..7d9448d8f 100644 --- a/src/main/webapp/static/pages/css/data_text.css +++ b/src/main/webapp/static/pages/css/data_text.css @@ -141,17 +141,18 @@ p{ text-align: center; overflow: hidden; white-space: nowrap; -/* text-overflow: ellipsis; */ - margin-left: 28px; + text-overflow: ellipsis; + margin-left: 33px; } .data_content .data_info .info_1 label:nth-child(1){ - width:100%; + width:77%; color:#fff; font-size: 16px; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; margin: -2px; + margin-left: 30px; } .data_content .data_info>div.info_1 p:nth-child(2){ width:100%;