From 21bc50e8ab00b93c3a5330ce54a7707a8aefb76d Mon Sep 17 00:00:00 2001 From: dhb52 Date: Sat, 9 Nov 2024 22:48:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(1.2.0-beta3-jdk8):=20jakarta.mail=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=20com.sun.mail/jakarta.mail@1.x=20=E5=85=BC?= =?UTF-8?q?=E5=AE=B9=20springboot=202.x;=20=E5=88=A0=E9=99=A4jakarta.mail-?= =?UTF-8?q?api,jakarta.activation-api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 16 +---- .../snail-job-common-core/pom.xml | 10 +--- .../core/alarm/email/InternalMailUtil.java | 6 +- .../common/core/alarm/email/Mail.java | 59 ++++++++++--------- .../alarm/email/UserPassAuthenticator.java | 4 +- .../snailjob/common/core/util/MailUtils.java | 4 +- 6 files changed, 41 insertions(+), 58 deletions(-) diff --git a/pom.xml b/pom.xml index 9d0f1eccd..9ccca6442 100644 --- a/pom.xml +++ b/pom.xml @@ -35,9 +35,7 @@ 1.2.17 1.3.4 2.0.2 - 2.1.3 - 2.0.3 - 2.1.3 + 1.6.7 32.0.0-jre @@ -163,20 +161,10 @@ ${jakarta-validation.version} - jakarta.mail - jakarta.mail-api - ${jakarta-mail-api.version} - - - org.eclipse.angus + com.sun.mail jakarta.mail ${jakarta-mail.version} - - jakarta.activation - jakarta.activation-api - ${jakarta-activation-api.version} - com.github.rholder guava-retrying diff --git a/snail-job-common/snail-job-common-core/pom.xml b/snail-job-common/snail-job-common-core/pom.xml index 6973bffe7..00de6131a 100644 --- a/snail-job-common/snail-job-common-core/pom.xml +++ b/snail-job-common/snail-job-common-core/pom.xml @@ -40,17 +40,9 @@ jakarta.validation-api - jakarta.mail - jakarta.mail-api - - - org.eclipse.angus + com.sun.mail jakarta.mail - - jakarta.activation - jakarta.activation-api - com.googlecode.aviator aviator diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/InternalMailUtil.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/InternalMailUtil.java index 7fd0703ad..c0ea84299 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/InternalMailUtil.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/InternalMailUtil.java @@ -1,10 +1,10 @@ package com.aizuda.snailjob.common.core.alarm.email; import cn.hutool.core.util.ArrayUtil; -import jakarta.mail.internet.AddressException; -import jakarta.mail.internet.InternetAddress; -import jakarta.mail.internet.MimeUtility; +import javax.mail.internet.AddressException; +import javax.mail.internet.InternetAddress; +import javax.mail.internet.MimeUtility; import java.io.UnsupportedEncodingException; import java.nio.charset.Charset; import java.util.ArrayList; diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/Mail.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/Mail.java index 233ffbae8..fcd7e6983 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/Mail.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/Mail.java @@ -9,18 +9,21 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.util.MailUtils; -import jakarta.activation.DataHandler; -import jakarta.activation.DataSource; -import jakarta.activation.FileDataSource; -import jakarta.activation.FileTypeMap; -import jakarta.mail.*; -import jakarta.mail.internet.MimeBodyPart; -import jakarta.mail.internet.MimeMessage; -import jakarta.mail.internet.MimeMultipart; -import jakarta.mail.internet.MimeUtility; -import jakarta.mail.util.ByteArrayDataSource; -import java.io.*; +import javax.activation.DataHandler; +import javax.activation.DataSource; +import javax.activation.FileDataSource; +import javax.activation.FileTypeMap; +import javax.mail.*; +import javax.mail.internet.MimeBodyPart; +import javax.mail.internet.MimeMessage; +import javax.mail.internet.MimeMultipart; +import javax.mail.internet.MimeUtility; +import javax.mail.util.ByteArrayDataSource; +import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintStream; import java.nio.charset.Charset; import java.util.Date; @@ -38,6 +41,10 @@ public class Mail implements Builder { * 邮箱帐户信息以及一些客户端配置信息 */ private final MailAccount mailAccount; + /** + * 正文、附件和图片的混合部分 + */ + private final Multipart multipart = new MimeMultipart(); /** * 收件人列表 */ @@ -66,10 +73,6 @@ public class Mail implements Builder { * 是否为HTML */ private boolean isHtml; - /** - * 正文、附件和图片的混合部分 - */ - private final Multipart multipart = new MimeMultipart(); /** * 是否使用全局会话，默认为false */ @@ -80,19 +83,6 @@ public class Mail implements Builder { */ private PrintStream debugOutput; - /** - * 创建邮件客户端 - * - * @param mailAccount 邮件帐号 - * @return Mail - */ - public static Mail create(MailAccount mailAccount) { - return new Mail(mailAccount); - } - - - // --------------------------------------------------------------- Constructor start - /** * 构造 * @@ -102,6 +92,19 @@ public class Mail implements Builder { Assert.notNull(mailAccount, () -> new MailException("邮件账号不能为空")); this.mailAccount = mailAccount; } + + + // --------------------------------------------------------------- Constructor start + + /** + * 创建邮件客户端 + * + * @param mailAccount 邮件帐号 + * @return Mail + */ + public static Mail create(MailAccount mailAccount) { + return new Mail(mailAccount); + } // --------------------------------------------------------------- Constructor end // --------------------------------------------------------------- Getters and Setters start diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/UserPassAuthenticator.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/UserPassAuthenticator.java index 84b3cf147..cdaccf83d 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/UserPassAuthenticator.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/alarm/email/UserPassAuthenticator.java @@ -1,7 +1,7 @@ package com.aizuda.snailjob.common.core.alarm.email; -import jakarta.mail.Authenticator; -import jakarta.mail.PasswordAuthentication; +import javax.mail.Authenticator; +import javax.mail.PasswordAuthentication; /** * 用户名密码验证器 diff --git a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/MailUtils.java b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/MailUtils.java index 9f9aae6be..d8a5ef7dc 100644 --- a/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/MailUtils.java +++ b/snail-job-common/snail-job-common-core/src/main/java/com/aizuda/snailjob/common/core/util/MailUtils.java @@ -8,11 +8,11 @@ import cn.hutool.core.util.StrUtil; import com.aizuda.snailjob.common.core.alarm.email.Mail; import com.aizuda.snailjob.common.core.alarm.email.MailAccount; import com.aizuda.snailjob.common.core.alarm.email.UserPassAuthenticator; -import jakarta.mail.Authenticator; -import jakarta.mail.Session; import lombok.AccessLevel; import lombok.NoArgsConstructor; +import javax.mail.Authenticator; +import javax.mail.Session; import java.io.File; import java.io.InputStream; import java.util.Collection;