diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java index ac50167e5..caf5969ce 100644 --- a/src/main/java/com/nis/web/controller/BaseController.java +++ b/src/main/java/com/nis/web/controller/BaseController.java @@ -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()); 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 0bd885663..f99c4ab17 100644 --- a/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/WebsiteCfgService.java @@ -643,6 +643,13 @@ public class WebsiteCfgService extends CrudService { return httpUrlCompile; } + public void saveSslCfg(List> cfgs){ + for(BaseStringCfg cfg:cfgs){ + if(StringUtils.isNotBlank(cfg.getCfgKeywords())){ + websiteCfgDao.saveSslKeywordCfg(cfg); + } + } + } public void saveSslCfg(CfgIndexInfo entity){ //设置区域运营商信息 setAreaEffectiveIds(entity); diff --git a/src/main/resources/sql/20181030/update_ans_ip_region.sql b/src/main/resources/sql/20181030/update_ans_ip_region.sql new file mode 100644 index 000000000..b0bc1929c --- /dev/null +++ b/src/main/resources/sql/20181030/update_ans_ip_region.sql @@ -0,0 +1,2 @@ +#ans ip去除 ip range +UPDATE function_region_dict SET config_ip_pattern='1,3' WHERE function_id=600; \ No newline at end of file diff --git a/src/main/resources/sql/20181030/update_region.sql b/src/main/resources/sql/20181030/update_region.sql index 0ba27213e..f15ae7799 100644 --- a/src/main/resources/sql/20181030/update_region.sql +++ b/src/main/resources/sql/20181030/update_region.sql @@ -4,4 +4,7 @@ UPDATE function_service_dict SET is_import=1 WHERE function_id=3 AND dict_id=15; #bgp导入 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 ; \ No newline at end of file +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; \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp index d350083a2..04a5c199e 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/sslList.jsp @@ -91,6 +91,23 @@ onClick="javascript:window.location='${ctx}/ntc/website/sslForm?functionId=${cfg.functionId}'"> + + + + + + + + + + + + + + + @@ -461,6 +478,8 @@ - + + +<%@include file="/WEB-INF/include/excel/importModal.jsp" %> \ No newline at end of file