zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

prepare 5.8.31

Browse Source
This commit is contained in:
Looly
2024-08-09 19:21:32 +08:00
parent b427440274
commit ef90358c51
29 changed files with 51 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-extra/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>cn.hutool</groupId>
<artifactId>hutool-parent</artifactId>
<version>5.8.30</version>
<version>5.8.31</version>
</parent>
<artifactId>hutool-extra</artifactId>

2
hutool-extra/src/main/java/cn/hutool/extra/mail/JakartaMailUtil.java
View File

@@ -387,7 +387,7 @@ public class JakartaMailUtil {
*/
private static String send(MailAccount mailAccount, boolean useGlobalSession, Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content,
Map<String, InputStream> imageMap, boolean isHtml, File... files) {
final Mail mail = Mail.create(mailAccount).setUseGlobalSession(useGlobalSession);
final JakartaMail mail = JakartaMail.create(mailAccount).setUseGlobalSession(useGlobalSession);
// 可选抄送人
if (CollUtil.isNotEmpty(ccs)) {

4
hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java
View File

@@ -1,7 +1,9 @@
package cn.hutool.extra.mail;
import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.ReUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.setting.Setting;
@@ -629,7 +631,7 @@ public class MailAccount implements Serializable {
*/
public MailAccount defaultIfEmpty() {
// 去掉发件人的姓名部分
final String fromAddress = InternalMailUtil.parseFirstAddress(this.from, this.charset).getAddress();
final String fromAddress = ReUtil.get(PatternPool.EMAIL, this.from, 0);
if (StrUtil.isBlank(this.host)) {
// 如果SMTP地址为空，默认使用smtp.<发件人邮箱后缀>