修正allow_http2的显示、bypass的自定义域改成null的json
This commit is contained in:
@@ -254,7 +254,10 @@ public class SchedulerTaskUtil {
|
|||||||
if(entity.getServiceId().equals(656)) {
|
if(entity.getServiceId().equals(656)) {
|
||||||
userRegion = BaseService.setUserRegionOfMantipulateCfg(cfg, userRegion);
|
userRegion = BaseService.setUserRegionOfMantipulateCfg(cfg, userRegion);
|
||||||
}
|
}
|
||||||
|
//Intercept Policy
|
||||||
|
else if(entity.getServiceId().equals(521)) {
|
||||||
|
userRegion="{}";
|
||||||
|
}
|
||||||
for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId
|
for(AsnIpCfg ip:asnIpList){//asn不需要再次获取regionId,groupId
|
||||||
if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应
|
if(ip.getAsnIpGroup().toString().equals(cfg.getUserRegion4())){//根据组号对应
|
||||||
ip.setIsValid(entity.getIsValid());
|
ip.setIsValid(entity.getIsValid());
|
||||||
|
|||||||
@@ -432,6 +432,8 @@ public class ConfigSynchronizationService extends BaseService{
|
|||||||
if(!StringUtil.isEmpty(cfg.getUserRegion1())&&cfg.getUserRegion1().startsWith("{")) {
|
if(!StringUtil.isEmpty(cfg.getUserRegion1())&&cfg.getUserRegion1().startsWith("{")) {
|
||||||
userRegion=cfg.getUserRegion1();
|
userRegion=cfg.getUserRegion1();
|
||||||
}
|
}
|
||||||
|
}else if(entity.getServiceId().equals(521)) {
|
||||||
|
userRegion="{}";
|
||||||
}else{
|
}else{
|
||||||
/*if(regionKey.equals("keyring_id") && StringUtil.isEmpty(value)){
|
/*if(regionKey.equals("keyring_id") && StringUtil.isEmpty(value)){
|
||||||
value = "0";
|
value = "0";
|
||||||
|
|||||||
@@ -476,6 +476,9 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
|
|||||||
//entity.getHttpUrlList().get(0).getCfgKeywords();
|
//entity.getHttpUrlList().get(0).getCfgKeywords();
|
||||||
|
|
||||||
domainUserRegion=domainUserRegion+";"+Constants.USERREGION_DOMAIN_STR+"="+domainStr;
|
domainUserRegion=domainUserRegion+";"+Constants.USERREGION_DOMAIN_STR+"="+domainStr;
|
||||||
|
if(entity.getServiceId().equals(521)) {
|
||||||
|
domainUserRegion="{}";
|
||||||
|
}
|
||||||
HttpUrlCfg cfg = new HttpUrlCfg();
|
HttpUrlCfg cfg = new HttpUrlCfg();
|
||||||
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
|
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
|
||||||
cfg.setTableName(HttpUrlCfg.getTablename());
|
cfg.setTableName(HttpUrlCfg.getTablename());
|
||||||
|
|||||||
@@ -837,20 +837,6 @@ legend{padding:.5em;border:0;width:auto;font-family: "Open Sans", sans-serif;col
|
|||||||
<div for="mirror_client"></div>
|
<div for="mirror_client"></div>
|
||||||
</div>
|
</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="row ssl_version <c:if test="${_cfg.userRegion.ssl_ver.mirror_client eq 1}">hidden</c:if>">
|
||||||
<div class="col-md-6">
|
<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 for="max"></div>
|
||||||
</div>
|
</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>
|
</div>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
<br class="monitAction hidden">
|
<br class="monitAction hidden">
|
||||||
|
|||||||
Reference in New Issue
Block a user