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:
wenyann 2020-12-24 13:43:39 +08:00
parent b1d95c8d55
commit 86c84855b8
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/jmeter/APIBackendListenerClient.java
View File

@ -21,7 +21,6 @@ import org.apache.jmeter.protocol.http.sampler.HTTPSampleResult;
import org.apache.jmeter.samplers.SampleResult; import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.visualizers.backend.AbstractBackendListenerClient; import org.apache.jmeter.visualizers.backend.AbstractBackendListenerClient;
import org.apache.jmeter.visualizers.backend.BackendListenerContext; import org.apache.jmeter.visualizers.backend.BackendListenerContext;
import org.python.antlr.ast.Str;
import org.springframework.http.HttpMethod; import org.springframework.http.HttpMethod;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@ -270,6 +269,7 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
paramMap.put("id", report.getId()); paramMap.put("id", report.getId());
paramMap.put("type", "performance"); paramMap.put("type", "performance");
paramMap.put("url", baseSystemConfigDTO.getUrl()); paramMap.put("url", baseSystemConfigDTO.getUrl());
paramMap.put("status", report.getStatus());
NoticeModel noticeModel = NoticeModel.builder() NoticeModel noticeModel = NoticeModel.builder()
.successContext(successContext) .successContext(successContext)
.successMailTemplate("ApiSuccessfulNotification") .successMailTemplate("ApiSuccessfulNotification")

1
backend/src/main/java/io/metersphere/notice/sender/NoticeModel.java
View File

@ -16,7 +16,6 @@ public class NoticeModel {
/** /**
* 保存状态 * 保存状态
*/ */
private String state;
private String status; private String status;
/** /**
* Event * Event

2
backend/src/main/java/io/metersphere/performance/notice/PerformanceNoticeTask.java
View File

@ -87,7 +87,7 @@ public class PerformanceNoticeTask {
paramMap.put("testName", loadTestReport.getName()); paramMap.put("testName", loadTestReport.getName());
paramMap.put("id", loadTestReport.getId()); paramMap.put("id", loadTestReport.getId());
paramMap.put("type", "performance"); paramMap.put("type", "performance");
paramMap.put("state", loadTestReport.getStatus()); paramMap.put("status", loadTestReport.getStatus());
paramMap.put("url", baseSystemConfigDTO.getUrl()); paramMap.put("url", baseSystemConfigDTO.getUrl());
NoticeModel noticeModel = NoticeModel.builder() NoticeModel noticeModel = NoticeModel.builder()
.successContext(successContext) .successContext(successContext)