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

(1)ANS IP配置去掉ip range的选项

Browse Source 
(2)SSL配置导入提交
This commit is contained in:
wangxin
2018-10-30 18:29:36 +08:00
parent df688f87d8
commit 3270d110fe
5 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/nis/web/controller/BaseController.java
View File

@@ -3361,6 +3361,9 @@ public class BaseController {
if (regionDict.getFunctionId().equals(61)) {
bgpCfgService.saveBgpAsCfg(stringCfgs);
}
if (regionDict.getFunctionId().intValue() == 34) {
websiteCfgService.saveSslCfg(stringCfgs);
}
} else if (regionDict.getRegionType().equals(3)) {
for (ComplexkeywordCfg cfg : complexkeywordCfgs) {
cfg.setAction(serviceDict.getAction());

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

@@ -643,6 +643,13 @@ public class WebsiteCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo> {
return httpUrlCompile;
}
public void saveSslCfg(List<BaseStringCfg<?>> cfgs){
for(BaseStringCfg cfg:cfgs){
if(StringUtils.isNotBlank(cfg.getCfgKeywords())){
websiteCfgDao.saveSslKeywordCfg(cfg);
}
}
}
public void saveSslCfg(CfgIndexInfo entity){
//设置区域运营商信息
setAreaEffectiveIds(entity);

2
src/main/resources/sql/20181030/update_ans_ip_region.sql Normal file
View File

@@ -0,0 +1,2 @@
#ans ip去除 ip range
UPDATE function_region_dict SET config_ip_pattern='1,3' WHERE function_id=600;

3
src/main/resources/sql/20181030/update_region.sql
View File

@@ -5,3 +5,6 @@ UPDATE function_service_dict SET is_import=1 WHERE function_id=3 AND dict_id=15;
update function_region_dict set is_import=1 where function_id=61 and dict_id=48;
update function_region_dict set is_import=1 where function_id=61 and dict_id=168;
UPDATE function_service_dict SET is_import=1 WHERE function_id=61 ;
#ssl 导入
UPDATE function_region_dict SET is_import=1 WHERE function_id=34 and dict_id in(20,21,22,23);
UPDATE function_service_dict SET is_import=1 WHERE function_id=34;

21
src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp
View File

@@ -91,6 +91,23 @@
onClick="javascript:window.location='${ctx}/ntc/website/sslForm?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>
<spring:message code="add"></spring:message></button>
<c:set var="serviceImport" value="false"></c:set>
<c:set var="regionImport" value="false"></c:set>
<c:forEach items="${serviceList}" var="service" >
<c:if test="${(cfg.functionId eq service.functionId) && service.isImport eq 1}">
<c:set var="serviceImport" value="true"></c:set>
</c:if>
</c:forEach>
<c:forEach items="${regionList}" var="region" >
<c:if test="${(cfg.functionId eq region.functionId) && region.isImport eq 1}">
<c:set var="regionImport" value="true"></c:set>
</c:if>
</c:forEach>
<c:if test="${serviceImport eq 'true' && regionImport eq 'true'}">
<button type="button" class="btn btn-primary import" >
<i class="fa fa-plus"></i>
<spring:message code="import"></spring:message></button>
</c:if>
</shiro:hasPermission>
</div>
@@ -461,6 +478,8 @@
</div>
</div>
</div>
<c:set var="importPath" value="/ntc/iplist/list?functionId=${cfg.functionId}"/>
<!-- 模板导入，start -->
<%@include file="/WEB-INF/include/excel/importModal.jsp" %>
</body>
</html>