gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正allow_http2的显示、bypass的自定义域改成null的json

Browse Source
This commit is contained in:
wangwei
2019-06-05 14:37:04 +08:00
parent db7049c041
commit 452e295d8a
4 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/nis/util/SchedulerTaskUtil.java
View File

@@ -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());

2
src/main/java/com/nis/web/service/configuration/ConfigSynchronizationService.java
View File

@@ -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";

3
src/main/java/com/nis/web/service/configuration/InterceptCfgService.java
View File

@@ -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());

32
src/main/webapp/WEB-INF/views/cfg/intercept/interceptForm.jsp
View File

@@ -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">