gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intercept模块userRegion复用

Browse Source 
特定服务模块的基础协议和app共用一套分类
This commit is contained in:
duandongmei
2018-08-28 17:16:49 +08:00
parent 8b938ac477
commit 414992b5ac
6 changed files with 80 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
View File

@@ -324,24 +324,24 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
} }
//限速需要发Droprate=0.001 ，暂不支持Bandwidth=200kbps //限速需要发Droprate=0.001 ，暂不支持Bandwidth=200kbps
if(entity.getAction().equals(Constants.RATELIMIT_ACTION)){ 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=""; String userRegion="";
//替换需要发zone //替换需要发zone
if(entity.getAction().equals(Constants.REPLACE_ACTION)){ 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) //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 substitute="";
String userRegion4=StringUtil.isEmpty(entity.getUserRegion4()) ? "":entity.getUserRegion4(); String userRegion2=StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2();
substitute="/"; substitute="/";
userRegion4 = BaseService.replaceContentEscape(userRegion4); userRegion2 = BaseService.replaceContentEscape(userRegion2);
substitute=substitute+userRegion4; substitute=substitute+userRegion2;
String userRegion5=StringUtil.isEmpty(entity.getUserRegion5()) ? "":entity.getUserRegion5(); String userRegion3=StringUtil.isEmpty(entity.getUserRegion3()) ? "":entity.getUserRegion3();
userRegion5 = BaseService.replaceContentEscape(userRegion5); userRegion3 = BaseService.replaceContentEscape(userRegion3);
substitute=substitute+"/"+userRegion5; substitute=substitute+"/"+userRegion3;
userRegion=userRegion+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute; userRegion=userRegion+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute;
maatCfg.setUserRegion(userRegion); maatCfg.setUserRegion(userRegion);

4
src/main/webapp/WEB-INF/include/form/complexInfo.jsp
View File

@@ -4,8 +4,8 @@
<head> <head>
<title></title> <title></title>
<input type="hidden" name="cfgType" value="${region.configRegionValue }"> <input type="hidden" name="cfgType" value="${region.configRegionValue }">
<input type="hidden" name="cfgRegionCode" value="${region.configRegionCode }"> <input type="hidden" name="cfgRegionCode" serviceType="${region.configServiceType }" value="${region.configRegionCode }">
<input type="hidden" name="configMultiKeywords" value="${region.configRegionCode }"> <input type="hidden" name="configMultiKeywords" value="${region.configMultiKeywords }">
<input type="hidden" name="configServiceType" value="${region.configServiceType }"> <input type="hidden" name="configServiceType" value="${region.configServiceType }">
<input type="hidden" name="configHex" value="${region.configHex }"> <input type="hidden" name="configHex" value="${region.configHex }">
</head> </head>

4
src/main/webapp/WEB-INF/views/cfg/complexCfgForm.jsp
View File

@@ -12,8 +12,8 @@
and regionValue eq regionDistrict.configRegionValue}"> --%> and regionValue eq regionDistrict.configRegionValue}"> --%>
<!-- regionDistrict.regionType==3表示增强字符串类配置 --> <!-- regionDistrict.regionType==3表示增强字符串类配置 -->
<input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }"> <input type="hidden" name="${cfgName}.cfgType" value="${region.configRegionValue }">
<input type="hidden" name="${cfgName}.cfgRegionCode" value="${region.configRegionCode }"> <input type="hidden" name="${cfgName}.cfgRegionCode" serviceType="${region.configServiceType }" value="${region.configRegionCode }">
<input type="hidden" name="${cfgName}.configMultiKeywords" value="${region.configRegionCode }"> <input type="hidden" name="${cfgName}.configMultiKeywords" value="${region.configMultiKeywords }">
<input type="hidden" name="${cfgName}.configServiceType" value="${region.configServiceType }"> <input type="hidden" name="${cfgName}.configServiceType" value="${region.configServiceType }">
<input type="hidden" name="${cfgName}.configHex" value="${region.configHex }"> <input type="hidden" name="${cfgName}.configHex" value="${region.configHex }">
<%-- </c:if> <%-- </c:if>

