diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/enums/FakeErrorType.java b/backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/FakeErrorType.java similarity index 80% rename from backend/services/project-management/src/main/java/io/metersphere/project/enums/FakeErrorType.java rename to backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/FakeErrorType.java index 6c2dbcbf91..40f5e22cff 100644 --- a/backend/services/project-management/src/main/java/io/metersphere/project/enums/FakeErrorType.java +++ b/backend/framework/sdk/src/main/java/io/metersphere/sdk/constants/FakeErrorType.java @@ -1,4 +1,4 @@ -package io.metersphere.project.enums; +package io.metersphere.sdk.constants; /** * @author: LAN diff --git a/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/SocketMsgDTO.java b/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/SocketMsgDTO.java index 38f8a34933..9defd79d7e 100644 --- a/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/SocketMsgDTO.java +++ b/backend/framework/sdk/src/main/java/io/metersphere/sdk/dto/SocketMsgDTO.java @@ -33,6 +33,6 @@ public class SocketMsgDTO implements Serializable { /** * 结果内容 */ - private String taskResult; + private Object taskResult; } diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/validator/EnumValidator.java b/backend/framework/sdk/src/main/java/io/metersphere/sdk/util/EnumValidator.java similarity index 89% rename from backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/validator/EnumValidator.java rename to backend/framework/sdk/src/main/java/io/metersphere/sdk/util/EnumValidator.java index 4cdb5160f2..3627107425 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/validator/EnumValidator.java +++ b/backend/framework/sdk/src/main/java/io/metersphere/sdk/util/EnumValidator.java @@ -1,6 +1,5 @@ -package io.metersphere.api.parser.jmeter.validator; +package io.metersphere.sdk.util; -import io.metersphere.sdk.util.LogUtils; import org.apache.commons.lang3.StringUtils; public class EnumValidator { diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/ApiParamConfig.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/ApiParamConfig.java index 9be3409efa..156fc0f8fb 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/ApiParamConfig.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/ApiParamConfig.java @@ -5,6 +5,7 @@ import io.metersphere.plugin.api.spi.AbstractMsTestElement; import io.metersphere.project.dto.environment.EnvironmentInfoDTO; import lombok.Data; +import java.util.HashMap; import java.util.Map; /** @@ -26,14 +27,14 @@ public class ApiParamConfig extends ParameterConfig { * key 为 AbstractMsTestElement 实现类对象 * value 为对应的插件 ID */ - private Map, String> testElementClassPluginIdMap; + private Map, String> testElementClassPluginIdMap = HashMap.newHashMap(0); /** * AbstractMsTestElement 实现类与接口协议的映射 * key 为 AbstractMsTestElement 实现类对象 * value 为对应的接口协议 * 环境前后置忽略协议需要使用 */ - private Map, String> testElementClassProtocalMap; + private Map, String> testElementClassProtocalMap = HashMap.newHashMap(0); @Override diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/dto/debug/ApiResourceRunRequest.java b/backend/services/api-test/src/main/java/io/metersphere/api/dto/debug/ApiResourceRunRequest.java index f23e5782f5..65bef76d84 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/dto/debug/ApiResourceRunRequest.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/dto/debug/ApiResourceRunRequest.java @@ -28,10 +28,6 @@ public class ApiResourceRunRequest { * 环境或者环境组ID */ private String environmentId; - /** - * 执行模式 - */ - private String runMode; /** * 资源类型 * @see io.metersphere.api.constants.ApiResourceType diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/AssertionConverter.java b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/AssertionConverter.java index 6007a3876b..414d8077be 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/AssertionConverter.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/AssertionConverter.java @@ -1,7 +1,7 @@ package io.metersphere.api.parser.jmeter.processor.assertion; import io.metersphere.project.api.assertion.MsAssertion; -import io.metersphere.api.parser.jmeter.validator.EnumValidator; +import io.metersphere.sdk.util.EnumValidator; import io.metersphere.plugin.api.dto.ParameterConfig; import io.metersphere.sdk.constants.MsAssertionCondition; import org.apache.commons.lang3.BooleanUtils; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/ResponseHeaderAssertionConverter.java b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/ResponseHeaderAssertionConverter.java index 73e5465bc9..c4e863c76d 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/ResponseHeaderAssertionConverter.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/parser/jmeter/processor/assertion/ResponseHeaderAssertionConverter.java @@ -1,7 +1,7 @@ package io.metersphere.api.parser.jmeter.processor.assertion; import io.metersphere.project.api.assertion.MsResponseHeaderAssertion; -import io.metersphere.api.parser.jmeter.validator.EnumValidator; +import io.metersphere.sdk.util.EnumValidator; import io.metersphere.plugin.api.dto.ParameterConfig; import io.metersphere.sdk.constants.MsAssertionCondition; import org.apache.commons.lang3.BooleanUtils; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiExecuteService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiExecuteService.java index fc3def75ed..2df0569f95 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiExecuteService.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/ApiExecuteService.java @@ -12,7 +12,6 @@ import io.metersphere.plugin.api.dto.ParameterConfig; import io.metersphere.plugin.api.spi.AbstractMsTestElement; import io.metersphere.project.domain.ProjectApplication; import io.metersphere.project.dto.customfunction.request.CustomFunctionRunRequest; -import io.metersphere.project.mapper.ProjectMapper; import io.metersphere.project.service.FileAssociationService; import io.metersphere.project.service.FileManagementService; import io.metersphere.project.service.FileMetadataService; @@ -153,6 +152,9 @@ public class ApiExecuteService { // 设置插件文件信息 taskRequest.setPluginFiles(apiPluginService.getFileInfoByProjectId(projectId)); + ApiRunModeConfigDTO runModeConfig = new ApiRunModeConfigDTO(); + runModeConfig.setRunMode(ApiExecuteRunMode.BACKEND_DEBUG.name()); + taskRequest.setRunModeConfig(runModeConfig); TestResourcePoolReturnDTO testResourcePoolDTO = getGetResourcePoolNodeDTO(projectId); TestResourceNodeDTO testResourceNodeDTO = getProjectExecuteNode(testResourcePoolDTO); @@ -223,9 +225,6 @@ public class ApiExecuteService { taskRequest.setReportId(reportId); taskRequest.setResourceId(testId); taskRequest.setResourceType(ApiExecuteResourceType.API_DEBUG.name()); - ApiRunModeConfigDTO apiRunModeConfig = new ApiRunModeConfigDTO(); - apiRunModeConfig.setRunMode(ApiExecuteRunMode.BACKEND_DEBUG.name()); - taskRequest.setRunModeConfig(apiRunModeConfig); doDebug(reportId, testId, taskRequest, executeScript, runRequest.getProjectId()); return reportId; diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/debug/ApiDebugService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/debug/ApiDebugService.java index da1abf5dd7..0827468a27 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/service/debug/ApiDebugService.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/debug/ApiDebugService.java @@ -16,7 +16,6 @@ import io.metersphere.plugin.api.spi.AbstractMsTestElement; import io.metersphere.project.dto.environment.EnvironmentInfoDTO; import io.metersphere.project.service.EnvironmentService; import io.metersphere.project.service.ProjectService; -import io.metersphere.sdk.constants.ApiExecuteRunMode; import io.metersphere.sdk.constants.DefaultRepositoryDir; import io.metersphere.sdk.exception.MSException; import io.metersphere.sdk.util.BeanUtils; @@ -197,19 +196,20 @@ public class ApiDebugService { public String debug(ApiDebugRunRequest request) { String id = request.getId(); + String reportId = request.getReportId(); ApiResourceRunRequest runRequest = BeanUtils.copyBean(new ApiResourceRunRequest(), request); runRequest.setProjectId(request.getProjectId()); runRequest.setTestId(id); - runRequest.setReportId(id); + runRequest.setReportId(reportId); runRequest.setResourceType(ApiResourceType.API_DEBUG.name()); - runRequest.setRunMode(ApiExecuteRunMode.BACKEND_DEBUG.name()); runRequest.setEnvironmentId(request.getEnvironmentId()); runRequest.setTestElement(ApiDataUtils.parseObject(JSON.toJSONString(request.getRequest()), AbstractMsTestElement.class)); ApiParamConfig paramConfig = new ApiParamConfig(); paramConfig.setTestElementClassPluginIdMap(apiPluginService.getTestElementPluginMap()); - paramConfig.setReportId(request.getReportId()); + paramConfig.setTestElementClassProtocalMap(apiPluginService.getTestElementProtocolMap()); + paramConfig.setReportId(reportId); EnvironmentInfoDTO environmentInfoDTO = environmentService.get(request.getEnvironmentId()); // 设置环境 paramConfig.setEnvConfig(environmentInfoDTO); diff --git a/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java b/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java index 3924c3484f..2b069d9123 100644 --- a/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java +++ b/backend/services/api-test/src/main/java/io/metersphere/api/service/scenario/ApiScenarioService.java @@ -1053,7 +1053,6 @@ public class ApiScenarioService { runRequest.setTestId(request.getId()); runRequest.setReportId(request.getReportId()); runRequest.setResourceType(ApiResourceType.API_SCENARIO.name()); - runRequest.setRunMode(ApiExecuteRunMode.BACKEND_DEBUG.name()); runRequest.setTempFileIds(request.getTempFileIds()); runRequest.setGrouped(request.getGrouped()); runRequest.setEnvironmentId(request.getEnvironmentId()); diff --git a/backend/services/project-management/src/main/java/io/metersphere/project/dto/FakeErrorDTO.java b/backend/services/project-management/src/main/java/io/metersphere/project/dto/FakeErrorDTO.java index 97a42d3537..c3b5e21316 100644 --- a/backend/services/project-management/src/main/java/io/metersphere/project/dto/FakeErrorDTO.java +++ b/backend/services/project-management/src/main/java/io/metersphere/project/dto/FakeErrorDTO.java @@ -1,7 +1,6 @@ package io.metersphere.project.dto; -import io.metersphere.project.enums.FakeErrorType; -import io.metersphere.sdk.constants.TemplateScene; +import io.metersphere.sdk.constants.FakeErrorType; import io.metersphere.system.valid.EnumValue; import io.metersphere.validation.groups.Created; import io.swagger.v3.oas.annotations.media.Schema;