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

refactor(接口测试): 增加场景查询环境的日志

This commit is contained in:
wxg0103 2022-12-05 11:54:06 +08:00 committed by wxg0103
parent ad296090be
commit 194fcd1025
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api-test/backend/src/main/java/io/metersphere/api/exec/scenario/ApiScenarioEnvService.java
View File

@ -59,6 +59,7 @@ public class ApiScenarioEnvService {
private BaseEnvironmentService apiTestEnvironmentService; private BaseEnvironmentService apiTestEnvironmentService;
public ScenarioEnv getApiScenarioEnv(String definition) { public ScenarioEnv getApiScenarioEnv(String definition) {
LogUtil.info("开始数据转换 " + System.currentTimeMillis());
ScenarioEnv env = new ScenarioEnv(); ScenarioEnv env = new ScenarioEnv();
if (StringUtils.isEmpty(definition)) { if (StringUtils.isEmpty(definition)) {
return env; return env;
@ -74,6 +75,7 @@ public class ApiScenarioEnvService {
getHashTree(testElement.getHashTree(), env); getHashTree(testElement.getHashTree(), env);
} }
} }
LogUtil.info("数据转换结束 " + System.currentTimeMillis());
return env; return env;
} }
@ -110,12 +112,14 @@ public class ApiScenarioEnvService {
|| StringUtils.equals(testElement.getType(), ElementConstants.TCP_SAMPLER)) { || StringUtils.equals(testElement.getType(), ElementConstants.TCP_SAMPLER)) {
if (StringUtils.isEmpty(testElement.getProjectId())) { if (StringUtils.isEmpty(testElement.getProjectId())) {
if (StringUtils.equals(testElement.getRefType(), CommonConstants.CASE)) { if (StringUtils.equals(testElement.getRefType(), CommonConstants.CASE)) {
LogUtil.info("引用用例查询数据库：");
ApiTestCase testCase = apiTestCaseMapper.selectByPrimaryKey(testElement.getId()); ApiTestCase testCase = apiTestCaseMapper.selectByPrimaryKey(testElement.getId());
if (testCase != null) { if (testCase != null) {
env.getProjectIds().add(testCase.getProjectId()); env.getProjectIds().add(testCase.getProjectId());
env.setFullUrl(false); env.setFullUrl(false);
} }
} else { } else {
LogUtil.info("接口查询数据库");
ApiDefinition apiDefinition = apiDefinitionService.get(testElement.getId()); ApiDefinition apiDefinition = apiDefinitionService.get(testElement.getId());
if (apiDefinition != null) { if (apiDefinition != null) {
env.getProjectIds().add(apiDefinition.getProjectId()); env.getProjectIds().add(apiDefinition.getProjectId());
@ -127,6 +131,7 @@ public class ApiScenarioEnvService {
env.setFullUrl(false); env.setFullUrl(false);
} }
} else if (StringUtils.equals(testElement.getType(), ElementConstants.SCENARIO) && StringUtils.isEmpty(testElement.getProjectId())) { } else if (StringUtils.equals(testElement.getType(), ElementConstants.SCENARIO) && StringUtils.isEmpty(testElement.getProjectId())) {
LogUtil.info("场景查询数据库");
ApiScenarioWithBLOBs apiScenario = apiScenarioMapper.selectByPrimaryKey(testElement.getId()); ApiScenarioWithBLOBs apiScenario = apiScenarioMapper.selectByPrimaryKey(testElement.getId());
if (apiScenario != null) { if (apiScenario != null) {
env.getProjectIds().add(apiScenario.getProjectId()); env.getProjectIds().add(apiScenario.getProjectId());

2
api-test/backend/src/main/java/io/metersphere/controller/scenario/ApiScenarioController.java
View File

@ -12,6 +12,7 @@ import io.metersphere.base.domain.ApiScenarioWithBLOBs;
import io.metersphere.base.domain.Schedule; import io.metersphere.base.domain.Schedule;
import io.metersphere.commons.constants.*; import io.metersphere.commons.constants.*;
import io.metersphere.commons.exception.MSException; import io.metersphere.commons.exception.MSException;
import io.metersphere.commons.utils.LogUtil;
import io.metersphere.commons.utils.PageUtils; import io.metersphere.commons.utils.PageUtils;
import io.metersphere.commons.utils.Pager; import io.metersphere.commons.utils.Pager;
import io.metersphere.commons.utils.WebSocketUtil; import io.metersphere.commons.utils.WebSocketUtil;
@ -185,6 +186,7 @@ public class ApiScenarioController {
@PostMapping("/scenario-env") @PostMapping("/scenario-env")
public ScenarioEnv getScenarioDefinition(@RequestBody ApiScenarioEnvRequest request) { public ScenarioEnv getScenarioDefinition(@RequestBody ApiScenarioEnvRequest request) {
LogUtil.info("获取前台传输 " + System.currentTimeMillis());
return apiAutomationService.getApiScenarioEnv(request.getDefinition()); return apiAutomationService.getApiScenarioEnv(request.getDefinition());
} }