diff --git a/src/main/java/com/nis/util/Constants.java b/src/main/java/com/nis/util/Constants.java index bf018d3c6..4a173c9d8 100644 --- a/src/main/java/com/nis/util/Constants.java +++ b/src/main/java/com/nis/util/Constants.java @@ -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限速业务类型 */ diff --git a/src/main/java/com/nis/web/service/configuration/DomainService.java b/src/main/java/com/nis/web/service/configuration/DomainService.java index eb45dfca2..b76607fbc 100644 --- a/src/main/java/com/nis/web/service/configuration/DomainService.java +++ b/src/main/java/com/nis/web/service/configuration/DomainService.java @@ -228,13 +228,13 @@ public class DomainService extends CrudService { 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()); diff --git a/src/main/resources/nis.properties b/src/main/resources/nis.properties index fee4ee6b0..807920269 100644 --- a/src/main/resources/nis.properties +++ b/src/main/resources/nis.properties @@ -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