Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

This commit is contained in:
duandongmei
2018-08-06 09:04:48 +08:00
40 changed files with 321 additions and 233 deletions

View File

@@ -13,8 +13,10 @@ import java.net.SocketTimeoutException;
import java.net.URI;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import javax.servlet.http.HttpServletRequest;
@@ -38,7 +40,9 @@ import org.apache.http.util.EntityUtils;
import org.apache.log4j.Logger;
import org.springframework.web.servlet.support.RequestContext;
import com.alibaba.fastjson.JSON;
import com.nis.exceptions.MaatConvertException;
import com.nis.util.Encodes;
/**
* @ClassName: HttpClientBean.java
@@ -147,6 +151,8 @@ public class HttpClientUtil {
int status = response.getStatusLine().getStatusCode();
if (status == HttpStatus.SC_OK) {
result = EntityUtils.toString(response.getEntity());
//调用处理数据方法
result = galaxyMessageFormat(result);
logger.debug("获取消息成功,相应内容如下: " + result);
} else {
@@ -174,6 +180,50 @@ public class HttpClientUtil {
}
return result;
}
/**
* 将接口的日志数据格式化包括 “null”,日期为“0”,特殊字符转义
* @param recv
* @return
*/
public static String galaxyMessageFormat(String recv){
Map parse = JSON.parseObject(recv,Map.class);
Map map = (Map) parse.get("data");
List reslist=new ArrayList();
List<Map<String,Object>> list= (List)map.get("list");
if(list!=null&&list.size()>0){
for (Map<String,Object> m : list) {
Map recvMap = new HashMap();
Iterator<Entry<String, Object>> iterator = m.entrySet().iterator();
while(iterator.hasNext()){
Entry<String, Object> next = iterator.next();
String key = next.getKey().toString();
Object value = next.getValue();
//处理字段为“null”情况
if(value!=null&&"null".equals(value)){
value="";
}
//处理时间字段为“0”情况
if("foundTime".equals(key)||"recvTime".equals(key)){
if(null!=value&&"0".equals(value)){
value="";
}
}
//处理特殊字符转义问题
if(null!=value){
value = Encodes.escapeHtml(value.toString());
}
recvMap.put(key, value);
}
reslist.add(recvMap);
}
map.put("list", reslist);
parse.put("data", map);
recv = JSON.toJSONString(parse);
}
return recv;
}
private static CloseableHttpClient httpClient = null;
private static RequestConfig requestConfig;
public static final int HTTP_SOCKET_TIMEOUT= 300000;

View File

