From ac7427cd2a162f440808027ca461fcb55c7628f1 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 10 Aug 2018 15:12:58 +0800
Subject: [PATCH] =?UTF-8?q?IP=E5=AF=BC=E5=85=A5=E7=95=8C=E9=9D=A2=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/message_en.properties  |  8 ++-
 .../messages/message_zh_CN.properties         |  6 ++-
 .../WEB-INF/views/cfg/common/ipList.jsp       | 52 ++++++++++++++++++-
 3 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index f43e8953f..45a6e90a3 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -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
\ No newline at end of file
+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
\ No newline at end of file
diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties
index 84520f86f..d6ea85b24 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -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
\ No newline at end of file
+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
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
index 7619b6c1f..7f232d773 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
@@ -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>