47
src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
View File

@@ -82,25 +82,18 @@
$("input[name$='exprType']").attr("disabled",false); $("input[name$='exprType']").attr("disabled",false);
var action=$("input[name='action']:checked").val(); var action=$("input[name='action']:checked").val();
if(action==1){ //监测 if(action==1){ //监测
$("input[name='userRegion2']").val(""); $(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
$("select[name='userRegion3']").val(""); $(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
$("input[name='userRegion4']").val("");
$("input[name='userRegion5']").val("");
}else if(action==64){//限速 }else if(action==64){//限速
$("select[name='userRegion1']").val(""); $(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
$("select[name='userRegion3']").val(""); $(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
$("input[name='userRegion4']").val("");
$("input[name='userRegion5']").val("");
}else if(action==80){//替换 }else if(action==80){//替换
$("input[name='userRegion1']").val(""); $(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
$("input[name='userRegion2']").val(""); $(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
$("input[name='userRegion2']").val("");
}else {//白名单 }else {//白名单
$("select[name='userRegion1']").val(""); $(".monitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
$("input[name='userRegion2']").val(""); $(".ratelimitAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
$("select[name='userRegion3']").val(""); $(".replaceAction").find("input[name^='userRegion'],select[name^='userRegion']").attr("disabled",true);
$("input[name='userRegion4']").val("");
$("input[name='userRegion5']").val("");
} }
loading('onloading...'); loading('onloading...');
form.submit(); form.submit();
@@ -268,9 +261,9 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label> <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ratelimit"/></label>
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control required number" range="[0,1]" type="text" name="userRegion2" value="${_cfg.userRegion2 }"> <input class="form-control required number" range="[0,1]" type="text" name="userRegion1" value="${_cfg.userRegion1 }">
</div> </div>
<div for="userRegion2"></div> <div for="userRegion1"></div>
</div> </div>
</div> </div>
</div> </div>
@@ -287,15 +280,15 @@
<spring:message code="replace_zone" /> <spring:message code="replace_zone" />
</label> </label>
<div class="col-md-6"> <div class="col-md-6">
<select name="userRegion3" <select name="userRegion1"
class="selectpicker show-tick form-control required"> class="selectpicker show-tick form-control required">
<option value="" ><spring:message code="selected"/></option> <option value="" ><spring:message code="selected"/></option>
<c:forEach items="${fns:getDictList('INTERCEPT_REPLACE_ZONE')}" var="replaceZoneC"> <c:forEach items="${fns:getDictList('INTERCEPT_REPLACE_ZONE')}" var="replaceZoneC">
<option value="${replaceZoneC.itemCode}" <c:if test="${_cfg.userRegion3==replaceZoneC.itemCode || _cfg.userRegion3==null}">selected</c:if>><spring:message code="${replaceZoneC.itemValue}"/></option> <option value="${replaceZoneC.itemCode}" <c:if test="${_cfg.userRegion1==replaceZoneC.itemCode || _cfg.userRegion1==null}">selected</c:if>><spring:message code="${replaceZoneC.itemValue}"/></option>
</c:forEach> </c:forEach>
</select> </select>
</div> </div>
<div for="userRegion3"></div> <div for="userRegion1"></div>
</div> </div>
</div> </div>
</div> </div>
@@ -306,10 +299,10 @@
<spring:message code="replaced_content" /></label> <spring:message code="replaced_content" /></label>
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control required" type="text" <input class="form-control required" type="text"
name="userRegion4" name="userRegion2"
value="${_cfg.userRegion4 }"> value="${_cfg.userRegion2 }">
</div> </div>
<div for="userRegion4"></div> <div for="userRegion2"></div>
</div> </div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
@@ -318,10 +311,10 @@
<spring:message code="replace_content" /></label> <spring:message code="replace_content" /></label>
<div class="col-md-6"> <div class="col-md-6">
<input class="form-control required" type="text" <input class="form-control required" type="text"
name="userRegion5" name="userRegion3"
value="${_cfg.userRegion5 }"> value="${_cfg.userRegion3 }">
</div> </div>
<div for="userRegion5"></div> <div for="userRegion3"></div>
</div> </div>
</div> </div>
</div> </div>

43
src/main/webapp/WEB-INF/views/cfg/intercept/interceptList.jsp
View File

@@ -350,27 +350,36 @@
<td>${indexCfg.compileId }</td> <td>${indexCfg.compileId }</td>
<td>${indexCfg.cfgDesc }</td> <td>${indexCfg.cfgDesc }</td>
<td> <td>
${indexCfg.userRegion2 } <c:if test="${indexCfg.action eq 64}">
${indexCfg.userRegion1 }
</c:if>
</td> </td>
<td> <td>
<c:forEach items="${certificateList}" var="certificate"> <c:if test="${indexCfg.action eq 1}">
<c:if test="${indexCfg.userRegion1==certificate.compileId}">${certificate.cfgDesc}</c:if> <c:forEach items="${certificateList}" var="certificate">
</c:forEach> <c:if test="${indexCfg.userRegion1==certificate.compileId}">${certificate.cfgDesc}</c:if>
</c:forEach>
</c:if>
</td> </td>
<c:if test="${interceptType eq 'Ip' }"> <c:if test="${interceptType eq 'Ip' }">
<td> <c:if test="${indexCfg.action eq 80}">
<c:forEach items="${fns:getDictList('INTERCEPT_REPLACE_ZONE')}" var="replaceZoneC"> <td>
<c:if test="${indexCfg.userRegion3==replaceZoneC.itemCode}"> <c:forEach items="${fns:getDictList('INTERCEPT_REPLACE_ZONE')}" var="replaceZoneC">
<spring:message code="${replaceZoneC.itemValue}"/> <c:if test="${indexCfg.userRegion1==replaceZoneC.itemCode}">
</c:if> <spring:message code="${replaceZoneC.itemValue}"/>
</c:forEach> </c:if>
</td> </c:forEach>
<td> </td>
${indexCfg.userRegion4 } <td>
</td> ${indexCfg.userRegion2 }
<td> </td>
${indexCfg.userRegion5 } <td>
</td> ${indexCfg.userRegion3 }
</td>
</c:if>
<c:if test="${indexCfg.action ne 80}">
<td></td><td></td><td></td>
</c:if>
</c:if> </c:if>
<td> <td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

40
src/main/webapp/static/global/scripts/common.js
View File

@@ -477,9 +477,9 @@ var setInterceptDefaultInfo=function(cfgId){
var interceptReplacePktBin=""; var interceptReplacePktBin="";
var protocolNamePrefix=""; var protocolNamePrefix="";
//查找当前业务中的serviceRegionType，是否存在intercept_ratelimit_ip //查找当前业务中的serviceRegionType，是否存在intercept_ratelimit_ip
$("input[name$='configServiceType']").each(function(){ $("input[name$='cfgRegionCode']").each(function(){
//替换动作非tcp //替换动作非tcp
var serviceRegionTypeValue=$(this).val(); var serviceRegionTypeValue=$(this).attr("serviceType");
var serviceRegionTypeName=$(this).attr("name"); var serviceRegionTypeName=$(this).attr("name");
if(serviceRegionTypeName.indexOf(".") >-1){ if(serviceRegionTypeName.indexOf(".") >-1){
serviceRegionTypeName=serviceRegionTypeName.substring(0,serviceRegionTypeName.indexOf(".")+1); serviceRegionTypeName=serviceRegionTypeName.substring(0,serviceRegionTypeName.indexOf(".")+1);
@@ -494,17 +494,17 @@ var setInterceptDefaultInfo=function(cfgId){
interceptReplacePktBin=serviceRegionTypeValue; interceptReplacePktBin=serviceRegionTypeValue;
} }
}); });
if(action==1){ if(action==1){
//监测 //监测
$(".monitAction").removeClass("hidden"); $(".monitAction").removeClass("hidden");
$(".ratelimitAction").addClass("hidden"); $(".ratelimitAction").addClass("hidden");
$(".replaceAction").addClass("hidden"); $(".replaceAction").addClass("hidden");
if(interceptRatelimitIp == 'intercept_ratelimit_ip'){ if(interceptRatelimitIp == 'intercept_ratelimit_ip'){
$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=0]").removeAttr("disabled"); $("select[name='"+protocolNamePrefix+"protocol']").find("option").remove();
$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=6]").removeAttr("disabled"); $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=17]").removeAttr("disabled"); $("select[name='"+protocolNamePrefix+"protocol']").append("<option value='0' selected>"+$.validator.messages.all+"</option>");
$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=1]").attr("disabled",true); $("select[name='"+protocolNamePrefix+"protocol']").append("<option value='6'>TCP</option>");
$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='17'>UDP</option>");
$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
} }
if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){ if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){
@@ -517,10 +517,11 @@ var setInterceptDefaultInfo=function(cfgId){
$(".ratelimitAction").removeClass("hidden"); $(".ratelimitAction").removeClass("hidden");
$(".replaceAction").addClass("hidden"); $(".replaceAction").addClass("hidden");
if(interceptRatelimitIp == 'intercept_ratelimit_ip'){ if(interceptRatelimitIp == 'intercept_ratelimit_ip'){
$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=0]").removeAttr("disabled"); $("select[name='"+protocolNamePrefix+"protocol']").find("option").remove();
$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=6]").removeAttr("disabled"); $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=17]").removeAttr("disabled"); $("select[name='"+protocolNamePrefix+"protocol']").append("<option value='0' selected>"+$.validator.messages.all+"</option>");
$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=1]").attr("disabled",true); $("select[name='"+protocolNamePrefix+"protocol']").append("<option value='6'>TCP</option>");
$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='17'>UDP</option>");
$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
} }
if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){ if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){
@@ -533,10 +534,10 @@ var setInterceptDefaultInfo=function(cfgId){
$(".ratelimitAction").addClass("hidden"); $(".ratelimitAction").addClass("hidden");
$(".replaceAction").removeClass("hidden"); $(".replaceAction").removeClass("hidden");
if(interceptRatelimitIp == 'intercept_ratelimit_ip'){ if(interceptRatelimitIp == 'intercept_ratelimit_ip'){
$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=0]").attr("disabled",true); $("select[name='"+protocolNamePrefix+"protocol']").find("option").remove();
$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=6]").attr("disabled",true); $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=17]").removeAttr("disabled"); $("select[name='"+protocolNamePrefix+"protocol']").append("<option value='17' selected>UDP</option>")
$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=1]").removeAttr("disabled"); $("select[name='"+protocolNamePrefix+"protocol']").append("<option value='1' >ICMP</option>")
$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
} }
if(interceptReplacePktBin == 'intercept_replace_pkt_bin' && cfgId == ""){ if(interceptReplacePktBin == 'intercept_replace_pkt_bin' && cfgId == ""){
@@ -551,10 +552,11 @@ var setInterceptDefaultInfo=function(cfgId){
$(".ratelimitAction").addClass("hidden"); $(".ratelimitAction").addClass("hidden");
$(".replaceAction").addClass("hidden"); $(".replaceAction").addClass("hidden");
if(interceptRatelimitIp == 'intercept_ratelimit'){ if(interceptRatelimitIp == 'intercept_ratelimit'){
$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=0]").removeAttr("disabled"); $("select[name='"+protocolNamePrefix+"protocol']").find("option").remove();
$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=6]").removeAttr("disabled"); $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=17]").removeAttr("disabled"); $("select[name='"+protocolNamePrefix+"protocol']").append("<option value='0' selected>"+$.validator.messages.all+"</option>")
$("select[name='"+protocolNamePrefix+"protocol']").find("option[value=1]").attr("disabled",true); $("select[name='"+protocolNamePrefix+"protocol']").append("<option value='6'>TCP</option>")
$("select[name='"+protocolNamePrefix+"protocol']").append("<option value='17'>UDP</option>")
$("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh"); $("select[name='"+protocolNamePrefix+"protocol']").selectpicker("refresh");
} }
if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){ if(interceptReplacePktBin == 'intercept_replace_pkt_bin'){