diff --git a/src/main/java/com/nis/web/test/LogTest.java b/src/main/java/com/nis/web/test/LogTest.java
index 6f65b9832..319baa456 100644
--- a/src/main/java/com/nis/web/test/LogTest.java
+++ b/src/main/java/com/nis/web/test/LogTest.java
@@ -49,6 +49,6 @@ public class LogTest {
 		Page<NtcIpLog> data = fromJson.getData();
 		System.out.println(data.getPageNo());
 		NtcIpLog object = data.getList().get(0);
-		System.out.print(object.getClientPort());
+		System.out.print(object.getsPort());
 	}
 }
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 237e7458e..8cfcccb9a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -50,7 +50,7 @@
 								<!-- 搜索内容与操作按钮栏 -->
 								<div class="col-md-12">
 									<div class="pull-left">
-										<form:select path="serviceType" class="selectpicker select2 input-small">
+										<form:select path="service" class="selectpicker select2 input-small">
 											<form:option value="" ><spring:message code="action"/></form:option>
 											<form:option value="16" ><spring:message code="action_reject"/></form:option>
 											<form:option value="1" ><spring:message code="action_monit"/></form:option>
@@ -103,7 +103,7 @@
 										<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="protocol_type"/>：</label>
-											<form:select path="protocol" class="selectpicker form-control select2">
+											<form:select path="transProto" class="selectpicker form-control select2">
 												<form:option value=""><spring:message code="select"/></form:option>
 												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
 											 		<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
@@ -125,7 +125,7 @@
 										<div class="col-md-2">
 											<div class="form-group">
 	                                            <label><spring:message code="clj_ip"/>：</label>
-	                                            <input name="cljIp" type="text" class="form-control" value="${log.cljIp}"/>
+	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
 	                                        </div>
 										</div>
 										<div class="col-md-2">
@@ -137,13 +137,13 @@
 										<div class="col-md-2">
 											<div class="form-group">
 	                                            <label><spring:message code="clientip"/>：</label>
-	                                            <input name="clientIp" type="text" class="form-control" value="${log.clientIp}"/>
+	                                            <input name="sIp" type="text" class="form-control" value="${log.sIp}"/>
 	                                        </div>
 										</div>
 										<div class="col-md-2">
 											<div class="form-group">
 	                                            <label><spring:message code="serverip"/>：</label>
-	                                            <input name="serverIp" type="text" class="form-control" value="${log.serverIp}"/>
+	                                            <input name="dIp" type="text" class="form-control" value="${log.dIp}"/>
 	                                        </div>
 										</div>
 									</div>
@@ -183,7 +183,11 @@
 									<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 										<tr>
 											<td>${log.cfgId}</td>
-											<td>${log.entranceId}</td>
+											<td>
+												<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+													<c:if test="${log.entranceId==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
+						               			</c:forEach>
+											</td>
 											<td>
 												<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
 												<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
@@ -197,7 +201,7 @@
 											<td>${log.recvTime }</td>
 											<td>
 												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
-													<c:if test="${log.protocol==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
+													<c:if test="${log.transProto==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
 											<td>
@@ -205,18 +209,18 @@
 													<c:if test="${log.addrType==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
-											<td>${log.serverIp}</td>
-											<td>${log.clientIp}</td>
-											<td>${log.serverPort}</td>
-											<td>${log.clientPort}</td>
+											<td>${log.dIp}</td>
+											<td>${log.sIp}</td>
+											<td>${log.dPort}</td>
+											<td>${log.sPort}</td>
 											<td>${log.deviceId}</td>
 											<td>
 												<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dict">
-													<c:if test="${log.streamType==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
+													<c:if test="${log.streamDir==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
-											<td>${log.cljIp}</td>
-											<td>${log.nestAddrList}</td>
+											<td>${log.capIp}</td>
+											<td>${log.addrList}</td>
 											<td>${log.userRegion}</td>
 											<td>
 												<c:if test="${log.tunnelType eq 1}"><spring:message code="contrl_message"/></c:if>
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 1d2927015..37c8a5aae 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -50,7 +50,7 @@
 								<!-- 搜索内容与操作按钮栏 -->
 								<div class="col-md-12">
 									<div class="pull-left">
-										<form:select path="serviceType" class="selectpicker select2 input-small">
+										<form:select path="service" class="selectpicker select2 input-small">
 											<form:option value="" ><spring:message code="action"/></form:option>
 											<form:option value="16" ><spring:message code="action_reject"/></form:option>
 											<form:option value="1" ><spring:message code="action_monit"/></form:option>
@@ -103,7 +103,7 @@
 										<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="protocol_type"/>：</label>
-											<form:select path="protocol" class="selectpicker form-control select2">
+											<form:select path="transProto" class="selectpicker form-control select2">
 												<form:option value=""><spring:message code="select"/></form:option>
 												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
 											 		<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
@@ -125,7 +125,7 @@
 										<div class="col-md-2">
 											<div class="form-group">
 	                                            <label><spring:message code="clj_ip"/>：</label>
-	                                            <input name="cljIp" type="text" class="form-control" value="${log.cljIp}"/>
+	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
 	                                        </div>
 										</div>
 										<div class="col-md-2">
@@ -137,13 +137,13 @@
 										<div class="col-md-2">
 											<div class="form-group">
 	                                            <label><spring:message code="clientip"/>：</label>
