From c7dcbd5c3b4dfa66e1666814c8ebd81cd7a1aca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
 <15040126243@163.com>
Date: Fri, 13 Jan 2023 22:55:05 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=80=82=E9=85=8D=20com.sun.mail=20?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=BA=20jakarta.mail=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0=E5=86=99=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-common/pom.xml                          |  4 +--
 .../ruoyi/common/utils/email/MailUtils.java   |  4 +--
 .../utils/email/UserPassAuthenticator.java    | 33 +++++++++++++++++++
 3 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/utils/email/UserPassAuthenticator.java

diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml
index fb50aa347..230c9667e 100644
--- a/ruoyi-common/pom.xml
+++ b/ruoyi-common/pom.xml
@@ -113,8 +113,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>jakarta.mail</artifactId>
+            <groupId>jakarta.mail</groupId>
+            <artifactId>jakarta.mail-api</artifactId>
         </dependency>
 
         <dependency>
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java
index 32a3f8252..a3ed32d03 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java
@@ -11,8 +11,8 @@ import com.ruoyi.common.utils.spring.SpringUtils;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
-import javax.mail.Authenticator;
-import javax.mail.Session;
+import jakarta.mail.Authenticator;
+import jakarta.mail.Session;
 import java.io.File;
 import java.io.InputStream;
 import java.util.Collection;
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/UserPassAuthenticator.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/UserPassAuthenticator.java
new file mode 100644
index 000000000..d3e0fc84f
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/email/UserPassAuthenticator.java
@@ -0,0 +1,33 @@
+package com.ruoyi.common.utils.email;
+
+import jakarta.mail.Authenticator;
+import jakarta.mail.PasswordAuthentication;
+
+/**
+ * 用户名密码验证器
+ *
+ * @author looly
+ * @since 3.1.2
+ */
+public class UserPassAuthenticator extends Authenticator {
+
+	private final String user;
+	private final String pass;
+
+	/**
+	 * 构造
+	 *
+	 * @param user 用户名
+	 * @param pass 密码
+	 */
+	public UserPassAuthenticator(String user, String pass) {
+		this.user = user;
+		this.pass = pass;
+	}
+
+	@Override
+	protected PasswordAuthentication getPasswordAuthentication() {
+		return new PasswordAuthentication(this.user, this.pass);
+	}
+
+}