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

fix(项目管理): 代码片段禁用本地执行 

【【接口测试】禁用本地执行后，项目设置里的自定义代码片段未使用资源池执行】https://www.tapd.cn/55049933/bugtrace/bugs/view?bug_id=1155049933001026037

Signed-off-by: fit2-zhao <yong.zhao@fit2cloud.com>
This commit is contained in:
fit2-zhao 2023-05-09 12:53:52 +08:00
parent 2ca7638815
commit 32da51121d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api-test/backend/src/main/java/io/metersphere/service/definition/FunctionRunService.java
View File

@ -5,7 +5,6 @@ import io.metersphere.api.dto.definition.request.processors.MsJSR223Processor;
import io.metersphere.api.exec.api.ApiExecuteService; import io.metersphere.api.exec.api.ApiExecuteService;
import io.metersphere.api.jmeter.JMeterService; import io.metersphere.api.jmeter.JMeterService;
import io.metersphere.commons.constants.ApiRunMode; import io.metersphere.commons.constants.ApiRunMode;
import io.metersphere.commons.constants.TriggerMode;
import io.metersphere.commons.exception.MSException; import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.GenerateHashTreeUtil; import io.metersphere.commons.utils.GenerateHashTreeUtil;
import io.metersphere.commons.utils.JSON; import io.metersphere.commons.utils.JSON;
@ -44,7 +43,7 @@ public class FunctionRunService {
try { try {
HashTree hashTree = apiExecuteService.getHashTree(request); HashTree hashTree = apiExecuteService.getHashTree(request);
JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(request.getId(), JmeterRunRequestDTO runRequest = new JmeterRunRequestDTO(request.getId(),
request.getId(), ApiRunMode.DEBUG.name(), TriggerMode.MANUAL.name(), hashTree); request.getId(), ApiRunMode.DEBUG.name(), hashTree);
runRequest.setDebug(true); runRequest.setDebug(true);
if (StringUtils.isNotEmpty(runModeConfigDTO.getResourcePoolId())) { if (StringUtils.isNotEmpty(runModeConfigDTO.getResourcePoolId())) {
runRequest.setPool(GenerateHashTreeUtil.isResourcePool(runModeConfigDTO.getResourcePoolId())); runRequest.setPool(GenerateHashTreeUtil.isResourcePool(runModeConfigDTO.getResourcePoolId()));