add param for mail

hutool-extra/src/main/java/cn/hutool/extra/mail/MailAccount.java

@@ -21,6 +21,8 @@ public class MailAccount implements Serializable {
 	private static final String SMTP_HOST = "mail.smtp.host";
 	private static final String SMTP_PORT = "mail.smtp.port";
 	private static final String SMTP_AUTH = "mail.smtp.auth";
+	private static final String SMTP_CONNECTION_TIMEOUT = "mail.smtp.connectiontimeout";
+	private static final String SMTP_TIMEOUT = "mail.smtp.timeout";
 
 	private static final String STARTTTLS_ENABLE = "mail.smtp.starttls.enable";
 	private static final String SOCKEY_FACTORY = "mail.smtp.socketFactory.class";
@@ -63,6 +65,11 @@ public class MailAccount implements Serializable {
 	private boolean socketFactoryFallback;
 	/** 指定的端口连接到在使用指定的套接字工厂。如果没有设置,将使用默认端口 */
 	private int socketFactoryPort = 465;
+
+	/** SMTP超时时长，单位毫秒，缺省值不超时 */
+	private long timeout;
+	/** Socket连接超时值，单位毫秒，缺省值不超时 */
+	private long connectionTimeout;
 
 	// -------------------------------------------------------------- Constructor start
 	/**
@@ -374,6 +381,28 @@ public MailAccount setSocketFactoryPort(int socketFactoryPort) {
 		this.socketFactoryPort = socketFactoryPort;
 		return this;
 	}
+
+	/**
+	 * 设置SMTP超时时长，单位毫秒，缺省值不超时
+	 * @param timeout SMTP超时时长，单位毫秒，缺省值不超时
+	 * @return this
+	 * @since 4.1.17
+	 */
+	public MailAccount setTimeout(long timeout) {
+		this.timeout = timeout;
+		return this;
+	}
+
+	/**
+	 * 设置Socket连接超时值，单位毫秒，缺省值不超时
+	 * @param connectionTimeout Socket连接超时值，单位毫秒，缺省值不超时
+	 * @return this
+	 * @since 4.1.17
+	 */
+	public MailAccount setConnectionTimeout(long connectionTimeout) {
+		this.connectionTimeout = connectionTimeout;
+		return this;
+	}
 
 	/**
 	 * 获得SMTP相关信息
@@ -389,6 +418,12 @@ public Properties getSmtpProps() {
 		p.put(SMTP_HOST, this.host);
 		p.put(SMTP_PORT, String.valueOf(this.port));
 		p.put(SMTP_AUTH, String.valueOf(this.auth));
+		if(this.timeout > 0) {
+			p.put(SMTP_TIMEOUT, String.valueOf(this.timeout));
+		}
+		if(this.connectionTimeout > 0) {
+			p.put(SMTP_CONNECTION_TIMEOUT, String.valueOf(this.connectionTimeout));
+		}
 
 		p.put(MAIL_DEBUG, String.valueOf(this.debug));
 

hutool-extra/src/test/java/cn/hutool/extra/mail/MailTest.java

@@ -29,7 +29,7 @@ public void sendTest2() {
 	}
 
 	@Test
-	@Ignore
+//	@Ignore
 	public void sendHtmlTest() {
 		MailUtil.send("[email protected]", "测试", "<h1>邮件来自Hutool测试</h1>", true);
 	}

hutool-extra/src/test/resources/config/mail.setting

@@ -32,4 +32,9 @@ socketFactoryFallback = true
 socketFactoryPort = 465
 
 # 对于超长参数是否切分为多份，默认为false（国内邮箱附件不支持切分的附件名）
-splitlongparameters = false
+splitlongparameters = false
+
+# SMTP超时时长，单位毫秒，缺省值不超时
+timeout = 0
+# Socket连接超时值，单位毫秒，缺省值不超时
+connectionTimeout = 0

hutool-extra/src/test/resources/example/mail-example.setting

@@ -32,4 +32,9 @@ socketFactoryFallback = true
 socketFactoryPort = 465
 
 # 对于超长参数是否切分为多份，默认为false（国内邮箱附件不支持切分的附件名）
-splitlongparameters = false
+splitlongparameters = false
+
+# SMTP超时时长，单位毫秒，缺省值不超时
+timeout = 0
+# Socket连接超时值，单位毫秒，缺省值不超时
+connectionTimeout = 0