From 452e295d8a3022fb3ddeacbf600b523c4335c07a Mon Sep 17 00:00:00 2001
From: wangwei <wangwei@nismail.iie.ac.cn>
Date: Wed, 5 Jun 2019 14:37:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3allow=5Fhttp2=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E3=80=81bypass=E7=9A=84=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=9F=9F=E6=94=B9=E6=88=90null=E7=9A=84json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/nis/util/SchedulerTaskUtil.java  |  5 ++-
 .../ConfigSynchronizationService.java         |  2 ++
 .../configuration/InterceptCfgService.java    |  3 ++
 .../views/cfg/intercept/interceptForm.jsp     | 32 ++++++++++---------
 4 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/nis/util/SchedulerTaskUtil.java b/src/main/java/com/nis/util/SchedulerTaskUtil.java
index fd465a32e..c134af774 100644
--- a/src/main/java/com/nis/util/SchedulerTaskUtil.java
+++ b/src/main/java/com/nis/util/SchedulerTaskUtil.java
@@ -254,7 +254,10 @@ public class SchedulerTaskUtil {
 								if(entity.getServiceId().equals(656)) {
 									userRegion = BaseService.setUserRegionOfMantipulateCfg(cfg, userRegion);
 								}
-								
+								//Intercept Policy
+								else if(entity.getServiceId().equals(521)) {
+									userRegion="{}";
+								}								
 								for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId
 									if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应
 										ip.setIsValid(entity.getIsValid());
diff --git a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
index f556e24cb..b17b6ca41 100644
--- a/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
+++ b/src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
@@ -432,6 +432,8 @@ public class ConfigSynchronizationService  extends BaseService{
 							if(!StringUtil.isEmpty(cfg.getUserRegion1())&&cfg.getUserRegion1().startsWith("{")) {
 								userRegion=cfg.getUserRegion1();
 							}
+						}else if(entity.getServiceId().equals(521)) {
+							userRegion="{}";
 						}else{
 							/*if(regionKey.equals("keyring_id") && StringUtil.isEmpty(value)){
 								value = "0";
diff --git a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
index dab530ff3..634100aba 100644
--- a/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
@@ -476,6 +476,9 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
 			//entity.getHttpUrlList().get(0).getCfgKeywords();
 			
 			domainUserRegion=domainUserRegion+";"+Constants.USERREGION_DOMAIN_STR+"="+domainStr;
+			if(entity.getServiceId().equals(521)) {
+				domainUserRegion="{}";
+			}
 			HttpUrlCfg cfg = new HttpUrlCfg();
 			BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
 			cfg.setTableName(HttpUrlCfg.getTablename());
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 232d68b5a..053b387c8 100644
--- a/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
@@ -836,21 +836,7 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col
 												</div>
 												<div for="mirror_client"></div>
 											</div>
-										</div>
-										<div class="col-md-6 ssl_version <c:if test="${_cfg.userRegion.ssl_ver.mirror_client eq 1}">hidden</c:if>"">
-											<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>										
 									</div>
 									<div class="row ssl_version <c:if test="${_cfg.userRegion.ssl_ver.mirror_client eq 1}">hidden</c:if>">
 										<div class="col-md-6">
@@ -883,6 +869,22 @@ 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>
+										</div>
 									</div>
 								</fieldset>
 								<br class="monitAction hidden">