From 2f047f60a66354298131279128b401d566e40bc8 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 3 Aug 2018 14:28:43 +0800 Subject: [PATCH 01/12] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=AD=97=E6=AE=B52.=E6=97=A5?= =?UTF-8?q?=E5=BF=97ddos=E6=94=BB=E5=87=BB=E7=B1=BB=E5=9E=8B=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E5=AD=97=E5=85=B8=E4=BE=9D=E6=8D=AE=E5=8D=8F=E8=AE=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=B7=B2=E6=9C=89=E7=B1=BB=E5=9E=8B=20UDP-Fl?= =?UTF-8?q?ood:=201069=20SYN-Flood:=201070?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/messages/message_en.properties | 16 ++++++------- .../messages/message_zh_CN.properties | 24 +++++++++---------- .../webapp/WEB-INF/views/log/ntc/ddosList.jsp | 8 ++++++- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 2f2987225..fbbcc1a6c 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -727,20 +727,20 @@ user_name=User Name attack_type=Attack Type attack_start_time=Attack Start Time last_attack_time=Last Attack Time -attack_max_pps=Attack Max Pps Num/s +attack_max_pps=Attack Max Pps PKT/s attack_max_bps=Attack Max Bps Bit/s -attack_total_pkt=Attack Total Pkt +attack_total_pkt=Attack Total PKT attack_total_byte=Attack Total Byte is_blcok=Is Blcok firstPage=First Page dk_behavior=Behavior app_label=App Tag -c2s_pkt_num=c2sPktNum -s2c_pkt_num=s2cPktNum -c2s_byte_num=c2sByteNum -s2c_byte_num=s2cByteNum -voip_recv_time=VOIP Receive Time -voip_protocol=VOIP Protocol +c2s_pkt_num=C2sPktNum +s2c_pkt_num=S2cPktNum +c2s_byte_num=C2sByteNum +s2c_byte_num=S2cByteNum +voip_recv_time=VoIP Receive Time +voip_protocol=VoIP Protocol av_protocol=AV Protocol duation=Duation(s) calling_account=Calling Account diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index 2cb47ee0a..469d3ce8c 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -730,7 +730,7 @@ attack_type=\u653B\u51FB\u7C7B\u578B attack_start_time=\u653B\u51FB\u8D77\u59CB\u65F6\u95F4 last_attack_time=\u6700\u540E\u4E00\u6B21\u653B\u51FB\u5305\u65F6\u95F4 attack_max_pps=\u653B\u51FB\u6700\u5927\u6D41\u91CF \u5305\u6570/\u79D2 -attack_max_bps=\u653B\u51FB\u6700\u5927\u6D41\u91CF bit\u6570/\u79D2 +attack_max_bps=\u653B\u51FB\u6700\u5927\u6D41\u91CF Bit\u6570/\u79D2 attack_total_pkt=\u653B\u51FB\u7D2F\u79EF\u5305\u6570 attack_total_byte=\u653B\u51FB\u7D2F\u79EF\u5B57\u8282\u6570 is_blcok=\u653B\u51FB\u6D41\u91CF\u662F\u5426\u88AB\u4E22\u5F03 @@ -741,18 +741,18 @@ c2s_pkt_num=c2s\u5305\u6570 s2c_pkt_num=s2c\u5305\u6570 c2s_byte_num=c2s\u5B57\u8282\u6570 s2c_byte_num=s2c\u5B57\u8282\u6570 -voip_recv_time=VOIP\u63A5\u6536\u65F6\u95F4 -voip_protocol=VOIP\u4F20\u8F93\u534F\u8BAE +voip_recv_time=VoIP\u63A5\u6536\u65F6\u95F4 +voip_protocol=VoIP\u4F20\u8F93\u534F\u8BAE av_protocol=\u97F3\u89C6\u9891\u4F20\u8F93\u534F\u8BAE -duation=VOIP\u901A\u8BDD\u65F6\u957F\uFF08\u79D2\uFF09 -calling_account=\u4E3B\u53EBVOIP\u8D26\u53F7 -called_account=\u88AB\u53EBVOIP\u8D26\u53F7 -calling_number=VOIP\u4E3B\u53EB\u7535\u4FE1\u53F7\u7801 -called_number=VOIP\u88AB\u53EB\u7535\u4FE1\u53F7\u7801 -from_to_store_ip=\u4E3B\u53EBVOIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668IP -from_to_store_url=\u4E3B\u53EBVOIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668URL -to_from_store_ip=\u88AB\u53EBVOIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668IP -to_from_store_url=\u88AB\u53EBVOIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668URL +duation=VoIP\u901A\u8BDD\u65F6\u957F\uFF08\u79D2\uFF09 +calling_account=\u4E3B\u53EBVoIP\u8D26\u53F7 +called_account=\u88AB\u53EBVoIP\u8D26\u53F7 +calling_number=VoIP\u4E3B\u53EB\u7535\u4FE1\u53F7\u7801 +called_number=VoIP\u88AB\u53EB\u7535\u4FE1\u53F7\u7801 +from_to_store_ip=\u4E3B\u53EBVoIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668IP +from_to_store_url=\u4E3B\u53EBVoIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668URL +to_from_store_ip=\u88AB\u53EBVoIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668IP +to_from_store_url=\u88AB\u53EBVoIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668URL pid=\u8282\u76EEID log_uri=\u5C01\u5835\u73B0\u573A\u7247\u6BB5\u8DEF\u5F84 fd_type=\u5C01\u5835\u7C7B\u578B 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 54d5fe1e4..1f81539b8 100644 --- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp +++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp @@ -208,7 +208,13 @@ $(document).ready(function(){ - ${log.attackType} + + + + + + + ${log.attackMaxPps} From 186c509de525fe4eec5d515bc4787f5975e3a1c8 Mon Sep 17 00:00:00 2001 From: zhanghongqing Date: Fri, 3 Aug 2018 14:34:57 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/sql/字典修改记录.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/resources/sql/字典修改记录.txt b/src/main/resources/sql/字典修改记录.txt index 5be3532a9..a8b991713 100644 --- a/src/main/resources/sql/字典修改记录.txt +++ b/src/main/resources/sql/字典修改记录.txt @@ -1,2 +1,5 @@ 2018-07-30 -޸ֵLOG_STREAM_TYPEʶ012Ϊ123 \ No newline at end of file +\u4FEE\u6539\u5B57\u5178LOG_STREAM_TYPE\uFF0C\u5C06\u6807\u8BC60\u30011\u30012\u6539\u4E3A1\u30012\u30013 + +2018-08-03 +\u589E\u52A0\u5B57\u5178ATTACK_TYPE\uFF0C\u4F9D\u636E\u534F\u8BAE\u7EDF\u8BA1\u5DF2\u6709\u7C7B\u578B \uFF1AUDP-Flood: 1069 \uFF0CSYN-Flood: 1070 \ No newline at end of file From 4c70448f49cc6b54de505e5231a9a452316f3ef1 Mon Sep 17 00:00:00 2001 From: zhangwei Date: Fri, 3 Aug 2018 16:50:12 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9Maintenance=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=E4=B8=BAAdvanced?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangwei --- src/main/resources/messages/message_en.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index fbbcc1a6c..ec501b766 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1052,6 +1052,6 @@ traffic_website_type_chart=Website Type website=Website #===============dashboard end=================================== ratelimit_limit=Limit Rate must between 0 and 100 -Maintenance=Policy Objects +Maintenance=Advanced Proxy=Proxy selective=Selective \ No newline at end of file From 2dc2017c72436dc92716334cbdfd12bb0c28988a Mon Sep 17 00:00:00 2001 From: zhangwei Date: Fri, 3 Aug 2018 17:00:30 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=EF=BC=9B=E4=BF=AE=E6=94=B9=E8=8B=B1=E6=96=87?= =?UTF-8?q?=E7=BF=BB=E8=AF=91=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhangwei --- .../resources/messages/message_en.properties | 3 ++- src/main/resources/nis.properties | 2 +- src/main/webapp/WEB-INF/views/home.jsp | 2 +- src/main/webapp/WEB-INF/views/login.jsp | 2 +- .../webapp/static/layouts/layout/img/logo1.png | Bin 0 -> 17554 bytes .../webapp/static/layouts/layout/img/logo2.png | Bin 0 -> 8418 bytes src/main/webapp/static/pages/img/logo1.png | Bin 0 -> 17554 bytes src/main/webapp/static/pages/img/logo2.png | Bin 0 -> 8418 bytes 8 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 src/main/webapp/static/layouts/layout/img/logo1.png create mode 100644 src/main/webapp/static/layouts/layout/img/logo2.png create mode 100644 src/main/webapp/static/pages/img/logo1.png create mode 100644 src/main/webapp/static/pages/img/logo2.png diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index ec501b766..d8e01c3e9 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1054,4 +1054,5 @@ website=Website ratelimit_limit=Limit Rate must between 0 and 100 Maintenance=Advanced Proxy=Proxy -selective=Selective \ No newline at end of file +selective=Selective +ip_protocol=IP Protocol \ No newline at end of file diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index 27250acdf..4a2ed7d31 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -52,7 +52,7 @@ work.notify.remind.interval=60000 #============================# #\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e -productName=National Firewall System +productName=National Traffic Control System copyrightYear=2015 version=V1.0.0 diff --git a/src/main/webapp/WEB-INF/views/home.jsp b/src/main/webapp/WEB-INF/views/home.jsp index bffb47116..dee80271b 100644 --- a/src/main/webapp/WEB-INF/views/home.jsp +++ b/src/main/webapp/WEB-INF/views/home.jsp @@ -194,7 +194,7 @@ window.onresize=function(){