Merge branch 'master' of https://github.com/metersphere/metersphere into master

2020-09-24 17:18:01 +08:00 · 2020-09-24 17:18:01 +08:00 · 6ff237baa7
parent 5d17ed6348 6811ac187a
commit 6ff237baa7
7 changed files with 161 additions and 142 deletions
--- a/backend/src/main/java/io/metersphere/notice/service/MailService.java
+++ b/backend/src/main/java/io/metersphere/notice/service/MailService.java
@ -13,20 +13,19 @@ import io.metersphere.service.SystemParameterService;
 import io.metersphere.service.UserService;
 import io.metersphere.track.request.testreview.SaveCommentRequest;
 import io.metersphere.track.request.testreview.SaveTestCaseReviewRequest;
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.io.IOUtils;
+import org.flywaydb.core.internal.util.StringUtils;
 import org.springframework.mail.MailException;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import org.springframework.mail.javamail.MimeMessageHelper;
 import org.springframework.stereotype.Service;

-
 import javax.annotation.Resource;
-import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
+import java.nio.charset.StandardCharsets;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Properties;
+import java.util.*;

@Service
 public class MailService {
@ -38,31 +37,7 @@ public class MailService {
    private SystemParameterService systemParameterService;

    public void sendHtml(String id, List<Notice> notice, String status, String type) {
-        JavaMailSenderImpl javaMailSender = new JavaMailSenderImpl();
-        List<SystemParameter> paramList = systemParameterService.getParamList(ParamConstants.Classify.MAIL.getValue());
-        javaMailSender.setDefaultEncoding("UTF-8");
-        javaMailSender.setProtocol("smtps");
-        for (SystemParameter p : paramList) {
-            if (p.getParamKey().equals("smtp.host")) {
-                javaMailSender.setHost(p.getParamValue());
-            }
-            if (p.getParamKey().equals("smtp.port")) {
-                javaMailSender.setPort(Integer.parseInt(p.getParamValue()));
-            }
-            if (p.getParamKey().equals("smtp.account")) {
-                javaMailSender.setUsername(p.getParamValue());
-            }
-            if (p.getParamKey().equals("smtp.password")) {
-                javaMailSender.setPassword(EncryptUtils.aesDecrypt(p.getParamValue()).toString());
-            }
-        }
-        Properties props = new Properties();
-        props.put("mail.smtp.auth", "true");
-        props.put("mail.smtp.starttls.enable", "true");
-        props.put("mail.smtp.starttls.required", "true");
-        props.put("mail.smtp.timeout", "30000");
-        props.put("mail.smtp.connectiontimeout", "5000");
-        javaMailSender.setJavaMailProperties(props);
+        JavaMailSenderImpl javaMailSender = getMailSender();
        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
        String testName = "";
        if (type.equals("api")) {
@ -73,38 +48,19 @@ public class MailService {
            testName = performanceResult.getName();
            status = performanceResult.getStatus();
        }
-        String html1 = "<!DOCTYPE html>\n" +
-                "<html lang=\"en\">\n" +
-                "<head>\n" +
-                "  <meta charset=\"UTF-8\">\n" +
-                "  <title>MeterSphere</title>\n" +
-                "</head>\n" +
-                "<body style=\"text-align: left\">\n" +
-                "    <div>\n" +
-                "      <h3>" + type + Translator.get("timing_task_result_notification") + "</h3>\n" +
-                "      <p>   尊敬的用户：您好，<p><br/>" +
-                "<p>您所执行的" + testName + "运行失败</p>\n" +
-                "    </div>\n" +
-                "</body>\n" +
-                "</html>";
-        String html2 = "<!DOCTYPE html>\n" +
-                "<html lang=\"en\">\n" +
-                "<head>\n" +
-                "  <meta charset=\"UTF-8\">\n" +
-                "  <title>MeterSphere</title>\n" +
-                "</head>\n" +
-                "<body style=\"text-align: left\">\n" +
-                "    <div>\n" +
-                "      <h3>" + type + Translator.get("timing_task_result_notification") + "</h3>\n" +
-                "      <p>    尊敬的用户：您好，" + testName + "运行成功</p>\n" +
-                "    </div>\n" +
-                "</body>\n" +
-                "</html>";
+
+        Map<String, String> context = new HashMap<>();
+        context.put("title", type + Translator.get("timing_task_result_notification"));
+        context.put("testName", testName);
+
        try {
+            String failTemplate = IOUtils.toString(this.getClass().getResource("/mail/fail.html"), StandardCharsets.UTF_8);
+            String successTemplate = IOUtils.toString(this.getClass().getResource("/mail/success.html"), StandardCharsets.UTF_8);
+
            MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true);
            helper.setFrom(javaMailSender.getUsername());
            helper.setSubject(Translator.get("timing_task_result_notification"));
-            String users[] = {};
+            String[] users;
            List<String> successEmailList = new ArrayList<>();
            List<String> failEmailList = new ArrayList<>();
            if (notice.size() > 0) {
@ -115,23 +71,20 @@ public class MailService {
                    if (n.getEnable().equals("true") && n.getEvent().equals("执行失败")) {
                        failEmailList = userService.queryEmail(n.getNames());
                    }
-
                }
            } else {
                LogUtil.error("Recipient information is empty");
            }

            if (status.equals("Success")) {
-                users = successEmailList.toArray(new String[successEmailList.size()]);
-                helper.setText(html2, true);
+                users = successEmailList.toArray(new String[0]);
+                helper.setText(getContent(successTemplate, context), true);
            } else {
-                users = failEmailList.toArray(new String[failEmailList.size()]);
-                helper.setText(html1, true);
-
+                users = failEmailList.toArray(new String[0]);
+                helper.setText(getContent(failTemplate, context), true);
            }
            helper.setTo(users);
-
-        } catch (MessagingException e) {
+        } catch (Exception e) {
            LogUtil.error(e);
        }
        try {
@ -141,6 +94,17 @@ public class MailService {
        }
    }

+    private String getContent(String template, Map<String, String> context) {
+        if (MapUtils.isNotEmpty(context)) {
+            context.forEach((k, v) -> {
+                if (v != null && !v.isEmpty()) {
+                    StringUtils.replaceAll(template, "${" + k + "}", v);
+                }
+            });
+        }
+        return template;
+    }
+

    public void sendHtml(List<String> userIds, String type, SaveTestCaseReviewRequest reviewRequest, SaveCommentRequest request, TestCaseWithBLOBs testCaseWithBLOBs) {
        Long startTime = reviewRequest.getCreateTime();
@ -156,6 +120,61 @@ public class MailService {
        if (!eTime.equals("null")) {
            end = sdf.format(new Date(Long.parseLong(eTime)));
        }
+        JavaMailSenderImpl javaMailSender = getMailSender();
+        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
+
+        Map<String, String> context = new HashMap<>();
+        context.put("creator", reviewRequest.getCreator());
+        context.put("maintainer", testCaseWithBLOBs.getMaintainer());
+        context.put("testCaseName", testCaseWithBLOBs.getName());
+        context.put("reviewName", reviewRequest.getName());
+        context.put("description", request.getDescription());
+        context.put("start", start);
+        context.put("end", end);
+
+        try {
+            String reviewerTemplate = IOUtils.toString(this.getClass().getResource("/mail/reviewer.html"), StandardCharsets.UTF_8);
+            String commentTemplate = IOUtils.toString(this.getClass().getResource("/mail/comment.html"), StandardCharsets.UTF_8);
+            String endTemplate = IOUtils.toString(this.getClass().getResource("/mail/end.html"), StandardCharsets.UTF_8);
+
+
+            MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true);
+            helper.setFrom(javaMailSender.getUsername());
+            helper.setSubject(Translator.get("test_review_task_notice"));
+            String[] users;
+            List<String> emails = new ArrayList<>();
+            try {
+                emails = userService.queryEmailByIds(userIds);
+            } catch (Exception e) {
+                LogUtil.error("Recipient information is empty");
+            }
+            users = emails.toArray(new String[0]);
+            switch (type) {
+                case "reviewer":
+                    helper.setText(getContent(reviewerTemplate, context), true);
+                    break;
+                case "comment":
+                    helper.setText(getContent(commentTemplate, context), true);
+                    break;
+                case "end":
+                    helper.setText(getContent(endTemplate, context), true);
+                    break;
+                default:
+                    break;
+            }
+            helper.setTo(users);
+
+        } catch (Exception e) {
+            LogUtil.error(e);
+        }
+        try {
+            javaMailSender.send(mimeMessage);
+        } catch (MailException e) {
+            LogUtil.error(e);
+        }
+    }
+
+    private JavaMailSenderImpl getMailSender() {
        JavaMailSenderImpl javaMailSender = new JavaMailSenderImpl();
        List<SystemParameter> paramList = systemParameterService.getParamList(ParamConstants.Classify.MAIL.getValue());
        javaMailSender.setDefaultEncoding("UTF-8");
@ -181,72 +200,7 @@ public class MailService {
        props.put("mail.smtp.timeout", "30000");
        props.put("mail.smtp.connectiontimeout", "5000");
        javaMailSender.setJavaMailProperties(props);
-        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
-        String html1 = "<!DOCTYPE html>\n" +
-                "<html lang=\"en\">\n" +
-                "<head>\n" +
-                "  <meta charset=\"UTF-8\">\n" +
-                "  <title>MeterSphere</title>\n" +
-                "</head>\n" +
-                "<body style=\"text-align: left\">\n" +
-                "    <div>\n" +
-                "      <p>" + reviewRequest.getCreator() + "发起的:" + "</p><br/>" + reviewRequest.getName() + "</p><br/>" + "计划开始时间是" + start + ",计划结束时间为" + end + "请跟进" + "</p>\n" +
-                "    </div>\n" +
-                "</body>\n" +
-                "</html>";
-        String html2 = "<!DOCTYPE html>\n" +
-                "<html lang=\"en\">\n" +
-                "<head>\n" +
-                "  <meta charset=\"UTF-8\">\n" +
-                "  <title>MeterSphere</title>\n" +
-                "</head>\n" +
-                "<body style=\"text-align: left\">\n" +
-                "    <div>\n" +
-                "      <p>" + testCaseWithBLOBs.getMaintainer() + "发起的" + "</p><br/>" + testCaseWithBLOBs.getName() + "</p><br/>" + "添加评论：" + request.getDescription() + "</p>\n" +
-                "    </div>\n" +
-                "</body>\n" +
-                "</html>";
-        String html3 = "<!DOCTYPE html>\n" +
-                "<html lang=\"en\">\n" +
-                "<head>\n" +
-                "  <meta charset=\"UTF-8\">\n" +
-                "  <title>MeterSphere</title>\n" +
-                "</head>\n" +
-                "<body style=\"text-align: left\">\n" +
-                "    <div>\n" +
-                "      <p>" + reviewRequest.getCreator() + "发起的：" + "</p><br/>" + reviewRequest.getName() + "</p><br/>" + "计划开始时间是" + start + ",计划结束时间为" + end + "已完成" + "</p>\n" +
-                "    </div>\n" +
-                "</body>\n" +
-                "</html>";
-        try {
-            MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, true);
-            helper.setFrom(javaMailSender.getUsername());
-            helper.setSubject(Translator.get("test_review_task_notice"));
-            String users[] = {};
-            List<String> emails = new ArrayList<>();
-            try {
-                emails = userService.queryEmailByIds(userIds);
-            } catch (Exception e) {
-                LogUtil.error("Recipient information is empty");
-            }
-            users = emails.toArray(new String[emails.size()]);
-            if (type.equals("reviewer")) {
-                helper.setText(html1, true);
-            } else if (type.equals("comment")) {
-                helper.setText(html2, true);
-            } else if (type.equals("end")) {
-                helper.setText(html3, true);
-            }
-            helper.setTo(users);
-
-        } catch (MessagingException e) {
-            LogUtil.error(e);
-        }
-        try {
-            javaMailSender.send(mimeMessage);
-        } catch (MailException e) {
-            LogUtil.error(e);
-        }
+        return javaMailSender;
    }
 }

--- a/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
+++ b/backend/src/main/java/io/metersphere/xmind/XmindCaseParser.java
@ -2,6 +2,7 @@ package io.metersphere.xmind;

 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.google.common.collect.ImmutableMap;
 import io.metersphere.base.domain.TestCaseWithBLOBs;
 import io.metersphere.commons.constants.TestCaseConstants;
 import io.metersphere.commons.utils.BeanUtils;
@ -60,6 +61,8 @@ public class XmindCaseParser {
        return this.testCases;
    }

+    private final Map<String, String> caseTypeMap = ImmutableMap.of("功能测试", "functional", "性能测试", "performance", "接口测试", "api");
+
    // 递归处理案例数据
    private void recursion(StringBuffer processBuffer, Attached parent, int level, String nodePath, List<Attached> attacheds) {
        for (Attached item : attacheds) {
@ -139,15 +142,11 @@ public class XmindCaseParser {
        // 用例等级和用例性质处理
        if (tcArr[0].indexOf("-") != -1) {
            String otArr[] = tcArr[0].split("-");
-            for (int i = 0; i < otArr.length; i++) {
-                if (otArr[i].startsWith("P") || otArr[i].startsWith("p")) {
-                    testCase.setPriority(otArr[i].toUpperCase());
-                } else if (otArr[i].endsWith("功能测试")) {
-                    testCase.setType("functional");
-                } else if (otArr[i].endsWith("性能测试")) {
-                    testCase.setType("performance");
-                } else if (otArr[i].endsWith("接口测试")) {
-                    testCase.setType("api");
+            for (String item : otArr) {
+                if (item.toUpperCase().startsWith("P")) {
+                    testCase.setPriority(item.toUpperCase());
+                } else {
+                    Optional.ofNullable(caseTypeMap.get(item)).ifPresent(opt -> testCase.setType(opt));
                }
            }
        }
--- a/backend/src/main/resources/mail/comment.html
+++ b/backend/src/main/resources/mail/comment.html
@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>MeterSphere</title>
+</head>
+<body style="text-align: left">
+<div>
+    <p>${maintainer} 发起的</p><br/> ${testCaseName} </p><br/>添加评论：${description} </p>
+</div>
+</body>
+</html>
--- a/backend/src/main/resources/mail/end.html
+++ b/backend/src/main/resources/mail/end.html
@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>MeterSphere</title>
+</head>
+<body style="text-align: left">
+<div>
+    <p>${creator} 发起的：</p><br/>${reviewName} </p><br/>计划开始时间是 ${start}, 计划结束时间为 ${end} 已完成</p>
+</div>
+</body>
+</html>
--- a/backend/src/main/resources/mail/fail.html
+++ b/backend/src/main/resources/mail/fail.html
@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>MeterSphere</title>
+</head>
+<body style="text-align: left">
+<div>
+    <h3>${title}</h3>
+    <p>尊敬的用户：您好，
+    <p><br/>
+    <p>您所执行的 ${testName} 运行失败</p>
+</div>
+</body>
+</html>
--- a/backend/src/main/resources/mail/reviewer.html
+++ b/backend/src/main/resources/mail/reviewer.html
@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>MeterSphere</title>
+</head>
+<body style="text-align: left">
+<div>
+    <p>${creator} 发起的:</p><br/>${reviewName} </p><br/>计划开始时间是 ${start},计划结束时间为 ${end} 请跟进</p>
+</div>
+</body>
+</html>
--- a/backend/src/main/resources/mail/success.html
+++ b/backend/src/main/resources/mail/success.html
@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>MeterSphere</title>
+</head>
+<body style="text-align: left">
+<div>
+    <h3>${title}</h3>
+    <p>尊敬的用户：您好，
+    <p><br/>
+    <p>您所执行的 ${testName} 运行成功</p>
+</div>
+</body>
+</html>