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

修改URL 和domain类的关键字显示为当前业务

Browse Source 
界面增加带宽的选项
This commit is contained in:
duandongmei
2018-08-29 10:50:40 +08:00
parent a6b6696521
commit 7a5b2dc32a
14 changed files with 149 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,7 +277,13 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
strRegionList=map.get("dstList");
}
}
//域名信息
boolean doaminFlag=false;
String domainUserRegion="";
if(entity.getHttpUrlList()!=null && entity.getHttpUrlList().size()>0){
doaminFlag=true;
domainUserRegion=Constants.USERREGION_DOMAIN_ID+"="+entity.getCompileId();
domainUserRegion=domainUserRegion+";"+Constants.USERREGION_DOMAIN_STR+"="+entity.getHttpUrlList().get(0).getCfgKeywords();
HttpUrlCfg cfg = new HttpUrlCfg();
BeanUtils.copyProperties(entity, cfg, new String[]{"cfgId"});
cfg.setTableName(HttpUrlCfg.getTablename());
@@ -324,9 +330,13 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
}
//限速需要发Droprate=0.001 ，暂不支持Bandwidth=200kbps
if(entity.getAction().equals(Constants.RATELIMIT_ACTION)){
entity.setUserRegion1(StringUtil.isEmpty(entity.getUserRegion1()) ? "":entity.getUserRegion1());
maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+entity.getUserRegion1());
if(entity.getUserRegion1().equals("0")){//丢包率
entity.setUserRegion2(StringUtil.isEmpty(entity.getUserRegion2()) ? "":entity.getUserRegion2());
maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+entity.getUserRegion2());
}else if(entity.getUserRegion1().equals("1")){//带宽
entity.setUserRegion3(StringUtil.isEmpty(entity.getUserRegion3()) ? "":entity.getUserRegion3());
maatCfg.setUserRegion(Constants.INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY+"="+entity.getUserRegion3());
}
}
String userRegion="";
//替换需要发zone
@@ -347,8 +357,17 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
maatCfg.setUserRegion(userRegion);
}
if(StringUtil.isEmpty(maatCfg.getUserRegion())){
maatCfg.setUserRegion(Constants.USER_REGION_PLACEHOLDER);
if(StringUtil.isEmpty(maatCfg.getUserRegion())
|| maatCfg.getUserRegion().equals(Constants.USER_REGION_PLACEHOLDER)){
if(doaminFlag){
maatCfg.setUserRegion(domainUserRegion);
}else{
maatCfg.setUserRegion(Constants.USER_REGION_PLACEHOLDER);
}
}else{
if(doaminFlag){
maatCfg.setUserRegion(maatCfg.getUserRegion()+";"+domainUserRegion);
}
}
configCompileList.add(maatCfg);