From c63b086b263addded6f49b1a796e558b8401e3e1 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 13 Jun 2018 16:51:15 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BC=881=EF=BC=89ip=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2action=E6=9B=BF=E6=8D=A2=20=EF=BC=882?=
 =?UTF-8?q?=EF=BC=89log=5Ftotal=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/messages/message_en.properties    | 1 +
 src/main/resources/messages/message_ru.properties    | 1 +
 src/main/resources/messages/message_zh_CN.properties | 1 +
 src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp    | 6 +++---
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties
index df9641e0b..5b2b4c248 100644
--- a/src/main/resources/messages/message_en.properties
+++ b/src/main/resources/messages/message_en.properties
@@ -630,4 +630,5 @@ version=version
 encrypt_mode=encrypt mode
 hmac=HMAC
 tunnel_type=tunnel type
+log_total=log total
 #===========log end  =============
\ No newline at end of file
diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties
index aa5722ff1..fc3e3d429 100644
--- a/src/main/resources/messages/message_ru.properties
+++ b/src/main/resources/messages/message_ru.properties
@@ -456,4 +456,5 @@ version=version
 encrypt_mode=encrypt mode
 hmac=HMAC
 tunnel_type=tunnel type
+log_total=log total
 #===========log end  =============
\ 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 75b4cac9e..2146351e6 100644
--- a/src/main/resources/messages/message_zh_CN.properties
+++ b/src/main/resources/messages/message_zh_CN.properties
@@ -657,4 +657,5 @@ version=\u7248\u672c\u53f7
 encrypt_mode=\u52a0\u5bc6\u65b9\u5f0f
 hmac=\u662f\u5426\u6709HMAC
 tunnel_type=\u901a\u9053\u7c7b\u578b
+log_total=\u65E5\u5FD7\u603B\u91CF
 #===========log end  =============
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp b/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp
index b6fca1c44..5f0da8f1b 100644
--- a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp
@@ -252,17 +252,17 @@
 									<td>${cfg.destPort }</td>
 									<td>
 										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="serviceC">
-									       <c:if test="${cfg.action eq serviceC.itemValue}"><spring:message code="${serviceC.itemDesc }"/></c:if>
+									       <c:if test="${cfg.action eq serviceC.itemCode}"><spring:message code="${serviceC.itemValue }"/></c:if>
 							            </c:forEach>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="directionC">
-											<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemDesc }"/></c:if>
+											<c:if test="${cfg.direction eq directionC.itemCode}"><spring:message code="${directionC.itemValue }"/></c:if>
 										</c:forEach>
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('PROTOCOL')}" var="protocolC">
-											<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemDesc }"/></c:if>
+											<c:if test="${cfg.protocol eq protocolC.itemCode}"><spring:message code="${protocolC.itemValue }"/></c:if>
 										</c:forEach>
 									</td>
 									<td>