From 317cb9ab281cba8012cfc6fb2eabe71486934bb7 Mon Sep 17 00:00:00 2001
From: leijun <leijun@intranet.com>
Date: Tue, 18 Dec 2018 16:49:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3IP=20Spoofing=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8D=E5=AF=B9=E5=BA=94=20=E8=A7=A3=E5=86=B3=20msg?=
 =?UTF-8?q?Prop=E8=AF=BB=E5=8F=96=E4=B8=8D=E5=88=B0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=A9=BA=E6=8C=87=E9=92=88=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/web/controller/BaseController.java  |  2 +-
 .../webapp/WEB-INF/views/log/ntc/openVpnList.jsp     | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/nis/web/controller/BaseController.java b/src/main/java/com/nis/web/controller/BaseController.java
index fa4d4b3d7..a658362c8 100644
--- a/src/main/java/com/nis/web/controller/BaseController.java
+++ b/src/main/java/com/nis/web/controller/BaseController.java
@@ -757,7 +757,7 @@ public class BaseController {
 			}
 
 		} catch (Exception e) {
-			msgProp = null;
+			//msgProp = null;
 			logger.error("未知i18n消息配置文件,请确定文件是否存在!", e);
 		}
 		return msgProp;
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
index 8c6d0b66b..b3c20796d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -316,7 +316,17 @@ $(document).ready(function(){
 					                	</c:forEach>
 					                	<spring:message code="${directions}"/>
 									</td>
-									
+									<td>${log.innerSmac }</td>
+									<td>${log.innerDmac }</td>
+									<td>
+										<c:set var="streamDirs">${log.streamDir }</c:set>
+										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="streamType">
+											<c:if test="${streamType.itemCode eq log.streamDir}">
+											<c:set var="streamDirs">${streamType.itemValue}</c:set>
+											</c:if>
+					                	</c:forEach>
+					                	<spring:message code="${streamDirs}"/>
+									</td>
 									<td>${log.addrList }</td>
 									<td>${log.serverLocate}</td>
 									<td>${log.clientLocate}</td>