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

Policy Group加入IP下发逻辑

Browse Source
This commit is contained in:
wangxin
2019-06-24 16:18:32 +08:00
parent 05599738d9
commit 240b10a05d
3 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/nis/web/service/configuration/ObjectGroupService.java
View File

@@ -107,6 +107,14 @@ public class ObjectGroupService extends BaseService {
}else if(entity.getAction().equals(16)){ }else if(entity.getAction().equals(16)){
entity.setServiceId(17); entity.setServiceId(17);
} }
}else if(StringUtils.isBlank(protocolType)){
if(MapUtils.isNotEmpty(entity.getUserRegion())&&entity.getUserRegion().containsKey("ipGroup")){
if(entity.getAction().equals(1)){
entity.setServiceId(128);
}else if(entity.getAction().equals(16)){
entity.setServiceId(16);
}
}
} }
if(entity.getCfgId()==null){ if(entity.getCfgId()==null){
Integer compileId = 0; Integer compileId = 0;

4
src/main/resources/service/service_config.xml
View File

@@ -435,6 +435,6 @@
<serviceCfg cfgType="3" tableName="http_res_head_cfg" ></serviceCfg> <serviceCfg cfgType="3" tableName="http_res_head_cfg" ></serviceCfg>
<serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg> <serviceCfg cfgType="2" tableName="ntc_subscribe_id_cfg" ></serviceCfg>
</service> </service>
<service id="0" serviceIds="512,592,129" functionId="888" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="公共分组监测"></service> <service id="0" serviceIds="512,592,128,129" functionId="888" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="公共分组监测"></service>
<service id="-1" serviceIds="576,17" functionId="888" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="公共分组阻断"></service> <service id="-1" serviceIds="576,16,17" functionId="888" serviceType="1" tableName="cfg_index_info" className="CfgIndexInfo" desc="公共分组阻断"></service>
</serviceList> </serviceList>

30
src/main/webapp/WEB-INF/views/cfg/objgroup/form.jsp
View File

@@ -28,6 +28,7 @@ $(function(){
}) })
} }
if('${_cfg.userRegion1}'=='intercept'){ if('${_cfg.userRegion1}'=='intercept'){
$(".domainGroup").removeClass("hidden").removeClass("disabled");
$(".urlGroup").addClass("hidden").addClass("disabled"); $(".urlGroup").addClass("hidden").addClass("disabled");
$(".subscribeIdGroup").addClass("hidden").addClass("disabled"); $(".subscribeIdGroup").addClass("hidden").addClass("disabled");
//处理do_log //处理do_log
@@ -35,10 +36,16 @@ $(function(){
$("[name='doLog']").find("[value=2]").prop("checked",true); $("[name='doLog']").find("[value=2]").prop("checked",true);
}else if('${_cfg.userRegion1}'=='https'||'${_cfg.userRegion1}'=='http'){ }else if('${_cfg.userRegion1}'=='https'||'${_cfg.userRegion1}'=='http'){
$(".domainGroup").addClass("hidden").addClass("disabled"); $(".domainGroup").addClass("hidden").addClass("disabled");
$(".subscribeIdGroup").removeClass("hidden").removeClass("disabled");
$(".urlGroup").removeClass("hidden").removeClass("disabled");
}else if("${_cfg.userRegion1}"==""){ }else if("${_cfg.userRegion1}"==""){
if($("[name=userRegion1]").val()!="intercept"){
$(".domainGroup").addClass("hidden").addClass("disabled"); $(".domainGroup").addClass("hidden").addClass("disabled");
} $(".subscribeIdGroup").addClass("hidden").addClass("disabled");
$(".urlGroup").addClass("hidden").addClass("disabled");
}else if($("[name=userRegion1]").val()!="intercept"){
$(".domainGroup").addClass("hidden").addClass("disabled");
$(".subscribeIdGroup").removeClass("hidden").removeClass("disabled");
$(".urlGroup").removeClass("hidden").removeClass("disabled");
} }
@@ -99,6 +106,14 @@ $(function(){
//处理do_log //处理do_log
$(".doLog").removeClass("hidden"); $(".doLog").removeClass("hidden");
}else if("http"==$(this).val()){ }else if("http"==$(this).val()){
$(".domainGroup").addClass("hidden").addClass("disabled");
$(".urlGroup").removeClass("hidden").removeClass("disabled");
$(".subscribeIdGroup").removeClass("hidden").removeClass("disabled");
//处理do_log
$(".doLog").removeClass("hidden");
}else if(""==$(this).val()){
$(".urlGroup").addClass("hidden").addClass("disabled");
$(".subscribeIdGroup").addClass("hidden").addClass("disabled");
$(".domainGroup").addClass("hidden").addClass("disabled"); $(".domainGroup").addClass("hidden").addClass("disabled");
//处理do_log //处理do_log
$(".doLog").removeClass("hidden"); $(".doLog").removeClass("hidden");
@@ -323,10 +338,11 @@ var delContent = function(contentClassName, addBtnClassName) {
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-6">
<div class="form-group "> <div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label> <label class="control-label col-md-3"><%--<font color="red">*</font>--%><spring:message code="protocol"/></label>
<div class="col-md-6"> <div class="col-md-6">
<select name="userRegion1" data-live-search="true" class="selectpicker form-control"> <select name="userRegion1" data-live-search="true" class="selectpicker form-control">
<%--<option value="https" <c:if test="${_cfg.userRegion1 eq 'https'}">selected</c:if>><spring:message code="HTTPS"/></option> <option value="" <c:if test="${_cfg.userRegion1 eq ''}">selected</c:if>> <spring:message code="select"/></option>
<%-- <option value="https" <c:if test="${_cfg.userRegion1 eq 'https'}">selected</c:if>><spring:message code="HTTPS"/></option>
<option value="intercept" <c:if test="${_cfg.userRegion1 eq 'intercept'}">selected</c:if>> <spring:message code="intercept"/></option>--%> <option value="intercept" <c:if test="${_cfg.userRegion1 eq 'intercept'}">selected</c:if>> <spring:message code="intercept"/></option>--%>
<option value="http" <c:if test="${_cfg.userRegion1 eq 'http'}">selected</c:if>> <spring:message code="HTTP"/></option> <option value="http" <c:if test="${_cfg.userRegion1 eq 'http'}">selected</c:if>> <spring:message code="HTTP"/></option>
</select> </select>
@@ -348,7 +364,7 @@ var delContent = function(contentClassName, addBtnClassName) {
<div for="ipGroup"></div> <div for="ipGroup"></div>
</div> </div>
</div> </div>
<div class="col-md-6 subscribeIdGroup"> <div class="col-md-6 subscribeIdGroup hidden disabled">
<div class="form-group "> <div class="form-group ">
<label class="control-label col-md-3"><spring:message code="subscribe_id_group"/></label> <label class="control-label col-md-3"><spring:message code="subscribe_id_group"/></label>
<div class="col-md-6"> <div class="col-md-6">
@@ -364,7 +380,7 @@ var delContent = function(contentClassName, addBtnClassName) {
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-6 urlGroup"> <div class="col-md-6 urlGroup hidden disabled">
<div class="form-group "> <div class="form-group ">
<label class="control-label col-md-3"><spring:message code="url_group"/></label> <label class="control-label col-md-3"><spring:message code="url_group"/></label>
<div class="col-md-6"> <div class="col-md-6">
@@ -377,7 +393,7 @@ var delContent = function(contentClassName, addBtnClassName) {
<div for="urlGroups"></div> <div for="urlGroups"></div>
</div> </div>
</div> </div>
<div class="col-md-6 domainGroup"> <div class="col-md-6 domainGroup hidden disabled">
<div class="form-group "> <div class="form-group ">
<label class="control-label col-md-3"><spring:message code="domain_group"/></label> <label class="control-label col-md-3"><spring:message code="domain_group"/></label>
<div class="col-md-6"> <div class="col-md-6">