From 0c653dc05b3d8c9bacd5a76130fe63cef49c853c Mon Sep 17 00:00:00 2001
From: duandongmei <duandongmei@intranet.com>
Date: Sat, 18 Aug 2018 15:27:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9direction?=
 =?UTF-8?q?=E5=8F=96=E9=94=99=E5=AD=97=E5=85=B8=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp  | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/appList.jsp             | 2 +-
 src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp            | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp             | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp             | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp            | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp              | 2 +-
 src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp           | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp         | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp            | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp          | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp         | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp         | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp        | 4 ++--
 .../webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp    | 4 ++--
 .../webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp    | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp   | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp     | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp   | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp    | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp   | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp        | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp         | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp         | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp             | 4 ++--
 src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp          | 4 ++--
 src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp         | 4 ++--
 27 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
index 117deea93..cdfdfc530 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -123,7 +123,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -281,7 +281,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
index 6e479db9d..15864d062 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
@@ -114,7 +114,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
index 0f0c267cd..69eea2267 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -104,7 +104,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -239,7 +239,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
index 94f308316..c0b3a80f8 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/dnsList.jsp
@@ -109,7 +109,7 @@
                                 		<label class="control-label"><spring:message code='direct'/>：</label>
                                        	<form:select path="direction" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction" >
+											<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
 												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
 											</c:forEach>
 										</form:select>
@@ -280,7 +280,7 @@
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
index 3374fb36a..862eac5d9 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -114,7 +114,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -244,7 +244,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
index fd11be005..f1f7c4044 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/httpList.jsp
@@ -109,7 +109,7 @@
                                 		<label class="control-label"><spring:message code='direct'/>：</label>
                                        	<form:select path="direction" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction" >
+											<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
 												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
 											</c:forEach>
 										</form:select>
@@ -312,7 +312,7 @@
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
index b2c6af8e1..828ba2b6d 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
@@ -109,7 +109,7 @@
                                 		<label class="control-label"><spring:message code='direct'/>：</label>
                                        	<form:select path="direction" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction" >
+											<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
 												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
 											</c:forEach>
 										</form:select>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
index d4f4aa5db..645f590df 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
@@ -103,7 +103,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -226,7 +226,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
index 0967854fd..3d0808933 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -112,7 +112,7 @@
 											<label><spring:message code="direct"/>：</label>
 												<form:select path="direction" class="selectpicker form-control select2">
 			                                    <form:option value=""><spring:message code="select"/></form:option>
-			                                     <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+			                                     <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 													 <form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 										         </c:forEach>
 			                                </form:select>
@@ -241,7 +241,7 @@
 												</c:forEach>
 											</td>
 											<td>
-												<c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+												<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 													<c:if test="${log.direction==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
index 8d679132e..08ac8fbd8 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mailList.jsp
@@ -109,7 +109,7 @@
                                 		<label class="control-label"><spring:message code='direct'/>：</label>
                                        	<form:select path="direction" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction" >
+											<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
 												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
 											</c:forEach>
 										</form:select>
@@ -249,7 +249,7 @@
 									<td>${log.sPort }</td>
 									<td>${log.deviceId }</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
