BJ_ZTEITS-Developers / parking-cloud-yudao

Commit 63983bbab3d48b22847c22a589f51dc520795f11

Authored by wangjingyi
1 parent c3335ba2

邮件模块 bug -修改保留字冲突

Inline Side-by-side
Showing 5 changed files with 8 additions and 8 deletions
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
  View file @63983bb
@@ -29,18 +29,18 @@ public interface MailAccountConvert { @@ -29,18 +29,18 @@ public interface MailAccountConvert {
29 .setHost(mailAccountDO.getHost()) 29 .setHost(mailAccountDO.getHost())
30 .setPort(mailAccountDO.getPort()) 30 .setPort(mailAccountDO.getPort())
31 .setAuth(true) 31 .setAuth(true)
32 - .setFrom(mailAccountDO.getFrom()) 32 + .setFrom(mailAccountDO.getFromAddress())
33 .setUser(mailAccountDO.getUsername()) 33 .setUser(mailAccountDO.getUsername())
34 .setPass(mailAccountDO.getPassword()) 34 .setPass(mailAccountDO.getPassword())
35 .setSslEnable(mailAccountDO.getSslEnable()); 35 .setSslEnable(mailAccountDO.getSslEnable());
36 - }; 36 + }
37 37
38 default Map<String, String> convertToMap(MailAccountDO mailAccountDO , String content) { 38 default Map<String, String> convertToMap(MailAccountDO mailAccountDO , String content) {
39 Map<String , String> map = new HashMap<>(); 39 Map<String , String> map = new HashMap<>();
40 - map.put("from" , mailAccountDO.getFrom()); 40 + map.put("from_address" , mailAccountDO.getFromAddress());
41 map.put("username" , mailAccountDO.getUsername()); 41 map.put("username" , mailAccountDO.getUsername());
42 map.put("content" , content); 42 map.put("content" , content);
43 return map; 43 return map;
44 - }; 44 + }
45 45
46 } 46 }
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
  View file @63983bb
@@ -39,7 +39,7 @@ public class MailLogDO extends BaseDO implements Serializable { @@ -39,7 +39,7 @@ public class MailLogDO extends BaseDO implements Serializable {
39 /** 39 /**
40 * 邮箱账号 40 * 邮箱账号
41 */ 41 */
42 - private String from; 42 + private String fromAddress;
43 43
44 /** 44 /**
45 * 模版主键 45 * 模版主键
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
  View file @63983bb
@@ -26,7 +26,7 @@ public class MailSendMessage extends AbstractStreamMessage { @@ -26,7 +26,7 @@ public class MailSendMessage extends AbstractStreamMessage {
26 * 邮箱地址 26 * 邮箱地址
27 */ 27 */
28 @NotNull(message = "邮箱地址不能为空") 28 @NotNull(message = "邮箱地址不能为空")
29 - private String from; 29 + private String fromAddress;
30 /** 30 /**
31 * 用户名 31 * 用户名
32 */ 32 */
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
  View file @63983bb
@@ -57,7 +57,7 @@ public class MailProducer { @@ -57,7 +57,7 @@ public class MailProducer {
57 public void sendMailSendMessage(MailAccountDO mailAccountDO, MailTemplateDO mailTemplateDO, String content, List<String> tos, String title , Long sendLogId) { 57 public void sendMailSendMessage(MailAccountDO mailAccountDO, MailTemplateDO mailTemplateDO, String content, List<String> tos, String title , Long sendLogId) {
58 MailSendMessage message = new MailSendMessage(); 58 MailSendMessage message = new MailSendMessage();
59 message.setContent(content); 59 message.setContent(content);
60 - message.setFrom(mailAccountDO.getFrom()); 60 + message.setFromAddress(mailAccountDO.getFromAddress());
61 message.setHost(mailAccountDO.getHost()); 61 message.setHost(mailAccountDO.getHost());
62 message.setPort(mailAccountDO.getPort()); 62 message.setPort(mailAccountDO.getPort());
63 message.setPassword(mailAccountDO.getPassword()); 63 message.setPassword(mailAccountDO.getPassword());
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
  View file @63983bb
@@ -43,7 +43,7 @@ public class MailLogServiceImpl implements MailLogService { @@ -43,7 +43,7 @@ public class MailLogServiceImpl implements MailLogService {
43 @Override 43 @Override
44 public Long createMailLog(MailAccountDO mailAccountDO , MailTemplateDO mailTemplateDO , String from, String content, List<String> tos, String title, Boolean isSend) { 44 public Long createMailLog(MailAccountDO mailAccountDO , MailTemplateDO mailTemplateDO , String from, String content, List<String> tos, String title, Boolean isSend) {
45 MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder(); 45 MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
46 - logDOBuilder.from(mailAccountDO.getFrom()); 46 + logDOBuilder.fromAddress(mailAccountDO.getFromAddress());
47 logDOBuilder.accountId(mailAccountDO.getId()); 47 logDOBuilder.accountId(mailAccountDO.getId());
48 logDOBuilder.content(content); 48 logDOBuilder.content(content);
49 logDOBuilder.title(title); 49 logDOBuilder.title(title);