修改日志界面展示字段和检索条件、添加详情按钮.

src/main/java/com/nis/domain/log/NtcSslLog.java

@@ -7,7 +7,7 @@ public class NtcSslLog extends BaseLogEntity<NtcSslLog>{
 	private String version;// 版本号
 	private String sni;// SNI 
 	private String san;// SAN 
-	private String ca;// CA
+	private String cn;// CN
 	
 	public String getVersion() {
 		return version;
@@ -27,11 +27,12 @@ public class NtcSslLog extends BaseLogEntity<NtcSslLog>{
 	public void setSan(String san) {
 		this.san = san;
 	}
-	public String getCa() {
-		return ca;
+	public String getCn() {
+		return cn;
 	}
-	public void setCa(String ca) {
-		this.ca = ca;
+	public void setCn(String cn) {
+		this.cn = cn;
 	}
+	
 }
 

src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp

@@ -52,8 +52,11 @@
 									<div class="pull-left">
 										<form:select path="action" 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>
+											<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
+												<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
+													<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
+												</c:if>		
+											</c:forEach>
 						             	</form:select>
 									</div>
 	                        		<div class="pull-left">
@@ -158,7 +161,7 @@
 										<th><spring:message code="cfg_id" /></th>
 										<th><spring:message code="action" /></th>
 										<th><spring:message code="found_time" /></th>
-										<th><spring:message code="entrance_id" /></th>
+										<th><spring:message code="entrance" /></th>
 										
 										<th><spring:message code="tunnel_type" /></th>
 										<th><spring:message code="encrypt_mode" /></th>
@@ -169,12 +172,12 @@
 										<th><spring:message code="addr_type" /></th>
 										<th><spring:message code="serverip" /></th>
 										<th><spring:message code="clientip" /></th>
-										<th><spring:message code="serverport" /></th>
-										<th><spring:message code="clientport" /></th>
+										<th><spring:message code="server_port" /></th>
+										<th><spring:message code="client_port" /></th>
 										<th><spring:message code="deviceid" /></th>
 										<th><spring:message code="direct" /></th>
 										<th><spring:message code="stream_type" /></th>
-										<th><spring:message code="nest_addr_list" /></th>
+										<%-- <th><spring:message code="nest_addr_list" /></th> --%>
 										<th><spring:message code='server_locate'/></th>
 										<th><spring:message code='client_locate'/></th>
 									</tr>
@@ -182,13 +185,24 @@
 								<tbody>
 									<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 										<tr>
-											<td>${log.cfgId}</td>
+											<td>${log.cfgId}
+												<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
+											</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>
+												<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+													<c:if test="${dict.itemCode eq log.action}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
 											</td>
 											<td>${log.foundTime }</td>
-											<td>${log.entranceId }</td>
+											<td>
+												<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+													<c:if test="${dict.itemCode eq log.entranceId}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
+											</td>
 											
 											<td>
 												<c:if test="${log.tunnelType eq 1}"><spring:message code="contrl_message"/></c:if>
@@ -225,9 +239,9 @@
 													<c:if test="${log.streamDir==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
-											<td title="${fns:escapeHtml(log.addrList)}">
+											<%-- <td title="${fns:escapeHtml(log.addrList)}">
 												${fns:stringFormat(log.addrList,30)}
-											</td>
+											</td> --%>
 											<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
 											<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 										</tr>

src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp

@@ -62,8 +62,11 @@ $(document).ready(function(){
 								<div class="pull-left">
 									<form:select path="action" 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>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
+											<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
+												<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
+											</c:if>		
+										</c:forEach>
 									</form:select>
 								</div>
 							<div class="pull-left">	
@@ -115,7 +118,7 @@ $(document).ready(function(){
 										</div>
 									</div>
 									
-									<div class="col-md-2">
+									<%-- <div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
@@ -124,8 +127,8 @@ $(document).ready(function(){
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
-									</div>
-									</div>
+										</div>
+									</div> --%>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -169,7 +172,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id'/></th>
 									<th><spring:message code="action"/></th>
 									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='pid'/></th>
 									<th><spring:message code='access_url'/></th>
@@ -177,19 +180,19 @@ $(document).ready(function(){
 									<th><spring:message code='refer'/></th>
 									<th><spring:message code='harm_level'/></th>
 									<th><spring:message code='fd_type'/></th>
-									<th><spring:message code='av_protocol'/></th>
+								<%--<th><spring:message code='av_protocol'/></th> --%>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='protocol_type'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></th>
-									<th><spring:message code='serverport'/></th>
-									<th><spring:message code='clientport'/></th>
-									<th><spring:message code='deviceid'/></th>
-									<th><spring:message code='direct'/></th>
+									<th><spring:message code='server_port'/></th>
+									<th><spring:message code='client_port'/></th>
+								<%--<th><spring:message code='deviceid'/></th>
+									<th><spring:message code='direct'/></th> --%>
 									<th><spring:message code='stream_type'/></th>
-									<th><spring:message code='nest_addr_list'/></th>
+								<%--<th><spring:message code='nest_addr_list'/></th> --%>
 									<th><spring:message code='server_locate'/></th>
 									<th><spring:message code='client_locate'/></th>
 								</tr>
@@ -197,13 +200,24 @@ $(document).ready(function(){
 							<tbody>
 							<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 								<tr>
-									<td>${log.cfgId}</td> 
+									<td>${log.cfgId}
+										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
+									</td> 
 									<td>
-										<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
-										<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+											<c:if test="${dict.itemCode eq log.action}">
+												<spring:message code="${dict.itemValue}"/>
+											</c:if>
+										</c:forEach>
 									</td>
 									<td>${log.foundTime}</td>
-									<td>${log.entranceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+											<c:if test="${dict.itemCode eq log.entranceId}">
+												<spring:message code="${dict.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									
 									<td>${log.pid}</td>
 									<td>http://${log.url}</td>
@@ -222,7 +236,7 @@ $(document).ready(function(){
 										<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block"/></c:if>
 										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
 									</td>
-									<td>${log.protocol}</td>
+								<%--<td>${log.protocol}</td> --%>
 									
 									<td>${log.capIp}</td>
 									<td>${log.transProto}</td>
@@ -235,20 +249,20 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+								<%--<td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
-									</td>
+									</td> --%>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
 											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
-									<td title="${fns:escapeHtml(log.addrList)}">
+									<%-- <td title="${fns:escapeHtml(log.addrList)}">
 										${fns:stringFormat(log.addrList,30)}
-									</td>
+									</td> --%>
 									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
 									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 								</tr>

src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp

@@ -62,8 +62,11 @@ $(document).ready(function(){
 								<div class="pull-left">
 									<form:select path="action" 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>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
+											<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
+												<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
+											</c:if>		
+										</c:forEach>
 									</form:select>
 								</div>
 							<div class="pull-left">	
@@ -115,7 +118,7 @@ $(document).ready(function(){
 										</div>
 									</div>
 									
-									<div class="col-md-2">
+									<%-- <div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
@@ -124,8 +127,8 @@ $(document).ready(function(){
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
-									</div>
-									</div>
+										</div>
+									</div> --%>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -169,7 +172,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id'/></th>
 									<th><spring:message code="action"/></th>
 									<th><spring:message code='found_time'/></th>
-									<th><spring:message code='entrance_id'/></th>
+									<th><spring:message code='entrance'/></th>
 									
 									<th><spring:message code='pid'/></th>
 									<th><spring:message code='access_url'/></th>
@@ -177,19 +180,19 @@ $(document).ready(function(){
 									<th><spring:message code='refer'/></th>
 									<th><spring:message code='harm_level'/></th>
 									<th><spring:message code='fd_type'/></th>
-									<th><spring:message code='av_protocol'/></th>
+									<%-- <th><spring:message code='av_protocol'/></th> --%>
 									
 									<th><spring:message code='clj_ip'/></th>
-									<th><spring:message code='protocol'/></th>
+									<th><spring:message code='protocol_type'/></th>
 									<th><spring:message code='addr_type'/></th>
 									<th><spring:message code='serverip'/></th>
 									<th><spring:message code='clientip'/></th>
-									<th><spring:message code='serverport'/></th>
-									<th><spring:message code='clientport'/></th>
-									<th><spring:message code='deviceid'/></th>
-									<th><spring:message code='direct'/></th>
+									<th><spring:message code='server_port'/></th>
+									<th><spring:message code='client_port'/></th>
+									<%-- <th><spring:message code='deviceid'/></th>
+									<th><spring:message code='direct'/></th> --%>
 									<th><spring:message code='stream_type'/></th>
-									<th><spring:message code='nest_addr_list'/></th>
+									<%-- <th><spring:message code='nest_addr_list'/></th> --%>
 									<th><spring:message code='server_locate'/></th>
 									<th><spring:message code='client_locate'/></th>
 								</tr>
@@ -197,13 +200,24 @@ $(document).ready(function(){
 							<tbody>
 							<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 								<tr>
-									<td>${log.cfgId}</td> 
+									<td>${log.cfgId}
+										<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
+									</td> 
 									<td>
-										<c:if test="${log.action eq 16 }"><spring:message code="action_reject"/></c:if>
-										<c:if test="${log.action eq 1 }"><spring:message code="action_monit"/></c:if>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+											<c:if test="${dict.itemCode eq log.action}">
+												<spring:message code="${dict.itemValue}"/>
+											</c:if>
+										</c:forEach>
 									</td>
 									<td>${log.foundTime}</td>
-									<td>${log.entranceId}</td>
+									<td>
+										<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+											<c:if test="${dict.itemCode eq log.entranceId}">
+												<spring:message code="${dict.itemValue}"/>
+											</c:if>
+										</c:forEach>
+									</td>
 									
 									<td>${log.pid}</td>
 									<td>http://${log.url}</td>
@@ -222,7 +236,7 @@ $(document).ready(function(){
 										<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block"/></c:if>
 										<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit"/></c:if>
 									</td>
-									<td>${log.protocol}</td>
+									<%-- <td>${log.protocol}</td> --%>
 									
 									<td>${log.capIp}</td>
 									<td>${log.transProto}</td>
@@ -235,20 +249,20 @@ $(document).ready(function(){
 									<td>${log.sIp}</td>
 									<td>${log.dPort}</td>
 									<td>${log.sPort}</td>
-									<td>${log.deviceId}</td>
+									<%-- <td>${log.deviceId}</td>
 									<td>
 										<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 											<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
-									</td>
+									</td> --%>
 									<td>
 										<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
 											<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
 				               			</c:forEach>
 									</td>
-									<td title="${fns:escapeHtml(log.addrList)}">
+									<%-- <td title="${fns:escapeHtml(log.addrList)}">
 										${fns:stringFormat(log.addrList,30)}
-									</td>
+									</td> --%>
 									<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
 									<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 								</tr>

src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp

@@ -76,17 +76,13 @@
 								<!-- 搜索内容与操作按钮栏 -->
 								<div class="col-md-12">
 									<div class="pull-left">
-										<form:select path="action"
-											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>
+										<form:select path="action" class="selectpicker select2 input-small">
+											<form:option value=""><spring:message code="action" /></form:option>
+											<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
+												<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
+													<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
+												</c:if>		
+											</c:forEach>
 										</form:select>
 									</div>
 									<div class="pull-left">
@@ -166,7 +162,7 @@
 											</div>
 										</div>
 
-										<div class="col-md-2">
+										<%-- <div class="col-md-2">
 											<div class="form-group">
 												<label><spring:message code="direct" />：</label>
 												<form:select path="direction"
@@ -182,7 +178,7 @@
 													</c:forEach>
 												</form:select>
 											</div>
-										</div>
+										</div> --%>
 										<div class="col-md-2">
 											<div class="form-group">
 												<label><spring:message code="entrance" />：</label>
@@ -237,7 +233,7 @@
 										<th><spring:message code='cfg_id' /></th>
 										<th><spring:message code="action" /></th>
 										<th><spring:message code='found_time' /></th>
-										<th><spring:message code='entrance_id' /></th>
+										<th><spring:message code='entrance' /></th>
 										
 										<th><spring:message code='pid' /></th>
 										<th><spring:message code='access_url' /></th>
@@ -245,19 +241,19 @@
 										<th><spring:message code='refer' /></th>
 										<th><spring:message code='harm_level' /></th>
 										<th><spring:message code='fd_type' /></th>
-										<th><spring:message code='av_protocol' /></th>
+										<%-- <th><spring:message code='av_protocol' /></th> --%>
 										
 										<th><spring:message code='clj_ip' /></th>
-										<th><spring:message code='protocol' /></th>
+										<th><spring:message code='protocol_type' /></th>
 										<th><spring:message code='addr_type' /></th>
 										<th><spring:message code='serverip' /></th>
 										<th><spring:message code='clientip' /></th>
-										<th><spring:message code='serverport' /></th>
-										<th><spring:message code='clientport' /></th>
-										<th><spring:message code='deviceid' /></th>
-										<th><spring:message code='direct' /></th>
+										<th><spring:message code='server_port' /></th>
+										<th><spring:message code='client_port' /></th>
+										<%-- <th><spring:message code='deviceid' /></th>
+										<th><spring:message code='direct' /></th> --%>
 										<th><spring:message code='stream_type' /></th>
-										<th><spring:message code='nest_addr_list' /></th>
+										<%-- <th><spring:message code='nest_addr_list' /></th> --%>
 										<th><spring:message code='server_locate' /></th>
 										<th><spring:message code='client_locate' /></th>
 									</tr>
@@ -265,13 +261,24 @@
 								<tbody>
 									<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 										<tr>
-											<td>${log.cfgId}</td>
+											<td>${log.cfgId}
+												<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
+											</td>
 											<td>
-												<c:if test="${log.action eq 16 }"><spring:message code="action_reject" /></c:if> 
-												<c:if test="${log.action eq 1 }"><spring:message code="action_monit" /></c:if>
+												<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+													<c:if test="${dict.itemCode eq log.action}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
 											</td>
 											<td>${log.foundTime}</td>
-											<td>${log.entranceId}</td>
+											<td>
+												<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+													<c:if test="${dict.itemCode eq log.entranceId}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
+											</td>
 											
 											<td>${log.pid}</td>
 											<td>http://${log.url}</td>
@@ -292,7 +299,7 @@
 												</c:if> <c:if test="${log.fdType eq 2 }">
 													<spring:message code="first_hit" />
 												</c:if></td>
-											<td>${log.protocol}</td>
+											<%-- <td>${log.protocol}</td> --%>
 											
 											<td>${log.capIp}</td>
 											<td>${log.transProto}</td>
@@ -305,20 +312,20 @@
 											<td>${log.sIp}</td>
 											<td>${log.dPort}</td>
 											<td>${log.sPort}</td>
-											<td>${log.deviceId}</td>
+											<%-- <td>${log.deviceId}</td>
 											<td>
 												<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 													<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
 												</c:forEach>
-											</td>
+											</td> --%>
 											<td>
 												<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
 													<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
 												</c:forEach>
 											</td>
-											<td title="${fns:escapeHtml(log.addrList)}">
+											<%-- <td title="${fns:escapeHtml(log.addrList)}">
 												${fns:stringFormat(log.addrList,30)}
-											</td>
+											</td> --%>
 											<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
 											<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 										</tr>

src/main/webapp/WEB-INF/views/log/ntc/mmSamplePicList.jsp

@@ -62,8 +62,11 @@ $(document).ready(function(){
 								<div class="pull-left">
 									<form:select path="action" 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>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
+											<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
+												<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
+											</c:if>		
+										</c:forEach>
 									</form:select>
 								</div>
 							<div class="pull-left">	
@@ -115,7 +118,7 @@ $(document).ready(function(){
 										</div>
 									</div>
 									
-									<div class="col-md-2">
+									<%-- <div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
@@ -124,8 +127,8 @@ $(document).ready(function(){
 											 	<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
 								             </c:forEach>
 	                                    	</form:select>
-									</div>
-									</div>
+										</div>
+									</div> --%>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -169,7 +172,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id' /></th>
 									<th><spring:message code="action" /></th>
 									<th><spring:message code='found_time' /></th>
-									<th><spring:message code='entrance_id' /></th>
+									<th><spring:message code='entrance' /></th>
 									
 									<th><spring:message code='pid' /></th>
 									<th><spring:message code='access_url' /></th>
@@ -177,19 +180,19 @@ $(document).ready(function(){
 									<th><spring:message code='refer' /></th>
 									<th><spring:message code='harm_level' /></th>
 									<th><spring:message code='fd_type' /></th>
-									<th><spring:message code='av_protocol' /></th>
+									<%-- <th><spring:message code='av_protocol' /></th> --%>
 									
 									<th><spring:message code='clj_ip' /></th>
-									<th><spring:message code='protocol' /></th>
+									<th><spring:message code='protocol_type' /></th>
 									<th><spring:message code='addr_type' /></th>
 									<th><spring:message code='serverip' /></th>
 									<th><spring:message code='clientip' /></th>
-									<th><spring:message code='serverport' /></th>
-									<th><spring:message code='clientport' /></th>
-									<th><spring:message code='deviceid' /></th>
-									<th><spring:message code='direct' /></th>
+									<th><spring:message code='server_port' /></th>
+									<th><spring:message code='client_port' /></th>
+									<%-- <th><spring:message code='deviceid' /></th>
+									<th><spring:message code='direct' /></th> --%>
 									<th><spring:message code='stream_type' /></th>
-									<th><spring:message code='nest_addr_list' /></th>
+									<%-- <th><spring:message code='nest_addr_list' /></th> --%>
 									<th><spring:message code='server_locate' /></th>
 									<th><spring:message code='client_locate' /></th>
 								</tr>
@@ -197,13 +200,24 @@ $(document).ready(function(){
 							<tbody>
 									<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 										<tr>
-											<td>${log.cfgId}</td>
+											<td>${log.cfgId}
+												<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
+											</td>
 											<td>
-												<c:if test="${log.action eq 16 }"><spring:message code="action_reject" /></c:if> 
-												<c:if test="${log.action eq 1 }"><spring:message code="action_monit" /></c:if>
+												<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+													<c:if test="${dict.itemCode eq log.action}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
 											</td>
 											<td>${log.foundTime}</td>
-											<td>${log.entranceId}</td>
+											<td>
+												<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+													<c:if test="${dict.itemCode eq log.entranceId}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
+											</td>
 											
 											<td>${log.pid}</td>
 											<td>http://${log.url}</td>
@@ -217,14 +231,12 @@ $(document).ready(function(){
 												${fns:stringFormat(log.refer,30)}
 											</td>
 											<td>${log.level}</td>
-											<td><c:if test="${log.fdType eq 0 }">
-													<spring:message code="black_block_list" />
-												</c:if> <c:if test="${log.fdType eq 1 }">
-													<spring:message code="static_cfg_block" />
-												</c:if> <c:if test="${log.fdType eq 2 }">
-													<spring:message code="first_hit" />
-												</c:if></td>
-											<td>${log.protocol}</td>
+											<td>
+												<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list" /></c:if> 
+												<c:if test="${log.fdType eq 1 }"><spring:message code="static_cfg_block" /></c:if> 
+												<c:if test="${log.fdType eq 2 }"><spring:message code="first_hit" /></c:if>
+											</td>
+											<%-- <td>${log.protocol}</td> --%>
 											
 											<td>${log.capIp}</td>
 											<td>${log.transProto}</td>
@@ -237,20 +249,20 @@ $(document).ready(function(){
 											<td>${log.sIp}</td>
 											<td>${log.dPort}</td>
 											<td>${log.sPort}</td>
-											<td>${log.deviceId}</td>
+											<%-- <td>${log.deviceId}</td>
 											<td>
 												<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 													<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
 												</c:forEach>
-											</td>
+											</td> --%>
 											<td>
 												<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
 													<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
 												</c:forEach>
 											</td>
-											<td title="${fns:escapeHtml(log.addrList)}">
+											<%-- <td title="${fns:escapeHtml(log.addrList)}">
 												${fns:stringFormat(log.addrList,30)}
-											</td>
+											</td> --%>
 											<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
 											<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 										</tr>

src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp

@@ -62,8 +62,11 @@ $(document).ready(function(){
 								<div class="pull-left">
 									<form:select path="action" 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>
+										<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
+											<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
+												<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
+											</c:if>		
+										</c:forEach>
 									</form:select>
 								</div>
 							<div class="pull-left">	
@@ -115,7 +118,7 @@ $(document).ready(function(){
 										</div>
 									</div>
 									
-									<div class="col-md-2">
+									<%-- <div class="col-md-2">
 										<div class="form-group">
 											<label><spring:message code="direct"/>：</label>
 											<form:select path="direction" class="selectpicker select2 form-control">
@@ -125,7 +128,7 @@ $(document).ready(function(){
 								             </c:forEach>
 	                                    	</form:select>
 									</div>
-									</div>
+									</div> --%>
 									<div class="col-md-2">
 									<div class="form-group">
 										<label><spring:message code="entrance"/>：</label>
@@ -169,7 +172,7 @@ $(document).ready(function(){
 									<th><spring:message code='cfg_id' /></th>
 									<th><spring:message code="action" /></th>
 									<th><spring:message code='found_time' /></th>
-									<th><spring:message code='entrance_id' /></th>
+									<th><spring:message code='entrance' /></th>
 									
 									<th><spring:message code='pid' /></th>
 									<th><spring:message code='access_url' /></th>
@@ -177,19 +180,19 @@ $(document).ready(function(){
 									<th><spring:message code='refer' /></th>
 									<th><spring:message code='harm_level' /></th>
 									<th><spring:message code='fd_type' /></th>
-									<th><spring:message code='av_protocol' /></th>
+									<%-- <th><spring:message code='av_protocol' /></th> --%>
 									
 									<th><spring:message code='clj_ip' /></th>
-									<th><spring:message code='protocol' /></th>
+									<th><spring:message code='protocol_type' /></th>
 									<th><spring:message code='addr_type' /></th>
 									<th><spring:message code='serverip' /></th>
 									<th><spring:message code='clientip' /></th>
-									<th><spring:message code='serverport' /></th>
-									<th><spring:message code='clientport' /></th>
-									<th><spring:message code='deviceid' /></th>
-									<th><spring:message code='direct' /></th>
+									<th><spring:message code='server_port' /></th>
+									<th><spring:message code='client_port' /></th>
+									<%-- <th><spring:message code='deviceid' /></th>
+									<th><spring:message code='direct' /></th> --%>
 									<th><spring:message code='stream_type' /></th>
-									<th><spring:message code='nest_addr_list' /></th>
+									<%-- <th><spring:message code='nest_addr_list' /></th> --%>
 									<th><spring:message code='server_locate' /></th>
 									<th><spring:message code='client_locate' /></th>
 								</tr>
@@ -197,13 +200,24 @@ $(document).ready(function(){
 							<tbody>
 							<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 										<tr>
-											<td>${log.cfgId}</td>
+											<td>${log.cfgId}
+												<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
+											</td>
 											<td>
-												<c:if test="${log.action eq 16 }"><spring:message code="action_reject" /></c:if> 
-												<c:if test="${log.action eq 1 }"><spring:message code="action_monit" /></c:if>
+												<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+													<c:if test="${dict.itemCode eq log.action}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
 											</td>
 											<td>${log.foundTime}</td>
-											<td>${log.entranceId}</td>
+											<td>
+												<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+													<c:if test="${dict.itemCode eq log.entranceId}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
+											</td>
 											
 											<td>${log.pid}</td>
 											<td>http://${log.url}</td>
@@ -224,7 +238,7 @@ $(document).ready(function(){
 												</c:if> <c:if test="${log.fdType eq 2 }">
 													<spring:message code="first_hit" />
 												</c:if></td>
-											<td>${log.protocol}</td>
+											<%-- <td>${log.protocol}</td> --%>
 											
 											<td>${log.capIp}</td>
 											<td>${log.transProto}</td>
@@ -237,20 +251,20 @@ $(document).ready(function(){
 											<td>${log.sIp}</td>
 											<td>${log.dPort}</td>
 											<td>${log.sPort}</td>
-											<td>${log.deviceId}</td>
+											<%-- <td>${log.deviceId}</td>
 											<td>
 												<c:forEach items="${fns:getDictList('DIRECTION')}" var="dic">
 													<c:if test="${log.direction==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
 												</c:forEach>
-											</td>
+											</td> --%>
 											<td>
 												<c:forEach items="${fns:getDictList('LOG_STREAM_TYPE')}" var="dic">
 													<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }" /></c:if>
 												</c:forEach>
 											</td>
-											<td title="${fns:escapeHtml(log.addrList)}">
+											<%-- <td title="${fns:escapeHtml(log.addrList)}">
 												${fns:stringFormat(log.addrList,30)}
-											</td>
+											</td> --%>
 											<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
 											<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 										</tr>

src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp

@@ -52,8 +52,11 @@
 									<div class="pull-left">
 										<form:select path="action" 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>
+											<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
+												<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
+													<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
+												</c:if>		
+											</c:forEach>
 						             	</form:select>
 									</div>
 	                        		<div class="pull-left">
@@ -158,7 +161,7 @@
 										<th><spring:message code="cfg_id" /></th>
 										<th><spring:message code="action" /></th>
 										<th><spring:message code="found_time" /></th>
-										<th><spring:message code="entrance_id" /></th>
+										<th><spring:message code="entrance" /></th>
 										
 										<th><spring:message code="tunnel_type" /></th>
 										<th><spring:message code="encrypt_mode" /></th>
@@ -168,12 +171,12 @@
 										<th><spring:message code="addr_type" /></th>
 										<th><spring:message code="serverip" /></th>
 										<th><spring:message code="clientip" /></th>
-										<th><spring:message code="serverport" /></th>
-										<th><spring:message code="clientport" /></th>
+										<th><spring:message code="server_port" /></th>
+										<th><spring:message code="client_port" /></th>
 										<th><spring:message code="deviceid" /></th>
 										<th><spring:message code="direct" /></th>
 										<th><spring:message code="stream_type" /></th>
-										<th><spring:message code="nest_addr_list" /></th>
+										<%-- <th><spring:message code="nest_addr_list" /></th> --%>
 										<th><spring:message code='server_locate'/></th>
 										<th><spring:message code='client_locate'/></th>
 									</tr>
@@ -181,13 +184,24 @@
 								<tbody>
 									<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 										<tr>
-											<td>${log.cfgId}</td>
+											<td>${log.cfgId}
+												<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
+											</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>
+												<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+													<c:if test="${dict.itemCode eq log.action}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
 											</td>
 											<td>${log.foundTime }</td>
-											<td>${log.entranceId }</td>
+											<td>
+												<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+													<c:if test="${dict.itemCode eq log.entranceId}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
+											</td>
 											
 											<td>
 												<c:if test="${log.tunnelType eq 1}"><spring:message code="contrl_tunnel"/></c:if>
@@ -221,9 +235,9 @@
 													<c:if test="${log.streamDir==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
-											<td title="${fns:escapeHtml(log.addrList)}">
+											<%-- <td title="${fns:escapeHtml(log.addrList)}">
 												${fns:stringFormat(log.addrList,30)}
-											</td>
+											</td> --%>
 											<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
 											<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 										</tr>

src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp

@@ -53,8 +53,11 @@
 									<div class="pull-left">
 										<form:select path="action" 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>
+											<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
+												<c:if test="${(action.itemValue eq 'action_reject') or (action.itemValue eq 'action_monit') }">
+													<form:option value="${action.itemCode }" ><spring:message code="${action.itemValue }"/></form:option>
+												</c:if>		
+											</c:forEach>
 										</form:select>
 						            </div>
 									<div class="pull-left">
@@ -167,24 +170,24 @@
 										<th><spring:message code="cfg_id" /></th>
 										<th><spring:message code="action" /></th>
 										<th><spring:message code="found_time" /></th>
-										<th><spring:message code="entrance_id" /></th>
+										<th><spring:message code="entrance" /></th>
 										
 										<th><spring:message code="version" /></th>
 										<th>SNI</th>
 										<th>SAN</th>
-										<th>CA</th>
+										<th>CN</th>
 										
 										<th><spring:message code="clj_ip" /></th>
 										<th><spring:message code="protocol_type" /></th>
 										<th><spring:message code="addr_type" /></th>
 										<th><spring:message code="serverip" /></th>
 										<th><spring:message code="clientip" /></th>
-										<th><spring:message code="serverport" /></th>
-										<th><spring:message code="clientport" /></th>
+										<th><spring:message code="server_port" /></th>
+										<th><spring:message code="client_port" /></th>
 										<th><spring:message code="deviceid" /></th>
 										<th><spring:message code="direct" /></th>
 										<th><spring:message code="stream_type" /></th>
-										<th><spring:message code="nest_addr_list" /></th>
+										<%-- <th><spring:message code="nest_addr_list" /></th> --%>
 										<th><spring:message code='server_locate'/></th>
 										<th><spring:message code='client_locate'/></th>
 									</tr>
@@ -192,13 +195,24 @@
 								<tbody>
 									<c:forEach items="${page.list}" var="log" varStatus="status" step="1">
 										<tr>
-											<td>${log.cfgId}</td>
+											<td>${log.cfgId}
+												<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
+											</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>
+												<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
+													<c:if test="${dict.itemCode eq log.action}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
 											</td>
 											<td>${log.foundTime }</td>
-											<td>${log.entranceId }</td>
+											<td>
+												<c:forEach items="${fns:getDictList('ENTRANCE')}" var="dict">
+													<c:if test="${dict.itemCode eq log.entranceId}">
+														<spring:message code="${dict.itemValue}"/>
+													</c:if>
+												</c:forEach>
+											</td>
 											
 											<td title="${fns:escapeHtml(log.version)}">
 												${fns:stringFormat(log.version,30)}
@@ -209,8 +223,8 @@
 											<td title="${fns:escapeHtml(log.san)}">
 												${fns:stringFormat(log.san,30)}
 											</td>
-											<td title="${fns:escapeHtml(log.ca)}">
-												${fns:stringFormat(log.ca,30)}
+											<td title="${fns:escapeHtml(log.cn)}">
+												${fns:stringFormat(log.cn,30)}
 											</td>
 											
 											<td>${log.capIp}</td>
@@ -235,9 +249,9 @@
 													<c:if test="${log.streamDir==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
 						               			</c:forEach>
 											</td>
-											<td title="${fns:escapeHtml(log.addrList)}">
+											<%-- <td title="${fns:escapeHtml(log.addrList)}">
 												${fns:stringFormat(log.addrList,30)}
-											</td>
+											</td> --%>
 											<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
 											<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
 										</tr>