Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

This commit is contained in:
dongxiaoyan
2018-12-15 11:35:46 +08:00
174 changed files with 801 additions and 395 deletions

View File

@@ -15,7 +15,19 @@
</style>
<script type="text/javascript">top.$.jBox.closeTip();</script>
<c:if test="${not empty content}">
<c:if test="${not empty type}"><c:set var="ctype" value="${type}"/></c:if><c:if test="${empty type}"><c:set var="ctype" value="${(!fn:containsIgnoreCase(content,'失败') && !fn:containsIgnoreCase(content,'failed') && !fn:containsIgnoreCase(content,'Exception') && !fn:containsIgnoreCase(content,'null')&& !fn:containsIgnoreCase(content,'出错')&& !fn:containsIgnoreCase(content,'error'))?'success':'error'}"/></c:if>
<div id="messageBox" class="alert alert-${ctype}" style="max-height:220px;overflow-y:auto;overflow-x:hidden;"><button data-dismiss="alert" class="close">×</button><spring:message code="${content}"/></div>
<script type="text/javascript">if(!top.$.jBox.tip.mess) {top.$.jBox.tip.mess=1;/* top.$.jBox.tip("<spring:message code='${content}'/>","${ctype}",{persistent:true,opacity:0}); */$("#messageBox").show();}</script>
<c:if test="${not empty type}">
<c:set var="ctype" value="${type}"/>
</c:if>
<c:if test="${empty type}">
<c:set var="ctype" value="${(!fn:containsIgnoreCase(content,'失败') && !fn:containsIgnoreCase(content,'failed') && !fn:containsIgnoreCase(content,'Exception') && !fn:containsIgnoreCase(content,'null')&& !fn:containsIgnoreCase(content,'出错')&& !fn:containsIgnoreCase(content,'error'))?'success':'error'}"/>
</c:if>
<div id="messageBox" class="alert alert-${ctype}" style="max-height:220px;overflow-y:auto;overflow-x:hidden;"><button data-dismiss="alert" class="close">×</button>
<spring:message code="${content}"/></div>
<script type="text/javascript">
if(!top.$.jBox.tip.mess) {
top.$.jBox.tip.mess=1;
/* top.$.jBox.tip("<spring:message code='${content}'/>","${ctype}",{persistent:true,opacity:0}); */
$("#messageBox").show();
}</script>
</c:if>

View File

