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

增加域名限速没有拦截限度bug，修改证书信息展示bug

Browse Source
This commit is contained in:
DuanDongmei
2018-11-20 17:16:42 +08:00
parent ffd9c2ec44
commit b88bf5beca
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -563,6 +563,25 @@
<div for="userRegion1"></div> <div for="userRegion1"></div>
</div> </div>
</div> </div>
<!-- 域名拦截增加拦截强度 -->
<c:if test="${_cfg.functionId eq 201}">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font>
<spring:message code="intercept_intensity" />
</label>
<div class="col-md-6">
<select name="userRegion5"
class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('INTERCEPT_DOMAIN_INTENSITY')}" var="intensityC">
<option value="${intensityC.itemCode}" <c:if test="${_cfg.userRegion5==intensityC.itemCode || (empty _cfg.userRegion5 && intensityC.itemCode eq 1)}">selected</c:if>><spring:message code="${intensityC.itemValue}"/></option>
</c:forEach>
</select>
</div>
<div for="userRegion5"></div>
</div>
</div>
</c:if>
<div class="col-md-6 droprate"> <div class="col-md-6 droprate">
<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>

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

@@ -449,7 +449,6 @@
<td> <td>
<c:if test="${indexCfg.action eq 1}"> <c:if test="${indexCfg.action eq 1}">
<c:forEach items="${certificateList}" var="certificate"> <c:forEach items="${certificateList}" var="certificate">
${indexCfg.userRegion1}
<c:if test="${indexCfg.userRegion1=='${certificate.compileId}'}">${certificate.cfgDesc}</c:if> <c:if test="${indexCfg.userRegion1=='${certificate.compileId}'}">${certificate.cfgDesc}</c:if>
</c:forEach> </c:forEach>
</c:if> </c:if>
@@ -464,7 +463,6 @@
<td> <td>
<c:if test="${indexCfg.action eq 1}"> <c:if test="${indexCfg.action eq 1}">
<c:forEach items="${certificateList}" var="certificate"> <c:forEach items="${certificateList}" var="certificate">
${indexCfg.userRegion1}
<c:if test="${indexCfg.userRegion1=='${certificate.compileId}'}">${certificate.cfgDesc}</c:if> <c:if test="${indexCfg.userRegion1=='${certificate.compileId}'}">${certificate.cfgDesc}</c:if>
</c:forEach> </c:forEach>
</c:if> </c:if>