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-09-17 16:14:38 +08:00
parent c0a9dc003d
commit 167dd8d0e8
6 changed files with 107 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,16 +3,20 @@ package io.metersphere.api.jmeter;
import io.metersphere.api.service.APIReportService; import io.metersphere.api.service.APIReportService;
import io.metersphere.api.service.APITestService; import io.metersphere.api.service.APITestService;
import io.metersphere.base.domain.ApiTestReport; import io.metersphere.base.domain.ApiTestReport;
import io.metersphere.base.domain.Notice;
import io.metersphere.commons.constants.APITestStatus; import io.metersphere.commons.constants.APITestStatus;
import io.metersphere.commons.constants.ApiRunMode; import io.metersphere.commons.constants.ApiRunMode;
import io.metersphere.commons.utils.CommonBeanFactory; import io.metersphere.commons.utils.CommonBeanFactory;
import io.metersphere.commons.utils.LogUtil; import io.metersphere.commons.utils.LogUtil;
import io.metersphere.notice.service.MailService;
import io.metersphere.notice.service.NoticeService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.assertions.AssertionResult; import org.apache.jmeter.assertions.AssertionResult;
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 javax.annotation.Resource;
import java.io.Serializable; import java.io.Serializable;
import java.util.*; import java.util.*;
@ -113,9 +117,12 @@ public class APIBackendListenerClient extends AbstractBackendListenerClient impl
report = apiReportService.getRunningReport(testResult.getTestId()); report = apiReportService.getRunningReport(testResult.getTestId());
} }
apiReportService.complete(testResult, report); apiReportService.complete(testResult, report);
queue.clear(); queue.clear();
super.teardownTest(context); super.teardownTest(context);
NoticeService noticeService = CommonBeanFactory.getBean(NoticeService.class);
List<Notice> notice = noticeService.queryNotice(testResult.getTestId());
MailService mailService = CommonBeanFactory.getBean(MailService.class);
mailService.sendHtml(report.getId(), notice, report.getStatus(), "api");
} }
private RequestResult getRequestResult(SampleResult result) { private RequestResult getRequestResult(SampleResult result) {

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

@ -223,10 +223,10 @@ public class APITestService {
apiTest.setUserId(request.getUserId()); apiTest.setUserId(request.getUserId());
} }
String reportId = apiReportService.create(apiTest, request.getTriggerMode()); String reportId = apiReportService.create(apiTest, request.getTriggerMode());
if (request.getTriggerMode().equals("SCHEDULE")) { /*if (request.getTriggerMode().equals("SCHEDULE")) {
List<Notice> notice = noticeService.queryNotice(request.getId()); List<Notice> notice = noticeService.queryNotice(request.getId());
mailService.sendHtml(reportId,notice,"api"); mailService.sendHtml(reportId,notice,"api");
} }*/
changeStatus(request.getId(), APITestStatus.Running); changeStatus(request.getId(), APITestStatus.Running);
jMeterService.run(request.getId(), null, is); jMeterService.run(request.getId(), null, is);
return reportId; return reportId;

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

@ -9,6 +9,7 @@ import io.metersphere.commons.utils.LogUtil;
import io.metersphere.dto.LoadTestDTO; import io.metersphere.dto.LoadTestDTO;
import io.metersphere.service.SystemParameterService; import io.metersphere.service.SystemParameterService;
import io.metersphere.service.UserService; import io.metersphere.service.UserService;
import org.springframework.mail.MailException;
import org.springframework.mail.javamail.JavaMailSenderImpl; import org.springframework.mail.javamail.JavaMailSenderImpl;
import org.springframework.mail.javamail.MimeMessageHelper; import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -30,22 +31,22 @@ public class MailService {
@Resource @Resource
private SystemParameterService systemParameterService; private SystemParameterService systemParameterService;
public void sendHtml(String id, List<Notice> notice,String type) { public void sendHtml(String id, List<Notice> notice, String status, String type) {
JavaMailSenderImpl javaMailSender = new JavaMailSenderImpl(); JavaMailSenderImpl javaMailSender = new JavaMailSenderImpl();
List<SystemParameter> paramList=systemParameterService.getParamList(ParamConstants.Classify.MAIL.getValue()); List<SystemParameter> paramList = systemParameterService.getParamList(ParamConstants.Classify.MAIL.getValue());
javaMailSender.setDefaultEncoding("UTF-8"); javaMailSender.setDefaultEncoding("UTF-8");
javaMailSender.setProtocol("smtps"); javaMailSender.setProtocol("smtps");
for(SystemParameter p:paramList){ for (SystemParameter p : paramList) {
if(p.getParamKey().equals("smtp.host")){ if (p.getParamKey().equals("smtp.host")) {
javaMailSender.setHost(p.getParamValue()); javaMailSender.setHost(p.getParamValue());
} }
if(p.getParamKey().equals("smtp.port")){ if (p.getParamKey().equals("smtp.port")) {
javaMailSender.setPort(Integer.parseInt(p.getParamValue())); javaMailSender.setPort(Integer.parseInt(p.getParamValue()));
} }
if(p.getParamKey().equals("smtp.account")){ if (p.getParamKey().equals("smtp.account")) {
javaMailSender.setUsername(p.getParamValue()); javaMailSender.setUsername(p.getParamValue());
} }
if(p.getParamKey().equals("smtp.password")){ if (p.getParamKey().equals("smtp.password")) {
javaMailSender.setPassword(EncryptUtils.aesDecrypt(p.getParamValue()).toString()); javaMailSender.setPassword(EncryptUtils.aesDecrypt(p.getParamValue()).toString());
} }
} }
@ -58,15 +59,12 @@ public class MailService {
javaMailSender.setJavaMailProperties(props); javaMailSender.setJavaMailProperties(props);
MimeMessage mimeMessage = javaMailSender.createMimeMessage(); MimeMessage mimeMessage = javaMailSender.createMimeMessage();
String testName = ""; String testName = "";
String state = "";
if (type.equals("api")) { if (type.equals("api")) {
APIReportResult reportResult = apiAndPerformanceHelper.getApi(id); APIReportResult reportResult = apiAndPerformanceHelper.getApi(id);
testName = reportResult.getTestName(); testName = reportResult.getTestName();
state = reportResult.getStatus();
} else if (type.equals("performance")) { } else if (type.equals("performance")) {
LoadTestDTO performanceResult = apiAndPerformanceHelper.getPerformance(id); LoadTestDTO performanceResult = apiAndPerformanceHelper.getPerformance(id);
testName = performanceResult.getName(); testName = performanceResult.getName();
state = performanceResult.getStatus();
} }
String html1 = "<!DOCTYPE html>\n" + String html1 = "<!DOCTYPE html>\n" +
"<html lang=\"en\">\n" + "<html lang=\"en\">\n" +
@ -76,12 +74,12 @@ public class MailService {
"</head>\n" + "</head>\n" +
"<body style=\"text-align: left\">\n" + "<body style=\"text-align: left\">\n" +
" <div>\n" + " <div>\n" +
" <h3>"+type+"定时任务结果通知</h3>\n" + " <h3>" + type + "定时任务结果通知</h3>\n" +
" <p> 尊敬的用户：您好，您所执行的"+testName+"运行失败，请点击报告链接查看</p>\n" + " <p> 尊敬的用户：您好，您所执行的" + testName + "运行失败，请点击报告链接查看</p>\n" +
" </div>\n" + " </div>\n" +
"</body>\n" + "</body>\n" +
"</html>"; "</html>";
String html2="<!DOCTYPE html>\n" + String html2 = "<!DOCTYPE html>\n" +
"<html lang=\"en\">\n" + "<html lang=\"en\">\n" +
"<head>\n" + "<head>\n" +
" <meta charset=\"UTF-8\">\n" + " <meta charset=\"UTF-8\">\n" +
@ -89,8 +87,8 @@ public class MailService {
"</head>\n" + "</head>\n" +
"<body style=\"text-align: left\">\n" + "<body style=\"text-align: left\">\n" +
" <div>\n" + " <div>\n" +
" <h3>"+type+"定时任务结果通知</h3>\n" + " <h3>" + type + "定时任务结果通知</h3>\n" +
" <p> 尊敬的用户：您好，"+testName+"运行成功，请点击报告链接查看</p>\n" + " <p> 尊敬的用户：您好，" + testName + "运行成功，请点击报告链接查看</p>\n" +
" </div>\n" + " </div>\n" +
"</body>\n" + "</body>\n" +
"</html>"; "</html>";
@ -99,36 +97,40 @@ public class MailService {
helper.setFrom(javaMailSender.getUsername()); helper.setFrom(javaMailSender.getUsername());
helper.setSubject("MeterSphere定时任务结果通知"); helper.setSubject("MeterSphere定时任务结果通知");
String users[] = {}; String users[] = {};
List<String> successEmailList=new ArrayList<>(); List<String> successEmailList = new ArrayList<>();
List<String> failEmailList=new ArrayList<>(); List<String> failEmailList = new ArrayList<>();
if(notice.size()>0){ if (notice.size() > 0) {
for(Notice n:notice){ for (Notice n : notice) {
if (n.getEnable().equals("true")&&n.getEvent().equals("执行成功")) { if (n.getEnable().equals("true") && n.getEvent().equals("执行成功")) {
successEmailList=userService.queryEmail(n.getNames()); successEmailList = userService.queryEmail(n.getNames());
} }
if (n.getEnable().equals("true")&&n.getEvent().equals("执行失败")) { if (n.getEnable().equals("true") && n.getEvent().equals("执行失败")) {
failEmailList=userService.queryEmail(n.getNames()); failEmailList = userService.queryEmail(n.getNames());
} }
} }
}else{ } else {
LogUtil.error("Recipient information is empty"); LogUtil.error("Recipient information is empty");
} }
if(state.equals("success")){ if (status.equals("Success")) {
users=successEmailList.toArray(new String[successEmailList.size()]); users = successEmailList.toArray(new String[successEmailList.size()]);
helper.setText(html2,true); helper.setText(html2, true);
}else{ } else {
users=failEmailList.toArray(new String[failEmailList.size()]); users = failEmailList.toArray(new String[failEmailList.size()]);
helper.setText(html1,true); helper.setText(html1, true);
} }
helper.setTo(users); helper.setTo(users);
javaMailSender.send(mimeMessage);
} catch (MessagingException e) { } catch (MessagingException e) {
e.printStackTrace(); e.printStackTrace();
} }
try {
javaMailSender.send(mimeMessage);
} catch (MailException e) {
e.printStackTrace();
}
} }

70
backend/src/main/java/io/metersphere/notice/service/NoticeService.java
View File

@ -16,53 +16,77 @@ import java.util.List;
public class NoticeService { public class NoticeService {
@Resource @Resource
private NoticeMapper noticeMapper; private NoticeMapper noticeMapper;
public void saveNotice(NoticeRequest noticeRequest) { public void saveNotice(NoticeRequest noticeRequest) {
Notice notice = new Notice();
NoticeExample example = new NoticeExample(); NoticeExample example = new NoticeExample();
example.createCriteria().andTestIdEqualTo(noticeRequest.getTestId()); example.createCriteria().andTestIdEqualTo(noticeRequest.getTestId());
List<Notice> notices = noticeMapper.selectByExample(example); List<Notice> notices = noticeMapper.selectByExample(example);
if (notices != null) { if (notices.size() > 0) {
noticeMapper.deleteByExample(example); noticeMapper.deleteByExample(example);
noticeRequest.getNotices().forEach(notice -> { noticeRequest.getNotices().forEach(n -> {
for(String x:notice.getNames()){ if (n.getNames().length > 0) {
notice.setEvent(notice.getEvent()); for (String x : n.getNames()) {
notice.setEmail(notice.getEmail()); notice.setEvent(n.getEvent());
notice.setEnable(notice.getEnable()); notice.setEmail(n.getEmail());
notice.setEnable(n.getEnable());
notice.setTestId(noticeRequest.getTestId()); notice.setTestId(noticeRequest.getTestId());
notice.setName(x); notice.setName(x);
noticeMapper.insert(notice); noticeMapper.insert(notice);
} }
} else {
notice.setEvent(n.getEvent());
notice.setEmail(n.getEmail());
notice.setEnable(n.getEnable());
notice.setTestId(noticeRequest.getTestId());
notice.setName("");
noticeMapper.insert(notice);
}
}); });
} else { } else {
noticeRequest.getNotices().forEach(notice -> { noticeRequest.getNotices().forEach(n -> {
notice.setEvent(noticeRequest.getEvent()); if (n.getNames().length > 0) {
for (String x : n.getNames()) {
notice.setEvent(n.getEvent());
notice.setEmail(n.getEmail());
notice.setEnable(n.getEnable());
notice.setTestId(noticeRequest.getTestId()); notice.setTestId(noticeRequest.getTestId());
notice.setName(x);
noticeMapper.insert(notice); noticeMapper.insert(notice);
}
} else {
notice.setEvent(n.getEvent());
notice.setEmail(n.getEmail());
notice.setEnable(n.getEnable());
notice.setTestId(noticeRequest.getTestId());
notice.setName("");
noticeMapper.insert(notice);
}
}); });
} }
} }
public List<Notice> queryNotice(String id) { public List<Notice> queryNotice(String id) {
NoticeExample example = new NoticeExample(); NoticeExample example = new NoticeExample();
example.createCriteria().andTestIdEqualTo(id); example.createCriteria().andTestIdEqualTo(id);
List<Notice> notices=noticeMapper.selectByExample(example); List<Notice> notices = noticeMapper.selectByExample(example);
List<Notice> notice=new ArrayList<>(); List<Notice> notice = new ArrayList<>();
List<String> success=new ArrayList<>(); List<String> success = new ArrayList<>();
List<String> fail=new ArrayList<>(); List<String> fail = new ArrayList<>();
String[] successArray=new String[success.size()]; String[] successArray = new String[success.size()];
String[] failArray=new String[fail.size()]; String[] failArray = new String[fail.size()];
Notice notice1=new Notice(); Notice notice1 = new Notice();
Notice notice2=new Notice(); Notice notice2 = new Notice();
if(notices.size()>0){ if (notices.size() > 0) {
for(Notice n:notices){ for (Notice n : notices) {
if(n.getEvent().equals("执行成功")){ if (n.getEvent().equals("执行成功")) {
success.add(n.getName()); success.add(n.getName());
notice1.setEnable(n.getEnable()); notice1.setEnable(n.getEnable());
notice1.setTestId(id); notice1.setTestId(id);
notice1.setEvent(n.getEvent()); notice1.setEvent(n.getEvent());
notice1.setEmail(n.getEmail()); notice1.setEmail(n.getEmail());
} }
if(n.getEvent().equals("执行失败")){ if (n.getEvent().equals("执行失败")) {
fail.add(n.getName()); fail.add(n.getName());
notice2.setEnable(n.getEnable()); notice2.setEnable(n.getEnable());
notice2.setTestId(id); notice2.setTestId(id);
@ -70,8 +94,8 @@ public class NoticeService {
notice2.setEmail(n.getEmail()); notice2.setEmail(n.getEmail());
} }
} }
successArray=success.toArray(new String[success.size()]); successArray = success.toArray(new String[success.size()]);
failArray=fail.toArray(new String[fail.size()]); failArray = fail.toArray(new String[fail.size()]);
notice1.setNames(successArray); notice1.setNames(successArray);
notice2.setNames(failArray); notice2.setNames(failArray);
notice.add(notice1); notice.add(notice1);

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()); startEngine(loadTest, engine, request.getTriggerMode());
if (request.getTriggerMode().equals("SCHEDULE")) { if (request.getTriggerMode().equals("SCHEDULE")) {
List<Notice> notice = noticeService.queryNotice(request.getId()); List<Notice> notice = noticeService.queryNotice(request.getId());
mailService.sendHtml(engine.getReportId(),notice,"performance"); mailService.sendHtml(engine.getReportId(), notice, "success", "performance");
} }
return engine.getReportId(); return engine.getReportId();
} }

5
frontend/src/business/components/common/components/MsScheduleEdit.vue
View File

@ -71,6 +71,7 @@
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<el-button type="primary" @click="saveNotice">{{$t('commons.save')}}</el-button>
</template> </template>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
@ -206,9 +207,11 @@
return false; return false;
} }
}); });
},
saveNotice(){
let param = this.buildParam(); let param = this.buildParam();
this.result = this.$post("notice/save", param, () => { this.result = this.$post("notice/save", param, () => {
this.$success(this.$t('commons.save_success'));
}) })
}, },
close() { close() {