From 919c649e4e22d4506dd98d131e125db432f73ca7 Mon Sep 17 00:00:00 2001
From: zhangwenqing <zhangwenqing@intranet.com>
Date: Fri, 24 Aug 2018 19:14:50 +0800
Subject: [PATCH] =?UTF-8?q?APP=E7=AD=96=E7=95=A5ssl=E3=80=81header?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/configuration/WebsiteCfgService.java  |  2 +-
 src/main/resources/messages/message_en.properties |  3 +++
 .../resources/messages/message_zh_CN.properties   |  5 ++++-
 .../WEB-INF/views/cfg/app/appHeaderCfgForm.jsp    |  4 ++--
 .../WEB-INF/views/cfg/app/appSslCfgForm.jsp       | 15 ++++++++-------
 5 files changed, 18 insertions(+), 11 deletions(-)

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<WebsiteCfgDao,CfgIndexInfo> {
 					}
 				}
 			}
-			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(){
 										<div class="col-md-6">
 											<div class="form-group">
 												<label class="control-label col-md-3"><font color="red">*</font>
-													<spring:message code="district" /></label>
+													<spring:message code="layer" /></label>
 												<div class="col-md-6">
 													<select name="district"
 														class="selectpicker show-tick form-control required district" onchange="changeDistrict($(this))">
@@ -186,7 +186,7 @@ $(function(){
 									<div class="col-md-6">
 										<div class="form-group">
 											<label class="control-label col-md-3"><font color="red">*</font>
-											<spring:message code="keywords" /></label>
+											<spring:message code="header" /></label>
 											<!-- 此配置的关键词可以输入多个关键词 -->
 											<c:if test="${region.configMultiKeywords eq 1}">
 												<div class="col-md-6">
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
index 62e1df904..7e6354a81 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
@@ -149,18 +149,19 @@ $(function(){
 								            <div for="action"></div>
 								       </div>
 									</div>
-									<c:if test="${!empty region.configDistrict }">
+									<%-- <c:if test="${!empty region.configDistrict }"> --%>
 										<div class="col-md-6">
 											<div class="form-group">
 												<label class="control-label col-md-3"><font color="red">*</font>
 													<spring:message code="district" /></label>
 												<div class="col-md-6">
-													<select name="district"
+													<select name="district" data-live-search="true" data-live-search-placeholder="search"
 														class="selectpicker show-tick form-control required district" onchange="changeDistrict($(this))">
-															<c:forEach items="${fn:split(region.configDistrict,',')}"
-																var="_district">
-																<option value="${_district }"
-																	<c:if test="${_cfg.district==_district}">selected</c:if>>${_district }</option>
+															<option value=""><spring:message code="select"/></option>
+															<c:forEach items="${fns:getDictList('SSL_CERT_DISTRICT')}"
+																var="dict">
+																<option value="${dict.itemValue }"
+																	<c:if test="${_cfg.district eq dict.itemValue}">selected</c:if>>${dict.itemValue }</option>
 															</c:forEach>
 													</select>
 													<input type="hidden" name="districtShowName" placeholder="<spring:message code='please_input'/> <spring:message code='custom_region'/>" class="otherValue form-control" value="${_cfg.district}"/>
@@ -168,7 +169,7 @@ $(function(){
 												<div for="district"></div>
 											</div>
 										</div>
-									</c:if>
+									<%-- </c:if> --%>
 									<!-- doLog -->
 									<div class="col-md-6 hidden">
 										<div class="form-group">