From e75c540e74e8aaa7dfb45284d8f238ce7c5fd1f3 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Mon, 15 Oct 2018 11:12:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97ddos?= =?UTF-8?q?=E6=8B=86=E5=88=86=E4=B8=BA=E4=B8=A4=E4=B8=AA=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/domain/log/NtcDdosLog.java | 10 +++--- .../controller/log/ntc/DdosLogController.java | 3 ++ .../resources/messages/message_en.properties | 4 ++- .../resources/messages/message_ru.properties | 4 ++- .../messages/message_zh_CN.properties | 4 ++- .../sql/20181015/update_sys_menu.sql | 3 ++ .../webapp/WEB-INF/views/log/ntc/ddosList.jsp | 36 ++++++++++--------- 7 files changed, 39 insertions(+), 25 deletions(-) create mode 100644 src/main/resources/sql/20181015/update_sys_menu.sql diff --git a/src/main/java/com/nis/domain/log/NtcDdosLog.java b/src/main/java/com/nis/domain/log/NtcDdosLog.java index 32ccf19a1..291056f7f 100644 --- a/src/main/java/com/nis/domain/log/NtcDdosLog.java +++ b/src/main/java/com/nis/domain/log/NtcDdosLog.java @@ -26,7 +26,7 @@ public class NtcDdosLog extends BaseLogEntity { @ApiModelProperty(value = "攻击累积字节数", required = true) protected String attackTotalByte; @ApiModelProperty(value = "攻击流量是否被丢弃", required = true) - protected Integer isBlcok; + protected Integer isBlock; public Integer getAttackType() { @@ -71,11 +71,11 @@ public class NtcDdosLog extends BaseLogEntity { public void setAttackTotalByte(String attackTotalByte) { this.attackTotalByte = attackTotalByte; } - public Integer getIsBlcok() { - return isBlcok; + public Integer getIsBlock() { + return isBlock; } - public void setIsBlcok(Integer isBlcok) { - this.isBlcok = isBlcok; + public void setIsBlock(Integer isBlock) { + this.isBlock = isBlock; } } diff --git a/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java b/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java index 65eeb3f7a..987de3a8c 100644 --- a/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java +++ b/src/main/java/com/nis/web/controller/log/ntc/DdosLogController.java @@ -57,6 +57,9 @@ public class DdosLogController extends BaseController{ Map params=new HashMap<>(); params.put("pageSize", page.getPageSize()); params.put("pageNo", page.getPageNo()); + if(entry!=null&&entry.getIsBlock()!=null) { + params.put("searchIsBlock", entry.getIsBlock()); + } //查询值判断 initLogSearchValue(entry,params); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 8a18b0823..121af32a8 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1237,4 +1237,6 @@ log_user=Operating User log_submission=Submission log_ip=Operator IP log_exception_info=Exception Information -system_log=Log Management \ No newline at end of file +system_log=Log Management +protected_ddos=Protected DDOS +usual_ddos=Usual DDOS \ No newline at end of file diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 869b28bdb..ba733a00c 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1216,7 +1216,7 @@ protocol_identify=Protocol Identify NTC_ASN_IP=ASN MM_FILE_DIGEST=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0414\u0430\u0439\u0434\u0436\u0435\u0441\u0442\u0430 \u0424\u0430\u0439\u043b\u043e\u0432 NTC_STREAMING_MEDIA_URL=Streaming Media URL -NTC_VOIP_ACCOUNT=VoIP \u0410\u043A\u043A\u0430\u0443\u043D\u0442 +NTC_VOIP_ACCOUNT=VoIP \u0410\u043a\u043a\u0430\u0443\u043d\u0442 export_failed=Export Failed user_manage=Client Account Manage ip_reuse_policy_object=IP Reuse Policy Object @@ -1249,3 +1249,5 @@ ip_addr=IP area_id=Area link_num=Link Number stat_time=Statistical Time +protected_ddos=Protected DDOS +usual_ddos=Usual DDOS \ No newline at end of file diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 736077094..925f50228 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1230,4 +1230,6 @@ log_exception=\u53EA\u67E5\u8BE2\u5F02\u5E38\u4FE1\u606F log_user=\u64CD\u4F5C\u7528\u6237 log_submission=\u63D0\u4EA4\u65B9\u5F0F log_ip=\u64CD\u4F5C\u8005IP -log_exception_info=\u5F02\u5E38\u4FE1\u606F \ No newline at end of file +log_exception_info=\u5F02\u5E38\u4FE1\u606F +protected_ddos=\u4FDD\u62A4DDOS\u653B\u51FB +usual_ddos=\u5E38\u7528DDOS\u653B\u51FB \ No newline at end of file diff --git a/src/main/resources/sql/20181015/update_sys_menu.sql b/src/main/resources/sql/20181015/update_sys_menu.sql new file mode 100644 index 000000000..4ad4408c4 --- /dev/null +++ b/src/main/resources/sql/20181015/update_sys_menu.sql @@ -0,0 +1,3 @@ +INSERT INTO `sys_menu` VALUES ('1138', '801', '0,1,152,801,', 'protected_ddos', '保护ddos攻击', '10', '/log/ntc/ntcDdosLogs/list?isBlock=1', '', '', '1', '', '1', '2018-09-17 16:38:57', '1', '2018-09-17 16:38:57', '', '0', null, '0', '0', '301'); +INSERT INTO `sys_menu` VALUES ('1139', '801', '0,1,152,801,', 'usual_ddos', '常用ddos攻击', '20', '/log/ntc/ntcDdosLogs/list?isBlock=0', '', '', '1', '', '1', '2018-09-17 16:38:57', '1', '2018-09-17 16:38:57', '', '0', null, '0', '0', '305'); +UPDATE sys_menu set href='',function_id=null where id=801; 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 a4185893f..46024a4c4 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -31,7 +31,8 @@ $(document).ready(function(){

- + +

@@ -44,6 +45,7 @@ $(document).ready(function(){ + @@ -89,7 +91,7 @@ $(document).ready(function(){