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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
duandongmei
2018-08-10 15:30:37 +08:00
parent 60b84ca6ed ac7427cd2a
commit 8bcd16718b
3 changed files with 62 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/resources/messages/message_en.properties
View File

@@ -1078,5 +1078,9 @@ MM_VOIP_ACCOUNT=VoIP Account
#=======================for import ip configuration=================
drop_ip=IP Drop
loop_ip=IP Loop
drop_or_loop_ip=IP Drop Or Loop
reject_or_monit_ip=IP Reject Or Monit
drop_or_loop_ip=IP Drop/Loop
reject_or_monit_ip=IP Block/Monitor
reject_ip=IP Block
monit_ip=IP Monitor
ir_ip=IP Reuseing
ratelimit_ip=IP Ratelimit

6
src/main/resources/messages/message_zh_CN.properties
View File

@@ -1073,4 +1073,8 @@ MM_VOIP_ACCOUNT=VOIP\u8D26\u53F7
drop_ip=IP\u4E22\u5F03
loop_ip=IP\u56DE\u6D41
drop_or_loop_ip=IP\u4E22\u5F03/\u56DE\u6D41
reject_or_monit_ip=IP\u963B\u65AD/\u76D1\u6D4B
reject_or_monit_ip=IP\u963B\u65AD/\u76D1\u6D4B
reject_ip=IP\u963B\u65AD
monit_ip=IP\u76D1\u6D4B
ir_ip=IP\u590D\u7528
ratelimit_ip=IP\u9650\u6D41

52
src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
View File

@@ -63,9 +63,59 @@
<i class="fa fa-angle-down"></i>
</button>
<ul class="dropdown-menu pull-right">
<c:forEach items="${serviceList}" var="service" varStatus="status">
<c:if test="${fn:containsIgnoreCase(service.actionCode,'monit')}">
<c:set var="monitCode" value="monit"/>
</c:if>
<c:if test="${fn:containsIgnoreCase(service.actionCode,'reject')}">
<c:set var="rejectCode" value="reject"/>
</c:if>
<c:if test="${fn:containsIgnoreCase(service.actionCode,'drop')}">
<c:set var="dropCode" value="monit"/>
</c:if>
<c:if test="${fn:containsIgnoreCase(service.actionCode,'ratelimit')}">
<c:set var="ratelimitCode" value="monit"/>
</c:if>
<c:if test="${fn:containsIgnoreCase(service.actionCode,'loop')}">
<c:set var="loopCode" value="monit"/>
<c:if test="${service.action==96}"><c:set var="irCode" value="monit"/></c:if>
</c:if>
</c:forEach>
<c:forEach items="${regionList}" var="region" varStatus="status">
<li><a href="javascript:;" onClick="toImport('${region.configRegionCode}','${region.configRegionValue}');">
<i class="fa fa-upload"></i><spring:message code="${region.configRegionValue}"/></a></li>
<i class="fa fa-upload"></i>
<c:choose>
<c:when test="${monitCode!=null and rejectCode!=null and region.isMaat==1}">
<spring:message code="reject_or_monit_ip"/>
</c:when>
<c:when test="${monitCode==null and rejectCode!=null and region.isMaat==1}">
<spring:message code="reject_ip"/>
</c:when>
<c:when test="${monitCode!=null and rejectCode==null and region.isMaat==1}">
<spring:message code="monit_ip"/>
</c:when>
<c:when test="${irCode!=null and region.isMaat==1}">
<spring:message code="ir_ip"/>
</c:when>
<c:when test="${ratelimitCode!=null and region.isMaat==1}">
<spring:message code="ratelimit_ip"/>
</c:when>
<c:when test="${dropCode!=null and loopCode!=null and region.isMaat==2}">
<spring:message code="drop_or_loop_ip"/>
</c:when>
<c:when test="${dropCode!=null and loopCode==null and region.isMaat==2}">
<spring:message code="drop_ip"/>
</c:when>
<c:when test="${loopCode!=null and dropCode==null and region.isMaat==2}">
<spring:message code="loop_ip"/>
</c:when>
<c:otherwise>
<spring:message code="${region.configRegionValue}"/>
</c:otherwise>
</c:choose>
</a>
</li>
</c:forEach>
</ul>
</div>