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

refactor: 解决冲突

This commit is contained in:
chenjianxing 2020-09-17 18:37:38 +08:00
parent e40ce93182 bd42309f73
commit 7b0045d1a7
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,9 +120,18 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
queue.clear();
super.teardownTest(context);
NoticeService noticeService = CommonBeanFactory.getBean(NoticeService.class);
List<Notice> notice = noticeService.queryNotice(testResult.getTestId());
List<Notice> notice = null;
try {
notice = noticeService.queryNotice(testResult.getTestId());
} catch (Exception e) {
e.printStackTrace();
}
MailService mailService = CommonBeanFactory.getBean(MailService.class);
mailService.sendHtml(report.getId(), notice, report.getStatus(), "api");
try {
mailService.sendHtml(report.getId(), notice, report.getStatus(), "api");
} catch (Exception e) {
e.printStackTrace();
}
}
private RequestResult getRequestResult(SampleResult result) {

1
backend/src/main/java/io/metersphere/notice/service/MailService.java
View File

@ -65,6 +65,7 @@ public class MailService {
} else if (type.equals("performance")) {
LoadTestDTO performanceResult = apiAndPerformanceHelper.getPerformance(id);
testName = performanceResult.getName();
status = performanceResult.getStatus();
}
String html1 = "<!DOCTYPE html>\n" +
"<html lang=\"en\">\n" +

2
backend/src/main/java/io/metersphere/performance/service/PerformanceTestService.java
View File

@ -239,7 +239,7 @@ public class PerformanceTestService {
startEngine(loadTest, engine, request.getTriggerMode());
if (request.getTriggerMode().equals("SCHEDULE")) {
List<Notice> notice = noticeService.queryNotice(request.getId());
mailService.sendHtml(engine.getReportId(), notice, "success", "performance");
mailService.sendHtml(engine.getReportId(), notice, "status", "performance");
}
return engine.getReportId();
}

3
frontend/src/business/components/api/test/ApiTestConfig.vue
View File

@ -292,8 +292,7 @@ export default {
});
},
cancel() {
console.log(this.test.toJMX().xml)
// this.$router.push('/api/test/list/all');
this.$router.push('/api/test/list/all');
},
handleCommand(command) {
switch (command) {

3
frontend/src/business/components/common/components/search/search-components.js
View File

@ -107,7 +107,8 @@ export const STATUS = {
options: [
{label: "Saved", value: "Saved"}, {label: "Starting", value: "Starting"},
{label: "Running", value: "Running"}, {label: "Reporting", value: "Reporting"},
{label: "Completed", value: "Completed"}, {label: "Error", value: "Error"}
{label: "Completed", value: "Completed"}, {label: "Error", value: "Error"},
{label: "Success", value: "Success"}
],
props: { // 尾部控件的props，一般为element ui控件的props
multiple: true