From b3213adbe586d3ae27bcf25615a677657a71a2b4 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Mon, 13 Aug 2018 13:49:04 +0800
Subject: [PATCH] =?UTF-8?q?ip=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0IP=E6=A0=BC=E5=BC=8F=E5=92=8C=E7=AB=AF=E5=8F=A3?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp    | 10 +++++++++-
 src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

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 7f232d773..d5d300700 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
@@ -329,6 +329,8 @@
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th exportColumn="config_describe" ><spring:message code="config_describe"/></th>
 									<th exportColumn="ip_type"><spring:message code="ip_type"/></th>
+									<th exportColumn="ip_pattern"><spring:message code="ip_pattern"/></th>
+									<th exportColumn="port_pattern"><spring:message code="port_pattern"/></th>
 									<c:if test="${specialFunctionId ne 'ipmulitiplex'}">
 									<th exportColumn="client_ip"><spring:message code="client_ip"/></th>
 									<th exportColumn="client_port"><spring:message code="client_port"/></th>
@@ -379,7 +381,13 @@
 									<%-- <td>${status.index+1 }</td> --%>
 									<td>${cfg.cfgDesc }</td>
 									<td><c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
-										<c:if test="${ipType.itemCode==cfg.ipType}">${ipType.itemValue}</c:if>
+										<c:if test="${ipType.itemCode==cfg.ipType}"><spring:message code="${ipType.itemValue}"/></c:if>
+					                </c:forEach></td>
+									<td><c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPattern">
+										<c:if test="${ipPattern.itemCode==cfg.ipPattern}"><spring:message code="${ipPattern.itemValue}"/></c:if>
+					                </c:forEach></td>
+					                <td><c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPattern">
+										<c:if test="${portPattern.itemCode==cfg.portPattern}"><spring:message code="${portPattern.itemValue}"/></c:if>
 					                </c:forEach></td>
 					                <c:if test="${specialFunctionId ne 'ipmulitiplex'}">
 										<td title="${cfg.srcIpAddress }">${fns:abbr(cfg.srcIpAddress, 42)}</td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
index f5bb59bd3..6ddcf1470 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipList.jsp
@@ -214,6 +214,8 @@
 									<%-- <th><spring:message code="seq"/></th> --%>
 									<th exportColumn="config_describe"><spring:message code="config_describe"/></th>
 									<th exportColumn="ip_type"><spring:message code="ip_type"/></th>
+									<th exportColumn="ip_pattern"><spring:message code="ip_pattern"/></th>
+									<th exportColumn="port_pattern"><spring:message code="port_pattern"/></th>
 									<th exportColumn="client_ip"><spring:message code="client_ip"/></th>
 									<th exportColumn="client_port"><spring:message code="client_port"/></th>
 									<th exportColumn="server_ip"><spring:message code="server_ip"/></th>
@@ -237,7 +239,13 @@
 									<%-- <td>${status.index+1 }</td> --%>
 									<td>${cfg.cfgDesc }</td>
 									<td><c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
-										<c:if test="${ipType.itemCode==cfg.ipType}">${ipType.itemValue}</c:if>
+										<c:if test="${ipType.itemCode==cfg.ipType}"><spring:message code="${ipType.itemValue}"/></c:if>
+					                </c:forEach></td>
+					                <td><c:forEach items="${fns:getDictList('IP_PATTERN')}" var="ipPattern">
+										<c:if test="${ipPattern.itemCode==cfg.ipPattern}"><spring:message code="${ipPattern.itemValue}"/></c:if>
+					                </c:forEach></td>
+					                <td><c:forEach items="${fns:getDictList('PORT_PATTERN')}" var="portPattern">
+										<c:if test="${portPattern.itemCode==cfg.portPattern}"><spring:message code="${portPattern.itemValue}"/></c:if>
 					                </c:forEach></td>
 									<td title="${cfg.srcIpAddress }">${fns:abbr(cfg.srcIpAddress, 42)}</td>
 									<td>${cfg.srcPort }</td>