-	                                            <input name="clientIp" type="text" class="form-control" value="${log.clientIp}"/>
+	                                            <input name="sIp" type="text" class="form-control" value="${log.sIp}"/>
 	                                        </div>
 										</div>
 										<div class="col-md-2">
 											<div class="form-group">
 	                                            <label><spring:message code="serverip"/>：</label>
-	                                            <input name="serverIp" type="text" class="form-control" value="${log.serverIp}"/>
+	                                            <input name="dIp" type="text" class="form-control" value="${log.dIp}"/>
 	                                        </div>
 										</div>
 									</div>
@@ -182,7 +182,11 @@
 									<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 										<tr>
 											<td>${log.cfgId}</td>
-											<td>${log.entranceId}</td>
+											<td>
+												<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+													<c:if test="${log.entranceId==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
+						               			</c:forEach>
+											</td>
 											<td>
 												<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
 												<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
@@ -196,7 +200,7 @@
 											<td>${log.recvTime }</td>
 											<td>
 												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
-													<c:if test="${log.protocol==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
+													<c:if test="${log.transProto==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
 											<td>
@@ -204,18 +208,18 @@
 													<c:if test="${log.addrType==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
-											<td>${log.serverIp}</td>
-											<td>${log.clientIp}</td>
-											<td>${log.serverPort}</td>
-											<td>${log.clientPort}</td>
+											<td>${log.dIp}</td>
+											<td>${log.sIp}</td>
+											<td>${log.dPort}</td>
+											<td>${log.sPort}</td>
 											<td>${log.deviceId}</td>
 											<td>
 												<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dict">
-													<c:if test="${log.streamType==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
+													<c:if test="${log.streamDir==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
-											<td>${log.cljIp}</td>
-											<td>${log.nestAddrList}</td>
+											<td>${log.capIp}</td>
+											<td>${log.addrList}</td>
 											<td>${log.userRegion}</td>
 											<td>
 												<c:if test="${log.tunnelType eq 1}"><spring:message code="contrl_tunnel"/></c:if>
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 7100f59c6..955ce9f70 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -51,7 +51,7 @@
 								<!-- 搜索内容与操作按钮栏 -->
 								<div class="col-md-12">
 									<div class="pull-left">
-										<form:select path="serviceType" class="selectpicker select2 input-small">
+										<form:select path="service" class="selectpicker select2 input-small">
 											<form:option value="" ><spring:message code="action"/></form:option>
 											<form:option value="16" ><spring:message code="action_reject"/></form:option>
 											<form:option value="1" ><spring:message code="action_monit"/></form:option>
@@ -112,7 +112,7 @@
 										<div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="protocol_type"/>：</label>
-											<form:select path="protocol" class="selectpicker form-control select2">
+											<form:select path="transProto" class="selectpicker form-control select2">
 											<form:option value=""><spring:message code="select"/></form:option>
 												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
 											 		<form:option value="${dict.itemCode}" ><spring:message code="${dict.itemValue}"/></form:option>
@@ -134,7 +134,7 @@
 										<div class="col-md-2">
 											<div class="form-group">
 	                                            <label><spring:message code="clj_ip"/>：</label>
-	                                            <input name="cljIp" type="text" class="form-control" value="${log.cljIp}"/>
+	                                            <input name="capIp" type="text" class="form-control" value="${log.capIp}"/>
 	                                        </div>
 										</div>
 										<div class="col-md-2">
@@ -146,13 +146,13 @@
 										<div class="col-md-2">
 											<div class="form-group">
 	                                            <label><spring:message code="clientip"/>：</label>
-	                                            <input name="clientIp" type="text" class="form-control" value="${log.clientIp}"/>
+	                                            <input name="sIp" type="text" class="form-control" value="${log.sIp}"/>
 	                                        </div>
 										</div>
 										<div class="col-md-2">
 											<div class="form-group">
 	                                            <label><spring:message code="serverip"/>：</label>
-	                                            <input name="serverIp" type="text" class="form-control" value="${log.serverIp}"/>
+	                                            <input name="dIp" type="text" class="form-control" value="${log.dIp}"/>
 	                                        </div>
 										</div>
 									</div>
@@ -193,7 +193,11 @@
 									<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 										<tr>
 											<td>${log.cfgId}</td>
-											<td>${log.entranceId}</td>
+											<td>
+												<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+													<c:if test="${log.entranceId==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
+						               			</c:forEach>
+											</td>
 											<td>
 												<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
 												<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
@@ -207,7 +211,7 @@
 											<td>${log.recvTime }</td>
 											<td>
 												<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dict">
-													<c:if test="${log.protocol==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
+													<c:if test="${log.transProto==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
 											<td>
@@ -215,18 +219,18 @@
 													<c:if test="${log.addrType==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
-											<td>${log.serverIp}</td>
-											<td>${log.clientIp}</td>
-											<td>${log.serverPort}</td>
-											<td>${log.clientPort}</td>
+											<td>${log.dIp}</td>
+											<td>${log.sIp}</td>
+											<td>${log.dPort}</td>
+											<td>${log.sPort}</td>
 											<td>${log.deviceId}</td>
 											<td>
 												<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dict">
-													<c:if test="${log.streamType==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
+													<c:if test="${log.streamDir==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
-											<td>${log.cljIp}</td>
-											<td>${log.nestAddrList}</td>
+											<td>${log.capIp}</td>
+											<td>${log.addrList}</td>
 											<td>${log.userRegion}</td>
 											<td>${log.version}</td>
 											<td>${log.sni}</td>