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-24 17:50:04 +08:00
parent 117786310e
commit 5212d4b723
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,8 @@ import io.metersphere.track.request.testreview.SaveCommentRequest;
import io.metersphere.track.request.testreview.SaveTestCaseReviewRequest; import io.metersphere.track.request.testreview.SaveTestCaseReviewRequest;
import org.apache.commons.collections4.MapUtils; import org.apache.commons.collections4.MapUtils;
import org.apache.commons.io.IOUtils; 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.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;
@ -96,11 +97,10 @@ public class MailService {
private String getContent(String template, Map<String, String> context) { private String getContent(String template, Map<String, String> context) {
if (MapUtils.isNotEmpty(context)) { if (MapUtils.isNotEmpty(context)) {
context.forEach((k, v) -> { for (String k : context.keySet()) {
if (v != null && !v.isEmpty()) { if (StringUtils.isNotBlank(context.get(k)))
StringUtils.replaceAll(template, "${" + k + "}", v); template = RegExUtils.replaceAll(template, "\\$\\{" + k + "}", context.get(k));
} }
});
} }
return template; return template;
} }