gfwleak/galaxy-k18-galaxy-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

测试提交

Browse Source
This commit is contained in:
renkaige
2019-01-10 19:10:09 +06:00
parent 6d9f4e10a2
commit fbce4e8364
6 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/nis/web/controller/restful/MaatTestController.java
View File

@@ -109,7 +109,7 @@ public class MaatTestController {
// }
// }
try {
if (!configRedisService.delMaatConfig(compileMap,false)) {
if (!configRedisService.delMaatConfig(compileMap,false,null)) {
FileUtils.addStrToFile(
sdf.format(new Date()) + "\t" + "error:删除业务类型" + serviceType + "下的maat配置" + configId + "失败\n",
Configurations.getStringProperty("maatTestLogPath", ""), true);

6
src/main/java/com/nis/web/service/restful/ConfigSourcesService.java
View File

@@ -258,7 +258,7 @@ public class ConfigSourcesService extends BaseService {
}
}
logger.info("---------------调用Redis maat配置新增接口---------------------");
configRedisService.saveMaatConfig(configMap);
configRedisService.saveMaatConfig(configMap,new ArrayList<>(commonGroupIdSet));
}
/**
@@ -364,7 +364,7 @@ public class ConfigSourcesService extends BaseService {
compileMap.put(config.getService(), idList);
}
if (isValid == 0) {
List<ConfigGroupRelation> keepGroupIdList = config.getKeepGroupIdList();
List<ConfigGroupRelation> keepGroupIdList = config.getKeepGroupList();
if (keepGroupIdList != null && keepGroupIdList.size() > 0) {
for (ConfigGroupRelation group : keepGroupIdList) {
if (compileGroupMap.containsKey(config.getCompileId())) {
@@ -435,7 +435,7 @@ public class ConfigSourcesService extends BaseService {
throw new RestServiceException("编译配置id为" + config.getCompileId() + "的IsValid字段不能为空",
RestBusinessCode.IsValidIsNull.getValue());
}
if (isValid == 1 && (config.getKeepGroupIdList() != null && config.getKeepGroupIdList().size() > 0)) {
if (isValid == 1 && (config.getKeepGroupList() != null && config.getKeepGroupList().size() > 0)) {
throw new RestServiceException("编译配置id为" + config.getCompileId() + "的配置在将状态改为生效时keepGroupIdList必须为空",
RestBusinessCode.GroupidShouldNull.getValue());
}