From 9c640a64337f73a236a5dd559c88d02d57cb68d4 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Tue, 31 May 2022 11:24:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0smtpPort?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jeesite/common/msg/EmailUtils.java    | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/common/src/main/java/com/jeesite/common/msg/EmailUtils.java b/common/src/main/java/com/jeesite/common/msg/EmailUtils.java
index 918cf1e4..9547a79b 100644
--- a/common/src/main/java/com/jeesite/common/msg/EmailUtils.java
+++ b/common/src/main/java/com/jeesite/common/msg/EmailUtils.java
@@ -20,9 +20,6 @@ public class EmailUtils {
 
 	/**
 	 * 发送邮件
-	 * @param toAddress 接收地址
-	 * @param subject 标题
-	 * @param content 内容
 	 * @return
 	 */
 	public static boolean send(String toAddress, String subject, String content) {
@@ -30,9 +27,23 @@ public class EmailUtils {
 		String fromAddress = props.getProperty("msg.email.fromAddress");
 		String fromPassword = props.getProperty("msg.email.fromPassword");
 		String fromHostName = props.getProperty("msg.email.fromHostName");
+		Integer smtpPort = props.getPropertyToInteger("msg.email.smtpPort", "25");
 		String sslOnConnect = props.getProperty("msg.email.sslOnConnect", "false");
 		String sslSmtpPort = props.getProperty("msg.email.sslSmtpPort");
-		return send(fromAddress, fromPassword, fromHostName, sslOnConnect, sslSmtpPort, toAddress, subject, content);
+		return send(fromAddress, fromPassword, fromHostName, smtpPort, sslOnConnect, sslSmtpPort, toAddress, subject, content);
+	}
+
+	/**
+	 * 发送邮件
+	 * @param toAddress 接收地址
+	 * @param subject 标题
+	 * @param content 内容
+	 * @return
+	 */
+	@Deprecated
+	public static boolean send(String fromAddress, String fromPassword, String fromHostName,
+			String sslOnConnect, String sslSmtpPort, String toAddress, String subject, String content) {
+		return send(fromAddress, fromPassword, fromHostName, 25, sslOnConnect, sslSmtpPort, toAddress, subject, content);
 	}
 	
 	/**
@@ -42,7 +53,7 @@ public class EmailUtils {
 	 * @param content 内容
 	 * @return
 	 */
-	public static boolean send(String fromAddress, String fromPassword, String fromHostName,
+	public static boolean send(String fromAddress, String fromPassword, String fromHostName, Integer smtpPort,
 			String sslOnConnect, String sslSmtpPort, String toAddress, String subject, String content) {
 		try {
 			HtmlEmail htmlEmail = new HtmlEmail();
@@ -50,8 +61,10 @@ public class EmailUtils {
 			htmlEmail.setFrom(fromAddress);
 			// 密码校验
 			htmlEmail.setAuthentication(fromAddress, fromPassword);
-			// 发送服务器协议
+			// 发送服务器主机名
 			htmlEmail.setHostName(fromHostName);
+			// 发送服务器端口
+			htmlEmail.setSmtpPort(smtpPort);
 
 			// SSL
 			if ("true".equals(sslOnConnect)) {