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 0abfc35e6..140963308 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java @@ -719,6 +719,17 @@ public class CheckIpFormatThread implements Callable{ map.put("mirror_client", mirrorClient); } } + if(allowHttp2==null) { + allowHttp2=1; + map.put("allow_http2", allowHttp2); + }else { + if(allowHttp2!=0&&allowHttp2!=1) { + errInfo.append(String.format(prop.getProperty("is_incorrect"), + prop.getProperty("ssl_ver_allow_http2","SSL version allow http2") + " ") + ";"); + }else { + map.put("allow_http2", allowHttp2); + } + } if(mirrorClient==0) { int minSort=0,maxSort=0; if(StringUtils.isBlank(min)) { @@ -726,18 +737,7 @@ public class CheckIpFormatThread implements Callable{ } if(StringUtils.isBlank(max)) { max="tls13"; - } - if(allowHttp2==null) { - allowHttp2=1; - map.put("allow_http2", allowHttp2); - }else { - if(allowHttp2!=0&&allowHttp2!=1) { - errInfo.append(String.format(prop.getProperty("is_incorrect"), - prop.getProperty("ssl_ver_allow_http2","SSL version allow http2") + " ") + ";"); - }else { - map.put("allow_http2", allowHttp2); - } - } + } for(SysDataDictionaryItem sslversion: sslversions) { if(sslversion.getItemCode().equals(min)) { minSort=sslversion.getItemSort(); diff --git a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp index 053b387c8..44039b8e8 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp @@ -869,20 +869,20 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col
-
-
-
- -
-
- checked/> -
-
-
+
+
+
+
+ +
+
+ checked/> +
+