(1)端口验证修改,端口必须为数字,不再限制大小小于65535,同时加入限制,非0数字不能以0开头

(2)Maat相关bean加入@Expose注解
This commit is contained in:
wangxin
2018-05-28 17:05:35 +08:00
parent da189660d8
commit 9cd93c1d6e
7 changed files with 109 additions and 29 deletions

View File

@@ -272,14 +272,14 @@ jQuery.validator.addMethod("portCheck",function(value, element) {
typeInt=$(element).parents(".row").find("select[name$='portPattern']").val();
}
if(typeInt==1){//port 0~65535
if(this.optional(element)||(/^([0-9]+)$/.test(value) && (RegExp.$1 <=65535 && RegExp.$1 >=0))){
if(this.optional(element)||(/^(0|[1-9]+)$/.test(value))){
return true;
}else{
$.validator.messages.portCheck=$.validator.messages.portRange
return false;
}
}else if(typeInt==2){// port -mask 0~65535/0~65535
if(this.optional(element)||(/^([0-9]+)\/([0-9]+)$/.test(value) && (RegExp.$1 <=65535 && RegExp.$2 <=65535))){
if(this.optional(element)||(/^(0|[1-9]+)\/(0|[1-9]{1,5})$/.test(value) && RegExp.$2 <=65535)){
return true;
}else{
$.validator.messages.portCheck=$.validator.messages.portMaskRange

View File

@@ -29,7 +29,7 @@
ipRange1:"start IP should smaller than end IP",
portCheck:"Please enter a correct port",
notStartZero:"Please enter a valid Integer",
portRange:"Port must between 0 and 65535",
portMaskRange:"Port and mask must between 0 and 65535.The right pattern is \"port/mask\"."
portRange:"Please enter a valid Integer",
portMaskRange:"Port must be a valid Integer and mask must between 0 and 65535.The correct pattern is \"port/mask\"."
});
}(jQuery));

View File

@@ -22,6 +22,12 @@
max: $.validator.format("Пожалуйста, введите число, меньшее или равное {0}."),
min: $.validator.format("Пожалуйста, введите число, большее или равное {0}."),
ipCheck: $.validator.format(" Пожалуйста, введите  правильный  IP - адрес."),
portCheck: $.validator.format(" Пожалуйста, введите  правильный  порт.")
ipMask:"Please enter a correct IP/mask",
ipMaskRange:"IP mask must between 0 and 32",
ipRange:"Wrong IP format or start IP and end IP in two subnet",
ipRange1:"start IP should smaller than end IP",
portCheck: " Пожалуйста, введите  правильный  порт.",
portRange:"Please enter a valid Integer",
portMaskRange:"Port must be a valid Integer and mask must between 0 and 65535.The correct pattern is \"port/mask\"."
});
}(jQuery));

View File

@@ -30,7 +30,7 @@
ipMaskRange:"掩码范围0到32",
ipRange:"IP范围格式错误或者起始IP与结束IP不在同一网段",
ipRange1:"起始IP值应小于结束IP值",
portRange:"端口范围0 到 65535",
portMaskRange:"端口和掩码均为0-65535格式为\"端口/掩码\""
portRange:"端口必须为整数非0数字不能以0开头",
portMaskRange:"端口必须为整数掩码范围0-65535非0数字不能以0开头。格式为\"端口/掩码\"",
});
}(jQuery));