From 56050aa6501f3d9d2f79a2c40a28815878ac56ee Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 24 十一月 2022 15:14:47 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复Log注解GET请求记录不到参数问题 * fix 修复某些特性的环境生成代码变乱码TXT文件问题 * update 消除Vue3控制台出现的警告信息 * fix 开启TopNav没有子菜单隐藏侧边栏 * fix 修复回显数据字典数组异常问题(I60UYQ) * update 忽略不必要的属性数据返回
---
ruoyi-framework/src/main/java/com/ruoyi/framework/config/properties/MailProperties.java | 60 +++++++++++++++++++++++++++++++++---------------------------
1 files changed, 33 insertions(+), 27 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..95e6cb8 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,54 +11,61 @@
*/
@Data
@Component
-@ConfigurationProperties(prefix = "spring.mail")
+@ConfigurationProperties(prefix = "mail")
public class MailProperties {
/**
* 杩囨护寮�鍏�
*/
- private String enabled;
+ private Boolean 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