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

fix(接口自动化): 修复数据迁移问题

This commit is contained in:
fit2-zhao 2021-01-22 19:00:36 +08:00
parent 96ae6250be
commit 66473ae258
3 changed files with 14 additions and 2 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/MsScenario.java
View File

@ -60,7 +60,7 @@ public class MsScenario extends MsTestElement {
return;
}
config.setStep(this.name);
config.setStepType("");
config.setEnableCookieShare(enableCookieShare);
if (StringUtils.isNotEmpty(environmentId)) {
ApiTestEnvironmentService environmentService = CommonBeanFactory.getBean(ApiTestEnvironmentService.class);

2
backend/src/main/java/io/metersphere/api/dto/definition/request/ParameterConfig.java
View File

@ -17,6 +17,6 @@ public class ParameterConfig {
// 步骤
private String step;
private final String stepType = "STEP_GROUP";
private String stepType;
}

12
backend/src/main/java/io/metersphere/api/service/HistoricalDataUpgradeService.java
View File

@ -185,6 +185,9 @@ public class HistoricalDataUpgradeService {
CollectionUtils.isNotEmpty(request.getAssertions().getRegex()) || CollectionUtils.isNotEmpty(request.getAssertions().getXpath2()))) {
String assertions = JSON.toJSONString(request.getAssertions());
MsAssertions msAssertions = JSON.parseObject(assertions, MsAssertions.class);
if (StringUtils.isEmpty(msAssertions.getName())) {
msAssertions.setName("Assertions");
}
msAssertions.setType("Assertions");
msAssertions.setIndex(index + "");
msAssertions.setResourceId(UUID.randomUUID().toString());
@ -196,6 +199,9 @@ public class HistoricalDataUpgradeService {
CollectionUtils.isNotEmpty(request.getExtract().getRegex()) || CollectionUtils.isNotEmpty(request.getExtract().getXpath()))) {
String extractJson = JSON.toJSONString(request.getExtract());
MsExtract extract = JSON.parseObject(extractJson, MsExtract.class);
if (StringUtils.isEmpty(extract.getName())) {
extract.setName("Extract");
}
extract.setType("Extract");
extract.setIndex(index + "");
extract.setHashTree(new LinkedList<>());
@ -206,6 +212,9 @@ public class HistoricalDataUpgradeService {
if (request.getJsr223PreProcessor() != null && StringUtils.isNotEmpty(request.getJsr223PreProcessor().getScript())) {
String preJson = JSON.toJSONString(request.getJsr223PreProcessor());
MsJSR223PreProcessor preProcessor = JSON.parseObject(preJson, MsJSR223PreProcessor.class);
if (StringUtils.isEmpty(preProcessor.getName())) {
preProcessor.setName("JSR223PreProcessor");
}
preProcessor.setType("JSR223PreProcessor");
preProcessor.setIndex(index + "");
preProcessor.setHashTree(new LinkedList<>());
@ -216,6 +225,9 @@ public class HistoricalDataUpgradeService {
if (request.getJsr223PostProcessor() != null && StringUtils.isNotEmpty(request.getJsr223PostProcessor().getScript())) {
String preJson = JSON.toJSONString(request.getJsr223PostProcessor());
MsJSR223PostProcessor preProcessor = JSON.parseObject(preJson, MsJSR223PostProcessor.class);
if (StringUtils.isEmpty(preProcessor.getName())) {
preProcessor.setName("JSR223PostProcessor");
}
preProcessor.setType("JSR223PostProcessor");
preProcessor.setIndex(index + "");
preProcessor.setHashTree(new LinkedList<>());