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

修复user_region domain_id,domain_str拼写错误

Browse Source
This commit is contained in:
wangxin
2018-07-20 16:18:22 +08:00
parent 9d496f4415
commit 1ab5aecc0d
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,11 +49,11 @@ public final class Constants {
/**
* 用户自定义域，域名ID
*/
public static final String USERREGION_DOMIAN_ID=Configurations.getStringProperty("userregion_domian_id", "DOMIAN_ID");
public static final String USERREGION_DOMAIN_ID=Configurations.getStringProperty("userregion_domain_id", "DOMAIN_ID");
/**
* 用户自定义域，域名
*/
public static final String USERREGION_DOMIAN_STR=Configurations.getStringProperty("userregion_domian_str", "DOMIAN_STR");
public static final String USERREGION_DOMAIN_STR=Configurations.getStringProperty("userregion_domain_str", "DOMAIN_STR");
/**
* IP限速业务类型
*/

8
src/main/java/com/nis/web/service/configuration/DomainService.java
View File

@@ -228,13 +228,13 @@ public class DomainService extends CrudService<DomainDao,HttpUrlCfg> {
areaIpRegionList=areaMap.get("dstList");
maatCfg.setAreaEffectiveIds(StringUtils.isBlank(cfg.getAreaEffectiveIds())?"0":cfg.getAreaEffectiveIds());
if(cfg.getServiceId().intValue()==Constants.SERVICE_PXY_DOMAIN_INTERCEPT){
String region=Constants.USERREGION_DOMIAN_ID+"="+cfg.getCompileId().intValue()+
Constants.USER_REGION_SPLIT+Constants.USERREGION_DOMIAN_STR+"="+this.keywordsEscape(cfg.getCfgKeywords());
String region=Constants.USERREGION_DOMAIN_ID+"="+cfg.getCompileId().intValue()+
Constants.USER_REGION_SPLIT+Constants.USERREGION_DOMAIN_STR+"="+this.keywordsEscape(cfg.getCfgKeywords());
maatCfg.setUserRegion(region);
}else if(Constants.SERVICE_DOMAIN_RATELIMIT==cfg.getServiceId().intValue()){
String region=Constants.USERREGION_RATE_LIMIT+"="+cfg.getRatelimit()+
Constants.USER_REGION_SPLIT+Constants.USERREGION_DOMIAN_ID+"="+cfg.getCompileId().intValue()+
Constants.USER_REGION_SPLIT+Constants.USERREGION_DOMIAN_STR+"="+this.keywordsEscape(cfg.getCfgKeywords());
Constants.USER_REGION_SPLIT+Constants.USERREGION_DOMAIN_ID+"="+cfg.getCompileId().intValue()+
Constants.USER_REGION_SPLIT+Constants.USERREGION_DOMAIN_STR+"="+this.keywordsEscape(cfg.getCfgKeywords());
maatCfg.setUserRegion(region);
}
maatCfg.setAction(cfg.getAction());

4
src/main/resources/nis.properties
View File

@@ -323,8 +323,8 @@ service_domain_ratelimit=1058
userregion_rate_limit=RATE_LIMIT
userregion_ir_strategy=IR_STRATEGY
userregion_ir_type=IR_TYPE
userregion_domian_id=DOMIAN_ID
userregion_domian_str=DOMIAN_STR
userregion_domian_id=DOMAIN_ID
userregion_domian_str=DOMAIN_STR
userregion_replace_type_key=zone
userregion_replace_req_key_value=http_req_body
userregion_replace_res_key_value=http_res_body