gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
develop

Conflicts:
	src/main/resources/messages/message_en.properties
	src/main/resources/messages/message_ru.properties
	src/main/resources/messages/message_zh_CN.properties
	关键字日志转http url配置功能完成
This commit is contained in:
duandongmei
2018-10-29 16:29:23 +08:00
parent 65ba7f2d7a 27575259a8
commit a30d80e64e
98 changed files with 2202 additions and 559 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
View File

@@ -341,7 +341,7 @@ jQuery.validator.addMethod("ipCheck",function(value, element) {
if((startPart0<128&&startPart1<128)||(startPart0>127&&startPart1>127&&startPart0<192&&startPart1<192)
||(startPart0>191&&startPart1>191&&startPart0<224&&startPart1<224)
||(startPart0>223&&startPart1>223&&startPart0<240&&startPart1<240)
||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许C段IP
||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许同段IP
if(ipToNumber(startIp)<=ipToNumber(endIp)){//比较IP大小
if((startIp.split(".")[0]!=endIp.split(".")[0])||
(startIp.split(".")[1]!=endIp.split(".")[1])||
@@ -465,7 +465,7 @@ jQuery.validator.addMethod("ipCheck",function(value, element) {
if((startPart0<128&&startPart1<128)||(startPart0>127&&startPart1>127&&startPart0<192&&startPart1<192)
||(startPart0>191&&startPart1>191&&startPart0<224&&startPart1<224)
||(startPart0>223&&startPart1>223&&startPart0<240&&startPart1<240)
||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许C段IP
||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许同段IP
if(ipToNumber(startIp)<=ipToNumber(endIp)){//比较IP大小
if((startIp.split(".")[0]!=endIp.split(".")[0])||
(startIp.split(".")[1]!=endIp.split(".")[1])||
@@ -636,7 +636,7 @@ jQuery.validator.addMethod("ipCheck",function(value, element) {
if((startPart0<128&&startPart1<128)||(startPart0>127&&startPart1>127&&startPart0<192&&startPart1<192)
||(startPart0>191&&startPart1>191&&startPart0<224&&startPart1<224)
||(startPart0>223&&startPart1>223&&startPart0<240&&startPart1<240)
||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许C段IP
||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许同段IP
if(ipToNumber(startIp)<=ipToNumber(endIp)){//比较IP大小
if((startIp.split(".")[0]!=endIp.split(".")[0])||
(startIp.split(".")[1]!=endIp.split(".")[1])||
@@ -692,7 +692,7 @@ jQuery.validator.addMethod("ipCheck",function(value, element) {
if((startPart0<128&&startPart1<128)||(startPart0>127&&startPart1>127&&startPart0<192&&startPart1<192)
||(startPart0>191&&startPart1>191&&startPart0<224&&startPart1<224)
||(startPart0>223&&startPart1>223&&startPart0<240&&startPart1<240)
||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许C段IP
||(startPart0>239&&startPart1>239&&startPart0<256&&startPart1<256)){//仅允许同段IP
if(ipToNumber(startIp)<=ipToNumber(endIp)){//比较IP大小
if((startIp.split(".")[0]!=endIp.split(".")[0])||
(startIp.split(".")[1]!=endIp.split(".")[1])||

2
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_en.js
View File

@@ -74,7 +74,7 @@
log_1_hour:"Log For The Last Hour",
input:"Please Enter ",
protocolPort:"TCP protocol or UDP protocol must be chosen when port is greater than 0",
protocolPort1:"Only when TCP protocol or UDP protocol is chosen can port greater than 0,ALL protocol has no limit",
protocolPort1:"Only when TCP protocol or UDP protocol is chosen can port greater than 0",
netAddress:"The class C type of IP addresses must has the same network number bit field",
ipUnique:"IP already exists.",
asnNoUnique:"ASN already exists."

2
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_ru.js
View File

@@ -74,7 +74,7 @@
log_1_hour:"Log For The Last Hour",
input:"Please Enter ",
protocolPort:"TCP protocol or UDP protocol must be chosen when port is greater than 0",
protocolPort1:"Only when TCP protocol or UDP protocol is chosen can port greater than 0,ALL protocol has no limit",
protocolPort1:"Only when TCP protocol or UDP protocol is chosen can port greater than 0",
netAddress:"C类IP地址网络位必须相同",
ipUnique:"IP already exists."
});

2
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/localization/messages_zh.js
View File

@@ -74,7 +74,7 @@
log_1_hour:"1小时日志量",
input:"请输入 ",
protocolPort:"端口大于0时必须选择TCP协议或者UDP协议",
protocolPort1:"只有tcp,udp协议端口号可以不为0,全部协议无限制",
protocolPort1:"只有tcp,udp协议端口号可以不为0",
netAddress:"C类IP地址网络位必须相同",
ipUnique:"IP已存在",
asnNoUnique:"ASN号已存在",