From 63983bbab3d48b22847c22a589f51dc520795f11 Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Thu, 5 May 2022 18:52:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E6=A8=A1=E5=9D=97=20bug=20-?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BF=9D=E7=95=99=E5=AD=97=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/system/convert/mail/MailAccountConvert.java    | 8 ++++----
 .../module/system/dal/dataobject/mail/MailLogDO.java      | 2 +-
 .../module/system/mq/message/mail/MailSendMessage.java    | 2 +-
 .../module/system/mq/producer/mail/MailProducer.java      | 2 +-
 .../system/service/mail/impl/MailLogServiceImpl.java      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
index f2228e170..b60ac088f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
@@ -29,18 +29,18 @@ public interface MailAccountConvert {
                 .setHost(mailAccountDO.getHost())
                 .setPort(mailAccountDO.getPort())
                 .setAuth(true)
-                .setFrom(mailAccountDO.getFrom())
+                .setFrom(mailAccountDO.getFromAddress())
                 .setUser(mailAccountDO.getUsername())
                 .setPass(mailAccountDO.getPassword())
                 .setSslEnable(mailAccountDO.getSslEnable());
-    };
+    }
 
     default Map<String, String> convertToMap(MailAccountDO mailAccountDO , String content) {
         Map<String , String> map = new HashMap<>();
-        map.put("from" , mailAccountDO.getFrom());
+        map.put("from_address" , mailAccountDO.getFromAddress());
         map.put("username" , mailAccountDO.getUsername());
         map.put("content" , content);
         return map;
-    };
+    }
 
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
index 7454d2acb..97cc51f4c 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
@@ -39,7 +39,7 @@ public class MailLogDO extends BaseDO implements Serializable {
     /**
      * 邮箱账号
      */
-    private String from;
+    private String fromAddress;
 
     /**
      * 模版主键
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
index 3df7c6dcf..fd1d68f6f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
@@ -26,7 +26,7 @@ public class MailSendMessage extends AbstractStreamMessage {
      * 邮箱地址
      */
     @NotNull(message = "邮箱地址不能为空")
-    private String from;
+    private String fromAddress;
     /**
      * 用户名
      */
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
index db8bbebf6..3b6745c26 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
@@ -57,7 +57,7 @@ public class MailProducer {
     public void sendMailSendMessage(MailAccountDO mailAccountDO, MailTemplateDO mailTemplateDO, String content, List<String> tos, String title , Long sendLogId) {
         MailSendMessage message = new MailSendMessage();
         message.setContent(content);
-        message.setFrom(mailAccountDO.getFrom());
+        message.setFromAddress(mailAccountDO.getFromAddress());
         message.setHost(mailAccountDO.getHost());
         message.setPort(mailAccountDO.getPort());
         message.setPassword(mailAccountDO.getPassword());
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
index 76a7198ab..e251cc82e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
@@ -43,7 +43,7 @@ public class MailLogServiceImpl implements MailLogService {
     @Override
     public Long createMailLog(MailAccountDO mailAccountDO , MailTemplateDO mailTemplateDO , String from, String content, List<String> tos, String title, Boolean isSend) {
         MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
-        logDOBuilder.from(mailAccountDO.getFrom());
+        logDOBuilder.fromAddress(mailAccountDO.getFromAddress());
         logDOBuilder.accountId(mailAccountDO.getId());
         logDOBuilder.content(content);
         logDOBuilder.title(title);