admin/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-12-08 01:59:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4113 from toint-admin/v7-dev

Browse Source 
修复M2版本邮件工具异常
This commit is contained in:
Golden Looly 2025-10-24 15:26:19 +08:00 committed by GitHub
commit 408d3c3873
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hutool-extra/src/main/java/cn/hutool/v7/extra/mail/InternalMailUtil.java
View File

@ -44,6 +44,7 @@ public class InternalMailUtil {
* @since 4.0.3
*/
public static InternetAddress[] parseAddressFromStrs(final String[] addrStrs, final Charset charset) {
if (ArrayUtil.isEmpty(addrStrs)) return new InternetAddress[0];
final List<InternetAddress> resultList = new ArrayList<>(addrStrs.length);
InternetAddress[] addrs;
for (final String addrStr : addrStrs) {

37
hutool-extra/src/main/java/cn/hutool/v7/extra/mail/SMTPMessage.java
View File

@ -196,7 +196,7 @@ public class SMTPMessage extends MimeMessage {
*/
public SMTPMessage setContent(final String content, final boolean isHtml) {
try {
super.setContent(buildContent(this.mailAccount.getCharset(), isHtml));
super.setContent(buildContent(content, this.mailAccount.getCharset(), isHtml));
} catch (final MessagingException e) {
throw new MailException(e);
}
@ -339,22 +339,25 @@ public class SMTPMessage extends MimeMessage {
}
}
/**
* 构建邮件信息主体
*
* @param charset 编码，{@code null}则使用{@link MimeUtility#getDefaultJavaCharset()}
* @param isHtml 是否为HTML
* @return 邮件信息主体
* @throws MessagingException 消息异常
*/
private Multipart buildContent(final Charset charset, final boolean isHtml) throws MessagingException {
final String charsetStr = null != charset ? charset.name() : MimeUtility.getDefaultJavaCharset();
// 正文
final MimeBodyPart body = new MimeBodyPart();
body.setContent(content, StrUtil.format("text/{}; charset={}", isHtml ? "html" : "plain", charsetStr));
addBodyPart( body, 0);
return this.multipart;
}
/**
* 构建邮件信息主体
*
* @param content 内容, {@code null}则使用{@link StrUtil#EMPTY}替换
* @param charset 编码，{@code null}则使用{@link MimeUtility#getDefaultJavaCharset()}
* @param isHtml 是否为HTML
* @return 邮件信息主体
* @throws MessagingException 消息异常
*/
private Multipart buildContent(final String content, final Charset charset, final boolean isHtml) throws MessagingException {
final String charsetStr = null != charset ? charset.name() : MimeUtility.getDefaultJavaCharset();
// 内容如果是null会抛异常, 使用空字符串代替
final String contentStr = content == null ? StrUtil.EMPTY : content;
// 正文
final MimeBodyPart body = new MimeBodyPart();
body.setContent(contentStr, StrUtil.format("text/{}; charset={}", isHtml ? "html" : "plain", charsetStr));
addBodyPart(body, 0);
return this.multipart;
}
/**
* 执行发送