test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(环境组): node执行场景使用环境问题 

--bug=1008147 --user=lyh 【接口测试】场景定时任务执行没有使用环境组
https://www.tapd.cn/55049933/s/1073453
This commit is contained in:
shiziyuan9527 2021-11-23 19:07:18 +08:00 committed by shiziyuan9527
parent 7ff11ff950
commit 2c29c35e8a
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/api/service/ApiJmeterFileService.java
View File

@ -85,6 +85,14 @@ public class ApiJmeterFileService {
if (item == null) {
MSException.throwException("未找到执行场景。");
}
String envType = item.getEnvironmentType();
String envJson = item.getEnvironmentJson();
String envGroupId = item.getEnvironmentGroupId();
if (StringUtils.equals(envType, EnvironmentType.JSON.name()) && StringUtils.isNotBlank(envJson)) {
planEnvMap = JSON.parseObject(envJson, Map.class);
} else if (StringUtils.equals(envType, EnvironmentType.GROUP.name()) && StringUtils.isNotBlank(envGroupId)) {
planEnvMap = environmentGroupProjectService.getEnvMap(envGroupId);
}
hashTree = apiAutomationService.generateHashTree(item, reportId, planEnvMap);
}
return zipFilesToByteArray(remoteTestId, hashTree);