diff --git a/src/main/java/com/nis/web/service/configuration/DomainService.java b/src/main/java/com/nis/web/service/configuration/DomainService.java index 642df6b81..feef3efb5 100644 --- a/src/main/java/com/nis/web/service/configuration/DomainService.java +++ b/src/main/java/com/nis/web/service/configuration/DomainService.java @@ -425,11 +425,12 @@ public class DomainService extends CrudService { } public void saveDomainCfg(CfgIndexInfo entity){ if(entity.getAction()==128){ - entity.setRequestId(0); - entity.setClassify("0"); - entity.setAttribute("0"); - entity.setLable("0"); - entity.setIsAreaEffective(0); + entity.setCfgType("WHITE_LIST_DOMAIN"); + if(entity.getHttpUrlList().size()>0){ + for (int i = 0; i < entity.getHttpUrlList().size(); i++) { + entity.getHttpUrlList().get(i).setCfgType("WHITE_LIST_DOMAIN"); + } + } } //设置区域运营商信息 setAreaEffectiveIds(entity); diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp index 3a3405826..f1d01757a 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp @@ -16,7 +16,7 @@ $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); $("#protocolId").val($(this).attr("protocolId")); - if($(this).val()!=128){ + /* if($(this).val()!=128){ $("#http_url").removeClass("hidden"); $(".httpurlCfg").removeClass("hidden").removeClass("disabled"); $(".httpwhite").addClass("hidden").addClass("disabled"); @@ -24,7 +24,7 @@ $(".httpwhite").removeClass("hidden").removeClass("disabled"); $(".httpurlCfg").addClass("hidden").addClass("disabled"); $("#http_url").addClass("hidden"); - } + } */ }); $("#serviceId").val($(".action:checked").attr("serviceId")); $("#protocolId").val($(".action:checked").attr("protocolId")); @@ -89,7 +89,7 @@ }, errorContainer : "#messageBox", }); - var actions=$("input[name='action']:checked").val(); + /* var actions=$("input[name='action']:checked").val(); if(actions!=128){ $("#http_url").removeClass("hidden"); $(".httpurlCfg").removeClass("hidden").removeClass("disabled"); @@ -98,7 +98,7 @@ $(".httpwhite").removeClass("hidden").removeClass("disabled"); $(".httpurlCfg").addClass("hidden").addClass("disabled"); $("#http_url").addClass("hidden"); - } + } */ }); //业务窗口打开 @@ -215,7 +215,7 @@ - + <%--
-
+
--%>
@@ -304,10 +304,8 @@ --%>
-
<%@include file="/WEB-INF/include/form/areaInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %> -
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp index 1a1b5ab7e..fb13116e1 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp @@ -114,7 +114,7 @@ - +<%--
@@ -123,9 +123,7 @@
-
- - + --%>
@@ -226,7 +224,6 @@
-