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

1:扩展编译,分组,域配置等的关联关系,以支持分组复用

Browse Source 
2:实现为分组复用配置单独添加域配置的功能
3:为单独添加域配置时添加ipClientRangeList(生效范围IP域分组列表)域支持,业务类型37需要该域
This commit is contained in:
RenKaiGe-Office
2018-08-27 09:48:09 +08:00
parent 4391669100
commit a574c207a3
6 changed files with 582 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ import com.nis.domain.restful.StrRegion;
import com.nis.util.Configurations;
import com.nis.util.ExceptionUtil;
import com.nis.util.FileUtils;
import com.nis.util.JsonMapper;
import com.nis.util.ReadCommSourceXmlUtil;
import com.nis.util.ServiceAndRDBIndexReal;
import com.nis.util.StringUtil;
@@ -151,6 +152,8 @@ public class MaatTestController {
for (int i = 0; i < saveCount; i++) {
configCompileList.add(getConfigCompile(ser));
}
String jsonString = JsonMapper.toJsonString(configCompileList);
System.out.println(jsonString);
// 保存测试配置
configSourcesService.saveMaatConfig(thread, start, configCompileList, sb);
for (ConfigCompile configCompile : configCompileList) {
@@ -175,6 +178,8 @@ public class MaatTestController {
for (int i = 0; i < saveCount; i++) {
configCompileList.add(getConfigCompile(service));
}
String jsonString = JsonMapper.toJsonString(configCompileList);
System.out.println(jsonString);
// 保存测试配置
configSourcesService.saveMaatConfig(thread, start, configCompileList, sb);
for (ConfigCompile configCompile : configCompileList) {
@@ -188,7 +193,8 @@ public class MaatTestController {
maatTestServiceimpl.getMaatKeys(configCompileList);
map.put(service, "http://127.0.0.1:8080/galaxy/service/test/cfg/v1/testDelMaat?serviceType="
+ service + "&configId=" + compileIdList.toString().replace("[", "").replace("]", ""));
if(!testDelMaat(compileIdList.toString().replace("[", "").replace("]", ""), service).equals("ok")) {
if (!testDelMaat(compileIdList.toString().replace("[", "").replace("]", ""), service)
.equals("ok")) {
map.put(-4, "del config error");
}
} else {
@@ -594,7 +600,7 @@ public class MaatTestController {
// 验证数据是否在正确
maatTestServiceimpl.getUnMaatKeys(jsonStr, service);
// 删除配置
if(!testDelUnMaat(compileIdList.toString().replace("[", "").replace("]", ""), service).equals("ok")){
if (!testDelUnMaat(compileIdList.toString().replace("[", "").replace("]", ""), service).equals("ok")) {
map.put(-4, "del unmaat error");
}
}