diff --git a/src/main/java/com/nis/util/excel/ExportExcel.java b/src/main/java/com/nis/util/excel/ExportExcel.java index 83660a690..e582331bf 100644 --- a/src/main/java/com/nis/util/excel/ExportExcel.java +++ b/src/main/java/com/nis/util/excel/ExportExcel.java @@ -899,7 +899,7 @@ public class ExportExcel { //allow_http2 if("ssl_ver_allow_http2".equals(headerStr)) { commentStr=""; - defaultValue="1"; + defaultValue="0"; commentStr=msgProp.getProperty("select")+":\n"+commentStr; index++; commentStr+=1+"("+msgProp.getProperty("yes")+")\n"; 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 140963308..eedd74745 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckIpFormatThread.java @@ -720,7 +720,7 @@ public class CheckIpFormatThread implements Callable{ } } if(allowHttp2==null) { - allowHttp2=1; + allowHttp2=0; map.put("allow_http2", allowHttp2); }else { if(allowHttp2!=0&&allowHttp2!=1) { 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 3d837b281..470b7f007 100644 --- a/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java +++ b/src/main/java/com/nis/util/excel/thread/CheckStringFormatThread.java @@ -667,6 +667,17 @@ public class CheckStringFormatThread implements Callable{ map.put("mirror_client", mirrorClient); } } + if(allowHttp2==null) { + allowHttp2=0; + 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)) { @@ -674,18 +685,7 @@ public class CheckStringFormatThread 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 44039b8e8..d722663f2 100644 --- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp +++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp @@ -878,8 +878,8 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col
- checked/> + checked/>