diff --git a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
index 6680f57ed..7165ae49f 100644
--- a/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
@@ -22,16 +22,7 @@ $(document).ready(function(){
});
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/manipulation/dkbehaviorLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -86,7 +77,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
index e7004c5a6..0b4103c27 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/appList.jsp
@@ -22,16 +22,7 @@ $(document).ready(function(){
});
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/ntc/ntcAppLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -89,7 +80,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
index f5326804b..4bbcbda6a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ddosList.jsp
@@ -22,16 +22,7 @@ $(document).ready(function(){
});
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/ntc/ntcDdosLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -79,7 +70,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
index cc47256ba..e92d98731 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ftpList.jsp
@@ -22,16 +22,7 @@ $(document).ready(function(){
});
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/ntc/NtcFtpLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -89,7 +80,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
index 311ddd2e1..043108dcf 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/ipsecList.jsp
@@ -20,19 +20,8 @@ $(document).ready(function(){
.attr("value",'');
$("#searchForm")[0].reset();
});
- var a='${log.functionId}';
- console.log(a)
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/ntc/ntcIpsecLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -80,7 +69,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
index b890e0d6a..5df1c25b0 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/l2tpLogList.jsp
@@ -78,7 +78,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
index b57de7520..5261e5792 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvIpList.jsp
@@ -22,16 +22,7 @@ $(document).ready(function(){
});
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/ntc/mmAvIpLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -89,7 +80,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
index 59686c304..a0ef95dce 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmAvUrlList.jsp
@@ -22,16 +22,7 @@ $(document).ready(function(){
});
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/ntc/mmAvUrlLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -89,7 +80,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
index 3b3bca480..4e31d568a 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicIpList.jsp
@@ -22,16 +22,7 @@ $(document).ready(function(){
});
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/ntc/mmPicIpLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -89,7 +80,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
index 252fb004d..c1277c01f 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPicUrlList.jsp
@@ -22,16 +22,7 @@ $(document).ready(function(){
});
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/ntc/mmPicUrlLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -89,7 +80,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
index 21fb1ea52..c6aea6516 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornAudioSampleList.jsp
@@ -22,16 +22,7 @@ $(document).ready(function(){
});
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/ntc/mmSampleAudioLevelLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -89,7 +80,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
index 7d8a00874..f17131eba 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmPornVideoSampleList.jsp
@@ -22,16 +22,7 @@ $(document).ready(function(){
});
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/ntc/mmSampleVideoLevelLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -89,7 +80,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
index 03835a168..c9ff007af 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleAudioList.jsp
@@ -31,16 +31,6 @@
});
});
- //查询
- function page(n, s) {
- $("#intype").attr("name", $("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action", "${ctx}/log/ntc/mmSampleAudioLogs");
- $("#searchForm").submit();
- loading();
- return false;
- }
@@ -113,7 +103,7 @@
-
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
index 50809b592..f53cdbcc3 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVideoList.jsp
@@ -22,16 +22,7 @@ $(document).ready(function(){
});
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/ntc/mmSampleVideoLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -89,7 +80,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
index 98038d70f..c23e271c4 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmSampleVoipList.jsp
@@ -22,16 +22,7 @@ $(document).ready(function(){
});
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/ntc/mmSampleVoipLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -89,7 +80,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
index 459dc3646..d7b9530e1 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipAccountList.jsp
@@ -22,16 +22,7 @@ $(document).ready(function(){
});
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/ntc/mmAvVoipAccountLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -89,7 +80,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
index 1e5440157..1130927a2 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/mmVoipIpList.jsp
@@ -22,16 +22,7 @@ $(document).ready(function(){
});
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/ntc/mmVoipIpLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -89,7 +80,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
index 13d563476..21b13db55 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/openVpnList.jsp
@@ -22,16 +22,7 @@ $(document).ready(function(){
});
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/ntc/ntcOpenvpnLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -89,7 +80,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
index 4b2fde596..a693faa37 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/pptpLogList.jsp
@@ -78,7 +78,7 @@
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
index c34c95146..bbf4d71af 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sshList.jsp
@@ -22,16 +22,7 @@ $(document).ready(function(){
});
});
-//查询
- function page(n,s){
- $("#intype").attr("name",$("#seltype").val());
- $("#pageNo").val(n);
- $("#pageSize").val(s);
- $("#searchForm").attr("action","${ctx}/log/ntc/ntcSshLogs");
- $("#searchForm").submit();
- loading();
- return false;
-}
+
@@ -89,7 +80,7 @@ $(document).ready(function(){
-
+
diff --git a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
index ff8fae1b0..71abdf143 100644
--- a/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
+++ b/src/main/webapp/WEB-INF/views/log/ntc/sslLogList.jsp
@@ -87,7 +87,7 @@
-
+
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
index 861d26785..9cd676f6b 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
@@ -28,6 +28,11 @@ jQuery.validator.addMethod("ip", function(value, element) {
return this.optional(element) || (/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/.test(value) && (RegExp.$1 <256 && RegExp.$2<256 && RegExp.$3<256 && RegExp.$4<256));
}, "请输入合法的IP地址");
+//IPv4 IPv6
+jQuery.validator.addMethod("ipv4v6", function(value, element) {
+ return this.optional(element) || (/^(\d+)\.(\d+)\.(\d+)\.(\d+)$/.test(value) && (RegExp.$1 <256 && RegExp.$2<256 && RegExp.$3<256 && RegExp.$4<256))||/^\s*((([0-9A-Fa-f]{1,4}:){7}(([0-9A-Fa-f]{1,4})|:))|(([0-9A-Fa-f]{1,4}:){6}(:|(:[0-9A-Fa-f]{1,4})))|(([0-9A-Fa-f]{1,4}:){5}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){4}(:[0-9A-Fa-f]{1,4}){0,1}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){3}(:[0-9A-Fa-f]{1,4}){0,2}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:){2}(:[0-9A-Fa-f]{1,4}){0,3}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(([0-9A-Fa-f]{1,4}:)(:[0-9A-Fa-f]{1,4}){0,4}((:?)|((:[0-9A-Fa-f]{1,4}){1,2})))|(:(:[0-9A-Fa-f]{1,4}){0,5}((:)|((:[0-9A-Fa-f]{1,4}){1,2}))))(%.+)?\s*$/.test(value);
+}, "请输入合法的IP地址如IPv4 0.0.0.0或IPv6 ::");
+
jQuery.validator.addMethod("abc",function(value, element) {
return this.optional(element) || /^[a-zA-Z0-9_]*$/.test(value);
},"请输入字母数字或下划线");
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
index d1929e3db..a1032db3b 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
@@ -51,6 +51,7 @@
ipv6: "ipv6",
over6: "4over6",
over4: "6over4",
+ ipv4v6:"Please enter a correct IPv4(0.0.0.0) or IPv6(::)",
all: "all",
ip_subnet: "Subnet",
ip_range: "ip Range",
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
index 2d3fdd8cd..cb9e55d16 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
@@ -45,10 +45,11 @@
isp: "isp",
close_info: "close",
client_ip: "client ip",
- ipv4: "ipv4",
- ipv6: "ipv6",
+ ipv4: "IPv4",
+ ipv6: "IPv6",
over6: "4over6",
over4: "6over4",
+ ipv4v6:"IPv4(0.0.0.0) or IPv6(::)",
all: "all",
ip_subnet: "Subnet",
ip_range: "ip Range",
diff --git a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
index 18857583a..03467cb14 100644
--- a/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
+++ b/src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
@@ -52,6 +52,7 @@
ipv6: "ipv6",
over6: "4over6",
over4: "6over4",
+ ipv4v6:"请输入合法的IP地址如IPv4(0.0.0.0)或IPv6(::)",
all: "全部",
ip_subnet: "Subnet",
ip_subnet: "Subnet",
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 88107c572..edc661290 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -380,6 +380,15 @@ $(function(){
},
"doendDate": {
compareDate: "[name=dobeginDate]"
+ },
+ "capIp":{
+ ipv4v6:true
+ },
+ "sIp":{
+ ipv4v6:true
+ },
+ "dIp":{
+ ipv4v6:true
}
},
submitHandler: function(form){
@@ -389,6 +398,10 @@ $(function(){
});
});
window.onload=function(){
+ //日志查询IP类型增加格式提示
+ $("#searchForm [name='capIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::");
+ $("#searchForm [name='sIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::");
+ $("#searchForm [name='dIp']").attr("placeholder","IPv4 0.0.0.0 or IPv6 ::");
// 动态调整日志页搜索框的样式,防止validate的错误提示导致样式错乱
var igHeight = $("#searchForm").find(".col-md-12").find(".pull-left").find(".input-group").height();
$("#searchForm").find(".col-md-12").find(".pull-left").find(".input-group").bind("DOMNodeInserted",function(e) {
diff --git a/src/main/webapp/static/pages/css/pageLogs.css b/src/main/webapp/static/pages/css/pageLogs.css
index 1eb6d7ab7..620c5c473 100644
--- a/src/main/webapp/static/pages/css/pageLogs.css
+++ b/src/main/webapp/static/pages/css/pageLogs.css
@@ -13,4 +13,8 @@ table.logTb td {
-khtml-text-overflow: ellipsis;
-moz-text-overflow: ellipsis;
-webkit-text-overflow: ellipsis;
-}
\ No newline at end of file
+}
+/*列表标题首字母大写 */
+table thead tr th{
+ text-transform: capitalize;
+}
\ No newline at end of file