diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java index fa02a7b73..947b0aae2 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WebsiteController.java @@ -27,6 +27,7 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.FunctionRegionDict; import com.nis.domain.Page; +import com.nis.domain.basics.PolicyGroupInfo; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.ComplexkeywordCfg; @@ -402,8 +403,12 @@ public class WebsiteController extends BaseController { public String dnsForm(Model model, String ids, CfgIndexInfo entity) { if (StringUtils.isNotBlank(ids)) { entity = websiteCfgService.getDnsCfg(Long.parseLong(ids), null); + entity.setGroupType(12); + entity.setUdFlag(1); initUpdateFormCondition(model, entity); } else { + entity.setGroupType(12); + entity.setUdFlag(1); initFormCondition(model, entity); } // 获取所有响应策略信息 diff --git a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java index fa5615f78..15438dbaf 100644 --- a/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java +++ b/src/main/java/com/nis/web/controller/configuration/ntc/WhiteListController.java @@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; +import com.nis.domain.basics.PolicyGroupInfo; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; import com.nis.domain.configuration.HttpUrlCfg; @@ -201,6 +202,8 @@ public class WhiteListController extends CommonController { if (entity.getHttpUrlList().size() == 0) { entity.getHttpUrlList().add(urlCfg); } + entity.setGroupType(11); + entity.setUdFlag(1); initUpdateFormCondition(model, entity); } else { HttpUrlCfg urlCfg = new HttpUrlCfg(); @@ -209,6 +212,8 @@ public class WhiteListController extends CommonController { List urlList = new ArrayList(); urlList.add(urlCfg); entity.setHttpUrlList(urlList); + entity.setGroupType(11); + entity.setUdFlag(1); initFormCondition(model, entity); } model.addAttribute("_cfg", entity); diff --git a/src/main/webapp/WEB-INF/views/cfg/dnsGroupForm.jsp b/src/main/webapp/WEB-INF/views/cfg/dnsGroupForm.jsp new file mode 100644 index 000000000..27130a2fd --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/dnsGroupForm.jsp @@ -0,0 +1,66 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + +
+
+ +
+
+
+<%-- + + + + + + + + + + + + + + + + --%> +<%-- + + + --%> + +
+ <%--
+
+ +
+ +
+
+
+
--%> +
+
+ +
+ <%-- --%> + +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/urlGroupForm.jsp b/src/main/webapp/WEB-INF/views/cfg/urlGroupForm.jsp new file mode 100644 index 000000000..59336cfe1 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/cfg/urlGroupForm.jsp @@ -0,0 +1,66 @@ +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + + + +
+
+ +
+
+
+<%-- + + + + + + + + + + + + + + + + --%> +<%-- + + + --%> + +
+ <%--
+
+ +
+ +
+
+
+
--%> +
+
+ +
+ <%-- --%> + +
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp index 6442a254e..e434addd7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/website/dnsForm.jsp @@ -114,6 +114,15 @@ $(this).removeAttr("disabled"); }); */ $(obj).addClass("hidden"); + + if(contentClassName=='NTC_DNS_REGIONTab'){ + $(".dnsGroup0").addClass("hidden").addClass("disabled"); + $(".dnsGroupAdd").removeClass("hidden"); + }else if(contentClassName=='dnsGroup'){ + $(".NTC_DNS_REGIONTab0").addClass("hidden").addClass("disabled"); + $(".NTC_DNS_REGIONTabAdd").removeClass("hidden"); + } + } //业务窗口关闭 @@ -258,6 +267,445 @@ + + +

+ + +

+ + + + + + + + + +

+ + +

+ + <%-- --%> + + + + +
+ <%@include file="/WEB-INF/views/cfg/ipCfgForm.jsp"%> +
+ + + + + + + + + + + + + +

+ + +

+ + <%-- --%> + + + + + + +
+ <%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%> +
+ + + + + + + + + + + + + + + + + + +

+ + +

+ + <%-- --%> + + + + + + +
+ <%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%> +
+ + + + + + + + + + + + + + + + + +
+ <%@include file="/WEB-INF/include/form/areaInfo.jsp"%> +
+ <%@include file="/WEB-INF/include/form/basicInfo.jsp"%> +
+ <%@include file="/WEB-INF/include/form/scheduleNew.jsp"%> +
+
+
+
+
+ + +
+
+
+
+
+
+ + + + + + + + + + + +<%@ page contentType="text/html;charset=UTF-8"%> +<%@ include file="/WEB-INF/include/taglib.jsp"%> + + +<spring:message code="${cfgName}"></spring:message> + + + + + + + +
+

+ +

+
+
+
+
+
+ + + + + + + +
+
+
+ +
+ + + + + + +
+ + +
+
+
+ +
+ +
+
+
+
+
+ +
+ + + +
+
+
+
+
+
+
+
+ + + + + + + + + + + + +
+
+ <%--
+
+ + + + + + + + + + + + +
+
--%> +
+
+
+ +
+ +
+
+
+
+
+ + +

+ + +

+ + 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 b78839b79..f58473dd9 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp @@ -102,20 +102,28 @@ }); //业务窗口打开 - /* var addContent = function(obj, contentClassName) { + var addContent = function(obj, contentClassName) { var showDiv = $(obj).parent().parent().next(); $(showDiv).removeClass("hidden").removeClass("disabled"); $("."+contentClassName+"0").find("input,select").each(function(){ $(this).removeAttr("disabled"); }); $(obj).addClass("hidden"); - } */ + + if(contentClassName=='httpUrlTab'){ + $(".urlGroup0").addClass("hidden").addClass("disabled"); + $(".urlGroupAdd").removeClass("hidden"); + }else if(contentClassName=='urlGroup'){ + $(".httpUrlTab0").addClass("hidden").addClass("disabled"); + $(".httpUrlTabAdd").removeClass("hidden"); + } + } //业务窗口关闭 -/* var delContent = function(contentClassName, addBtnClassName) { + var delContent = function(contentClassName, addBtnClassName) { $("." + contentClassName).addClass("hidden").addClass("disabled"); $("." + addBtnClassName).removeClass("hidden"); - } */ + } @@ -234,6 +242,8 @@

+

@@ -264,18 +274,16 @@ --%> -
<%-- --%> -
<%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%>
+ -
<%-- @@ -327,6 +335,18 @@ --%> + + +

+ + +

+ + +
<%@include file="/WEB-INF/include/form/areaInfo.jsp" %> <%@include file="/WEB-INF/include/form/basicInfo.jsp" %>