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

app block增加DKC=8自定义域(userRegion4)

Browse Source
This commit is contained in:
duandongmei
2019-01-10 15:47:52 +06:00
parent 1cc208d5ff
commit f9a39c7801
4 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/nis/web/service/configuration/AppCfgService.java
View File

@@ -1021,8 +1021,8 @@ public class AppCfgService extends BaseService {
userRegion+=Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY+"="+entity.getUserRegion3(); userRegion+=Constants.USER_REGION_SPLIT +Constants.INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY+"="+entity.getUserRegion3();
} }
} }
//VIGNORE=1 //DKC=8
if(StringUtil.isEmpty(entity.getUserRegion4())){ if(!StringUtil.isEmpty(entity.getUserRegion4())){
userRegion+=Constants.USER_REGION_SPLIT +Constants.APP_VIGNORE_USER_REGION_KEY+"=1"; userRegion+=Constants.USER_REGION_SPLIT +Constants.APP_VIGNORE_USER_REGION_KEY+"=1";
} }
userRegion+=Constants.USER_REGION_SPLIT+"config_id="+entity.getCompileId(); userRegion+=Constants.USER_REGION_SPLIT+"config_id="+entity.getCompileId();

2
src/main/resources/nis.properties
View File

@@ -557,7 +557,7 @@ max_allowed_packet=1048576
http_max_connection=1000 http_max_connection=1000
default_max_perroute=100 default_max_perroute=100
poolcm_socket_timeout=3000 poolcm_socket_timeout=3000
app_vignore_user_region_key=VIGNORE app_vignore_user_region_key=DKC
#policies\u83dc\u5355\u7684\u83dc\u5355ID #policies\u83dc\u5355\u7684\u83dc\u5355ID
policies_menu_id=86 policies_menu_id=86
userCreate=UserCreate userCreate=UserCreate

14
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgForm.jsp
View File

@@ -8,6 +8,11 @@ $(function(){
$(".ratelimitAction").find("input[name='userRegion1']").on("change",function(){ $(".ratelimitAction").find("input[name='userRegion1']").on("change",function(){
switchRateLimitType(); switchRateLimitType();
}); });
if($(".action:checked").val()==16){
$(".dnsIpSpoofing").removeClass("hidden");
}else{
$(".dnsIpSpoofing").addClass("hidden");
}
$(".action").on("change", function() { $(".action").on("change", function() {
$("#serviceId").val($(this).attr("serviceId")); $("#serviceId").val($(this).attr("serviceId"));
$("#protocolId").val($(this).attr("protocolId")); $("#protocolId").val($(this).attr("protocolId"));
@@ -24,6 +29,11 @@ $(function(){
if($(this).val()==1){ if($(this).val()==1){
$(".ipPortAdd").click(); $(".ipPortAdd").click();
} }
if($(".action:checked").val()==16){
$(".dnsIpSpoofing").removeClass("hidden");
}else{
$(".dnsIpSpoofing").addClass("hidden");
}
switchAction($(this).val()); switchAction($(this).val());
}); });
$("#serviceId").val($(".action:checked").attr("serviceId")); $("#serviceId").val($(".action:checked").attr("serviceId"));
@@ -316,10 +326,10 @@ var delContent = function(contentClassName, addBtnClassName) {
<div for="action"></div> <div for="action"></div>
</div> </div>
</div> </div>
<div class="col-md-6 hidden"> <div class="col-md-6 dnsIpSpoofing hidden">
<div class="form-group"> <div class="form-group">
<label class="control-label col-md-3"> <label class="control-label col-md-3">
<input type="checkbox" name="userRegion4" class="child-checks" <%-- <c:if test="${_cfg.userRegion4 eq '1' }"> --%>checked<%-- </c:if> --%> value="1"> <input type="checkbox" name="userRegion4" class="child-checks" <c:if test='${_cfg.userRegion4 eq "8" }'> checked</c:if> value="8">
</label> </label>
<div class="col-md-6"> <div class="col-md-6">
<label class="control-label"> <label class="control-label">

13
src/main/webapp/WEB-INF/views/cfg/app/appPolicyCfgList.jsp
View File

@@ -384,7 +384,7 @@
<th><input type="checkbox" class="i-checks" id="checkAll"></th> <th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th class="sort-column r.compile_id" style="display: none" column="cfg_id" ><spring:message code="cfg_id"/></th> <th class="sort-column r.compile_id" style="display: none" column="cfg_id" ><spring:message code="cfg_id"/></th>
<th class="sort-column r.cfg_desc cfgDesc" column="config_describe" ><spring:message code="config_describe"/></th> <th class="sort-column r.cfg_desc cfgDesc" column="config_describe" ><spring:message code="config_describe"/></th>
<%-- <th><spring:message code="block_by_app_server_ip"/></th> --%> <th column="user_region4" ><spring:message code="block_by_app_server_ip"/></th>
<th class="sort-column r.action" column="block_type" ><spring:message code="block_type"/></th> <th class="sort-column r.action" column="block_type" ><spring:message code="block_type"/></th>
<th column="ratelimit" ><spring:message code="ratelimit"/></th> <th column="ratelimit" ><spring:message code="ratelimit"/></th>
<th column="social_app" ><spring:message code="social_app"/></th> <th column="social_app" ><spring:message code="social_app"/></th>
@@ -415,14 +415,11 @@
</td> </td>
<td>${cfg.compileId }</td> <td>${cfg.compileId }</td>
<td>${cfg.cfgDesc }</td> <td>${cfg.cfgDesc }</td>
<%-- <td> <td>
<c:if test="${cfg.userRegion4 eq '1'}"> <c:if test="${cfg.userRegion4 eq '8'}">
<spring:message code="yes"/> <spring:message code="block_by_app_server_ip"/>
</c:if> </c:if>
<c:if test="${empty cfg.userRegion4}"> </td>
<spring:message code="no"/>
</c:if>
</td> --%>
<td> <td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${dict.itemCode eq cfg.action }"> <c:if test="${dict.itemCode eq cfg.action }">