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=1016665 --user=王孝刚 【测试跟踪】github#17752，接口带后置脚本，使用local资源池执行报错
https://www.tapd.cn/55049933/s/1241176
This commit is contained in:
wxg0103 2022-09-09 13:31:54 +08:00 committed by f2c-ci-robot[bot]
parent 6f25bbb90d
commit aa25c4817a
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/dto/definition/request/processors/post/MsJSR223PostProcessor.java
View File

@ -6,7 +6,6 @@ import io.metersphere.api.dto.RunningParamKeys;
import io.metersphere.api.dto.definition.request.ParameterConfig; import io.metersphere.api.dto.definition.request.ParameterConfig;
import io.metersphere.api.dto.scenario.environment.EnvironmentConfig; import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
import io.metersphere.api.dto.shell.filter.ScriptFilter; import io.metersphere.api.dto.shell.filter.ScriptFilter;
import io.metersphere.commons.utils.SessionUtils;
import io.metersphere.plugin.core.MsParameter; import io.metersphere.plugin.core.MsParameter;
import io.metersphere.plugin.core.MsTestElement; import io.metersphere.plugin.core.MsTestElement;
import lombok.Data; import lombok.Data;
@ -88,7 +87,6 @@ public class MsJSR223PostProcessor extends MsTestElement {
processor.setProperty("scriptLanguage", "rhino"); processor.setProperty("scriptLanguage", "rhino");
} }
processor.setProperty("script", this.getScript()); processor.setProperty("script", this.getScript());
processor.setProperty("projectId", StringUtils.isNotEmpty(this.getProjectId()) ? this.getProjectId() : SessionUtils.getCurrentProjectId());
final HashTree jsr223PostTree = tree.add(processor); final HashTree jsr223PostTree = tree.add(processor);
if (CollectionUtils.isNotEmpty(hashTree)) { if (CollectionUtils.isNotEmpty(hashTree)) {
hashTree.forEach(el -> { hashTree.forEach(el -> {

2
backend/src/main/java/io/metersphere/api/service/ApiExecutionQueueService.java
View File

@ -157,7 +157,7 @@ public class ApiExecutionQueueService {
queue.setRetryEnable(config.isRetryEnable()); queue.setRetryEnable(config.isRetryEnable());
queue.setRetryNumber(config.getRetryNum()); queue.setRetryNumber(config.getRetryNum());
queue.setProjectIds(JSON.toJSONString(new ArrayList<>() {{ queue.setProjectIds(JSON.toJSONString(new ArrayList<>() {{
runMap.get(k).getProjectId(); this.add(runMap.get(k).getProjectId());
}})); }}));
queueDetails.add(queue); queueDetails.add(queue);
detailMap.put(k, queue.getId()); detailMap.put(k, queue.getId());