From c06d7e11cb257bb8fe1bd60c1ead99400d3a53ec Mon Sep 17 00:00:00 2001 From: leijun Date: Fri, 5 Oct 2018 02:26:15 +0800 Subject: [PATCH] =?UTF-8?q?http=5Furl=201=E3=80=81=E5=8A=A8=E4=BD=9C?= =?UTF-8?q?=EF=BC=9A=E7=99=BD=E5=90=8D=E5=8D=95=EF=BC=8C=E9=98=BB=E6=96=AD?= =?UTF-8?q?=EF=BC=8C=E7=9B=91=E6=B5=8B=202=E3=80=81=E7=99=BD=E5=90=8D?= =?UTF-8?q?=E5=8D=95=E4=B8=9A=E5=8A=A1=E4=B8=BA=E5=8E=9F=E6=9C=89=E7=9A=84?= =?UTF-8?q?=E5=9F=9F=E5=90=8D=E7=99=BD=E5=90=8D=E5=8D=95=EF=BC=8C=E9=98=BB?= =?UTF-8?q?=E6=96=AD=E5=92=8C=E7=9B=91=E6=B5=8B=E4=B8=9A=E5=8A=A1=E4=B8=BA?= =?UTF-8?q?HTTP=E7=9A=84=E9=98=BB=E6=96=AD=E5=92=8C=E7=9B=91=E6=B5=8B?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ntc/WhiteListController.java | 14 ++ .../service/configuration/DomainService.java | 7 + .../sql/20180929/update_http_url.sql | 3 + .../views/cfg/whitelist/domainForm.jsp | 164 ++++++++++-------- .../views/cfg/whitelist/domianSubList.jsp | 19 +- 5 files changed, 134 insertions(+), 73 deletions(-) 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 6f9053e26..809503f2b 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,10 +21,12 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributes; import com.nis.domain.Page; import com.nis.domain.configuration.BaseStringCfg; import com.nis.domain.configuration.CfgIndexInfo; +import com.nis.domain.configuration.HttpUrlCfg; import com.nis.domain.configuration.IpPortCfg; import com.nis.domain.configuration.NtcSubscribeIdCfg; import com.nis.domain.configuration.template.WhiteListIpTemplate; import com.nis.exceptions.MaatConvertException; +import com.nis.util.Constants; import com.nis.web.controller.configuration.CommonController; import com.nis.web.security.UserUtils; @@ -134,8 +136,20 @@ public class WhiteListController extends CommonController{ public String domainForm(Model model,String ids,CfgIndexInfo entity) { if(StringUtils.isNotBlank(ids)){ entity = domainService.getDomainCfg(Long.parseLong(ids)); + HttpUrlCfg urlCfg = new HttpUrlCfg(); + urlCfg.setCfgType(Constants.HTTP_URL_REGION); + entity.setHttpUrl(urlCfg); + if(entity.getHttpUrlList().size()==0){ + entity.getHttpUrlList().add(urlCfg); + } initUpdateFormCondition(model,entity); }else{ + HttpUrlCfg urlCfg = new HttpUrlCfg(); + urlCfg.setCfgType(Constants.HTTP_URL_REGION); + entity.setHttpUrl(urlCfg); + List urlList=new ArrayList(); + urlList.add(urlCfg); + entity.setHttpUrlList(urlList); initFormCondition(model,entity); } model.addAttribute("_cfg", entity); 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 11a8bc8ef..642df6b81 100644 --- a/src/main/java/com/nis/web/service/configuration/DomainService.java +++ b/src/main/java/com/nis/web/service/configuration/DomainService.java @@ -424,6 +424,13 @@ public class DomainService extends CrudService { return entity; } public void saveDomainCfg(CfgIndexInfo entity){ + if(entity.getAction()==128){ + entity.setRequestId(0); + entity.setClassify("0"); + entity.setAttribute("0"); + entity.setLable("0"); + entity.setIsAreaEffective(0); + } //设置区域运营商信息 setAreaEffectiveIds(entity); diff --git a/src/main/resources/sql/20180929/update_http_url.sql b/src/main/resources/sql/20180929/update_http_url.sql index 69ca58431..e8cd1dad3 100644 --- a/src/main/resources/sql/20180929/update_http_url.sql +++ b/src/main/resources/sql/20180929/update_http_url.sql @@ -6,3 +6,6 @@ update function_region_dict set function_id='6' , config_service_type='http_url #ip复用地址池 INSERT INTO `function_service_dict` ( `function_id`, `protocol_id`, `action`, `action_code`, `service_id`, `service_name`, `service_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `region_code`) VALUES ( '633', '0', '96', 'loop', '832', 'ip_reuse_adress_pool_loop', NULL, '1', NULL, NULL, NULL, NULL, NULL); INSERT INTO `function_region_dict` (`config_service_type`, `config_multi_keywords`, `config_expr_type`, `config_hex`, `config_match_method`, `function_id`, `config_region_code`, `config_region_value`, `config_district`, `config_desc`, `is_valid`, `creator_id`, `create_time`, `editor_id`, `edit_time`, `is_maat`, `region_type`, `config_ip_type`, `config_ip_pattern`, `config_port_pattern`, `config_direction`, `config_protocol`, `config_ip_port_show`, `config_region_sort`) VALUES (NULL, NULL, NULL, NULL, NULL, '633', '1', 'IR_STATIC_IP_POOL_CB', NULL, 'IP复用地址池配置', '1', NULL, NULL, NULL, NULL, '2', '2', '4,6', '1,2,3', '1,2', '0', '0', '1', '1'); + +#http_url白名单 +update function_region_dict set function_id='6' where dict_id='15'; \ No newline at end of file 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 a4ca327b2..a718c81fb 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domainForm.jsp @@ -16,6 +16,15 @@ $(".action").on("change", function() { $("#serviceId").val($(this).attr("serviceId")); $("#protocolId").val($(this).attr("protocolId")); + if($(this).val()!=128){ + $("#http_url").removeClass("hidden"); + $(".httpurlCfg").removeClass("hidden").removeClass("disabled"); + $(".httpwhite").addClass("hidden").addClass("disabled"); + }else{ + $(".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")); @@ -80,37 +89,39 @@ }, errorContainer : "#messageBox", }); - + var actions=$("input[name='action']:checked").val(); + if(actions!=128){ + $("#http_url").removeClass("hidden"); + $(".httpurlCfg").removeClass("hidden").removeClass("disabled"); + $(".httpwhite").addClass("hidden").addClass("disabled"); + }else{ + $(".httpwhite").removeClass("hidden").removeClass("disabled"); + $(".httpurlCfg").addClass("hidden").addClass("disabled"); + $("#http_url").addClass("hidden"); + } }); //业务窗口打开 - 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(){ + $(showDiv).removeClass("hidden").removeClass("disabled"); + $("."+contentClassName+"0").find("input,select").each(function(){ $(this).removeAttr("disabled"); - }); */ + }); $(obj).addClass("hidden"); - } + } */ //业务窗口关闭 - var delContent = function(contentClassName, addBtnClassName) { +/* var delContent = function(contentClassName, addBtnClassName) { $("." + contentClassName).addClass("hidden").addClass("disabled"); - /* $("."+contentClassName).find("input,select").each(function(){ - $(this).attr("disabled","true"); - }); */ $("." + addBtnClassName).removeClass("hidden"); - } + } */
-

- -

@@ -132,14 +143,9 @@ - - -
- -
@@ -179,51 +185,73 @@
-

- -

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

+ +

- + +
+ + + +
+
+
+ +
+ + + + + +
+
+
+
+
+ +
+ + + +
+ + <%-- --%> + + +
+ <%@include file="/WEB-INF/views/cfg/complexCfgForm.jsp"%> +
+ +
+ + + <%-- @@ -237,7 +265,7 @@ onClick="addContent(this,'${tabName}')" title="add"> - <%-- --%> + @@ -270,15 +298,13 @@ - + --%>
- <%--@include file="/WEB-INF/include/form/areaInfo.jsp"--%> - <%--@include file="/WEB-INF/include/form/basicInfo.jsp"--%> - - - - +
+ <%@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 0304cae99..232fb4b7c 100644 --- a/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/domianSubList.jsp @@ -114,16 +114,27 @@ - +
- +
- <%--
+ + + +
+
+
+
+ +
+
+
+
@@ -159,7 +170,7 @@
-
--%> +