@@ -730,7 +730,7 @@ attack_type=\u653B\u51FB\u7C7B\u578B
attack_start_time=\u653B\u51FB\u8D77\u59CB\u65F6\u95F4
last_attack_time=\u6700\u540E\u4E00\u6B21\u653B\u51FB\u5305\u65F6\u95F4
attack_max_pps=\u653B\u51FB\u6700\u5927\u6D41\u91CF \u5305\u6570/\u79D2
attack_max_bps=\u653B\u51FB\u6700\u5927\u6D41\u91CF bit\u6570/\u79D2
attack_max_bps=\u653B\u51FB\u6700\u5927\u6D41\u91CF Bit\u6570/\u79D2
attack_total_pkt=\u653B\u51FB\u7D2F\u79EF\u5305\u6570
attack_total_byte=\u653B\u51FB\u7D2F\u79EF\u5B57\u8282\u6570
is_blcok=\u653B\u51FB\u6D41\u91CF\u662F\u5426\u88AB\u4E22\u5F03
@@ -741,18 +741,18 @@ c2s_pkt_num=c2s\u5305\u6570
s2c_pkt_num=s2c\u5305\u6570
c2s_byte_num=c2s\u5B57\u8282\u6570
s2c_byte_num=s2c\u5B57\u8282\u6570
voip_recv_time=VOIP\u63A5\u6536\u65F6\u95F4
voip_protocol=VOIP\u4F20\u8F93\u534F\u8BAE
voip_recv_time=VoIP\u63A5\u6536\u65F6\u95F4
voip_protocol=VoIP\u4F20\u8F93\u534F\u8BAE
av_protocol=\u97F3\u89C6\u9891\u4F20\u8F93\u534F\u8BAE
duation=VOIP\u901A\u8BDD\u65F6\u957F\uFF08\u79D2\uFF09
calling_account=\u4E3B\u53EBVOIP\u8D26\u53F7
called_account=\u88AB\u53EBVOIP\u8D26\u53F7
calling_number=VOIP\u4E3B\u53EB\u7535\u4FE1\u53F7\u7801
called_number=VOIP\u88AB\u53EB\u7535\u4FE1\u53F7\u7801
from_to_store_ip=\u4E3B\u53EBVOIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668IP
from_to_store_url=\u4E3B\u53EBVOIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668URL
to_from_store_ip=\u88AB\u53EBVOIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668IP
to_from_store_url=\u88AB\u53EBVOIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668URL
duation=VoIP\u901A\u8BDD\u65F6\u957F\uFF08\u79D2\uFF09
calling_account=\u4E3B\u53EBVoIP\u8D26\u53F7
called_account=\u88AB\u53EBVoIP\u8D26\u53F7
calling_number=VoIP\u4E3B\u53EB\u7535\u4FE1\u53F7\u7801
called_number=VoIP\u88AB\u53EB\u7535\u4FE1\u53F7\u7801
from_to_store_ip=\u4E3B\u53EBVoIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668IP
from_to_store_url=\u4E3B\u53EBVoIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668URL
to_from_store_ip=\u88AB\u53EBVoIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668IP
to_from_store_url=\u88AB\u53EBVoIP\u8BED\u97F3\u6587\u4EF6\u5B58\u653E\u670D\u52A1\u5668URL
pid=\u8282\u76EEID
log_uri=\u5C01\u5835\u73B0\u573A\u7247\u6BB5\u8DEF\u5F84
fd_type=\u5C01\u5835\u7C7B\u578B

View File

@@ -52,7 +52,7 @@ work.notify.remind.interval=60000
#============================#
#\u4ea7\u54c1\u4fe1\u606f\u8bbe\u7f6e
productName=National Firewall System
productName=National Traffic Control System
copyrightYear=2015
version=V1.0.0

View File

@@ -1,2 +1,5 @@
2018-07-30
<EFBFBD>޸<EFBFBD><EFBFBD>ֵ<EFBFBD>LOG_STREAM_TYPE<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʶ0<EFBFBD><EFBFBD>1<EFBFBD><EFBFBD>2<EFBFBD><EFBFBD>Ϊ1<EFBFBD><EFBFBD>2<EFBFBD><EFBFBD>3
\u4FEE\u6539\u5B57\u5178LOG_STREAM_TYPE\uFF0C\u5C06\u6807\u8BC60\u30011\u30012\u6539\u4E3A1\u30012\u30013
2018-08-03
\u589E\u52A0\u5B57\u5178ATTACK_TYPE\uFF0C\u4F9D\u636E\u534F\u8BAE\u7EDF\u8BA1\u5DF2\u6709\u7C7B\u578B \uFF1AUDP-Flood: 1069 \uFF0CSYN-Flood: 1070

View File