@@ -46,6 +46,7 @@
if(str.substr(str.length-1)== ','){
ids = str.substr(0,str.length-1);
}
var canDel=true;
var tip='<spring:message code="can_not_delete_issued_asn_group"/>';
if(serviceGroupIds.length>0){
@@ -60,7 +61,7 @@
}
}
});
if(canDel){
/* if(canDel){ // 不能删除包含ASN IP的 ASN组
$.ajax({
type:'post',
url:'${ctx}/basics/policyGroup/ajaxHasAsnIPs',
@@ -73,11 +74,35 @@
}
}
});
}
} */
}
if(canDel){
window.location = url+"&ids="+ids;
}else{
var added = "";
if(serviceGroupIds.length != 0){
added = "<spring:message code='asn_ip_group_delete'/>";
}
top.$.jBox.confirm("<spring:message code='confirm_message'/>"+added,"<spring:message code='info'/>",function(v,h,f){
if(v=="ok"){
if(serviceGroupIds.length != 0){
$.ajax({
type:'post',
url:'${ctx}/basics/asn/ajaxDeleteAsnIp',
data:{"ids":serviceGroupIds.join(',')},
async:false,
success:function(data,textStatus){
if(textStatus == "success"){
window.location = url+"&ids="+ids;
}
}
});
}else{
window.location = url+"&ids="+ids;
}
}
},{buttonsFocus:1});
top.$('.jbox-body .jbox-icon').css('top','55px');
}else{
$.jBox.tip(tip);
return false;
}
@@ -159,6 +184,7 @@
<a href="javascript:void(0);" class="btn btn-default" onclick="deletes('${ctx}/basics/policyGroup/delete?isValid=0')" data-toggle="tooltip" data-placement="top">
<i class="fa fa-trash"> <spring:message code="delete"/></i>
</a>
<%-- <sys:delRow url="${ctx}/basics/asn/delete?isValid=-1&functionId=${cfg.functionId }" id="contentTable" label="delete"></sys:delRow> --%>
<%-- </shiro:hasPermission> --%>
<a class="btn btn-icon-only btn-default setfields tooltips"
@@ -211,7 +237,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -199,7 +199,7 @@ label.errorShow {
<!-- BEGIN FORM-->
<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/basics/serviceDictInfo/saveOrUpdate?itType=${itType}" method="post" class="form-horizontal">
<form:hidden path="serviceDictId"/>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="form-group <c:if test="${itType==5 }"> hidden </c:if> " >
<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
<div class="col-md-4">

View File

@@ -37,7 +37,7 @@
<!-- BEGIN FORM-->
<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/basics/serviceDictInfo/saveOrUpdate" method="post" class="form-horizontal">
<form:hidden path="serviceDictId"/>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="superior_config"/>:</label>
<div class="col-md-4">

View File

@@ -265,7 +265,7 @@
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="treeTable" class="table table-striped table-bordered table-condensed text-nowrap">

View File

@@ -143,7 +143,7 @@
<!-- BEGIN FORM-->
<form:form id="inputForm" modelAttribute="sysDictInfo" action="${ctx}/basics/sysDictInfo/saveOrUpdate?itType=${itType}" method="post" class="form-horizontal">
<form:hidden path="sysDictId"/>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<c:if test="${specType == null or specType!=3 }">
<div class="form-group">
<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>

View File

@@ -37,7 +37,7 @@
<!-- BEGIN FORM-->
<form:form id="inputForm" modelAttribute="sysDictInfo" action="${ctx}/basics/sysDictInfo/saveOrUpdate" method="post" class="form-horizontal">
<form:hidden path="sysDictId"/>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<c:if test="${specType == null or specType!=3 }">
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="superior_config"/>:</label>

View File

@@ -294,7 +294,7 @@
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="treeTable" class="table table-striped table-bordered table-condensed text-nowrap">

View File

@@ -22,7 +22,7 @@
<div class="portlet-body form">
<!-- BEGIN FORM-->
<form:form action="${ctx}/basics/taskInfo/saveOrUpdate" modelAttribute="taskInfo" class="form-horizontal" id="inputForm" method="post" >
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<input type="hidden" name="id" value="${taskInfo.id}"/>
<div class="form-body">
<div class="form-group">

View File

@@ -153,7 +153,7 @@
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

View File

@@ -240,7 +240,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

View File

@@ -32,6 +32,7 @@ $(function(){
var isHexbin=$(this).val();
if(isHexbin == 1){
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
keywords=keywords.replace("***and***","");
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".form-body").find(
"div[for='"

View File

@@ -32,6 +32,7 @@ $(function(){
var isHexbin=$(this).val();
if(isHexbin == 1){
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
keywords=keywords.replace("***and***","");
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".form-body").find(
"div[for='"

View File

@@ -302,7 +302,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -348,7 +348,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -32,13 +32,14 @@ $(function(){
var isHexbin=$(this).val();
if(isHexbin == 1){
var keywords=$("input[name$='"+$(this).attr("name").replace("isHexbin","cfgKeywords")+"']").val();
keywords=keywords.replace("***and***","");
if(!(/^([0-9|a-f|A-F]*)$/.test(keywords))){
$(this).parents(".form-body").find(
"div[for='"
+ $(this).attr("name").replace("isHexbin","cfgKeywords")
+ "']").html("<label id=\"cfgKeywordsError\" class=\"error\">"+$.validator.messages.hexCheck+"</label>");
flag = false;
}
}
}
});
if(flag){
@@ -53,6 +54,13 @@ $(function(){
errorContainer: "#messageBox",
});
});
function changeDistrict(obj){
if("others"==obj.val()){
obj.parent().siblings(".otherValue").prop("type","text");
}else{
obj.parent().siblings(".otherValue").prop("type","hidden");
}
}
</script>
</head>
<body>
@@ -441,4 +449,4 @@ $(function(){
</div>
</div>
</body>
</html>
</html>

View File

@@ -54,7 +54,7 @@
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<shiro:hasPermission name="app:http:config">
<shiro:hasPermission name="app:ssl:config">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/app/sslCfgForm?functionId=${cfg.functionId}'">
<i class="fa fa-plus"></i>

View File

@@ -269,7 +269,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -278,7 +278,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -330,7 +330,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -362,7 +362,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -313,6 +313,7 @@ function sampleFileValidate(fileType,fileName){
<spring:message code="${_cfg.menuNameCode }"></spring:message>
</h3>
<div class="row">
<div class="col-md-12">
<div class="portlet box blue">
@@ -446,7 +447,11 @@ function sampleFileValidate(fileType,fileName){
class="fileNoteInfo" data-icon="&#xe08b;" style="cursor:default"></span>
<div for="srcFileInfo"></div>
<div id="fileErrorNote"></div>
</div>
<div style="margin-bottom:5px">
<span style="color: red;font-size: 16px;letter-spacing: 0px;"> <spring:message code="av_tips"></spring:message></span>
</div>
</div>
<%-- <div class="col-md-6">
<div class="form-group">

View File

@@ -31,7 +31,7 @@
<label><spring:message code='src_file' />:</label>
<a href="javascript:;" data-original-title="${cfg.srcUrl}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fns:abbr(cfg.srcUrl,100)}
${fns:abbr(cfg.srcUrl,40)}
</a>
</div>
</div>
@@ -42,7 +42,7 @@
<label><spring:message code='sample_file' />:</label>
<a href="${cfg.sampleUrl }" target="_blank" data-original-title="${cfg.sampleUrl }"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(cfg.sampleUrl,0,100) }
${fn:substring(cfg.sampleUrl,0,40) }
</a>
</div>
</div>

View File

@@ -330,7 +330,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

View File

@@ -328,7 +328,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -285,7 +285,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

View File

@@ -87,7 +87,7 @@ $(function(){
</div>
</div>
<div class="portlet-body form">
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<shiro:hasPermission name="avSignSample:preset">
<form id="presetFrom" action="${ctx}/ntc/av/sample/auditAvSignSample" method="get" class="form-horizontal">
<input type="hidden" name="functionId" value="${functionId }">

View File

@@ -354,7 +354,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -267,7 +267,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

View File

@@ -339,7 +339,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

View File

@@ -123,7 +123,10 @@
<input type="radio"
name="${cfgName}.exprType" value="${exprType }"
class="required"
<c:if test="${stat.index == 0 }"> checked </c:if>
<%-- <c:if test="${stat.index == 0 }"> checked </c:if> --%>
<c:if test="${cfg.exprType eq exprType || (empty cfg.exprType && exprType eq 0)}">
checked
</c:if>
>
<spring:message code="${exprTypeC.itemValue }" />
</label>

View File

@@ -312,7 +312,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -309,7 +309,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -362,7 +362,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

View File

@@ -2,6 +2,7 @@
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<html>
<head>
<script src="${pageContext.request.contextPath}/static/global/scripts/app.min.js" type="text/javascript"></script>
<script>
$(document).ready(function() {
//$("div[name='tabTitle"+index+"']").get(0).click();
@@ -10,6 +11,7 @@
<style type="text/css">
</style>
</head>
<c:forEach items="${tabList}" var="region" varStatus="regionStatus">
<div id="${region[1]}Title${index}" onclick="switchSubCfgTabInfo('${region[1]}',${index})"
class="col-md-1 tabInfo" name="tabTitle${index }">
@@ -23,24 +25,24 @@
<c:set value="${_cfg}" var="cfg"></c:set>
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
<div class="row" style="margin-top: 5px;">
<div class="row">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='digest' />:</label>
<a href="javascript:;" title="${cfg.digest}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fns:abbr(cfg.digest,40)}
</a>
<label><spring:message code='file_url' />:</label>
<a href="${cfg.fileUrl}" data-original-title="${cfg.fileUrl}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fns:abbr(cfg.fileUrl,40)}
</a>
</div>
</div>
</div>
<div class="row">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='file_url' />:</label>
<a href="${cfg.fileUrl }" target="_blank" title="${cfg.fileUrl }"
<label><spring:message code='digest' />:</label>
<a href="javascript:;" target="_blank" data-original-title="${cfg.digest}"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
${fn:substring(cfg.fileUrl,0,40) }
${fn:substring(cfg.digest,0,40) }
</a>
</div>
</div>
@@ -69,7 +71,7 @@
</div>
</div>
</div>
</c:if>
</c:if>
</c:if>
</c:forEach>
</html>

View File

@@ -334,7 +334,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -348,7 +348,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -349,7 +349,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -109,7 +109,6 @@
</div>
</div>
</div>
</div>
</c:if>
</c:forEach>
</c:if>

View File

@@ -293,7 +293,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

View File

@@ -275,7 +275,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -295,7 +295,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -221,7 +221,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -31,7 +31,7 @@
<div class="form-body">
<!-- BEGIN FORM-->
<form:form id="inputForm" modelAttribute="user" action="#" method="post" class="form-horizontal">
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="row">
<div class="col-md-6">
<div class="form-group">

View File

@@ -26,7 +26,7 @@
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
<div class="row" style="margin-top: 5px;">
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='original_dest_ip'/>:</label>
<label>
@@ -34,7 +34,9 @@
</label>
</div>
</div>
<div class="col-md-4">
</div>
<div class="row">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='original_dest_port'/>:</label>
<label>
@@ -42,9 +44,9 @@
</label>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='translated_dest_ip'/>:</label>
<label>
@@ -52,14 +54,16 @@
</label>
</div>
</div>
<div class="col-md-4">
</div>
<div class="row">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='translated_dest_port'/>:</label> <label> ${cfg.destPort }</label>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">
<div class="col-md-8">
<div class="form-group">
<label><spring:message code='protocol'/>:</label>
<label>

View File

@@ -26,7 +26,7 @@
<c:if test="${region[1] eq cfg.cfgType }">
<div id="${region[1]}Info${index}" class="content" name="subCfg${index}">
<div class="row" style="margin-top: 5px;">
<div class="col-md-4">
<div class="col-md-10">
<div class="form-group">
<label><spring:message code='address_pool'/>:</label>
<label>
@@ -38,7 +38,9 @@
</label>
</div>
</div>
<div class="col-md-4">
</div>
<div class="row">
<div class="col-md-10">
<div class="form-group">
<label><spring:message code='user_type'/>:</label>
<label>
@@ -54,6 +56,7 @@
</label>
</div>
</div>
</div>
<div class="row">
<div class="col-md-4">

View File

@@ -348,7 +348,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -335,7 +335,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -540,7 +540,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -262,7 +262,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}" />
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

View File

@@ -270,7 +270,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -22,7 +22,7 @@
<div class="portlet-body form">
<!-- BEGIN FORM-->
<form:form action="${ctx}/cfg/request/saveOrUpdate" modelAttribute="requestInfo" class="form-horizontal" id="inputForm" method="post" >
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<input type="hidden" name="id" value="${requestInfo.id}"/>
<div class="form-body">
<div class="form-group">

View File

@@ -165,7 +165,7 @@
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">

View File

@@ -11,7 +11,7 @@ $(document).ready(function() {
</head>
<body>
<div class="page-content">
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
</div>
</body>
</html>

View File

@@ -346,7 +346,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -345,7 +345,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -326,7 +326,7 @@
<!-- /筛选搜索内容栏 结束-->
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive">
<table id="contentTable" class="table table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -17,10 +17,42 @@
<h3 class="page-title">
<spring:message code="${searchAction}"></spring:message>
</h3>
<div class="row" >
<form:form id="searchForm" method="get" class="form-search">
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
</div>
<input id="beginDate" name="beginDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:00',isShowClear:true,maxDate:'${endDate}'});"/>
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
</div>
<input id="endDate" name="endDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:00',isShowClear:true,maxDate:'${endDate}'});"/>
</div>
</div>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return searchList()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" id="resetBtn" > <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
</div>
</div>
<!-- 搜索内容与操作按钮栏 -->
</form:form>
</div>
<div id="chart" style="width:97%;height:550px;"></div>
<input id="searchAction" name="searchAction" type="hidden" value="${searchAction}"/>
<input id="beginDateh" type="hidden" value="${beginDate}"/>
<input id="endDateh" type="hidden" value="${endDate}"/>
</div>
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/highcharts.js"></script>
@@ -30,8 +62,36 @@
<%-- <script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/themes/grid.js"></script> --%>
<script type="text/javascript">
$(document).ready(function(){
actionTransAjax($("#searchAction").val());
var starth=$("#beginDateh").val();
var endh=$("#endDateh").val();
$("#beginDate").val(starth);
$("#endDate").val(endh);
actionTransAjax($("#searchAction").val(),starth,endh);
//筛选功能初始化
$("#resetBtn").on("click",function(){
$("select.selectpicker").each(function(){
$(this).selectpicker('val',$(this).find('option:first').val());
$(this).find("option").attr("selected",false);
$(this).find("option:first").attr("selected",true);
});
$(".Wdate").attr("value",'');
$("#searchForm")[0].reset();
});
setInterval(function(){
actionTransAjax($("#searchAction").val(),starth,new Date().Format("yyyy-MM-dd HH:mm:00"));
},500000);// 五分钟调用一次
});
function searchList(){
loading();
var start=$("#beginDate").val();
var end=$("#endDate").val();
if(start==''||end==''||end==null||start==null){
window.location.reload();
}else{
actionTransAjax($("#searchAction").val(),start,end);
}
}
// 局点信息
function showActionTransChart(rs){
var data=new Array();
@@ -52,9 +112,10 @@ function showActionTransChart(rs){
});
})
var chart = Highcharts.chart('chart', {
/* chart:{
type: 'area',
}, */
chart:{
// type: 'area',
zoomType: 'x'
},
exporting: {
filename:'Action-Trans',
scale:1,
@@ -71,6 +132,9 @@ function showActionTransChart(rs){
text: 'time',
align:'high',
},
labels: {
rotation: -45, //倾斜的角度
},
},
yAxis: {
title: {
@@ -100,10 +164,10 @@ function showActionTransChart(rs){
});
}
// 动作一小时,间隔五分钟统计数据
function actionTransAjax(searchAction){
function actionTransAjax(searchAction,beginDate,endDate){
loading();
$.ajax({
url: "${ctx}/dashboard/traffic/actionEntranceTrans?searchAction="+searchAction,
url: "${ctx}/dashboard/traffic/actionEntranceTrans?searchAction="+searchAction+"&beginDate="+beginDate+"&endDate="+endDate,
type : "get" ,
dataType:"json",
cache:false,
@@ -115,7 +179,9 @@ function showActionTransChart(rs){
error: function(data, textStatus, errorThrown){
closeTip();
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
}

View File

@@ -33,6 +33,8 @@
<div class="row" >
<form:form id="searchForm" action="${ctx}/dashboard/traffic/appTypeList" method="get" class="form-search">
<input id="beginDateh" type="hidden" value="${beginDate}"/>
<input id="endDateh" type="hidden" value="${endDate}"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
@@ -40,8 +42,8 @@
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
</div>
<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="${searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
<input id="beginDate" name="beginDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="${beginDate}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'${endDate}'});"/>
</div>
</div>
<div class="pull-left">
@@ -49,8 +51,8 @@
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
</div>
<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="${searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
<input id="endDate" name="endDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="${endDate}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'${endDate}'});"/>
</div>
</div>
@@ -95,7 +97,11 @@
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
<script type="text/javascript">
$(document).ready(function(){
ajaxProtocolList();
var starth=$("#beginDateh").val();
var endh=$("#endDateh").val();
$("#beginDate").val(starth);
$("#endDate").val(endh);
ajaxAppList(starth,endh);
//筛选功能初始化
$("#resetBtn").on("click",function(){
$("select.selectpicker").each(function(){
@@ -106,26 +112,27 @@ $(document).ready(function(){
$(".Wdate").attr("value",'');
$("#searchForm")[0].reset();
});
setInterval(function(){
ajaxAppList(starth,new Date().Format("yyyy-MM-dd HH:mm:00"));
},500000);// 五分钟调用一次
});
function searchList(){
loading();
var start=$("#searchFoundStartTime").val();
var end=$("#searchFoundEndTime").val();
var start=$("#beginDate").val();
var end=$("#endDate").val();
if(start==''||end==''||end==null||start==null){
start="";
end="";
$("#searchFoundStartTime").val("");
$("#searchFoundEndTime").val("");
window.location.reload();
}else{
ajaxAppList(start,end);
}
ajaxProtocolList(start,end);
}
function ajaxProtocolList(start,end){
function ajaxAppList(start,end){
loading();
$.ajax({
url: '${ctx}/dashboard/traffic/appList',
type: 'get',
dataType: "json",
data:{"searchFoundStartTime":start,"searchFoundEndTime":end},
data:{"beginDate":start,"endDate":end},
async:false,
timeout:10000,
success:function (data){
@@ -224,9 +231,9 @@ function htmlData(fileDataS){
html+= "<td class='tc'>"+data.appName+"</td>";
html+= "<td class='tc'>"+data.linkNum+"</td>";
html+= "<td class='tc'>"+linkper+"%"+"</td>";
html+= "<td class='tc'>"+data.packets+"</td>";
html+= "<td class='tc'>"+Math.round(data.packets*100)/100+"</td>";
html+= "<td class='tc'>"+packper+"%"+"</td>";
html+= "<td class='tc'>"+data.GByte+"</td>";
html+= "<td class='tc'>"+Math.round(data.GByte*100)/100+"</td>";
html+= "<td class='tc'>"+gbytper+"%"+"</td>";
html+="</tr>"
}

View File

@@ -21,7 +21,9 @@
</h3>
<h5 class="page-header"></h5>
<div class="row" >
<form:form id="searchForm" action="${ctx}/dashboard/traffic/protocolTypeList" method="get" class="form-search">
<form:form id="searchForm" action="${ctx}/dashboard/traffic/bandwidthList" method="get" class="form-search">
<input id="beginDateh" type="hidden" value="${beginDate}"/>
<input id="endDateh" type="hidden" value="${endDate}"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
@@ -30,7 +32,7 @@
<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
</div>
<input id="beginDate" name="beginDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'${endDate}'});"/>
</div>
</div>
<div class="pull-left">
@@ -39,7 +41,7 @@
<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
</div>
<input id="endDate" name="endDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'${endDate}'});"/>
</div>
</div>
@@ -83,22 +85,23 @@
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
<script type="text/javascript">
$(document).ready(function(){
var starth=$("#beginDateh").val();
var endh=$("#endDateh").val();
$("#beginDate").val(starth);
$("#endDate").val(endh);
var unitType=$("#unitType").val();
var start=$("#beginDate").val();
var end=$("#endDate").val();
changeBandwidth(unitType,start,end);
changeBandwidth2(unitType,start,end);
changeBandwidth(unitType,starth,endh);
changeBandwidth2(unitType,starth,endh);
$("#unitType").on("change",function(){
changeBandwidth($("#unitType").val(),$("#beginDate").val(),$("#endDate").val());
changeBandwidth2($("#unitType").val(),$("#beginDate").val(),$("#endDate").val());
});
setInterval(function(){
changeBandwidth($("#unitType").val(),$("#beginDate").val(),$("#endDate").val());
changeBandwidth2($("#unitType").val(),$("#beginDate").val(),$("#endDate").val());
changeBandwidth($("#unitType").val(),$("#beginDate").val(),new Date().Format("yyyy-MM-dd HH:mm:00"));
changeBandwidth2($("#unitType").val(),$("#beginDate").val(),new Date().Format("yyyy-MM-dd HH:mm:00"));
},500000);// 五分钟调用一次
//筛选功能初始化
$("#resetBtn").on("click",function(){
$("select.selectpicker").each(function(){
@@ -115,8 +118,12 @@ function searchList(){
loading();
var start=$("#beginDate").val();
var end=$("#endDate").val();
if(start==''||end==''||end==null||start==null){
window.location.reload();
}else{
changeBandwidth($("#unitType").val(),start,end);
changeBandwidth2($("#unitType").val(),start,end);
}
}
// 默认显示四条线 ip46,tcp,udp

View File

@@ -29,7 +29,7 @@
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
</form:form>
</div>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<h3 class="page-title">
<spring:message code="traffic_ipactive_hour_max"></spring:message>
</h3>

View File

@@ -23,6 +23,8 @@
<h5 class="page-header"></h5>
<div class="row" >
<form:form id="searchForm" action="${ctx}/dashboard/traffic/protocolTypeList" method="get" class="form-search">
<input id="beginDateh" type="hidden" value="${beginDate}"/>
<input id="endDateh" type="hidden" value="${endDate}"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
@@ -30,17 +32,17 @@
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="begin_date"/></span>
</div>
<input id="searchFoundStartTime" name="searchFoundStartTime" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="${searchFoundStartTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
<input id="beginDate" name="beginDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'${endDate}'});"/>
</div>
</div>
<div class="pull-left">
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="selectpicker form-control" ><spring:message code="end_date"/></span>
</div>
<input id="searchFoundEndTime" name="searchFoundEndTime" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="${searchFoundEndTime}" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true});"/>
<input id="endDate" name="endDate" type="text" readonly="readonly" class="form-control Wdate input-medium"
value="" onclick="WdatePicker({dateFmt:'yyyy-MM-dd HH:mm:ss',isShowClear:true,maxDate:'${endDate}'});"/>
</div>
</div>
@@ -85,7 +87,11 @@
<script src="${pageContext.request.contextPath}/static/global/plugins/highcharts/js/offline-exporting.js"></script>
<script type="text/javascript">
$(document).ready(function(){
ajaxProtocolList();
var starth=$("#beginDateh").val();
var endh=$("#endDateh").val();
$("#beginDate").val(starth);
$("#endDate").val(endh);
ajaxProtocolList(starth,endh);
//筛选功能初始化
$("#resetBtn").on("click",function(){
$("select.selectpicker").each(function(){
@@ -96,18 +102,20 @@ $(document).ready(function(){
$(".Wdate").attr("value",'');
$("#searchForm")[0].reset();
});
setInterval(function(){
ajaxProtocolList(starth,new Date().Format("yyyy-MM-dd HH:mm:00"));
},500000);// 五分钟调用一次
});
function searchList(){
loading();
var start=$("#searchFoundStartTime").val();
var end=$("#searchFoundEndTime").val();
var start=$("#beginDate").val();
var end=$("#endDate").val();
if(start==''||end==''||end==null||start==null){
start="";
end="";
$("#searchFoundStartTime").val("");
$("#searchFoundEndTime").val("");
window.location.reload();
}else{
ajaxProtocolList(start,end);
}
ajaxProtocolList(start,end);
}
function ajaxProtocolList(start,end){
loading();
@@ -115,7 +123,7 @@ function ajaxProtocolList(start,end){
url: '${ctx}/dashboard/traffic/protocolList',
type: 'get',
dataType: "json",
data:{"searchFoundStartTime":start,"searchFoundEndTime":end},
data:{"beginDate":start,"endDate":end},
async:false,
timeout:10000,
success:function (data){
@@ -213,9 +221,9 @@ function htmlData(fileDataS){
html+= "<td class='tc'>"+data.protocolType+"</td>";
html+= "<td class='tc'>"+data.linkNum+"</td>";
html+= "<td class='tc'>"+linkper+"%"+"</td>";
html+= "<td class='tc'>"+data.packets+"</td>";
html+= "<td class='tc'>"+Math.round(data.packets*100)/100+"</td>";
html+= "<td class='tc'>"+packper+"%"+"</td>";
html+= "<td class='tc'>"+data.GByte+"</td>";
html+= "<td class='tc'>"+Math.round(data.GByte*100)/100+"</td>";
html+= "<td class='tc'>"+gbytper+"%"+"</td>";
html+="</tr>"
}

View File

@@ -174,7 +174,7 @@
<div class="col-md-12">
<div class="portlet">
<div class="portlet-body">
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<!-- top -->
<%-- <div class="row">
<div class="col-md-6">

View File

@@ -80,7 +80,7 @@
});
});
</script>
<sys:message content="${message}"/>
<sys:message content="${message}" type="${messageType }"/>
<div class="table-responsive show-two">
<table id="contentTable" style="width: 35%;" class="table table-hover table-striped table-bordered table-condensed text-nowrap">
<thead>

View File

@@ -239,7 +239,7 @@ $(document).ready(function(){
<th class="sort-column label_app_id"><spring:message code='social_app'/></th>
<%-- <th class="sort-column label_app_source" isVisible="false"><spring:message code='label_app_source'/></th> --%>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>
@@ -329,9 +329,9 @@ $(document).ready(function(){
</c:forEach>
<spring:message code="${labelAppIds}"/>
</td>
<td>
<%-- <td>
${log.labelAppSource}
</td>
</td> --%>
<td title="${log.capIp }">${fns:abbr(log.capIp, 42)}</td>
<td>
<c:set var="transProtos">${log.transProto }</c:set>

View File

@@ -185,7 +185,7 @@ $(document).ready(function(){
<th class="sort-column label_app_source"><spring:message code='label_app_source'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -218,7 +218,7 @@
<th class="sort-column entrance_id" isVisible="false"><spring:message code="entrance_id"/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -132,7 +132,7 @@ $(document).ready(function(){
<div class="row">
<div class="col-md-2 hidden">
<div class="form-group">
<label><spring:message code="protocol_type"/></label>
<label><spring:message code="transport_layer_protocol"/></label>
<c:set var="select"><spring:message code='select'/></c:set>
<form:select path="transProto" class="selectpicker form-control" >
<form:option value=""><spring:message code="select"/></form:option>

View File

@@ -237,7 +237,7 @@
<th class="sort-column dns_sub"><spring:message code="dns_sub"/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -222,7 +222,7 @@ $(document).ready(function(){
<th class="sort-column ftp_content"><spring:message code='ftp_content'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -100,6 +100,9 @@
<h3 class="page-title">
<spring:message code="http_keyword"/>
</h3>
<div style="color:red">
<spring:message code="keyword_log_tips"></spring:message>
</div>
<h5 class="page-header"></h5>
<div class="col-md-12">
<div class="portlet">
@@ -257,7 +260,7 @@
<th class="sort-column website"><spring:message code="website"/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -240,7 +240,7 @@
<th class="sort-column website"><spring:message code="website"/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -220,7 +220,7 @@
<th class="sort-column recv_time" isVisible="false"><spring:message code="recv_time"/></th>
<th class="sort-column entrance_id" isVisible="false"><spring:message code="entrance_id"/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -168,7 +168,7 @@ $(document).ready(function(){
<th class="sort-column isakmp_mode"><spring:message code='isakmp_mode'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -196,7 +196,7 @@
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -196,7 +196,7 @@
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -180,7 +180,7 @@
<th class="sort-column encrypt_mode"><spring:message code="encrypt_mode" /></th>
<th class="sort-column chap_name"><spring:message code="user_name"/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -248,7 +248,7 @@
<th class="sort-column eml_file"><spring:message code="eml_file"/></th>
<th class="sort-column eml_key" isVisible="false"><spring:message code="eml_key"/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -185,7 +185,7 @@ $(document).ready(function(){
<th class="sort-column protocol" ><spring:message code='av_protocol'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -183,7 +183,7 @@ $(document).ready(function(){
<th class="sort-column fd_type" isVisible="false"><spring:message code='fd_type'/></th>
<th class="sort-column protocol" ><spring:message code='av_protocol'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -219,13 +219,13 @@ $(document).ready(function(){
<th class="sort-column pid" isVisible="false"><spring:message code='pid'/></th>
<th class="sort-column url"><spring:message code='access_url'/></th>
<th class="sort-column log_uri"><spring:message code='log_uri'/></th>
<%-- <th class="sort-column log_uri"><spring:message code='log_uri'/></th> --%>
<th class="sort-column referer"><spring:message code='referer'/></th>
<th class="sort-column level" isVisible="false"><spring:message code='harm_level'/></th>
<th class="sort-column fd_type" isVisible="false"><spring:message code='fd_type'/></th>
<th class="sort-column protocol" ><spring:message code='av_protocol'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>
@@ -289,7 +289,7 @@ $(document).ready(function(){
${log.url}
</c:if>
</td>
<td>
<%-- <td>
<c:if test="${fn:startsWith(log.logUri, 'http')}">
<a href="${log.logUri}" data-original-title="${log.logUri}" target="_blank"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
@@ -303,7 +303,7 @@ $(document).ready(function(){
http://${fn:substring(log.logUri,0,20) }
</a>
</c:if>
</td>
</td> --%>
<td>
${log.referer}
</td>

View File

@@ -182,7 +182,7 @@ $(document).ready(function(){
<th class="sort-column fd_type" isVisible="false"><spring:message code='fd_type'/></th>
<th class="sort-column protocol" ><spring:message code='av_protocol'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -180,7 +180,7 @@ $(document).ready(function(){
<th class="sort-column fd_type" isVisible="false"><spring:message code='fd_type'/></th>
<th class="sort-column protocol" ><spring:message code='av_protocol'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -183,7 +183,7 @@ $(document).ready(function(){
<th class="sort-column fd_type" isVisible="false"><spring:message code='fd_type'/></th>
<th class="sort-column protocol" ><spring:message code='av_protocol'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -224,7 +224,7 @@ $(document).ready(function(){
<th class="sort-column fd_type" isVisible="false"><spring:message code='fd_type'/></th>
<th class="sort-column protocol" ><spring:message code='av_protocol'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -284,7 +284,7 @@
<th class="sort-column protocol" ><spring:message code='av_protocol'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -224,7 +224,7 @@ $(document).ready(function(){
<th class="sort-column fd_type" isVisible="false"><spring:message code='fd_type'/></th>
<th class="sort-column protocol" ><spring:message code='av_protocol'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -224,7 +224,7 @@ $(document).ready(function(){
<th class="sort-column fd_type" isVisible="false"><spring:message code='fd_type'/></th>
<th class="sort-column protocol" ><spring:message code='av_protocol'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -224,7 +224,7 @@ $(document).ready(function(){
<th class="sort-column fd_type" isVisible="false"><spring:message code='fd_type'/></th>
<th class="sort-column protocol" ><spring:message code='av_protocol'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -224,7 +224,7 @@ $(document).ready(function(){
<th class="sort-column fd_type" isVisible="false"><spring:message code='fd_type'/></th>
<th class="sort-column protocol" ><spring:message code='av_protocol'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -225,7 +225,7 @@ $(document).ready(function(){
<th class="sort-column fd_type" isVisible="false"><spring:message code='fd_type'/></th>
<th class="sort-column protocol" ><spring:message code='av_protocol'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -190,7 +190,7 @@ $(document).ready(function(){
<th class="sort-column level" isVisible="false"><spring:message code='harm_level'/></th>
<th class="sort-column fd_type" isVisible="false"><spring:message code='fd_type'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -223,17 +223,19 @@ $(document).ready(function(){
<th class="sort-column called_account"><spring:message code='called_account'/></th>
<th class="sort-column calling_number" isVisible="false"><spring:message code='calling_number'/></th>
<th class="sort-column called_number" isVisible="false"><spring:message code='called_number'/></th>
<c:if test="${fns:getUser().isAdmin()}"><th><spring:message code='from_to_store_ip'/></th>
<c:if test="${fns:getUser().isAdmin()}">
<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></c:if>
<th><spring:message code='to_from_store_url'/></th>
</c:if>
<th class="sort-column pid" isVisible="false"><spring:message code='pid'/></th>
<%-- <th class="sort-column log_uri"><spring:message code='log_uri'/></th> --%>
<c:if test="${fns:getUser().isAdmin()}"><th class="sort-column log_uri"><spring:message code='log_uri'/></th></c:if>
<th class="sort-column level" isVisible="false"><spring:message code='harm_level'/></th>
<th class="sort-column fd_type" isVisible="false"><spring:message code='fd_type'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>
@@ -293,12 +295,15 @@ $(document).ready(function(){
<td>${log.calledAccount }</td>
<td>${log.callingNumber}</td>
<td>${log.calledNumber}</td>
<c:if test="${fns:getUser().isAdmin()}"><td>${log.fromToStoreIp}</td>
<c:if test="${fns:getUser().isAdmin()}">
<td>${log.fromToStoreIp}</td>
<td>${log.fromToStoreUrl}</td>
<td>${log.toFromStoreIp}</td>
<td>${log.toFromStoreUrl}</td></c:if>
<td>${log.toFromStoreUrl}</td>
</c:if>
<td>${log.pid}</td>
<c:if test="${fns:getUser().isAdmin()}"><td>
<c:if test="${fns:getUser().isAdmin()}">
<td>
<c:if test="${fn:startsWith(log.logUri, 'http')}">
<a href="${log.logUri}" data-original-title="${log.logUri}" target="_blank"
class="tooltips" data-flag="false" data-html="true" data-placement="top">
@@ -312,7 +317,8 @@ $(document).ready(function(){
http://${fn:substring(log.logUri,0,20) }
</a>
</c:if>
</td></c:if>
</td>
</c:if>
<td>${log.level}</td>
<!--0动态黑名单FD1静态配置FD2首次分析命中 -->
<td>

View File

@@ -218,7 +218,7 @@ $(document).ready(function(){
<th class="sort-column url"><spring:message code='access_url'/></th>
<th><spring:message code='stream_media_protocol'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -182,7 +182,7 @@ $(document).ready(function(){
<th class="sort-column hmac"><spring:message code='hmac'/></th>
<th class="sort-column tunnel_type"><spring:message code='tunnel_type'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -222,7 +222,7 @@
<th class="sort-column p2p_file_id"><spring:message code="p2p_file_id"/></th>
<th class="sort-column p2p_keyword"><spring:message code="p2p_keyword"/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -177,7 +177,7 @@
<th class="sort-column tunnel_type"><spring:message code="tunnel_type" /></th>
<th class="sort-column encrypt_mode"><spring:message code="encrypt_mode" /></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -58,7 +58,7 @@
" value="${page.orderBy}" callback="page();" />
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
<%-- <div class="pull-left">
<form:select path="service" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="action"/></form:option>
<c:forEach items="${serviceList}" var="service"
@@ -70,7 +70,7 @@
</c:forEach>
</c:forEach>
</form:select>
</div>
</div> --%>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
@@ -193,7 +193,7 @@
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -184,7 +184,7 @@ $(document).ready(function(){
<th class="sort-column mac"><spring:message code='mac'/></th>
<th class="sort-column tunnel_type"><spring:message code='tunnel_type'/></th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

View File

@@ -236,7 +236,7 @@
<th class="sort-column san">SAN</th>
<th class="sort-column cn">CN</th>
<th class="sort-column cap_ip" isVisible="false"><spring:message code="clj_ip"/></th>
<th class="sort-column trans_proto"><spring:message code="protocol_type"/></th>
<th class="sort-column trans_proto"><spring:message code="transport_layer_protocol"/></th>
<th class="sort-column addr_type"><spring:message code='addr_type'/></th>
<th class="sort-column d_ip"><spring:message code="server_ip"/></th>
<th class="sort-column s_ip"><spring:message code="client_ip"/></th>

Some files were not shown because too many files have changed in this diff Show More