diff --git a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java index af7332b89..79e27c9bd 100644 --- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java @@ -542,7 +542,7 @@ public class WebsiteCfgService extends CrudService { } } } - if(entity.getSslList()!=null){ + if(entity.getNtcSubscribeIdCfgList()!=null){ for(NtcSubscribeIdCfg cfg:entity.getNtcSubscribeIdCfgList()){ if(StringUtils.isNotBlank(cfg.getCfgKeywords())){ BeanUtils.copyProperties(entity, cfg,new String[]{"cfgRegionCode","cfgType"}); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index f4c220032..639f9207d 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1110,3 +1110,6 @@ intercept_file_strategy=Intercept Certificate Strategy root=Root Certificate intermediate=Intermediate Certificate end_entity=End-entity Certificate + +header=Header +layer=Layer \ 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 db9fd8987..d6cec7415 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1105,4 +1105,7 @@ pxy_intercept_monit_keyring=\u8BC1\u4E66\u7B56\u7565 intercept_file_strategy=\u62E6\u622A\u8BC1\u4E66\u7B56\u7565 root=\u6839\u8BC1\u4E66 intermediate=\u4E2D\u95F4\u8BC1\u4E66 -end_entity=\u5B9E\u4F53\u8BC1\u4E66 +end_entity=\u5B9E\u4F53\u8BC1\u4E66 + +header=\u5173\u952E\u5B57 +layer=\u5339\u914D\u533A\u57DF \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp index c9c845482..dbd704749 100644 --- a/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp @@ -154,7 +154,7 @@ $(function(){
+
- - + + + @@ -168,7 +169,7 @@ $(function(){
- + <%-- --%>