|
@ -7,7 +7,7 @@ import cn.hutool.core.util.CharUtil; |
|
|
import cn.hutool.core.util.StrUtil; |
|
|
import cn.hutool.core.util.StrUtil; |
|
|
import cn.hutool.extra.mail.JakartaMail; |
|
|
import cn.hutool.extra.mail.JakartaMail; |
|
|
import cn.hutool.extra.mail.JakartaUserPassAuthenticator; |
|
|
import cn.hutool.extra.mail.JakartaUserPassAuthenticator; |
|
|
import cn.hutool.extra.mail.MailAccount; |
|
|
//import cn.hutool.extra.mail.MailAccount;
|
|
|
import jakarta.mail.Authenticator; |
|
|
import jakarta.mail.Authenticator; |
|
|
import jakarta.mail.Session; |
|
|
import jakarta.mail.Session; |
|
|
import lombok.AccessLevel; |
|
|
import lombok.AccessLevel; |
|
@ -415,7 +415,8 @@ public class MailUtils { |
|
|
*/ |
|
|
*/ |
|
|
private static String send(MailAccount mailAccount, boolean useGlobalSession, Collection<String> tos, Collection<String> ccs, Collection<String> bccs, String subject, String content, |
|
|
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) { |
|
|
Map<String, InputStream> imageMap, boolean isHtml, File... files) { |
|
|
final JakartaMail mail = JakartaMail.create(mailAccount).setUseGlobalSession(useGlobalSession); |
|
|
// final JakartaMail mail = JakartaMail.create(mailAccount).setUseGlobalSession(useGlobalSession);
|
|
|
|
|
|
final JakartaMail mail = JakartaMail.create().setUseGlobalSession(useGlobalSession); |
|
|
|
|
|
|
|
|
// 可选抄送人
|
|
|
// 可选抄送人
|
|
|
if (CollUtil.isNotEmpty(ccs)) { |
|
|
if (CollUtil.isNotEmpty(ccs)) { |
|
|