gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source 
Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_zh_CN.properties
This commit is contained in:
duandongmei
2018-08-20 10:03:10 +08:00
parent 1b42f73d4e b2bb12a52b
commit fbbe28a619
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/controller/configuration/ntc/FileTransferCfgController.java
View File

@@ -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);

3
src/main/resources/messages/message_en.properties
View File

@@ -1076,4 +1076,5 @@ 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
app_built_in_features_config=APP Built-in Features
app_ssl_config=APP SSL Cert Feature

3
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1074,4 +1074,5 @@ 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
app_built_in_features_config=APP\u5185\u7F6E\u7279\u5F81\u7EF4\u62A4
app_ssl_config=APP SSL\u8BC1\u4E66\u7279\u5F81