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

1:解决maat测试程序组装数据的问题

Browse Source 
2:解决取消域配置,某些域配置无法取消的问题
This commit is contained in:
RenKaiGe-Office
2018-09-08 17:53:34 +08:00
parent 4f475ef90b
commit 5a54c3f9c2
2 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -258,11 +258,11 @@ public class MaatTestController {
List<NumRegion> numList = new ArrayList<NumRegion>();
List<StrRegion> strList = new ArrayList<StrRegion>();
List<DigestRegion> digestList = new ArrayList<DigestRegion>();
configCompile.setIpRegionList(ipList);
configCompile.setNumRegionList(numList);
configCompile.setStrRegionList(strList);
configCompile.setDigestRegionList(digestList);
configCompile.setIpClientRangeList(ipList);
// configCompile.setIpRegionList(ipList);
// configCompile.setNumRegionList(numList);
// configCompile.setStrRegionList(strList);
// configCompile.setDigestRegionList(digestList);
// configCompile.setIpClientRangeList(ipList);
if (tableType == 12 || tableType == 18) {
ipList = new ArrayList<IpRegion>();
if (tableNameArr.length == 1) {
@@ -379,7 +379,11 @@ public class MaatTestController {
strRegion.setGroupId(groupId);
strRegion.setRegionId(configRedisService.getIncrId("SEQ_REGIONID"));
strRegion.setTableName(ServiceAndRDBIndexReal.getMaatTableName(service, type, tableName));
strRegion.setDistrict("");
if(type==15) {
strRegion.setDistrict("增强字符串测试groupid"+groupId);
}else {
strRegion.setDistrict("");
}
strRegion.setKeywords("keywords,UUID:" + UUID.randomUUID());
strRegion.setExprType(1);
strRegion.setMatchMethod(1);