1.修改日志字段显示2.修改国际化英文翻译3.日志界面增加查看详情4.修改查询条件与字段名相同

This commit is contained in:
zhanghongqing
2018-08-02 17:40:16 +08:00
parent 699ca9d3a2
commit e09a7d0e69
23 changed files with 243 additions and 171 deletions

View File

@@ -187,7 +187,7 @@ $(document).ready(function(){
<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>
@@ -195,7 +195,7 @@ $(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:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq log.action}">
@@ -204,7 +204,13 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>${log.foundTime}</td>
<td>${log.entranceId}</td>
<td>
<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 title="${fns:escapeHtml(log.appLabel)}">
${fns:stringFormat(log.appLabel,30)}
@@ -236,9 +242,9 @@ $(document).ready(function(){
<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>

View File

@@ -183,7 +183,7 @@ $(document).ready(function(){
<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>
@@ -191,7 +191,7 @@ $(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:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq log.action}">
@@ -200,7 +200,13 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>${log.foundTime}</td>
<td>${log.entranceId}</td>
<td>
<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.capIp}</td>
<td>${log.transProto}</td>
<td>
@@ -223,9 +229,9 @@ $(document).ready(function(){
<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>

View File

@@ -183,7 +183,7 @@ $(document).ready(function(){
<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>
@@ -191,7 +191,7 @@ $(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:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq log.action}">
@@ -200,7 +200,13 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>${log.foundTime}</td>
<td>${log.entranceId}</td>
<td>
<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.attackType}</td>
<td><fmt:formatDate value="${log.attackStartTime}" pattern="yyyy-MM-dd HH:mm:ss" /></td>
@@ -233,9 +239,9 @@ $(document).ready(function(){
<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
</c:forEach>
</td>
<td title="${fns:escapeHtml(log.addrList)}">
${fns:stringFormat(log.addrList,30)}
</td>
<%-- <td title="${fns:escapeHtml(log.addrList)}"> --%>
<%-- ${fns:stringFormat(log.addrList,30)} --%>
<!-- </td> -->
<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
</tr>

View File

@@ -187,7 +187,7 @@ $(document).ready(function(){
<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>
@@ -195,7 +195,7 @@ $(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:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq log.action}">
@@ -204,7 +204,13 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>${log.foundTime}</td>
<td>${log.entranceId}</td>
<td>
<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>
<a href="${log.ftpUrl}" data-original-title="${log.ftpUrl}" target="_blank"
@@ -239,7 +245,7 @@ $(document).ready(function(){
<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
</c:forEach>
</td>
<td>${log.addrList}</td>
<%-- <td>${log.addrList}</td> --%>
<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
</tr>

View File

@@ -178,7 +178,7 @@ $(document).ready(function(){
<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>
@@ -186,7 +186,7 @@ $(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:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq log.action}">
@@ -195,12 +195,18 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>${log.foundTime}</td>
<td>${log.entranceId}</td>
<td>
<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>
<c:if test="${log.exProtocol==1}">ISAKMP(V1)</c:if>
<c:if test="${log.exProtocol==2}">IKEv2</c:if>
<c:if test="${log.exProtocol==3}">其它</c:if>
<c:if test="${log.exProtocol==3}">Others</c:if>
</td>
<td>
<c:if test="${log.isakmpMode==1}">Aggre</c:if>
@@ -231,9 +237,9 @@ $(document).ready(function(){
<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
</c:forEach>
</td>
<td title="${fns:escapeHtml(log.addrList)}">
${fns:stringFormat(log.addrList,30)}
</td>
<%-- <td title="${fns:escapeHtml(log.addrList)}"> --%>
<%-- ${fns:stringFormat(log.addrList,30)} --%>
<!-- </td> -->
<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
</tr>

View File

@@ -182,7 +182,7 @@
<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>

View File

@@ -179,7 +179,7 @@
<th><spring:message code="deviceid"/></th>
<th><spring:message code="direction"/></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>
@@ -187,7 +187,7 @@
<tbody>
<c:forEach var="_log" items="${page.list }" varStatus="status">
<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:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq _log.action}">
@@ -196,7 +196,13 @@
</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.action}">
<spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td>${_log.mailProto }</td>
<td title="${fns:escapeHtml(_log.mailFrom)}">
@@ -239,9 +245,9 @@
<c:if test="${streamType.itemCode eq _log.streamDir}">${streamType.itemValue}</c:if>
</c:forEach>
</td>
<td title="${fns:escapeHtml(_log.addrList)}">
${fns:stringFormat(_log.addrList,30)}
</td>
<%-- <td title="${fns:escapeHtml(_log.addrList)}"> --%>
<%-- ${fns:stringFormat(_log.addrList,30)} --%>
<!-- </td> -->
<td title="${_log.serverLocate}">${fns:abbr(_log.serverLocate,20)}</td>
<td title="${_log.clientLocate}">${fns:abbr(_log.clientLocate,20)}</td>
</tr>

View File

@@ -118,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">
@@ -128,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>
@@ -180,7 +180,7 @@ $(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>
@@ -189,10 +189,10 @@ $(document).ready(function(){
<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='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>
@@ -201,7 +201,7 @@ $(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:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq log.action}">
@@ -210,7 +210,13 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>${log.foundTime}</td>
<td>${log.entranceId}</td>
<td>
<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.pid}</td>
<td>${log.url}</td>
@@ -230,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>
@@ -243,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>

View File

@@ -118,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">
@@ -128,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>
@@ -180,7 +180,7 @@ $(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>
@@ -189,10 +189,10 @@ $(document).ready(function(){
<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='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>
@@ -201,7 +201,7 @@ $(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:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq log.action}">
@@ -210,7 +210,13 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>${log.foundTime}</td>
<td>${log.entranceId}</td>
<td>
<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.pid}</td>
<td>${log.url}</td>
@@ -230,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>
@@ -243,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>

View File

@@ -197,7 +197,7 @@ $(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>

View File

@@ -197,7 +197,7 @@ $(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>

View File

@@ -200,7 +200,7 @@ $(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>

View File

@@ -200,7 +200,7 @@ $(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>

View File

@@ -265,7 +265,7 @@
<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>

View File

@@ -197,7 +197,7 @@ $(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>

View File

@@ -197,7 +197,7 @@ $(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>

View File

@@ -207,7 +207,7 @@ $(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>

View File

@@ -118,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">
@@ -128,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>
@@ -180,10 +180,10 @@ $(document).ready(function(){
<th><spring:message code='called_account'/></th>
<th><spring:message code='calling_number'/></th>
<th><spring:message code='called_number'/></th>
<th><spring:message code='from_to_store_ip'/></th>
<th><spring:message code='from_to_store_url'/></th>
<th><spring:message code='to_from_store_ip'/></th>
<th><spring:message code='to_from_store_url'/></th>
<%-- <th><spring:message code='from_to_store_ip'/></th> --%>
<%-- <th><spring:message code='from_to_store_url'/></th> --%>
<%-- <th><spring:message code='to_from_store_ip'/></th> --%>
<%-- <th><spring:message code='to_from_store_url'/></th> --%>
<th><spring:message code='pid'/></th>
<th><spring:message code='log_uri'/></th>
<th><spring:message code='harm_level'/></th>
@@ -196,10 +196,10 @@ $(document).ready(function(){
<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='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>
@@ -207,7 +207,7 @@ $(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:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq log.action}">
@@ -216,7 +216,13 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>${log.foundTime}</td>
<td>${log.entranceId}</td>
<td>
<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.duation}</td>
<td>${log.voipProtocol}</td>
@@ -228,10 +234,10 @@ $(document).ready(function(){
</td>
<td>${log.callingNumber}</td>
<td>${log.calledNumber}</td>
<td>${log.fromToStoreIp}</td>
<td>${log.fromToStoreUrl}</td>
<td>${log.toFromStoreIp}</td>
<td>${log.toFromStoreUrl}</td>
<%-- <td>${log.fromToStoreIp}</td> --%>
<%-- <td>${log.fromToStoreUrl}</td> --%>
<%-- <td>${log.toFromStoreIp}</td> --%>
<%-- <td>${log.toFromStoreUrl}</td> --%>
<td>${log.pid}</td>
<td>
<a href="http://${log.logUri}" data-original-title="http://${log.logUri}" target="_blank"
@@ -258,20 +264,20 @@ $(document).ready(function(){
<td>${log.sIp}</td>
<td>${log.dPort}</td>
<td>${log.sPort}</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>${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>
<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)}">
${fns:stringFormat(log.addrList,30)}
</td>
<%-- <td title="${fns:escapeHtml(log.addrList)}"> --%>
<%-- ${fns:stringFormat(log.addrList,30)} --%>
<!-- </td> -->
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
</tr>

View File

@@ -118,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">
@@ -128,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>
@@ -180,10 +180,10 @@ $(document).ready(function(){
<th><spring:message code='called_account'/></th>
<th><spring:message code='calling_number'/></th>
<th><spring:message code='called_number'/></th>
<th><spring:message code='from_to_store_ip'/></th>
<th><spring:message code='from_to_store_url'/></th>
<th><spring:message code='to_from_store_ip'/></th>
<th><spring:message code='to_from_store_url'/></th>
<%-- <th><spring:message code='from_to_store_ip'/></th> --%>
<%-- <th><spring:message code='from_to_store_url'/></th> --%>
<%-- <th><spring:message code='to_from_store_ip'/></th> --%>
<%-- <th><spring:message code='to_from_store_url'/></th> --%>
<th><spring:message code='pid'/></th>
<th><spring:message code='log_uri'/></th>
<th><spring:message code='harm_level'/></th>
@@ -196,10 +196,10 @@ $(document).ready(function(){
<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='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>
@@ -207,7 +207,7 @@ $(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:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq log.action}">
@@ -216,7 +216,13 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>${log.foundTime}</td>
<td>${log.entranceId}</td>
<td>
<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.duation}</td>
<td>${log.voipProtocol}</td>
@@ -228,10 +234,10 @@ $(document).ready(function(){
</td>
<td>${log.callingNumber}</td>
<td>${log.calledNumber}</td>
<td>${log.fromToStoreIp}</td>
<td>${log.fromToStoreUrl}</td>
<td>${log.toFromStoreIp}</td>
<td>${log.toFromStoreUrl}</td>
<%-- <td>${log.fromToStoreIp}</td> --%>
<%-- <td>${log.fromToStoreUrl}</td> --%>
<%-- <td>${log.toFromStoreIp}</td> --%>
<%-- <td>${log.toFromStoreUrl}</td> --%>
<td>${log.pid}</td>
<td>
<a href="http://${log.logUri}" data-original-title="http://${log.logUri}" target="_blank"
@@ -258,20 +264,20 @@ $(document).ready(function(){
<td>${log.sIp}</td>
<td>${log.dPort}</td>
<td>${log.sPort}</td>
<td>${log.deviceId}</td>
<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>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
</tr>

View File

@@ -189,7 +189,7 @@ $(document).ready(function(){
<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,7 +197,7 @@ $(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:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq log.action}">
@@ -206,7 +206,13 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>${log.foundTime}</td>
<td>${log.entranceId}</td>
<td>
<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 title="${fns:escapeHtml(log.version)}">
${fns:stringFormat(log.version,30)}
@@ -245,9 +251,9 @@ $(document).ready(function(){
<c:if test="${log.streamDir==dic.itemCode}"><spring:message code="${dic.itemValue }"/></c:if>
</c:forEach>
</td>
<td title="${fns:escapeHtml(log.addrList)}">
${fns:stringFormat(log.addrList,30)}
</td>
<%-- <td title="${fns:escapeHtml(log.addrList)}"> --%>
<%-- ${fns:stringFormat(log.addrList,30)} --%>
<!-- </td> -->
<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
</tr>

View File

@@ -181,7 +181,7 @@
<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>

View File

@@ -174,12 +174,12 @@ $(document).ready(function(){
<th><spring:message code='found_time'/></th>
<th><spring:message code='entrance_id'/></th>
<th><spring:message code='version'/></th>
<%-- <th><spring:message code='version'/></th> --%>
<th><spring:message code='host_key'/></th>
<th><spring:message code='host_cookie'/></th>
<%-- <th><spring:message code='host_cookie'/></th>
<th><spring:message code='encrypt_mode'/></th>
<th><spring:message code='mac'/></th>
<th><spring:message code='tunnel_type'/></th>
<th><spring:message code='tunnel_type'/></th> --%>
<th><spring:message code='clj_ip'/></th>
<th><spring:message code='protocol_type'/></th>
@@ -191,7 +191,7 @@ $(document).ready(function(){
<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>
@@ -199,7 +199,7 @@ $(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:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${dict.itemCode eq log.action}">
@@ -208,15 +208,21 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>${log.foundTime}</td>
<td>${log.entranceId}</td>
<td title="${fns:escapeHtml(log.version)}">
${fns:stringFormat(log.version,30)}
<td>
<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 title="${fns:escapeHtml(log.version)}">
${fns:stringFormat(log.version,30)}
</td> --%>
<td title="${fns:escapeHtml(log.hostKey)}">
${fns:stringFormat(log.hostKey,30)}
</td>
<td title="${fns:escapeHtml(log.hostCookie)}">
<%-- <td title="${fns:escapeHtml(log.hostCookie)}">
${fns:stringFormat(log.hostCookie,30)}
</td>
<td title="${fns:escapeHtml(log.encryptMode)}">
@@ -224,12 +230,12 @@ $(document).ready(function(){
</td>
<td title="${fns:escapeHtml(log.mac)}">
${fns:stringFormat(log.mac,30)}
</td>
<td>
</td> --%>
<%-- <td>
<c:if test="${log.tunnelType==1}">SSH</c:if>
<c:if test="${log.tunnelType==2}">SSHD</c:if>
<c:if test="${log.tunnelType==3}">SFTP</c:if>
</td>
</td> --%>
<td>${log.capIp}</td>
<td>${log.transProto}</td>
@@ -253,9 +259,9 @@ $(document).ready(function(){
<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>