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

fix(场景转性能测试): 场景转性能测试时去除debugSampler 

场景转性能测试时去除debugSampler
This commit is contained in:
song-tianyang 2021-12-21 15:58:31 +08:00 committed by 刘瑞斌
parent 7c8b114af2
commit c96ff48464
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/src/main/java/io/metersphere/api/service/APITestService.java
View File

@ -1,7 +1,6 @@
package io.metersphere.api.service; package io.metersphere.api.service;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.client.utils.StringUtils;
import io.github.ningyu.jmeter.plugin.dubbo.sample.ProviderService; import io.github.ningyu.jmeter.plugin.dubbo.sample.ProviderService;
import io.metersphere.api.dto.*; import io.metersphere.api.dto.*;
import io.metersphere.api.dto.definition.RunDefinitionRequest; import io.metersphere.api.dto.definition.RunDefinitionRequest;
@ -34,6 +33,7 @@ import io.metersphere.job.sechedule.ApiTestJob;
import io.metersphere.service.FileService; import io.metersphere.service.FileService;
import io.metersphere.service.ScheduleService; import io.metersphere.service.ScheduleService;
import io.metersphere.track.service.TestCaseService; import io.metersphere.track.service.TestCaseService;
import org.apache.commons.lang3.StringUtils;
import org.apache.dubbo.common.URL; import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.constants.CommonConstants; import org.apache.dubbo.common.constants.CommonConstants;
import org.apache.jorphan.collections.HashTree; import org.apache.jorphan.collections.HashTree;
@ -504,6 +504,15 @@ public class APITestService {
//HTTPSamplerProxy， 进行附件转化： 1.elementProp里去掉路径； 2。elementProp->filePath获取路径并读出来 //HTTPSamplerProxy， 进行附件转化： 1.elementProp里去掉路径； 2。elementProp->filePath获取路径并读出来
attachmentFilePathList.addAll(this.parseAttachmentFileInfo(element)); attachmentFilePathList.addAll(this.parseAttachmentFileInfo(element));
//查看是否含有RunningDebugSampler,转jmx的时候去掉
List<Element> debugSamplerElementList = element.elements("DebugSampler");
for (Element debugSampler : debugSamplerElementList) {
String testname = debugSampler.attributeValue("testname");
if (StringUtils.equalsAnyIgnoreCase(testname, RunningParamKeys.RUNNING_DEBUG_SAMPLER_NAME)) {
element.remove(debugSampler);
}
}
} }
//如果存在证书文件，也要匹配出来 //如果存在证书文件，也要匹配出来
attachmentFilePathList.addAll(this.parseAttachmentFileInfo(innerHashTreeElement)); attachmentFilePathList.addAll(this.parseAttachmentFileInfo(innerHashTreeElement));

2
backend/src/main/java/io/metersphere/performance/controller/PerformanceTestController.java
View File

@ -198,7 +198,7 @@ public class PerformanceTestController {
byte[] bytes = fileService.loadFileAsBytes(fileOperationRequest.getId()); byte[] bytes = fileService.loadFileAsBytes(fileOperationRequest.getId());
return ResponseEntity.ok() return ResponseEntity.ok()
.contentType(MediaType.parseMediaType("application/octet-stream")) .contentType(MediaType.parseMediaType("application/octet-stream"))
.header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + fileOperationRequest.getName() + "\"") .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"" + fileOperationRequest.getId()+".jmx" + "\"")
.body(bytes); .body(bytes);
} }