@@ -33,6 +33,10 @@
<link href="${pageContext.request.contextPath}/static/global/plugins/bootstrap-fileupload/css/bootstrap-fileupload.css" rel="stylesheet" type="text/css" />
<link href="${pageContext.request.contextPath}/static/global/plugins/jquery-tree-multiselect/jquery.tree-multiselect.min.css" rel="stylesheet" type="text/css" />
<!-- 日志界面 -->
<link href="${pageContext.request.contextPath}/static/pages/css/pageLogs.css" rel="stylesheet" type="text/css" />
<!--[if lt IE 9]>
<script src="${pageContext.request.contextPath}/static/global/plugins/respond.min.js"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/excanvas.min.js"></script>
@@ -97,3 +101,6 @@
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-fileupload/js/jquery.cookie.min.js" type="text/javascript"></script>
<script src="${pageContext.request.contextPath}/static/global/plugins/jquery-tree-multiselect/jquery.tree-multiselect.js" type="text/javascript"></script>
<!-- 日志界面 -->
<script src="${pageContext.request.contextPath}/static/pages/scripts/pageLogs.js" type="text/javascript"></script>

View File

@@ -194,7 +194,7 @@ window.onresize=function(){
<!-- BEGIN LOGO -->
<div class="page-logo">
<a href="index.html"> <img
src="${pageContext.request.contextPath}/static/layouts/layout/img/logo.png"
src="${pageContext.request.contextPath}/static/layouts/layout/img/logo2.png"
alt="logo" class="logo-default" />
</a>

View File

@@ -163,7 +163,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -212,8 +212,8 @@ $(document).ready(function(){
</c:forEach>
</td>
<td title="${fns:escapeHtml(log.appLabel)}">
${fns:stringFormat(log.appLabel,30)}
<td>
${log.appLabel}
</td>
<td>${log.c2sPktNum}</td>
<td>${log.s2cPktNum}</td>
@@ -242,11 +242,11 @@ $(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>
${log.addrList}
</td> --%>
<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -166,7 +166,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -229,11 +229,11 @@ $(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>
${log.addrList}
</td> --%>
<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -156,7 +156,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -208,7 +208,13 @@ $(document).ready(function(){
</c:forEach>
</td>
<td>${log.attackType}</td>
<td>
<c:forEach items="${fns:getDictList('ATTACK_TYPE')}" var="dict">
<c:if test="${dict.itemCode eq log.attackType}">
<spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>
</td>
<td><fmt:formatDate value="${log.attackStartTime}" pattern="yyyy-MM-dd HH:mm:ss" /></td>
<td><fmt:formatDate value="${log.lastAttackTime}" pattern="yyyy-MM-dd HH:mm:ss" /></td>
<td>${log.attackMaxPps}</td>
@@ -242,8 +248,8 @@ $(document).ready(function(){
<%-- <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>
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -163,7 +163,7 @@
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -285,8 +285,8 @@
</c:forEach>
</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>
<td>${_log.serverLocate}</td>
<td>${_log.clientLocate}</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -166,7 +166,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -219,8 +219,8 @@ $(document).ready(function(){
</a>
</td>
<td title="${fns:escapeHtml(log.ftpContent)}">
${fns:stringFormat(log.ftpContent,30)}
<td>
${log.ftpContent}
</td>
<td>${log.capIp}</td>
@@ -246,8 +246,8 @@ $(document).ready(function(){
</c:forEach>
</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>
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -164,7 +164,7 @@
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -215,7 +215,7 @@
</c:forEach>
</td>
<td title="${_log.url }">${fns:abbr(_log.url, 30)}</td>
<td>${_log.url}</td>
<td>${_log.reqHdrFile}</td>
<td>${_log.reqBodyFile}</td>
<td>${_log.resHdrFile}</td>
@@ -248,8 +248,8 @@
</c:forEach>
</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>
<td>${_log.serverLocate}</td>
<td>${_log.clientLocate}</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -155,7 +155,7 @@
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="cfg_id"/></th>
@@ -225,8 +225,8 @@
</c:forEach>
</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>
<td>${_log.serverLocate}</td>
<td>${_log.clientLocate}</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -157,7 +157,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -237,11 +237,11 @@ $(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> --%>
<%-- ${log.addrList} --%>
<!-- </td> -->
<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -155,7 +155,7 @@
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="cfg_id" /></th>
@@ -213,8 +213,8 @@
<c:if test="${log.encryptMode eq 1}">IPSEC</c:if>
<c:if test="${log.encryptMode eq 2}">无</c:if>
</td>
<td title="${fns:escapeHtml(log.chapName)}">
${fns:stringFormat(log.chapName,30)}
<td>
${log.chapName}
</td>
<td>${log.capIp}</td>
@@ -239,11 +239,11 @@
<c:if test="${log.streamDir==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
</c:forEach>
</td>
<%-- <td title="${fns:escapeHtml(log.addrList)}">
${fns:stringFormat(log.addrList,30)}
<%-- <td>
${log.addrList}
</td> --%>
<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -155,7 +155,7 @@
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="cfg_id"/></th>
@@ -205,18 +205,26 @@
</td>
<td>${_log.mailProto }</td>
<td title="${fns:escapeHtml(_log.mailFrom)}">
${fns:stringFormat(_log.mailFrom,30)}
<td>
${_log.mailFrom}
</td>
<td title="${fns:escapeHtml(_log.mailTo)}">
${fns:stringFormat(_log.mailTo,30)}
<td>
${_log.mailTo}
</td>
<td>${_log.subject }</td>
<td>
<c:if test="${fn:startsWith(_log.emlFile, 'http')}">
<a href="${_log.emlFile}" data-original-title="${_log.emlFile}" target="_blank"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(_log.emlFile,0,20) }
</a>
</c:if>
<c:if test="${!fn:startsWith(_log.emlFile, 'http')}">
<a href="http://${_log.emlFile}" data-original-title="http://${_log.emlFile}" target="_blank"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
http://${fn:substring(_log.emlFile,0,20) }
</a>
</c:if>
</td>
<td>${_log.capIp }</td>
@@ -245,11 +253,11 @@
<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> --%>
<%-- ${_log.addrList } --%>
<!-- </td> -->
<td title="${_log.serverLocate}">${fns:abbr(_log.serverLocate,20)}</td>
<td title="${_log.clientLocate}">${fns:abbr(_log.clientLocate,20)}</td>
<td>${_log.serverLocate}</td>
<td>${_log.clientLocate}</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -166,7 +166,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -226,8 +226,8 @@ $(document).ready(function(){
http://${fn:substring(log.logUri,0,20) }
</a>
</td>
<td title="${fns:escapeHtml(log.refer)}">
${fns:stringFormat(log.refer,30)}
<td>
${log.refer}
</td>
<td>${log.level}</td>
<!--0动态黑名单FD1静态配置FD2首次分析命中 -->
@@ -260,11 +260,11 @@ $(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>
${log.addrList}
</td> --%>
<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -166,7 +166,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -226,8 +226,8 @@ $(document).ready(function(){
http://${fn:substring(log.logUri,0,20) }
</a>
</td>
<td title="${fns:escapeHtml(log.refer)}">
${fns:stringFormat(log.refer,30)}
<td>
${log.refer}
</td>
<td>${log.level}</td>
<!--0动态黑名单FD1静态配置FD2首次分析命中 -->
@@ -260,11 +260,11 @@ $(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>
${log.addrList}
</td> --%>
<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -166,7 +166,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -263,8 +263,8 @@ $(document).ready(function(){
<%-- <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>
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -166,7 +166,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -227,8 +227,8 @@ $(document).ready(function(){
http://${fn:substring(log.logUri,0,20) }
</a>
</td>
<td title="${fns:escapeHtml(log.refer)}">
${fns:stringFormat(log.refer,30)}
<td>
${log.refer}
</td>
<td>${log.level}</td>
<td>
@@ -260,11 +260,11 @@ $(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>
${log.addrList}
</td> --%>
<td title="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -166,7 +166,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -224,14 +224,12 @@ $(document).ready(function(){
<%-- <c:if test="${fn:startsWith(log.url, 'http')}">${log.url }</c:if>
<c:if test="${!fn:startsWith(log.url, 'http')}">http://${log.url }</c:if> --%>
<c:if test="${fn:startsWith(log.url, 'http')}">
<c:set var="url" value="${log.url }"/>
${log.url}
</c:if>
<c:if test="${!fn:startsWith(log.url, 'http')}">
<c:set var="url" value="http://${log.url }"/>
http://${log.url}
</c:if>
<span title="${fns:escapeHtml(url)}">
${fns:stringFormat(url,30)}
</span>
</td>
<td>
<c:if test="${fn:startsWith(log.logUri, 'http')}">
@@ -240,13 +238,17 @@ $(document).ready(function(){
<c:if test="${!fn:startsWith(log.logUri, 'http')}">
<c:set var="logUri" value="http://${log.logUri }"/>
</c:if>
<a target="_blank" href='${fns:escapeHtml(logUri)}' title="${fns:escapeHtml(logUri)}">
${fns:stringFormat(logUri,30)}
<%-- <a target="_blank" href='${logUri}' title="${logUri}"> --%>
<%-- ${fn:substring(logUri,0,20)} --%>
<!-- </a> -->
<a href="${logUri}" target="_blank" data-original-title="${logUri}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(logUri,0,20) }
</a>
<%-- <c:if test="${fn:startsWith(log.logUri, \"http\")}">${log.logUri }</c:if>
<c:if test="${!fn:startsWith(log.logUri, \"http\")}">http://${log.logUri }</c:if>'>http://${log.logUri }</a> --%>
</td>
<td title="${fns:escapeHtml(log.refer)}">${fns:stringFormat(log.refer,30)}</td>
<td>${log.refer}</td>
<td>${log.level}</td>
<!--0动态黑名单FD1静态配置FD2首次分析命中 -->
<td>
@@ -278,7 +280,7 @@ $(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>${log.addrList}</td> --%>
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
</tr>

View File

@@ -166,7 +166,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -224,14 +224,12 @@ $(document).ready(function(){
<%-- <c:if test="${fn:startsWith(log.url, 'http')}">${log.url }</c:if>
<c:if test="${!fn:startsWith(log.url, 'http')}">http://${log.url }</c:if> --%>
<c:if test="${fn:startsWith(log.url, 'http')}">
<c:set var="url" value="${log.url }"/>
${log.url }
</c:if>
<c:if test="${!fn:startsWith(log.url, 'http')}">
<c:set var="url" value="http://${log.url }"/>
${log.url }
</c:if>
<span title="${fns:escapeHtml(url)}">
${fns:stringFormat(url,30)}
</span>
</td>
<td>
<c:if test="${fn:startsWith(log.logUri, 'http')}">
@@ -240,14 +238,15 @@ $(document).ready(function(){
<c:if test="${!fn:startsWith(log.logUri, 'http')}">
<c:set var="logUri" value="http://${log.logUri }"/>
</c:if>
<a target="_blank" href='${fns:escapeHtml(logUri)}' title="${fns:escapeHtml(logUri)}">
${fns:stringFormat(logUri,30)}
<a href="${logUri}" target="_blank" data-original-title="${logUri}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(logUri,0,20) }
</a>
<%-- <c:if test="${fn:startsWith(log.logUri, \"http\")}">${log.logUri }</c:if>
<c:if test="${!fn:startsWith(log.logUri, \"http\")}">http://${log.logUri }</c:if>'>http://${log.logUri }</a> --%>
</td>
<td title="${fns:escapeHtml(log.refer)}">${fns:stringFormat(log.refer,30)}</td>
<td>${log.level}</td>
<td>${log.refer }</td>
<td>${log.level }</td>
<!--0动态黑名单FD1静态配置FD2首次分析命中 -->
<td>
<c:if test="${log.fdType eq 0 }"><spring:message code="black_block_list"/></c:if>
@@ -278,7 +277,7 @@ $(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>${log.addrList }</td> --%>
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
</tr>

View File

@@ -227,7 +227,7 @@
<div class="table-responsive">
<sys:message content="${message}" />
<table id="contentTable"
class="table table-striped table-bordered table-condensed text-nowrap">
class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id' /></th>
@@ -288,9 +288,7 @@
http://${fn:substring(log.logUri,0,20) }
</a>
</td>
<td title="${fns:escapeHtml(log.refer)}">
${fns:stringFormat(log.refer,30)}
</td>
<td>${log.refer }</td>
<td>${log.level}</td>
<td><c:if test="${log.fdType eq 0 }">
<spring:message code="black_block_list" />
@@ -323,11 +321,9 @@
<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="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
<%-- <td>${log.addrList }</td> --%>
<td>${log.serverLocate }</td>
<td>${log.clientLocate }</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -166,7 +166,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id' /></th>
@@ -227,10 +227,8 @@ $(document).ready(function(){
http://${fn:substring(log.logUri,0,20) }
</a>
</td>
<td title="${fns:escapeHtml(log.refer)}">
${fns:stringFormat(log.refer,30)}
</td>
<td>${log.level}</td>
<td>${log.refer }</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>
@@ -260,11 +258,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="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
<%-- <td>${log.addrList }</td> --%>
<td>${log.serverLocate }</td>
<td>${log.clientLocate }</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -166,7 +166,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id' /></th>
@@ -227,9 +227,7 @@ $(document).ready(function(){
http://${fn:substring(log.logUri,0,20) }
</a>
</td>
<td title="${fns:escapeHtml(log.refer)}">
${fns:stringFormat(log.refer,30)}
</td>
<td>${log.refer }</td>
<td>${log.level}</td>
<td><c:if test="${log.fdType eq 0 }">
<spring:message code="black_block_list" />
@@ -262,11 +260,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="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
<%-- <td>${log.addrList }</td> --%>
<td>${log.serverLocate }</td>
<td>${log.clientLocate }</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -166,7 +166,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -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_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='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,8 +196,8 @@ $(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='server_locate'/></th>
@@ -228,14 +228,14 @@ $(document).ready(function(){
<td>${log.duation}</td>
<td>${log.voipProtocol}</td>
<td title="${fns:escapeHtml(log.callingAccount)}">${fn:substring(log.callingAccount,0,30) }</td>
<td title="${fns:escapeHtml(log.calledAccount)}">${fn:substring(log.calledAccount,0,30) }</td>
<td title="${fns:escapeHtml(log.callingNumber)}">${fn:substring(log.callingNumber,0,30) }</td>
<td title="${fns:escapeHtml(log.calledNumber)}">${fn:substring(log.calledNumber,0,30) }</td>
<td>${log.callingAccount }</td>
<td>${log.calledAccount }</td>
<td>${log.callingNumber }</td>
<td>${log.calledNumber }</td>
<%-- <td>${log.fromToStoreIp}</td>
<td title="${fns:escapeHtml(log.fromToStoreUrl)}">${fn:substring(log.fromToStoreUrl,0,30) }</td>
<td>${log.fromToStoreUrl }</td>
<td>${log.toFromStoreIp}</td>
<td title="${fns:escapeHtml(log.toFromStoreUrl)}">${fn:substring(log.toFromStoreUrl,0,30) }</td> --%>
<td>${log.toFromStoreUrl }</td> --%>
<td>${log.pid}</td>
<td>
<c:if test="${fn:startsWith(log.logUri, 'http')}">
@@ -244,8 +244,9 @@ $(document).ready(function(){
<c:if test="${!fn:startsWith(log.logUri, 'http')}">
<c:set var="logUri" value="http://${log.logUri }"/>
</c:if>
<a target="_blank" href='${fns:escapeHtml(logUri)}' title="${fns:escapeHtml(logUri)}">
${fns:stringFormat(logUri,30)}
<a href="${logUri}" target="_blank" data-original-title="${logUri}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(logUri,0,20) }
</a>
</td>
<td>${log.level}</td>
@@ -278,7 +279,7 @@ $(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>${log.addrList}</td> --%>
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
</tr>

View File

@@ -166,7 +166,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -226,11 +226,8 @@ $(document).ready(function(){
<td>${log.duation}</td>
<td>${log.voipProtocol}</td>
<td title="${fns:escapeHtml(log.callingAccount)}">
${fns:stringFormat(log.callingAccount,30)}
</td>
<td title="${fns:escapeHtml(log.calledAccount)}">
${fns:stringFormat(log.calledAccount,30)}
<td>${log.callingAccount }</td>
<td>${log.calledAccount }
</td>
<td>${log.callingNumber}</td>
<td>${log.calledNumber}</td>
@@ -275,8 +272,8 @@ $(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> --%>
<%-- ${log.addrList } --%>
<!-- </td> -->
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>

View File

@@ -166,7 +166,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -226,12 +226,8 @@ $(document).ready(function(){
<td>${log.duation}</td>
<td>${log.voipProtocol}</td>
<td title="${fns:escapeHtml(log.callingAccount)}">
${fns:stringFormat(log.callingAccount,30)}
</td>
<td title="${fns:escapeHtml(log.calledAccount)}">
${fns:stringFormat(log.calledAccount,30)}
</td>
<td>${log.callingAccount }</td>
<td>${log.calledAccount }</td>
<td>${log.callingNumber}</td>
<td>${log.calledNumber}</td>
<%-- <td>${log.fromToStoreIp}</td> --%>
@@ -275,9 +271,7 @@ $(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>${log.addrList }</td> --%>
<td>${log.serverLocate}</td>
<td>${log.clientLocate}</td>
</tr>

View File

@@ -166,7 +166,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -251,11 +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="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
<%-- <td>${log.addrList }</td> --%>
<td>${log.serverLocate }</td>
<td>${log.clientLocate }</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -155,7 +155,7 @@
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="cfg_id" /></th>
@@ -235,11 +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)}">
${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>
<%-- <td>${log.addrList }</td> --%>
<td>${log.serverLocate }</td>
<td>${log.clientLocate }</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -166,7 +166,7 @@ $(document).ready(function(){
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code='cfg_id'/></th>
@@ -216,21 +216,11 @@ $(document).ready(function(){
</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)}">
${fns:stringFormat(log.hostCookie,30)}
</td>
<td title="${fns:escapeHtml(log.encryptMode)}">
${fns:stringFormat(log.encryptMode,30)}
</td>
<td title="${fns:escapeHtml(log.mac)}">
${fns:stringFormat(log.mac,30)}
</td> --%>
<%-- <td>${log.version }</td> --%>
<td>${log.hostKey }</td>
<%-- <td>${log.hostCookie }</td>
<td>${log.encryptMode }</td>
<td>${log.mac }</td> --%>
<%-- <td>
<c:if test="${log.tunnelType==1}">SSH</c:if>
<c:if test="${log.tunnelType==2}">SSHD</c:if>
@@ -259,11 +249,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="${log.serverLocate}">${fns:abbr(log.serverLocate,20)}</td>
<td title="${log.clientLocate}">${fns:abbr(log.clientLocate,20)}</td>
<%-- <td>${log.addrList }</td> --%>
<td>${log.serverLocate }</td>
<td>${log.clientLocate }</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -164,7 +164,7 @@
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="cfg_id" /></th>
@@ -214,18 +214,10 @@
</c:forEach>
</td>
<td title="${fns:escapeHtml(log.version)}">
${fns:stringFormat(log.version,30)}
</td>
<td title="${fns:escapeHtml(log.sni)}">
${fns:stringFormat(log.sni,30)}
</td>
<td title="${fns:escapeHtml(log.san)}">
${fns:stringFormat(log.san,30)}
</td>
<td title="${fns:escapeHtml(log.cn)}">
${fns:stringFormat(log.cn,30)}
</td>
<td>${log.version }</td>
<td>${log.sni }</td>
<td>${log.san }</td>
<td>${log.cn }</td>
<td>${log.capIp}</td>
<td>${log.transProto }</td>
@@ -249,11 +241,9 @@
<c:if test="${log.streamDir==dict.itemCode}"><spring:message code="${dict.itemValue }"/></c:if>
</c:forEach>
</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>
<%-- <td>${log.addrList }</td> --%>
<td>${log.serverLocate }</td>
<td>${log.clientLocate }</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -145,7 +145,7 @@
</div>
<div class="table-responsive">
<sys:message content="${message}"/>
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap logTb">
<thead>
<tr>
<th><spring:message code="cfg_id"/></th>
@@ -180,7 +180,7 @@
</c:if>
</c:forEach>
</td>
<td title="${fns:escapeHtml(_log.url)}">${fns:stringFormat(_log.url,30)}</td>
<td>${_log.url }</td>
<td>${_log.capIp }</td>
<td>${_log.transProto }</td>
<td>${_log.dIp }</td>
@@ -202,9 +202,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="${_log.serverLocate}">${fns:abbr(_log.serverLocate,20)}</td>
<td title="${_log.clientLocate}">${fns:abbr(_log.clientLocate,20)}</td>
<%-- <td>${_log.addrList }</td> --%>
<td>${_log.serverLocate }</td>
<td>${_log.clientLocate }</td>
</tr>
</c:forEach>
</tbody>

View File

@@ -40,7 +40,7 @@
<body class="">
<div class="page-login">
<div class="page-logo">
<img src="${pageContext.request.contextPath}/static/pages/img/logo.png" alt="logo" />
<img src="${pageContext.request.contextPath}/static/pages/img/logo1.png" alt="logo" />
</div>
<div class="page-body">
<div class="login-head"> <spring:message code='login'/> </div>

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

View File

@@ -0,0 +1,16 @@
/* logs page */
table.logTb {
table-layout: fixed;
}
table.logTb td {
width: 100px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
-o-text-overflow: ellipsis;
-icab-text-overflow: ellipsis;
-khtml-text-overflow: ellipsis;
-moz-text-overflow: ellipsis;
-webkit-text-overflow: ellipsis;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.2 KiB

View File

@@ -0,0 +1,43 @@
$(document).ready(function() {
// 界面鼠标悬停事件
$("table.logTb").find("td").not(":has(a)").bind("mouseover", function(){
this.title=$(this).html(this.innerHTML.trim()).text();
});
$("table.logTb th").each(function(){
// 判断是否支持currentStyle属性 是IE 否FF or Chrome
var finalStyle = this.currentStyle ? this.currentStyle : document.defaultView.getComputedStyle(this , null);
var fontSize = (finalStyle.fontSize).replace("px","");
var px = getPixelsCount($(this).text(),fontSize)+55;
this.setAttribute('width',px+'px');
});
})
// 获取界面标题字符串对等的像素值
function getPixelsCount(str, strFontSize){
// 字符串字符个数
var stringCharsCount = str.length;
// 像素值
var stringPixelsCount = 0;
var element = document.createElement("span");
element.style.fontSize = strFontSize; // 设置span的fontSize
element.style.visibility = "hidden"; // 设置span不可见
element.style.display = "inline-block";
element.style.wordBreak = "break-all !important";
document.body.appendChild(element);
for(var i = 0; i < stringCharsCount; i++){
if(str[i] == " "){
element.innerHTML = "&nbsp;";
}else{
element.innerHTML = str[i];
}
stringPixelsCount += element.offsetWidth;
}
return stringPixelsCount;
}