diff --git a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java index 7c44cd8a4..134bcae84 100644 --- a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java +++ b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java @@ -324,24 +324,24 @@ public class InterceptCfgService extends CrudService } //限速需要发Droprate=0.001 ，暂不支持Bandwidth=200kbps if(entity.getAction().equals(Constants.RATELIMIT_ACTION)){ - entity.setUserRegion2(StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2()); + entity.setUserRegion1(StringUtil.isEmpty(entity.getUserRegion1()) ? "":entity.getUserRegion1()); - maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+entity.getUserRegion2()); + maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+entity.getUserRegion1()); } String userRegion=""; //替换需要发zone if(entity.getAction().equals(Constants.REPLACE_ACTION)){ //HTTP replace： replace type is not null ;find is not null;replace with is not null(userRegion is not null) - userRegion=Constants.REPLACE_ZONE_KEY+"="+entity.getUserRegion3(); + userRegion=Constants.REPLACE_ZONE_KEY+"="+entity.getUserRegion1(); String substitute=""; - String userRegion4=StringUtil.isEmpty(entity.getUserRegion4()) ? "":entity.getUserRegion4(); + String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2(); substitute="/"; - userRegion4 = BaseService.replaceContentEscape(userRegion4); - substitute=substitute+userRegion4; + userRegion2 = BaseService.replaceContentEscape(userRegion2); + substitute=substitute+userRegion2; - String userRegion5=StringUtil.isEmpty(entity.getUserRegion5()) ? "":entity.getUserRegion5(); - userRegion5 = BaseService.replaceContentEscape(userRegion5); - substitute=substitute+"/"+userRegion5; + String userRegion3=StringUtil.isEmpty(entity.getUserRegion3()) ? "":entity.getUserRegion3(); + userRegion3 = BaseService.replaceContentEscape(userRegion3); + substitute=substitute+"/"+userRegion3; userRegion=userRegion+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute; maatCfg.setUserRegion(userRegion); diff --git a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp index 884b2ee2d..2cae78b96 100644 --- a/src/main/webapp/WEB-INF/include/form/complexInfo.jsp +++ b/src/main/webapp/WEB-INF/include/form/complexInfo.jsp @@ -4,8 +4,8 @@ - - + + diff --git a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp index 4ddf65ec1..62614aff7 100644 --- a/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp @@ -12,8 +12,8 @@ and regionValue eq regionDistrict.configRegionValue}"> --%> - - + + <%-- diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp index 1a98a2cb2..156dff6c4 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp @@ -82,25 +82,18 @@ $("input[name$='exprType']").attr("disabled",false); var action=$("input[name='action']:checked").val(); if(action==1){ //监测 - $("input[name='userRegion2']").val(""); - $("select[name='userRegion3']").val(""); - $("input[name='userRegion4']").val(""); - $("input[name='userRegion5']").val(""); + $(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); + $(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); }else if(action==64){//限速 - $("select[name='userRegion1']").val(""); - $("select[name='userRegion3']").val(""); - $("input[name='userRegion4']").val(""); - $("input[name='userRegion5']").val(""); + $(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); + $(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); }else if(action==80){//替换 - $("input[name='userRegion1']").val(""); - $("input[name='userRegion2']").val(""); - $("input[name='userRegion2']").val(""); + $(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); + $(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); }else {//白名单 - $("select[name='userRegion1']").val(""); - $("input[name='userRegion2']").val(""); - $("select[name='userRegion3']").val(""); - $("input[name='userRegion4']").val(""); - $("input[name='userRegion5']").val(""); + $(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); + $(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); + $(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true); } loading('onloading...'); form.submit(); @@ -268,9 +261,9 @@
- +
-
+
@@ -287,15 +280,15 @@
-
-
+
@@ -306,10 +299,10 @@
+ name="userRegion2" + value="${_cfg.userRegion2 }">
-
+
@@ -318,10 +311,10 @@
+ name="userRegion3" + value="${_cfg.userRegion3 }">
-
+
diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp index 05066452b..27be174ec 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp @@ -350,27 +350,36 @@ ${indexCfg.compileId } ${indexCfg.cfgDesc } - ${indexCfg.userRegion2 } + + ${indexCfg.userRegion1 } + - - ${certificate.cfgDesc} - + + + ${certificate.cfgDesc} + + - - - - - - - - - ${indexCfg.userRegion4 } - - - ${indexCfg.userRegion5 } - + + + + + + + + + + ${indexCfg.userRegion2 } + + + ${indexCfg.userRegion3 } + + + + + diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js index 7dfe63f93..27ea7c562 100644 --- a/src/main/webapp/static/global/scripts/common.js +++ b/src/main/webapp/static/global/scripts/common.js @@ -477,9 +477,9 @@ var setInterceptDefaultInfo=function(cfgId){ var interceptReplacePktBin=""; var protocolNamePrefix=""; //查找当前业务中的serviceRegionType，是否存在intercept_ratelimit_ip - $("input[name$='configServiceType']").each(function(){ + $("input[name$='cfgRegionCode']").each(function(){ //替换动作非tcp - var serviceRegionTypeValue=$(this).val(); + var serviceRegionTypeValue=$(this).attr("serviceType"); var serviceRegionTypeName=$(this).attr("name"); if(serviceRegionTypeName.indexOf(".") >-1){ serviceRegionTypeName=serviceRegionTypeName.substring(0,serviceRegionTypeName.indexOf(".")+1); @@ -494,17 +494,17 @@ var setInterceptDefaultInfo=function(cfgId){ interceptReplacePktBin=serviceRegionTypeValue; } }); - if(action==1){ //监测 $(".monitAction").removeClass("hidden"); $(".ratelimitAction").addClass("hidden"); $(".replaceAction").addClass("hidden"); if(interceptRatelimitIp == 'intercept_ratelimit_ip'){ - $("select[name='"+protocolNamePrefix+"protocol']").find("option[value=0]").removeAttr("disabled"); - $("select[name='"+protocolNamePrefix+"protocol']").find("option[value=6]").removeAttr("disabled"); - $("select[name='"+protocolNamePrefix+"protocol']").find("option[value=17]").removeAttr("disabled"); - $("select[name='"+protocolNamePrefix+"protocol']").find("option[value=1]").attr("disabled",true); + $("select[name='"+protocolNamePrefix+"protocol']").find("option").remove(); + $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); + $("select[name='"+protocolNamePrefix+"protocol']").append(""); + $("select[name='"+protocolNamePrefix+"protocol']").append(""); + $("select[name='"+protocolNamePrefix+"protocol']").append(""); $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); } if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){ @@ -517,10 +517,11 @@ var setInterceptDefaultInfo=function(cfgId){ $(".ratelimitAction").removeClass("hidden"); $(".replaceAction").addClass("hidden"); if(interceptRatelimitIp == 'intercept_ratelimit_ip'){ - $("select[name='"+protocolNamePrefix+"protocol']").find("option[value=0]").removeAttr("disabled"); - $("select[name='"+protocolNamePrefix+"protocol']").find("option[value=6]").removeAttr("disabled"); - $("select[name='"+protocolNamePrefix+"protocol']").find("option[value=17]").removeAttr("disabled"); - $("select[name='"+protocolNamePrefix+"protocol']").find("option[value=1]").attr("disabled",true); + $("select[name='"+protocolNamePrefix+"protocol']").find("option").remove(); + $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); + $("select[name='"+protocolNamePrefix+"protocol']").append(""); + $("select[name='"+protocolNamePrefix+"protocol']").append(""); + $("select[name='"+protocolNamePrefix+"protocol']").append(""); $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); } if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){ @@ -533,10 +534,10 @@ var setInterceptDefaultInfo=function(cfgId){ $(".ratelimitAction").addClass("hidden"); $(".replaceAction").removeClass("hidden"); if(interceptRatelimitIp == 'intercept_ratelimit_ip'){ - $("select[name='"+protocolNamePrefix+"protocol']").find("option[value=0]").attr("disabled",true); - $("select[name='"+protocolNamePrefix+"protocol']").find("option[value=6]").attr("disabled",true); - $("select[name='"+protocolNamePrefix+"protocol']").find("option[value=17]").removeAttr("disabled"); - $("select[name='"+protocolNamePrefix+"protocol']").find("option[value=1]").removeAttr("disabled"); + $("select[name='"+protocolNamePrefix+"protocol']").find("option").remove(); + $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); + $("select[name='"+protocolNamePrefix+"protocol']").append("") + $("select[name='"+protocolNamePrefix+"protocol']").append("") $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); } if(interceptReplacePktBin == 'intercept_replace_pkt_bin' && cfgId == ""){ @@ -551,10 +552,11 @@ var setInterceptDefaultInfo=function(cfgId){ $(".ratelimitAction").addClass("hidden"); $(".replaceAction").addClass("hidden"); if(interceptRatelimitIp == 'intercept_ratelimit'){ - $("select[name='"+protocolNamePrefix+"protocol']").find("option[value=0]").removeAttr("disabled"); - $("select[name='"+protocolNamePrefix+"protocol']").find("option[value=6]").removeAttr("disabled"); - $("select[name='"+protocolNamePrefix+"protocol']").find("option[value=17]").removeAttr("disabled"); - $("select[name='"+protocolNamePrefix+"protocol']").find("option[value=1]").attr("disabled",true); + $("select[name='"+protocolNamePrefix+"protocol']").find("option").remove(); + $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); + $("select[name='"+protocolNamePrefix+"protocol']").append("") + $("select[name='"+protocolNamePrefix+"protocol']").append("") + $("select[name='"+protocolNamePrefix+"protocol']").append("") $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); } if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){