From b2bb12a52b325fbefb9720382d8b67ca5aa42f7a Mon Sep 17 00:00:00 2001 From: zhangwenqing Date: Mon, 20 Aug 2018 09:52:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E4=BB=A3=E7=A0=81.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../configuration/ntc/FileTransferCfgController.java | 4 ++-- src/main/resources/messages/message_en.properties | 5 ++++- src/main/resources/messages/message_zh_CN.properties | 5 ++++- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java index 328afda87..5576b03d5 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java @@ -247,7 +247,7 @@ public class FileTransferCfgController extends BaseController{ if(StringUtils.isNotBlank(ids)){ entity = fileTransferCfgService.getP2pCfg(Long.parseLong(ids)); - // 添加配置域Key,用于新增页面判断 + // 添加配置域Key,用于修改页面区分各域配置 P2pHashCfg hashCfg = new P2pHashCfg(); hashCfg.setCfgType(Constants.P2P_HASH_BIN_REGION); entity.setP2pHash(hashCfg); @@ -270,7 +270,7 @@ public class FileTransferCfgController extends BaseController{ initUpdateFormCondition(model,entity); }else{ - // 添加配置域Key,用于修改页面判断 + // 添加配置域Key,用于新增页面区分各域配置 P2pHashCfg hashCfg = new P2pHashCfg(); hashCfg.setCfgType(Constants.P2P_HASH_BIN_REGION); entity.setP2pHash(hashCfg); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index faee65b1d..31f244158 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1068,4 +1068,7 @@ website=Website p2p_ip_config_type=IP Config Type p2p_hash_type=Hash Type -NTC_SUBSCRIBE_ID=Certification Mark Configuration \ No newline at end of file +NTC_SUBSCRIBE_ID=Certification Mark Configuration + +app_header_config=APP Header Feature +app_ssl_config=APP SSL Cert Feature \ 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 533b7590a..d4e91bca3 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1066,4 +1066,7 @@ website=\u7F51\u7AD9\u57DF\u540D p2p_ip_config_type=IP\u914D\u7F6E\u7C7B\u578B p2p_hash_type=HASH\u7C7B\u578B -NTC_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E \ No newline at end of file +NTC_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E + +app_header_config=APP\u62A5\u5934\u7279\u5F81 +app_ssl_config=APP SSL\u8BC1\u4E66\u7279\u5F81 \ No newline at end of file From 1b42f73d4e711718ceea5d63c0c642ee510ca48d Mon Sep 17 00:00:00 2001 From: duandongmei Date: Mon, 20 Aug 2018 10:01:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0intercepter=E9=99=90=E9=80=9F=E5=92=8C=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/messages/message_en.properties | 10 +++++++++- src/main/resources/messages/message_zh_CN.properties | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index faee65b1d..3bf93a562 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1068,4 +1068,12 @@ website=Website p2p_ip_config_type=IP Config Type p2p_hash_type=Hash Type -NTC_SUBSCRIBE_ID=Certification Mark Configuration \ No newline at end of file +NTC_SUBSCRIBE_ID=Certification Mark Configuration + +app_header_config=APP Header Feature +app_ssl_config=APP SSL Cert Feature +ip_intercepter_replace=IP Intercept Replace +domain_intercepter_replace=Domain Intercept Replace +ip_intercepter_ratelimit=IP Intercept Ratelimit +domain_intercepter_ratelimit=Domain Intercept Ratelimit +app_built_in_features_config=APP Built-in Features \ 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 533b7590a..737abae9e 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1066,4 +1066,12 @@ website=\u7F51\u7AD9\u57DF\u540D p2p_ip_config_type=IP\u914D\u7F6E\u7C7B\u578B p2p_hash_type=HASH\u7C7B\u578B -NTC_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E \ No newline at end of file +NTC_SUBSCRIBE_ID=\u8BA4\u8BC1\u6807\u8BC6\u914D\u7F6E + +app_header_config=APP\u62A5\u5934\u7279\u5F81 +app_ssl_config=APP SSL\u8BC1\u4E66\u7279\u5F81 +ip_intercepter_replace=IP\u62E6\u622A\u66FF\u6362 +domain_intercepter_replace=\u57DF\u540D\u62E6\u622A\u66FF\u6362 +ip_intercepter_ratelimit=IP\u62E6\u622A\u9650\u901F +domain_intercepter_ratelimit=\u57DF\u540D\u62E6\u622A\u9650\u901F +app_built_in_features_config=APP\u5185\u7F6E\u7279\u5F81\u7EF4\u62A4 \ No newline at end of file