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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
leijun
2018-10-16 09:14:35 +08:00
parent 8c77c1e054 f73cdd0741
commit 35e0446279
11 changed files with 106 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/nis/util/Constants.java
View File

@@ -656,6 +656,7 @@ public final class Constants {
public static String INTERCEPT_IP_MONIT_USER_REGION_KEY=Configurations.getStringProperty("keyring_id", "keyring_id");
public static String INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY=Configurations.getStringProperty("Droprate", "Droprate");
public static String INTERCEPT_IP_RATELIMIT_BANDWITH_USER_REGION_KEY=Configurations.getStringProperty("Bandwidth", "Bandwidth");
public static String INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY=Configurations.getStringProperty("intercept_domain_intensity", "DOMAIN_INTENSITY");
//大屏统计分析查询接口URL
public static final String DASHBOARD_URL = Configurations.getStringProperty("dashboardUrl","dashboardUrl");

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

@@ -365,6 +365,7 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
maatCfg.setUserRegion(userRegion);
}
//域名拦截需要增加域名id和域名字符串自定义配置
if(StringUtil.isEmpty(maatCfg.getUserRegion())
|| maatCfg.getUserRegion().equals(Constants.USER_REGION_PLACEHOLDER)){
if(doaminFlag){
@@ -378,6 +379,18 @@ public class InterceptCfgService extends CrudService<WebsiteCfgDao,CfgIndexInfo>
}
}
//域名拦截需要增加拦截强度自定义域
if(doaminFlag){
if(StringUtil.isEmpty(entity.getUserRegion5()) || maatCfg.getUserRegion().equals(Constants.USER_REGION_PLACEHOLDER)){
userRegion= Constants.INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY+"="+entity.getUserRegion5();
maatCfg.setUserRegion(userRegion);
}else{
userRegion= maatCfg.getUserRegion();
userRegion=userRegion+";"+Constants.INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY+"="+entity.getUserRegion5();
maatCfg.setUserRegion(userRegion);
}
}
configCompileList.add(maatCfg);
maatBean.setConfigCompileList(configCompileList);
maatBean.setAuditTime(entity.getAuditTime());