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

//HTTP block： response code is not null ;response content

Browse Source 
null(userRegion is not null)
//HTTP redirect： response code is not null ;response content 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)
修复proxy 排序 查询列表bug
This commit is contained in:
duandongmei
2018-08-09 15:07:49 +08:00
parent 5964eeca80
commit 9b1f4d30cc
5 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/webapp/WEB-INF/views/cfg/actionRegionForm.jsp
View File

@@ -22,9 +22,8 @@
<div class="col-md-6">
<select name="userRegion1"
class="selectpicker show-tick form-control">
<option value="" <c:if test="${empty _cfg.userRegion1}">selected</c:if>>Silent</option>
<c:forEach items="${fns:getDictList('RESPONSE_CODE')}" var="responseCodeC">
<option value="${responseCodeC.itemCode}" <c:if test="${_cfg.userRegion1 eq responseCodeC.itemCode}">selected</c:if>>${responseCodeC.itemCode} <spring:message code="${responseCodeC.itemValue}"/></option>
<option value="${responseCodeC.itemCode}" <c:if test="${_cfg.userRegion1 eq responseCodeC.itemCode || (empty _cfg.userRegion1 && responseCodeC.itemCode eq 404)}">selected</c:if>>${responseCodeC.itemCode} <spring:message code="${responseCodeC.itemValue}"/></option>
</c:forEach>
</select>
</div>
@@ -34,10 +33,9 @@
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3">
<font color="red" class="userRegion2">*</font>
<spring:message code="response_content" /></label>
<div class="col-md-6">
<input class="form-control required" type="text"
<input class="form-control" type="text"
name="userRegion2"
value="${_cfg.userRegion2 }">
</div>

8
src/main/webapp/WEB-INF/views/cfg/proxy/control/httpRedirectList.jsp
View File

@@ -237,22 +237,27 @@
<c:if test="${action eq 16 }">
<c:set var="configPermissionName" value="control:httpBlock:config"/>
<c:set var="confirmPermissionName" value="control:httpBlock:confirm"/>
<c:set var="actionPath" value="${ctx}/proxy/control/httpRedirect/httpBlockList?functionId=${cfg.functionId}"></c:set>
</c:if>
<c:if test="${action eq 48 }">
<c:set var="configPermissionName" value="control:httpRedirect:config"/>
<c:set var="confirmPermissionName" value="control:httpRedirect:confirm"/>
<c:set var="actionPath" value="${ctx}/proxy/control/httpRedirect/httpRedirectList?functionId=${cfg.functionId}"></c:set>
</c:if>
<c:if test="${action eq 80 }">
<c:set var="configPermissionName" value="control:httpReplace:config"/>
<c:set var="confirmPermissionName" value="control:httpReplace:confirm"/>
<c:set var="actionPath" value="${ctx}/proxy/control/httpRedirect/httpReplaceList?functionId=${cfg.functionId}"></c:set>
</c:if>
<c:if test="${action eq 1 }">
<c:set var="configPermissionName" value="control:httpMonit:config"/>
<c:set var="confirmPermissionName" value="control:httpMonit:confirm"/>
<c:set var="actionPath" value="${ctx}/proxy/control/httpRedirect/httpMonitList?functionId=${cfg.functionId}"></c:set>
</c:if>
<c:if test="${action eq 128 }">
<c:set var="configPermissionName" value="control:httpWhitelist:config"/>
<c:set var="confirmPermissionName" value="control:httpWhitelist:confirm"/>
<c:set var="actionPath" value="${ctx}/proxy/control/httpRedirect/httpWhitelistList?functionId=${cfg.functionId}"></c:set>
</c:if>
<shiro:hasPermission name="${configPermissionName }">
<button type="button" class="btn btn-primary"
@@ -286,7 +291,8 @@
<div class="portlet-body">
<div class="row" >
<sys:message content="${message}"/>
<form:form id="searchForm" modelAttribute="cfg" action="${ctx}/proxy/control/httpRedirect/list?functionId=${cfg.functionId}" method="post" class="form-search">
<form:form id="searchForm" modelAttribute="cfg" action="${actionPath }" method="post" class="form-search">
<input id="functionId" name="functionId" type="hidden" value="${cfg.functionId}"/>
<input id="audit" name="audit" type="hidden" value="${audit}"/>
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>

2
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
View File

@@ -30,7 +30,7 @@
ipMaskRange:"IP mask must between 0 and 32",
srcIpNotEqDestIp:"Sourse IP ",
destIpNotEqDestIp:" and destination IP ",
IpNotEqDestIp:" can't the same",
IpNotEqDestIp:" can't be the same",
srcIpIsNotValue:"Sourse IP can't be ",
destIpIsNotValue:"Destination IP can't be ",
ipRange:"Wrong IP format or start IP and end IP in two subnet",