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

APP策略ssl、header界面修改.

Browse Source
This commit is contained in:
zhangwenqing
2018-08-24 19:14:50 +08:00
parent e62cace354
commit 919c649e4e
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java
View File

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

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

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

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

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

4
src/main/webapp/WEB-INF/views/cfg/app/appHeaderCfgForm.jsp
View File

@@ -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">

15
src/main/webapp/WEB-INF/views/cfg/app/appSslCfgForm.jsp
View File

@@ -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">