From 6111463ec383517a861c217726cfea37b8dbcc06 Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 17 Dec 2018 18:03:25 +0600 Subject: [PATCH 1/2] =?UTF-8?q?(1)ddosIp=E8=A1=A8=E5=8D=95=E6=8C=89?= =?UTF-8?q?=E7=85=A7=E6=9D=A8=E5=A8=81=E8=A6=81=E6=B1=82=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E6=9C=80=E5=B0=8F=E5=80=BC=E9=99=90=E5=88=B6=20(2)=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E4=BD=BF=E7=94=A8=E6=A8=A1=E6=9D=BF=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=8E=BB=E6=8E=89=E5=85=B3=E4=BA=8E?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=E7=9A=84=E5=8F=99=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 2 +- src/main/resources/messages/message_ru.properties | 2 +- src/main/resources/messages/message_zh_CN.properties | 2 +- src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index 57feba518..05940e2ad 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1219,7 +1219,7 @@ http_keyword_monit=Website Keyword Monitor http_keyword_reject=Website Keyword Block has_invisible_char=%s has invisible characters not_multiple=%s do not support multiple keywords -template_error=The import template is incorrect. Pleace choose a proper template which has the same language with the system and the same configure type. +template_error=The import template is incorrect. asn_no=ASN query=Query cfg_operation_log=Configuration Operation Log diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index ee25a064f..ca7780a39 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1219,7 +1219,7 @@ http_keyword_monit=\u041c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433 http_keyword_reject=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u043a\u043b\u044e\u0447\u0435\u0432\u044b\u0445 \u0441\u043b\u043e\u0432 \u0432\u0435\u0431-c\u0430\u0439\u0442\u0430 has_invisible_char=%s \u0438\u043c\u0435\u0435\u0442 \u043d\u0435\u0432\u0438\u0434\u0438\u043c\u044b\u0435 \u0441\u0438\u043c\u0432\u043e\u043b\u044b not_multiple=%s \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u044e\u0442 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043a\u043b\u044e\u0447\u0435\u0432\u044b\u0445 \u0441\u043b\u043e\u0432 -template_error=\u0428\u0430\u0431\u043b\u043e\u043d \u0438\u043c\u043f\u043e\u0440\u0442\u0430 \u043d\u0435\u0432\u0435\u0440\u0435\u043d. \u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043f\u043e\u0434\u0445\u043e\u0434\u044f\u0449\u0438\u0439 \u0448\u0430\u0431\u043b\u043e\u043d, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0438\u043c\u0435\u0435\u0442 \u0442\u043e\u0442 \u0436\u0435 \u044f\u0437\u044b\u043a \u0441 \u0441\u0438\u0441\u0442\u0435\u043c\u043e\u0439 \u0438 \u0442\u043e\u0442 \u0436\u0435 \u0442\u0438\u043f \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438. +template_error=\u0428\u0430\u0431\u043b\u043e\u043d \u0438\u043c\u043f\u043e\u0440\u0442\u0430 \u043d\u0435\u0432\u0435\u0440\u0435\u043d. asn_no=ASN query=\u0417\u0430\u043f\u0440\u043e\u0441 cfg_operation_log=\u0416\u0443\u0440\u043d\u0430\u043b \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u0439 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438 diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index d4b30d3b7..438ecd572 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1214,7 +1214,7 @@ http_keyword_monit=\u7f51\u9875\u5173\u952e\u5b57\u76d1\u6d4b http_keyword_reject=\u7f51\u9875\u5173\u952e\u5b57\u963b\u65ad has_invisible_char=%s\u5305\u542b\u4e0d\u53ef\u89c1\u5b57\u7b26 not_multiple=%s\u4e0d\u652f\u6301\u591a\u4e2a\u5173\u952e\u5b57 -template_error=\u5bfc\u5165\u6a21\u677f\u9519\u8bef.\u8bf7\u9009\u62e9\u4e0e\u7cfb\u7edf\u8bed\u8a00\u4e00\u81f4\uff0c\u5e76\u4e14\u914d\u7f6e\u7c7b\u578b\u4e00\u81f4\u7684\u6a21\u677f\u5bfc\u5165. +template_error=\u5bfc\u5165\u6a21\u677f\u9519\u8bef. asn_no=ASN query=Query cfg_operation_log=\u914d\u7f6e\u64cd\u4f5c\u65e5\u5fd7 diff --git a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp index d717125e5..af45a3927 100644 --- a/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/ddosIpCfgForm.jsp @@ -187,7 +187,7 @@ $(function(){
- +
@@ -196,7 +196,7 @@ $(function(){
- +
From e1d3a8d84981ab543f0d9b7115fe310d6547dd71 Mon Sep 17 00:00:00 2001 From: wangxin Date: Mon, 17 Dec 2018 18:14:09 +0600 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=81=94=E9=80=9A?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=9A=84appLabel=E5=AD=97=E6=AE=B5=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=BAString?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/nis/domain/log/NtcConnRecordLog.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/nis/domain/log/NtcConnRecordLog.java b/src/main/java/com/nis/domain/log/NtcConnRecordLog.java index cb292b588..f6863769d 100644 --- a/src/main/java/com/nis/domain/log/NtcConnRecordLog.java +++ b/src/main/java/com/nis/domain/log/NtcConnRecordLog.java @@ -6,7 +6,7 @@ public class NtcConnRecordLog extends BaseLogEntity { private static final long serialVersionUID = -4947912502754359817L; @ExcelField(title = "social_app", sort = 8) - protected Integer appLabel; + protected String appLabel; @ExcelField(title = "c2s_pkt_num", sort = 9) protected String c2sPktNum; @@ -20,11 +20,11 @@ public class NtcConnRecordLog extends BaseLogEntity { @ExcelField(title = "s2c_byte_num", sort = 13) protected String s2cByteNum; - public Integer getAppLabel() { + public String getAppLabel() { return appLabel; } - public void setAppLabel(Integer appLabel) { + public void setAppLabel(String appLabel) { this.appLabel = appLabel; }