From 3247d6fc9e0a94db96f0bae5c19e7809e3a58062 Mon Sep 17 00:00:00 2001 From: wangwei Date: Sat, 8 Jun 2019 22:14:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=8B=A6=E6=88=AA=E7=AD=96?= =?UTF-8?q?=E7=95=A5ssl=E7=89=88=E6=9C=AC=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/nis/util/excel/thread/CheckIpFormatThread.java | 2 +- .../java/com/nis/util/excel/thread/CheckStringFormatThread.java | 2 +- src/main/resources/messages/message_en.properties | 2 +- src/main/resources/messages/message_ru.properties | 2 +- src/main/resources/messages/message_zh_CN.properties | 2 +- .../plugins/jquery-validation/1.11.0/jquery.validate.method.js | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java index eedd74745..b84e83f8c 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java @@ -755,7 +755,7 @@ public class CheckIpFormatThread implements Callable{ errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("ssl_ver_max","max SSL version") + " ") + ";"); } - if(minSort>=maxSort) { + if(minSort>maxSort) { errInfo.append(prop.getProperty("min_should_less_than_max","the min SSL version should less than the max SSL version") + ";"); } map.put("min", min); diff --git a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java index 470b7f007..161183124 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java @@ -703,7 +703,7 @@ public class CheckStringFormatThread implements Callable{ errInfo.append(String.format(prop.getProperty("is_incorrect"), prop.getProperty("ssl_ver_max","max SSL version") + " ") + ";"); } - if(minSort>=maxSort) { + if(minSort>maxSort) { errInfo.append(prop.getProperty("min_should_less_than_max","the min SSL version should less than the max SSL version") + ";"); } map.put("min", min); diff --git a/src/main/resources/messages/message_en.properties b/src/main/resources/messages/message_en.properties index f1ae6608b..0590fe196 100644 --- a/src/main/resources/messages/message_en.properties +++ b/src/main/resources/messages/message_en.properties @@ -1548,7 +1548,7 @@ format=Format file_is_used=Policy is used none_profile_tip=Please Choose Profile Info! #---------------------------pxy intercept------------------------------------ -min_should_less_than_max=The min SSL version should less than the max SSL version +min_should_less_than_max=The min SSL version should less than or equal the max SSL version exclusions_ev_cert=Exclusion EV Cert exclusions_cert_transparency=Exclusion Cert Transparency exclusions_client_cert_req=Exclusion Client Cert Request diff --git a/src/main/resources/messages/message_ru.properties b/src/main/resources/messages/message_ru.properties index 20e05a077..a3069e8ea 100644 --- a/src/main/resources/messages/message_ru.properties +++ b/src/main/resources/messages/message_ru.properties @@ -1550,7 +1550,7 @@ format=Format file_is_used=Policy is used none_profile_tip=Please Choose Profile Info! #---------------------------pxy intercept------------------------------------ -min_should_less_than_max=The min SSL version should less than the max SSL version +min_should_less_than_max=The min SSL version should less than or equal the max SSL version exclusions_ev_cert=Exclusion EV Cert exclusions_cert_transparency=Exclusion Cert Transparency exclusions_client_cert_req=Exclusion Client Cert Request diff --git a/src/main/resources/messages/message_zh_CN.properties b/src/main/resources/messages/message_zh_CN.properties index d4b898c4c..8dcae6cbf 100644 --- a/src/main/resources/messages/message_zh_CN.properties +++ b/src/main/resources/messages/message_zh_CN.properties @@ -1548,7 +1548,7 @@ format=\u683c\u5f0f file_is_used=\u7b56\u7565\u88ab\u5f15\u7528 none_profile_tip=\u8bf7\u9009\u62e9\u6587\u4ef6! #---------------------------pxy intercept------------------------------------ -min_should_less_than_max=\u6700\u5c0fSSL\u7248\u672c\u5e94\u5c0f\u4e8e\u6700\u5927SSL\u7248\u672c +min_should_less_than_max=\u6700\u5c0fSSL\u7248\u672c\u5e94\u5c0f\u4e8e\u6216\u7B49\u4E8E\u6700\u5927SSL\u7248\u672c exclusions_ev_cert=\u6392\u9664EV\u8bc1\u4e66 exclusions_cert_transparency=\u6392\u9664\u8bc1\u4e66\u900f\u660e exclusions_client_cert_req=\u6392\u9664\u5ba2\u6237\u7aef\u8bc1\u4e66\u8bf7\u6c42 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 bf7e8a5e2..6611cabeb 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 @@ -885,7 +885,7 @@ jQuery.validator.addMethod("sslVersionCheck",function(value,element) { }else{ max=element,min=$("#min"); } - if($(min).find("option:selected").data("sort")>=$(max).find("option:selected").data("sort")){ + if($(min).find("option:selected").data("sort")>$(max).find("option:selected").data("sort")){ return false; }else{ return true;