admin/sms4j
1
0
Fork 0
mirror of https://gitee.com/dromara/sms4j.git synced 2025-12-06 17:08:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化换行格式

Browse Source
This commit is contained in:
wind 2023-07-05 17:17:53 +08:00
parent 4dc2bead0c
commit f7169fcfd5
1 changed files with 46 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
sms4j-Email-plugin/sms4j-Email-core/src/main/java/org/dromara/email/core/service/MailService.java
View File

@ -223,7 +223,7 @@ public class MailService implements MailClient {
@Override
public void sendHtml(List<String> mailAddress, String title, String body, String htmlName, Map<String, String> parameter, Map<String, String> files) {
send(mailAddress, title, body, HtmlUtil.readHtml(htmlName), parameter, files,null,null);
send(mailAddress, title, body, HtmlUtil.readHtml(htmlName), parameter, files, null, null);
}
@Override
@ -238,7 +238,7 @@ public class MailService implements MailClient {
@Override
public void sendHtml(List<String> mailAddress, String title, String body, InputStream html, Map<String, String> parameter, Map<String, String> files) {
send(mailAddress, title, body, HtmlUtil.readHtml(html), parameter, files,null,null);
send(mailAddress, title, body, HtmlUtil.readHtml(html), parameter, files, null, null);
}
@Override
@ -247,23 +247,51 @@ public class MailService implements MailClient {
}
@Override
public void sendHtml(List<String> mailAddress, String title, String body, InputStream html, List<String> cc, List<String> bcc, Map<String, String> parameter, Map<String, String> files) {
send(mailAddress,title,body,HtmlUtil.readHtml(html),parameter,files,cc,bcc);
public void sendHtml(List<String> mailAddress,
String title,
String body,
InputStream html,
List<String> cc,
List<String> bcc,
Map<String, String> parameter,
Map<String, String> files) {
send(mailAddress, title, body, HtmlUtil.readHtml(html), parameter, files, cc, bcc);
}
@Override
public void sendHtml(List<String> mailAddress, String title, String body, InputStream html, List<String> cc, List<String> bcc, Parameter parameter, Map<String, String> files) {
send(mailAddress,title,body,HtmlUtil.readHtml(html),ReflectUtil.getValues(parameter),files,cc,bcc);
public void sendHtml(List<String> mailAddress,
String title,
String body,
InputStream html,
List<String> cc,
List<String> bcc,
Parameter parameter,
Map<String, String> files) {
send(mailAddress, title, body, HtmlUtil.readHtml(html), ReflectUtil.getValues(parameter), files, cc, bcc);
}
@Override
public void sendHtml(List<String> mailAddress, String title, String body, String html, List<String> cc, List<String> bcc, Map<String, String> parameter, Map<String, String> files) {
send(mailAddress,title,body,HtmlUtil.readHtml(html),parameter,files,cc,bcc);
public void sendHtml(List<String> mailAddress,
String title,
String body,
String html,
List<String> cc,
List<String> bcc,
Map<String, String> parameter,
Map<String, String> files) {
send(mailAddress, title, body, HtmlUtil.readHtml(html), parameter, files, cc, bcc);
}
@Override
public void sendHtml(List<String> mailAddress, String title, String body, String html, List<String> cc, List<String> bcc, Parameter parameter, Map<String, String> files) {
send(mailAddress,title,body,HtmlUtil.readHtml(html),ReflectUtil.getValues(parameter),files,cc,bcc);
public void sendHtml(List<String> mailAddress,
String title,
String body,
String html,
List<String> cc,
List<String> bcc,
Parameter parameter,
Map<String, String> files) {
send(mailAddress, title, body, HtmlUtil.readHtml(html), ReflectUtil.getValues(parameter), files, cc, bcc);
}
@Override
@ -316,7 +344,14 @@ public class MailService implements MailClient {
multipart.addBodyPart(messageBodyPart);
}
private void send(List<String> mailAddress, String title, String body, List<String> html, Map<String, String> parameter, Map<String, String> files,List<String>cc,List<String>bcc) {
private void send(List<String> mailAddress,
String title,
String body,
List<String> html,
Map<String, String> parameter,
Map<String, String> files,
List<String> cc,
List<String> bcc) {
try {
Message message = mailBuild.getMessage();
message.setRecipients(Message.RecipientType.TO, mailBuild.eliminate(mailAddress));