into develop

Conflicts:
	src/main/webapp/WEB-INF/views/log/ntc/connRecordLogList.jsp
去掉所有日志界面关于ip的悬浮查看(已有公共方法处理)
This commit is contained in:
duandongmei
2019-01-07 18:29:08 +06:00
46 changed files with 162 additions and 145 deletions

View File

@@ -561,7 +561,7 @@
// verticalAlign: 'middle'
// },
series: [{
name: 'server',
name: 'Client IP',
data: (function () {
var data = [];
if(sipResult!=null&&sipResult.length>0){
@@ -584,7 +584,7 @@
}())
},
{
name: 'client',
name: 'Server IP',
data: (function () {
var data = [];
if(dipResult!=null&&dipResult.length>0){

View File

@@ -346,7 +346,7 @@ $(document).ready(function(){
<%-- <td>
${log.labelAppSource}
</td> --%>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -365,8 +365,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -275,7 +275,7 @@ $(document).ready(function(){
<td>
${log.labelAppSource}
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -294,8 +294,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>

View File

@@ -292,7 +292,7 @@
</c:forEach>
<spring:message code="${entrances}"/>
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -311,8 +311,8 @@
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -198,7 +198,7 @@ $(document).ready(function(){
<td>${log.pid }</td>
<td><fmt:formatDate value="${log.foundTime }" pattern="yyyy-MM-dd HH:mm:ss" /></td>
<td><fmt:formatDate value="${log.recvTime }" pattern="yyyy-MM-dd HH:mm:ss" /></td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>${log.voipProtocol }</td>
<td>${log.rtpDIp }</td>
<td>${log.rtpSIp }</td>

View File

@@ -128,7 +128,8 @@
<input id="protos" type="hidden" value="${log.protoId}"/>
<!-- 筛选按钮展开状态-->
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
<sys:tableSort id="orderBy" name="orderBy" value="${page.orderBy}" callback="page();" />
<sys:tableSort id="orderBy" name="orderBy.
" value="${page.orderBy}" callback="page();" />
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<%-- <div class="pull-left">
@@ -287,7 +288,7 @@
<label class="control-label"><spring:message code='Web'/></label>
<select id="webSelect" name="webId" title="<spring:message code="select"/>" class="selectpicker form-control" data-max-options="10" data-selected-text-format="count > 3" multiple data-live-search="true" data-live-search-placeholder="<spring:message code="search"/>">
<c:forEach items="${webList}" var="web" >
<option value="${web.id}"><spring:message code="${web.domain}"></spring:message></option>
<option value="${web.code}"><spring:message code="${web.item}"></spring:message></option>
</c:forEach>
</select>
</div>
@@ -322,20 +323,6 @@
<input name="dAsn" type="text" class="form-control" value="${log.dAsn }"/>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label><spring:message code="s_subscribe_id"></spring:message></label>
<input name="sSubscribeId" type="text" class="form-control" value="${log.sSubscribeId }"/>
</div>
</div>
<div class="col-md-4">
<div class="form-group">
<label><spring:message code="d_subscribe_id"></spring:message></label>
<input name="dSubscribeId" type="text" class="form-control" value="${log.dSubscribeId }"/>
</div>
</div>
</div>
</div>
@@ -437,8 +424,8 @@
<td>
<c:set var="webIds">${log.webId }</c:set>
<c:forEach items="${webList}" var="dict">
<c:if test="${dict.id eq log.webId}">
<c:set var="webIds">${dict.domain}</c:set>
<c:if test="${dict.code eq log.webId}">
<c:set var="webIds">${dict.item}</c:set>
</c:if>
</c:forEach>
<spring:message code="${webIds}"/>

View File

@@ -324,7 +324,7 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${isBlocks}"/>
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -343,8 +343,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -365,7 +365,7 @@
</c:forEach>
<spring:message code="${dnsSubs}"/>
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -384,8 +384,8 @@
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -320,7 +320,7 @@ $(document).ready(function(){
<td>
${log.ftpContent}
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -339,8 +339,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -350,7 +350,7 @@
</c:if> --%>
</td>
<td>${log.website }</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -369,8 +369,8 @@
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -408,7 +408,7 @@
</c:if>
</td>
<td>${log.website }</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td>${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -427,8 +427,8 @@
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td>${log.dIp}</td>
<td>${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -288,7 +288,7 @@
</c:forEach>
<spring:message code="${entrances}"/>
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -307,8 +307,8 @@
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -234,7 +234,7 @@ $(document).ready(function(){
<c:if test="${log.isakmpMode==3}">nat_aggre</c:if>
<c:if test="${log.isakmpMode==4}">nat_main</c:if>
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -253,8 +253,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -269,7 +269,7 @@
<td>${log.c2sByteNum }</td>
<td>${log.s2cByteNum }</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -288,8 +288,8 @@
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -268,7 +268,7 @@
<td>${log.c2sByteNum }</td>
<td>${log.s2cByteNum }</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -287,8 +287,8 @@
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -246,7 +246,7 @@
<td>
${log.chapName}
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -266,8 +266,8 @@
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -342,7 +342,7 @@
</c:if>
</td>
<td title="${log.emlKey }">${fns:abbr(log.emlKey, 42)}</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -361,8 +361,8 @@
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -287,7 +287,7 @@ $(document).ready(function(){
</c:forEach>
${avProtocol }
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -306,8 +306,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>

View File

@@ -283,7 +283,7 @@ $(document).ready(function(){
</c:forEach>
${avProtocol }
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -302,8 +302,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -342,7 +342,7 @@ $(document).ready(function(){
</c:forEach>
${avProtocol }
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -361,8 +361,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -284,7 +284,7 @@ $(document).ready(function(){
</c:forEach>
${avProtocol }
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -303,8 +303,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -282,7 +282,7 @@ $(document).ready(function(){
</c:forEach>
${avProtocol }
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -301,8 +301,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -284,7 +284,7 @@ $(document).ready(function(){
</c:forEach>
${avProtocol }
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -303,8 +303,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -344,7 +344,7 @@ $(document).ready(function(){
</c:forEach>
${avProtocol }
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -364,8 +364,8 @@ $(document).ready(function(){
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -394,7 +394,7 @@
</c:if>
</c:forEach>
${avProtocol }</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -413,8 +413,8 @@
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -325,7 +325,7 @@ $(document).ready(function(){
</c:forEach>
${avProtocol }
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -345,8 +345,8 @@ $(document).ready(function(){
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -323,7 +323,7 @@ $(document).ready(function(){
</c:if>
</c:forEach>
${avProtocol }</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -342,8 +342,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -342,7 +342,7 @@ $(document).ready(function(){
</c:if>
</c:forEach>
${avProtocol }</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -361,8 +361,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -325,7 +325,7 @@ $(document).ready(function(){
</c:if>
</c:forEach>
${avProtocol }</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -344,8 +344,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -343,7 +343,7 @@ $(document).ready(function(){
</c:if>
</c:forEach>
${avProtocol }</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
@@ -363,8 +363,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -339,7 +339,7 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${fdTypes}"/>
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -358,8 +358,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -280,7 +280,7 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${fdTypes}"/>
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -299,8 +299,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -352,7 +352,7 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${fdTypes}"/>
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -371,8 +371,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -305,7 +305,7 @@ $(document).ready(function(){
</td>
<td>${log.protocol}</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -324,8 +324,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -284,7 +284,7 @@ $(document).ready(function(){
<c:if test="${log.tunnelType==1}">TCP</c:if>
<c:if test="${log.tunnelType==2}">UDP</c:if>
</td> --%>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -303,8 +303,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -298,7 +298,7 @@
<td>${log.p2pProto}</td>
<td>${log.p2pFileId}</td>
<td>${log.p2pKeyword}</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -318,8 +318,8 @@
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -239,7 +239,7 @@
<c:if test="${log.encryptMode eq 3}">PAP</c:if><c:if test="${log.encryptMode eq 4}">CHAP</c:if>
<c:if test="${log.encryptMode eq 5}">MS-CHAP(v1/v2)</c:if><c:if test="${log.encryptMode eq 6}">EAP-TLS</c:if>
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -258,8 +258,8 @@
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -295,7 +295,7 @@
<td>${log.framedIp }</td>
<td>${log.account }</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -314,8 +314,8 @@
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -247,7 +247,7 @@ $(document).ready(function(){
<c:if test="${log.tunnelType==2}">SSHD</c:if>
<c:if test="${log.tunnelType==3}">SFTP</c:if>
</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -266,8 +266,8 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -318,7 +318,7 @@
<td>${log.sni }</td>
<td>${log.san }</td>
<td>${log.cn }</td>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
@@ -338,8 +338,8 @@
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -328,7 +328,7 @@
<td>${log.respHeader }</td> --%>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td >${log.capIp}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>
<c:forEach items="${fns:getDictList('LOG_PROTOCOL')}" var="dic">
@@ -347,8 +347,8 @@
</c:forEach>
<spring:message code="${addrTypes}"/>
</td>
<td title="${log.dIp }">${fns:abbr(log.dIp, 42)}</td>
<td title="${log.sIp }">${fns:abbr(log.sIp, 42)}</td>
<td >${log.dIp}</td>
<td >${log.sIp}</td>
<td>${log.dPort }</td>
<td>${log.sPort }</td>
<td>

View File

@@ -5881,7 +5881,7 @@ Custom color buttons
width: 145px !important; }
.input-medium {
width: 240px !important; }
width: 200px !important; }
.input-large {
width: 320px !important; }

View File

@@ -120,7 +120,7 @@ function aJaxImportPost(url, params) {
// 设置form属性
temp_form .action = url;
temp_form .target = "_self";
temp_form .method = "post";
temp_form .method = "post"; R
temp_form .style.display = "none";
// 处理需要传递的参数
for (var x in params) {