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

fix(系统设置): 修复修改系统参数时会重置mock环境其余配置的问题 

--bug=1012789 --user=宋天阳 【接口测试】mock环境每次使用都会被初始化
https://www.tapd.cn/55049933/s/1152810
This commit is contained in:
song-tianyang 2022-05-05 15:09:33 +08:00 committed by halo-ci-bot[bot]
parent d1703dcea6
commit b2721483d1
1 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
backend/src/main/java/io/metersphere/api/service/ApiTestEnvironmentService.java
View File

@ -255,8 +255,7 @@ public class ApiTestEnvironmentService {
}
if (needUpdate) {
String id = returnModel.getId();
returnModel = this.genHttpApiTestEnvironmentByUrl(project,projectNumber, protocal, name, url);
returnModel.setId(id);
returnModel = this.genHttpApiTestEnvironmentByUrl(id,project,projectNumber, protocal, name, url);
apiTestEnvironmentMapper.updateByPrimaryKeyWithBLOBs(returnModel);
}
return returnModel;
@ -266,12 +265,12 @@ public class ApiTestEnvironmentService {
ProjectService projectService = CommonBeanFactory.getBean(ProjectService.class);
Project project = projectService.getProjectById(projectId);
if(project != null){
return this.genHttpApiTestEnvironmentByUrl(project,projectNumber, protocal, name, baseUrl);
return this.genHttpApiTestEnvironmentByUrl(null,project,projectNumber, protocal, name, baseUrl);
}
return null;
}
private ApiTestEnvironmentWithBLOBs genHttpApiTestEnvironmentByUrl(Project project,String projectNumber, String protocal, String name, String baseUrl) {
private ApiTestEnvironmentWithBLOBs genHttpApiTestEnvironmentByUrl(String envId,Project project,String projectNumber, String protocal, String name, String baseUrl) {
if(project == null){
return null;
}
@ -303,15 +302,6 @@ public class ApiTestEnvironmentService {
}
}
JSONObject commonConfigObj = new JSONObject();
JSONArray commonVariablesArr = new JSONArray();
Map<String, Object> commonMap = new HashMap<>();
commonMap.put("enable", true);
commonVariablesArr.add(commonMap);
commonConfigObj.put("variables", commonVariablesArr);
commonConfigObj.put("enableHost", false);
commonConfigObj.put("hosts", new String[]{});
JSONObject httpConfig = new JSONObject();
httpConfig.put("socket", null);
httpConfig.put("isMock", true);
@ -352,32 +342,50 @@ public class ApiTestEnvironmentService {
httpConfig.put("conditions", httpItemArr);
httpConfig.put("defaultCondition", "NONE");
JSONArray databaseConfigObj = new JSONArray();
JSONObject tcpConfigObj = new JSONObject();
tcpConfigObj.put("classname", "TCPClientImpl");
tcpConfigObj.put("reUseConnection", false);
tcpConfigObj.put("nodelay", false);
tcpConfigObj.put("closeConnection", false);
if(project != null){
ProjectConfig config = projectApplicationService.getSpecificTypeValue(project.getId(), ProjectApplicationType.MOCK_TCP_PORT.name());
Integer mockPort = config.getMockTcpPort();
if(mockPort != null && mockPort != 0){
tcpConfigObj.put("server", tcpSocket);
tcpConfigObj.put("port", mockPort);
}
ApiTestEnvironmentWithBLOBs blobs = null;
if(StringUtils.isNotEmpty(envId)) {
blobs = this.get(envId);
}
if(blobs != null && StringUtils.isNotEmpty(blobs.getConfig())){
JSONObject object = JSONObject.parseObject(blobs.getConfig());
object.put("httpConfig", httpConfig);
blobs.setConfig(object.toString());
}else {
blobs = new ApiTestEnvironmentWithBLOBs();
JSONObject commonConfigObj = new JSONObject();
JSONArray commonVariablesArr = new JSONArray();
Map<String, Object> commonMap = new HashMap<>();
commonMap.put("enable", true);
commonVariablesArr.add(commonMap);
commonConfigObj.put("variables", commonVariablesArr);
commonConfigObj.put("enableHost", false);
commonConfigObj.put("hosts", new String[]{});
JSONObject object = new JSONObject();
object.put("commonConfig", commonConfigObj);
object.put("httpConfig", httpConfig);
object.put("databaseConfigs", databaseConfigObj);
object.put("tcpConfig", tcpConfigObj);
JSONArray databaseConfigObj = new JSONArray();
ApiTestEnvironmentWithBLOBs blobs = new ApiTestEnvironmentWithBLOBs();
JSONObject tcpConfigObj = new JSONObject();
tcpConfigObj.put("classname", "TCPClientImpl");
tcpConfigObj.put("reUseConnection", false);
tcpConfigObj.put("nodelay", false);
tcpConfigObj.put("closeConnection", false);
if(project != null){
ProjectConfig config = projectApplicationService.getSpecificTypeValue(project.getId(), ProjectApplicationType.MOCK_TCP_PORT.name());
Integer mockPort = config.getMockTcpPort();
if(mockPort != null && mockPort != 0){
tcpConfigObj.put("server", tcpSocket);
tcpConfigObj.put("port", mockPort);
}
}
JSONObject object = new JSONObject();
object.put("commonConfig", commonConfigObj);
object.put("httpConfig", httpConfig);
object.put("databaseConfigs", databaseConfigObj);
object.put("tcpConfig", tcpConfigObj);
blobs.setConfig(object.toString());
}
blobs.setProjectId(project.getId());
blobs.setName(name);
blobs.setConfig(object.toString());
return blobs;
}