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-21 16:53:43 +08:00
parent 4fd5bce705
commit 96caef2f10
1 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ import io.metersphere.api.dto.definition.request.sampler.MsJDBCSampler;
import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler; import io.metersphere.api.dto.definition.request.sampler.MsTCPSampler;
import io.metersphere.api.dto.definition.request.timer.MsConstantTimer; import io.metersphere.api.dto.definition.request.timer.MsConstantTimer;
import io.metersphere.api.dto.scenario.Body; import io.metersphere.api.dto.scenario.Body;
import io.metersphere.api.dto.scenario.KeyValue;
import io.metersphere.api.dto.scenario.Scenario; import io.metersphere.api.dto.scenario.Scenario;
import io.metersphere.api.dto.scenario.environment.EnvironmentConfig; import io.metersphere.api.dto.scenario.environment.EnvironmentConfig;
import io.metersphere.api.dto.scenario.request.*; import io.metersphere.api.dto.scenario.request.*;
@ -108,13 +109,40 @@ public class HistoricalDataUpgradeService {
URL urlObject = new URL(request1.getUrl()); URL urlObject = new URL(request1.getUrl());
String envPath = StringUtils.equals(urlObject.getPath(), "/") ? "" : urlObject.getPath(); String envPath = StringUtils.equals(urlObject.getPath(), "/") ? "" : urlObject.getPath();
request1.setPath(envPath); request1.setPath(envPath);
request1.setUrl(null);
} catch (Exception ex) { } catch (Exception ex) {
LogUtil.error(ex.getMessage()); LogUtil.error(ex.getMessage());
} }
} else {
request1.setUrl(null);
} }
if (request1.getBody() != null && request1.getBody().isOldKV()) { if (request1.getBody() != null) {
request1.getBody().setType(Body.FORM_DATA);
request1.getBody().setBinary(new ArrayList<>()); request1.getBody().setBinary(new ArrayList<>());
if (request1.getBody().isOldKV()) {
request1.getBody().setType(Body.FORM_DATA);
}
if ("json".equals(request1.getBody().getFormat())) {
request1.getBody().setType(Body.JSON);
if (CollectionUtils.isEmpty(request1.getHeaders())) {
List<KeyValue> headers = new LinkedList<>();
headers.add(new KeyValue("Content-Type", "application/json"));
request1.setHeaders(headers);
} else {
boolean isJsonType = false;
for (KeyValue keyValue : request1.getHeaders()) {
if ("Content-Type".equals(keyValue.getName())) {
isJsonType = true;
break;
}
}
if (!isJsonType) {
request1.getHeaders().add(new KeyValue("Content-Type", "application/json"));
}
}
}
if ("xml".equals(request1.getBody().getFormat())) {
request1.getBody().setType(Body.XML);
}
} }
BeanUtils.copyBean(element, request1); BeanUtils.copyBean(element, request1);
((MsHTTPSamplerProxy) element).setProtocol(RequestType.HTTP); ((MsHTTPSamplerProxy) element).setProtocol(RequestType.HTTP);
@ -366,14 +394,16 @@ public class HistoricalDataUpgradeService {
environmentDTOMap = new HashMap<>(); environmentDTOMap = new HashMap<>();
if (CollectionUtils.isNotEmpty(environments)) { if (CollectionUtils.isNotEmpty(environments)) {
environments.forEach(environment -> { environments.forEach(environment -> {
EnvironmentConfig envConfig = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class); if (environment != null && environment.getConfig() != null) {
if (CollectionUtils.isNotEmpty(envConfig.getDatabaseConfigs())) { EnvironmentConfig envConfig = JSONObject.parseObject(environment.getConfig(), EnvironmentConfig.class);
envConfig.getDatabaseConfigs().forEach(item -> { if (CollectionUtils.isNotEmpty(envConfig.getDatabaseConfigs())) {
EnvironmentDTO dto = new EnvironmentDTO(); envConfig.getDatabaseConfigs().forEach(item -> {
dto.setDatabaseConfig(item); EnvironmentDTO dto = new EnvironmentDTO();
dto.setEnvironmentId(environment.getId()); dto.setDatabaseConfig(item);
environmentDTOMap.put(item.getId(), dto); dto.setEnvironmentId(environment.getId());
}); environmentDTOMap.put(item.getId(), dto);
});
}
} }
}); });
} }