1、修改serviceTable.properties:所有maat配置添加 生效范围IP段配置 ;

2、修改maat.xml:,摘要类域配置表名修改;添加ipRange配置项。
3、为ipRange配置添加验证
This commit is contained in:
zhangdongxu
2018-06-08 09:40:59 +08:00
parent 2a2c62b834
commit 92611bff69
3 changed files with 107 additions and 59 deletions

View File

@@ -349,6 +349,50 @@ public class CompileVal {
}
}
}
List<IpRegion> ipClientRangeList = configCompile.getIpClientRangeList();
if (ipClientRangeList != null && ipClientRangeList.size() > 0) {
for (IpRegion ipRegion : ipClientRangeList) {
// if (configCompile.getIsValid() != 0 &&
// !regionGroupIdList.contains(ipRegion.getGroupId())) {
if (!StringUtil.isEmpty(ipRegion.getTableName())&&!type2TableNameIsOk(configCompile.getService(), ipRegion.getTableName())) {
return "配置id为" + configCompile.getCompileId() + "的配置中ipClientRangeList中的regionid为"
+ ipRegion.getRegionId() + "的域配置tableName与编译配置业务类型不一致";
}
if (!isUpdate && (null == ipRegion.getIsValid() || ipRegion.getIsValid() != 1)) {
return "配置id为" + configCompile.getCompileId() + "的配置中ipClientRangeList中的regionid为"
+ ipRegion.getRegionId() + "的域配置在添加时不能为无效";
}
if (isUpdate && (null == ipRegion.getIsValid() || ipRegion.getIsValid() != 0)) {
return "配置id为" + configCompile.getCompileId() + "的配置中ipClientRangeList中的regionid为"
+ ipRegion.getRegionId() + "的域配置在修改时不能为有效";
}
if (groupList.size() > 0 && !groupList.contains(ipRegion.getGroupId())) {
return "配置id为" + configCompile.getCompileId() + "的配置中ipClientRangeList中的regionid为"
+ ipRegion.getRegionId() + "的配置的groupid在配置分组关系中不存在";
}
if (!regionGroupIdList.contains(ipRegion.getGroupId())) {
regionGroupIdList.add(ipRegion.getGroupId());
}
if (!isUpdate && Constants.BASE_VALIDATE) {
String valIpRegion = valIpRegion(ipRegion, compileId);
if (!valIpRegion.equals("ok")) {
return valIpRegion;
}
}
if (!isUpdate && Constants.SERVICE_VALIDATE) {
String serviceIpRegionVal = serviceIpRegionVal(ipRegion, compileId);
if (!serviceIpRegionVal.equals("ok")) {
return serviceIpRegionVal;
}
}
}
}
return CompileJudgeCode.CompileGroupSizeGtZero.getErrorReason();
}