From 5212d4b723a11ce00cddab1318effa33ebb91b99 Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Thu, 24 Sep 2020 17:50:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=82=AE=E4=BB=B6?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F=E6=B2=A1=E6=9C=89=E6=9B=BF=E6=8D=A2=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/metersphere/notice/service/MailService.java   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/notice/service/MailService.java b/backend/src/main/java/io/metersphere/notice/service/MailService.java
index 015746fbb1..7ed6ec6e42 100644
--- a/backend/src/main/java/io/metersphere/notice/service/MailService.java
+++ b/backend/src/main/java/io/metersphere/notice/service/MailService.java
@@ -15,7 +15,8 @@ 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.apache.commons.lang3.RegExUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.mail.MailException;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import org.springframework.mail.javamail.MimeMessageHelper;
@@ -96,11 +97,10 @@ 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);
-                }
-            });
+            for (String k : context.keySet()) {
+                if (StringUtils.isNotBlank(context.get(k)))
+                    template = RegExUtils.replaceAll(template, "\\$\\{" + k + "}", context.get(k));
+            }
         }
         return template;
     }