代理配置导入并下发操作增加自定义域参数.
This commit is contained in:
@@ -2123,6 +2123,22 @@ public abstract class BaseService {
|
|||||||
umap.put("bps_threadshold", _cfg.getBpsThreadshold());
|
umap.put("bps_threadshold", _cfg.getBpsThreadshold());
|
||||||
umap.put("pps_threadshold", _cfg.getPpsThreadshold());
|
umap.put("pps_threadshold", _cfg.getPpsThreadshold());
|
||||||
maatCfg.setUserRegion(new Gson().toJson(umap));
|
maatCfg.setUserRegion(new Gson().toJson(umap));
|
||||||
|
}else if(regionDict.getFunctionId()==200) {// IP Intercept
|
||||||
|
maatCfg.setUserRegion(Constants.USER_REGION_PLACEHOLDER);
|
||||||
|
if(_cfg.getAction().equals(Constants.MONIT_ACTION)) {
|
||||||
|
maatCfg.setUserRegion(Constants.INTERCEPT_IP_MONIT_USER_REGION_KEY+"="+Constants.USER_REGION_PLACEHOLDER);
|
||||||
|
}
|
||||||
|
}else if(regionDict.getFunctionId()==207 || regionDict.getFunctionId()==208 || regionDict.getFunctionId()==209) {// HTTP(s)阻断、重定向、替换
|
||||||
|
String userRegion = Constants.USER_REGION_PLACEHOLDER;
|
||||||
|
if(_cfg.getAction().equals(Constants.REJECT_ACTION)) {// 阻断
|
||||||
|
userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+_cfg.getUserRegion1()+";"+Constants.REDIRECT_CONTENT_KEY+"="+_cfg.getUserRegion2();
|
||||||
|
}else if(_cfg.getAction().equals(48)) {// 重定向
|
||||||
|
userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+_cfg.getUserRegion1()+";"+Constants.REDIRECT_URL_KEY+"="+_cfg.getUserRegion2();;
|
||||||
|
}else if(_cfg.getAction().equals(Constants.REPLACE_ACTION)) {// 替换
|
||||||
|
String substitute = "/"+_cfg.getUserRegion2()+"/"+_cfg.getUserRegion3();
|
||||||
|
userRegion = Constants.REPLACE_ZONE_KEY+"="+_cfg.getUserRegion1()+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute;
|
||||||
|
}
|
||||||
|
maatCfg.setUserRegion(userRegion);
|
||||||
}
|
}
|
||||||
|
|
||||||
configCompileList.add(maatCfg);
|
configCompileList.add(maatCfg);
|
||||||
@@ -2214,6 +2230,25 @@ public abstract class BaseService {
|
|||||||
}
|
}
|
||||||
}else if(regionDict.getDictId()==159) {
|
}else if(regionDict.getDictId()==159) {
|
||||||
maatCfg.setUserRegion(Constants.P2P_HASH_TYPE_USER_REGION_KEY+"="+_cfg.getUserRegion1());
|
maatCfg.setUserRegion(Constants.P2P_HASH_TYPE_USER_REGION_KEY+"="+_cfg.getUserRegion1());
|
||||||
|
}else if(regionDict.getFunctionId()==201) {// Domain Intercept
|
||||||
|
String userRegion = Constants.USERREGION_DOMAIN_ID+"="+_cfg.getCompileId()+";"+Constants.USERREGION_DOMAIN_STR+"="+_cfg.getCfgKeywords();
|
||||||
|
if(_cfg.getAction().equals(Constants.MONIT_ACTION)) {// 监测 需要发keyring_id、拦截强度
|
||||||
|
userRegion = Constants.INTERCEPT_IP_MONIT_USER_REGION_KEY+"=0"+";"+Constants.INTERCEPT_DOMAN_INTENSITY_USER_REGION_KEY+"="+_cfg.getUserRegion5()+";" + userRegion;
|
||||||
|
}else if(_cfg.getAction().equals(Constants.RATELIMIT_ACTION)) {// 限速 需要发Droprate
|
||||||
|
userRegion = Constants.INTERCEPT_IP_RATELIMIT_DROPRATE_USER_REGION_KEY+"="+_cfg.getUserRegion2()+";" + userRegion;
|
||||||
|
}
|
||||||
|
maatCfg.setUserRegion(userRegion);
|
||||||
|
}else if(regionDict.getFunctionId()==207 || regionDict.getFunctionId()==208 || regionDict.getFunctionId()==209) {// HTTP(s)阻断、重定向、替换
|
||||||
|
String userRegion = Constants.USER_REGION_PLACEHOLDER;
|
||||||
|
if(_cfg.getAction().equals(Constants.REJECT_ACTION)) {// 阻断
|
||||||
|
userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+_cfg.getUserRegion1()+";"+Constants.REDIRECT_CONTENT_KEY+"="+_cfg.getUserRegion2();
|
||||||
|
}else if(_cfg.getAction().equals(48)) {// 重定向
|
||||||
|
userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+_cfg.getUserRegion1()+";"+Constants.REDIRECT_URL_KEY+"="+_cfg.getUserRegion2();;
|
||||||
|
}else if(_cfg.getAction().equals(Constants.REPLACE_ACTION)) {// 替换
|
||||||
|
String substitute = "/"+_cfg.getUserRegion2()+"/"+_cfg.getUserRegion3();
|
||||||
|
userRegion = Constants.REPLACE_ZONE_KEY+"="+_cfg.getUserRegion1()+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute;
|
||||||
|
}
|
||||||
|
maatCfg.setUserRegion(userRegion);
|
||||||
}
|
}
|
||||||
configCompileList.add(maatCfg);
|
configCompileList.add(maatCfg);
|
||||||
}
|
}
|
||||||
@@ -2294,6 +2329,17 @@ public abstract class BaseService {
|
|||||||
if(StringUtil.isEmpty(dictValue) || dictValue.equals("默认")){
|
if(StringUtil.isEmpty(dictValue) || dictValue.equals("默认")){
|
||||||
maatCfg.setUserRegion(Constants.HTTP_HEADER_USER_REGION_KEY+"="+cfg.getDistrict());
|
maatCfg.setUserRegion(Constants.HTTP_HEADER_USER_REGION_KEY+"="+cfg.getDistrict());
|
||||||
}
|
}
|
||||||
|
}else if(regionDict.getFunctionId()==207 || regionDict.getFunctionId()==208 || regionDict.getFunctionId()==209) {// HTTP(s)阻断、重定向、替换
|
||||||
|
String userRegion = Constants.USER_REGION_PLACEHOLDER;
|
||||||
|
if(cfg.getAction().equals(Constants.REJECT_ACTION)) {// 阻断
|
||||||
|
userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+cfg.getUserRegion1()+";"+Constants.REDIRECT_CONTENT_KEY+"="+cfg.getUserRegion2();
|
||||||
|
}else if(cfg.getAction().equals(48)) {// 重定向
|
||||||
|
userRegion = Constants.REDIRECT_RESPONSE_CODE_KEY+"="+cfg.getUserRegion1()+";"+Constants.REDIRECT_URL_KEY+"="+cfg.getUserRegion2();;
|
||||||
|
}else if(cfg.getAction().equals(Constants.REPLACE_ACTION)) {// 替换
|
||||||
|
String substitute = "/"+cfg.getUserRegion2()+"/"+cfg.getUserRegion3();
|
||||||
|
userRegion = Constants.REPLACE_ZONE_KEY+"="+cfg.getUserRegion1()+";"+Constants.REPLACE_SUBSTITUTE_KEY+"="+substitute;
|
||||||
|
}
|
||||||
|
maatCfg.setUserRegion(userRegion);
|
||||||
}
|
}
|
||||||
configCompileList.add(maatCfg);
|
configCompileList.add(maatCfg);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user