From 5f8a9b43fcc4950acec8de304073b0c75b7f71c8 Mon Sep 17 00:00:00 2001
From: wangwei <wangwei@nismail.iie.ac.cn>
Date: Sat, 8 Jun 2019 16:07:20 +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=A5allow=20http2=E5=BC=80=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../excel/thread/CheckIpFormatThread.java     | 24 ++++++++---------
 .../views/cfg/intercept/interceptForm.jsp     | 26 +++++++++----------
 2 files changed, 25 insertions(+), 25 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 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<String>{
 						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<String>{
 					}
 					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
 												<div for="max"></div>
 											</div>
 										</div>
-										<div calss="row">
-											<div class="col-md-6">
-												<div class="form-group">
-													<label class="control-label col-md-3">
-															<spring:message code="allow_http2" />
-													</label>
-													<div class="col-md-6">
-														<div class="bootstrap-switch">
-										            		<input type="checkbox" id="allow_http2" name="allow_http2" class="switch form-control sslVersionCheck" 									            											            		
-										            		value="${_cfg.cfgId eq null?1:_cfg.userRegion.ssl_ver.allow_http2 }"  <c:if test="${_cfg.cfgId eq null or _cfg.userRegion.ssl_ver.allow_http2 eq 1}">checked</c:if>/>
-										            	</div>
-													</div>
-													<div for="allow_http2"></div>
+									</div>
+									<div calss="row">
+										<div class="col-md-6">
+											<div class="form-group">
+												<label class="control-label col-md-3">
+														<spring:message code="allow_http2" />
+												</label>
+												<div class="col-md-6">
+													<div class="bootstrap-switch">
+									            		<input type="checkbox" id="allow_http2" name="allow_http2" class="switch form-control sslVersionCheck" 									            											            		
+									            		value="${_cfg.cfgId eq null?1:_cfg.userRegion.ssl_ver.allow_http2 }"  <c:if test="${_cfg.cfgId eq null or _cfg.userRegion.ssl_ver.allow_http2 eq 1}">checked</c:if>/>									            		
+									            	</div>
 												</div>
+												<div for="allow_http2"></div>
 											</div>
 										</div>
 									</div>