From 7dc33c9247dfd585195016513ced1a3e98e96df2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 27 六月 2022 11:03:27 +0800
Subject: [PATCH] update springboot 2.6.8 => 2.6.9 update easyexcel 3.1.0 => 3.1.1 update hutool 5.8.2 => 5.8.3 update redisson 3.17.2 => 3.17.4 update aws-java-sdk-s3 1.12.215 => 1.12.248 update tencentcloud-sdk-java 3.1.500 => 3.1.537
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/email/MailUtils.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
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 92fa89a..32a3f82 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
@@ -38,13 +38,13 @@
/**
* 鑾峰彇閭欢鍙戦�佸疄渚� (鑷畾涔夊彂閫佷汉浠ュ強鎺堟潈鐮�)
*
- * @param username 鍙戦�佷汉
- * @param password 鎺堟潈鐮�
+ * @param user 鍙戦�佷汉
+ * @param pass 鎺堟潈鐮�
*/
- public static MailAccount getMailAccount(String username, String password) {
- ACCOUNT.setFrom(StringUtils.blankToDefault(username, ACCOUNT.getUser()));
- ACCOUNT.setUser(StringUtils.blankToDefault(username, ACCOUNT.getUser()));
- ACCOUNT.setPass(StringUtils.blankToDefault(password, ACCOUNT.getPass()));
+ public static MailAccount getMailAccount(String from, String user, String pass) {
+ ACCOUNT.setFrom(StringUtils.blankToDefault(from, ACCOUNT.getFrom()));
+ ACCOUNT.setUser(StringUtils.blankToDefault(user, ACCOUNT.getUser()));
+ ACCOUNT.setPass(StringUtils.blankToDefault(pass, ACCOUNT.getPass()));
return ACCOUNT;
}
--
Gitblit v1.9.3