From c40a430f04e52ea5f479de979791cc65abf6837b Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Fri, 25 May 2018 16:58:55 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BC=881=EF=BC=89=E7=AB=AF=E5=8F=A3=E9=AA=8C?=
 =?UTF-8?q?=E8=AF=81=E5=8E=BB=E6=8E=89=E6=AD=A3=E5=88=99=E6=AF=94=E8=BE=83?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=20=EF=BC=882=EF=BC=89=E7=99=BD=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95=E8=A1=A8=E5=8D=95=E5=86=85=E5=AE=B9=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp        | 4 ++--
 .../jquery-validation/1.11.0/jquery.validate.method.js        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
index e25e8d887..410f640fc 100644
--- a/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/whitelist/ipForm.jsp
@@ -129,7 +129,7 @@ $(function(){
 							            <label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
 							            <div class="col-md-6">
 							            	 <select name="ipPattern" class="selectpicker show-tick form-control required">
-							                   <option value="1" <c:if test="${_cfg.ipPattern==1}">selected</c:if>><spring:message code="subnet"/></option>
+							                   <option value="1" <c:if test="${_cfg.ipPattern==1}">selected</c:if>><spring:message code="ip_subnet"/></option>
 							                   <option value="2" <c:if test="${_cfg.ipPattern==2}">selected</c:if>><spring:message code="ip_range"/></option>
 							                   <option value="3" <c:if test="${_cfg.ipPattern==3}">selected</c:if>><spring:message code="ip"/></option>
 							                 </select>
@@ -155,7 +155,7 @@ $(function(){
 							            <div class="col-md-6">
 							            	 <select name="portPattern" class="selectpicker show-tick form-control required">
 							                   <option value="1" <c:if test="${_cfg.portPattern==1}">selected</c:if> ><spring:message code="port"/></option>
-							                   <option value="2" <c:if test="${_cfg.portPattern==2}">selected</c:if>><spring:message code="subnet"/></option>
+							                   <option value="2" <c:if test="${_cfg.portPattern==2}">selected</c:if>><spring:message code="port_mask"/></option>
 							                 </select>
 							            </div>
 							            <div for="portPattern"></div>
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 1289ca53b..fb1ce4fe3 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
@@ -264,7 +264,7 @@ jQuery.validator.addMethod("portCheck",function(value, element) {
 		if(typeInt==1){//port 0~65535
 			return this.optional(element)||(/^([0-9]+)$/.test(value) && (RegExp.$1 <=65535 && RegExp.$1 >=0));
 		}else if(typeInt==2){// port -mask 0~65535/0~65535
-			return this.optional(element)||(/^([0-9]+)\/([0-9]+)$/.test(value) && (RegExp.$1 <=65535 && RegExp.$2 <=65535 && RegExp.$1<RegExp.$2));
+			return this.optional(element)||(/^([0-9]+)\/([0-9]+)$/.test(value) && (RegExp.$1 <=65535 && RegExp.$2 <=65535));
 		}
 	}, "请填写正确的端口");
 //ip v4转数字