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

app策略，基础协议，加密隧道行为审核userregion调整

Browse Source 
(1)proto_id修改为app_id,配置文件变量名修改为app_id_region
(2)提取变量app_cfg_userregion_splitor，值为&到配置文件，app策略，基础协议，加密隧道行为分隔userregion的分隔符
This commit is contained in:
wangxin
2018-08-06 13:49:01 +08:00
parent 56f4dcb193
commit 9f76db073c
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/nis/web/service/configuration/AppCfgService.java
View File

@@ -471,25 +471,25 @@ public class AppCfgService extends BaseService {
maatCfg.setIsValid(entity.getIsValid());
if(Constants.SPECIFIC_SERVICE_CFG_TYPE_APP.equalsIgnoreCase(configType)) {
//设置APP自定义域
String userRegion = "APP_ID="+entity.getAppCode();
String userRegion = Constants.APP_ID_REGION+"="+entity.getAppCode();
//限速业务需要设置
String actionCode = DictUtils.getDictCode("SERVICE_ACTION", "action_ratelimit");
if(!actionCode.equals("默认")){
if(entity.getAction().equals(Integer.parseInt(actionCode))){
userRegion += Constants.USER_REGION_SPLIT+Constants.RATE_LIMIT_REGION+"="+entity.getRatelimit();
userRegion += Constants.APP_CFG_USERREGION_SPLITOR+Constants.RATE_LIMIT_REGION+"="+entity.getRatelimit();
}
}
if(entity.getBehavCode()!=null) {
userRegion += Constants.USER_REGION_SPLIT+Constants.BEHAV_ID_REGION+"="+entity.getBehavCode();
userRegion += Constants.APP_CFG_USERREGION_SPLITOR+Constants.BEHAV_ID_REGION+"="+entity.getBehavCode();
}
maatCfg.setUserRegion(userRegion);
}else if(Constants.SPECIFIC_SERVICE_CFG_TYPE_BASIC_PROTOCOL.equalsIgnoreCase(configType)) {
String userRegion = Constants.PROTO_ID_REGION+"="+entity.getAppCode();
String userRegion = Constants.APP_ID_REGION+"="+entity.getAppCode();
maatCfg.setUserRegion(userRegion);
}else if(Constants.SPECIFIC_SERVICE_CFG_TYPE_ENCRYPTED_TUNNEL_BEHAVIOR.equalsIgnoreCase(configType)) {
String userRegion = Constants.PROTO_ID_REGION+"="+entity.getAppCode();
String userRegion = Constants.APP_ID_REGION+"="+entity.getAppCode();
if(entity.getBehavCode()!=null) {
userRegion += Constants.USER_REGION_SPLIT+Constants.BEHAV_ID_REGION+"="+entity.getBehavCode();
userRegion += Constants.APP_CFG_USERREGION_SPLITOR+Constants.BEHAV_ID_REGION+"="+entity.getBehavCode();
}
maatCfg.setUserRegion(userRegion);
}