From 4941aaa5c1c59f17881d3587f1679b93736bd01e Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 02 五月 2022 23:12:16 +0800
Subject: [PATCH] update 重构 pr_172 集成邮件发送功能
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/MailProperties.java | 58 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 32 insertions(+), 26 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/MailProperties.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/MailProperties.java
index ce2103f..66d3698 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/MailProperties.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/MailProperties.java
@@ -1,7 +1,6 @@
package com.ruoyi.framework.config.properties;
import lombok.Data;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
@@ -12,7 +11,7 @@
*/
@Data
@Component
-@ConfigurationProperties(prefix = "spring.mail")
+@ConfigurationProperties(prefix = "mail")
public class MailProperties {
/**
@@ -21,45 +20,52 @@
private String enabled;
/**
- * 閭欢鏈嶅姟鍦板潃
+ * SMTP鏈嶅姟鍣ㄥ煙鍚�
*/
private String host;
/**
- * 鐢ㄦ埛鍚�
- */
- private String username;
-
- /**
- * 鎺堟潈鐮� (璁剧疆 - 璐︽埛 - POP3/SMTP鏈嶅姟)
- */
- private String password;
-
- /**
- * 閭鍔犲瘑绔彛锛屼笉鍚岄偖绠辩殑绔彛涓嶄竴鏍�
+ * SMTP鏈嶅姟绔彛
*/
private Integer port;
/**
- * 鏄惁闇�瑕佺敤鎴疯璇�
+ * 鏄惁闇�瑕佺敤鎴峰悕瀵嗙爜楠岃瘉
*/
- @Value("${spring.mail.properties.mail.smtp.auth}")
private Boolean auth;
/**
- * 鏄惁鍚敤TLS鍔犲瘑
+ * 鐢ㄦ埛鍚�
*/
- @Value("${spring.mail.properties.mail.smtp.starttls.enable}")
- private Boolean starttlsEnable;
-
- @Value("${spring.mail.properties.mail.smtp.ssl.trust}")
- private String sslTrust;
-
- private Boolean debug;
+ private String user;
/**
- * 浼犺緭鍗忚 starttls.enable = true 鏃朵负 smtps
+ * 瀵嗙爜
*/
- private String protocol;
+ private String pass;
+ /**
+ * 鍙戦�佹柟锛岄伒寰猂FC-822鏍囧噯
+ */
+ private String from;
+
+ /**
+ * 浣跨敤 STARTTLS瀹夊叏杩炴帴锛孲TARTTLS鏄绾枃鏈�氫俊鍗忚鐨勬墿灞曘�傚畠灏嗙函鏂囨湰杩炴帴鍗囩骇涓哄姞瀵嗚繛鎺ワ紙TLS鎴朣SL锛夛紝 鑰屼笉鏄娇鐢ㄤ竴涓崟鐙殑鍔犲瘑閫氫俊绔彛銆�
+ */
+ private Boolean starttlsEnable;
+
+ /**
+ * 浣跨敤 SSL瀹夊叏杩炴帴
+ */
+ private Boolean sslEnable;
+
+ /**
+ * SMTP瓒呮椂鏃堕暱锛屽崟浣嶆绉掞紝缂虹渷鍊间笉瓒呮椂
+ */
+ private Long timeout;
+
+ /**
+ * Socket杩炴帴瓒呮椂鍊硷紝鍗曚綅姣锛岀己鐪佸�间笉瓒呮椂
+ */
+ private Long connectionTimeout;
}
--
Gitblit v1.9.3