index 1b8b3e1bc..a72fa4de3 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -114,7 +114,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -263,7 +263,7 @@ $(document).ready(function(){
 									<td>${log.sPort}</td>
 									<%-- <td>${log.deviceId}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td> --%>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
index a5274be19..1cfad6620 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -114,7 +114,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -262,7 +262,7 @@ $(document).ready(function(){
 									<td>${log.sPort}</td>
 									<%-- <td>${log.deviceId}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td> --%>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
index 96046b659..d0e5c5c41 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -114,7 +114,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -269,7 +269,7 @@ $(document).ready(function(){
 										</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td> --%>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
index a9005a229..ae0b1c035 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -114,7 +114,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -269,7 +269,7 @@ $(document).ready(function(){
 										</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td> --%>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
index 4055e31d4..066d106ef 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
@@ -114,7 +114,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -264,7 +264,7 @@ $(document).ready(function(){
 									<td>${log.sPort}</td>
 									<%-- <td>${log.deviceId}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td> --%>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
index f412e10b1..f8b128211 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
@@ -114,7 +114,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -261,7 +261,7 @@ $(document).ready(function(){
 									<td>${log.sPort}</td>
 									<%-- <td>${log.deviceId}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td> --%>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
index 339088271..d1c619c3b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -158,7 +158,7 @@
 													<form:option value="">
 														<spring:message code="select" />
 													</form:option>
-													<c:forEach items="${fns:getDictList('DIRECTION')}"
+													<c:forEach items="${fns:getDictList('IP_LOCATION')}"
 														var="dict">
 														<form:option value="${dict.itemCode}">
 															<spring:message code="${dict.itemValue}" />
@@ -327,7 +327,7 @@
 												</c:forEach>
 											</td>
 											<td>
-												<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+												<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 													<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
 												</c:forEach>
 											</td> --%>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
index 77f98bd70..60b9cde87 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp
@@ -114,7 +114,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -267,7 +267,7 @@ $(document).ready(function(){
 												</c:forEach>
 											</td>
 											<td>
-												<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+												<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 													<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
 												</c:forEach>
 											</td> --%>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
index 9256f2cf5..e9d01a01b 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -114,7 +114,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -269,7 +269,7 @@ $(document).ready(function(){
 												</c:forEach>
 											</td>
 											<td>
-												<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+												<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 													<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
 												</c:forEach>
 											</td> --%>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
index a3a6da20f..fd54870d9 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
@@ -114,7 +114,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -269,7 +269,7 @@ $(document).ready(function(){
 									<td>${log.sPort}</td>
 									<%-- <td>${log.deviceId}</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td> --%>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
index 346f48acf..f24a8dc37 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -114,7 +114,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -268,7 +268,7 @@ $(document).ready(function(){
 									<td>${log.sPort}</td>
 <%-- 									<td>${log.deviceId}</td> --%>
 <!-- 									<td> -->
-<%-- 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic"> --%>
+<%-- 										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic"> --%>
 <%-- 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if> --%>
 <%-- 				               			</c:forEach> --%>
 <!-- 									</td> -->
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
index fc861d481..077ab18b2 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -114,7 +114,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -267,7 +267,7 @@ $(document).ready(function(){
 									<td>${log.sPort}</td>
 <%-- 									<td>${log.deviceId}</td> --%>
 									<%-- <td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td> --%>
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 d1b2e8938..27130cc25 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -114,7 +114,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -240,7 +240,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
index 16784b77f..61f53f363 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -112,7 +112,7 @@
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker form-control select2">
 			                                	 <form:option value=""><spring:message code="select"/></form:option>
-			                                     <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+			                                     <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 													 <form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 										         </c:forEach>
 			                                </form:select>
@@ -237,7 +237,7 @@
 												</c:forEach>
 											</td>
 											<td>
-												<c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+												<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 													<c:if test="${log.direction==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
index c09e1e6fa..6bf979c2f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -114,7 +114,7 @@ $(document).ready(function(){
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
 	                                        <form:option value=""><spring:message code="select"/></form:option>
-	                                        <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+	                                        <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
@@ -240,7 +240,7 @@ $(document).ready(function(){
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
index 585c30877..f4abeda1f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -121,7 +121,7 @@
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker form-control select2">
 			                                    <form:option value=""><spring:message code="select"/></form:option>
-			                                     <c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+			                                     <c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 													 <form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 										         </c:forEach>
 			                                </form:select>
@@ -243,7 +243,7 @@
 												</c:forEach>
 											</td>
 											<td>
-												<c:forEach items="${fns:getDictList('DIRECTION')}" var="dict">
+												<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="dict">
 													<c:if test="${log.direction==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
diff --git a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
index d8c889786..6b5260889 100644
--- a/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/pxy/pxyHttpList.jsp
@@ -99,7 +99,7 @@
                                 		<label class="control-label"><spring:message code='direct'/>：</label>
                                        	<form:select path="direction" class="selectpicker form-control">
 											<form:option value=""><spring:message code="select"/></form:option>
-											<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction" >
+											<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction" >
 												<form:option value="${direction.itemCode}"><spring:message code="${direction.itemValue}"></spring:message></form:option>
 											</c:forEach>
 										</form:select>
@@ -205,7 +205,7 @@
 					                	</c:forEach>
 									</td>
 									<td>
-										<c:forEach items="${fns:getDictList('DIRECTION')}" var="direction">
+										<c:forEach items="${fns:getDictList('IP_LOCATION')}" var="direction">
 											<c:if test="${direction.itemCode eq log.direction}"><spring:message code="${direction.itemValue}"/></c:if>
 					                	</c:forEach>
 									</td>