huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-22 23:31:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangjingyi 2022-05-05 18:52:34 +08:00
parent c3335ba2ca
commit 63983bbab3
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
View File

@ -29,18 +29,18 @@ public interface MailAccountConvert {
.setHost(mailAccountDO.getHost()) .setHost(mailAccountDO.getHost())
.setPort(mailAccountDO.getPort()) .setPort(mailAccountDO.getPort())
.setAuth(true) .setAuth(true)
.setFrom(mailAccountDO.getFrom()) .setFrom(mailAccountDO.getFromAddress())
.setUser(mailAccountDO.getUsername()) .setUser(mailAccountDO.getUsername())
.setPass(mailAccountDO.getPassword()) .setPass(mailAccountDO.getPassword())
.setSslEnable(mailAccountDO.getSslEnable()); .setSslEnable(mailAccountDO.getSslEnable());
}; }
default Map<String, String> convertToMap(MailAccountDO mailAccountDO , String content) { default Map<String, String> convertToMap(MailAccountDO mailAccountDO , String content) {
Map<String , String> map = new HashMap<>(); Map<String , String> map = new HashMap<>();
map.put("from" , mailAccountDO.getFrom()); map.put("from_address" , mailAccountDO.getFromAddress());
map.put("username" , mailAccountDO.getUsername()); map.put("username" , mailAccountDO.getUsername());
map.put("content" , content); map.put("content" , content);
return map; return map;
}; }
} }

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/mail/MailLogDO.java
View File

@ -39,7 +39,7 @@ public class MailLogDO extends BaseDO implements Serializable {
/** /**
* 邮箱账号 * 邮箱账号
*/ */
private String from; private String fromAddress;
/** /**
* 模版主键 * 模版主键

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailSendMessage.java
View File

@ -26,7 +26,7 @@ public class MailSendMessage extends AbstractStreamMessage {
* 邮箱地址 * 邮箱地址
*/ */
@NotNull(message = "邮箱地址不能为空") @NotNull(message = "邮箱地址不能为空")
private String from; private String fromAddress;
/** /**
* 用户名 * 用户名
*/ */

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
View File

@ -57,7 +57,7 @@ public class MailProducer {
public void sendMailSendMessage(MailAccountDO mailAccountDO, MailTemplateDO mailTemplateDO, String content, List<String> tos, String title , Long sendLogId) { public void sendMailSendMessage(MailAccountDO mailAccountDO, MailTemplateDO mailTemplateDO, String content, List<String> tos, String title , Long sendLogId) {
MailSendMessage message = new MailSendMessage(); MailSendMessage message = new MailSendMessage();
message.setContent(content); message.setContent(content);
message.setFrom(mailAccountDO.getFrom()); message.setFromAddress(mailAccountDO.getFromAddress());
message.setHost(mailAccountDO.getHost()); message.setHost(mailAccountDO.getHost());
message.setPort(mailAccountDO.getPort()); message.setPort(mailAccountDO.getPort());
message.setPassword(mailAccountDO.getPassword()); message.setPassword(mailAccountDO.getPassword());

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/mail/impl/MailLogServiceImpl.java
View File

@ -43,7 +43,7 @@ public class MailLogServiceImpl implements MailLogService {
@Override @Override
public Long createMailLog(MailAccountDO mailAccountDO , MailTemplateDO mailTemplateDO , String from, String content, List<String> tos, String title, Boolean isSend) { public Long createMailLog(MailAccountDO mailAccountDO , MailTemplateDO mailTemplateDO , String from, String content, List<String> tos, String title, Boolean isSend) {
MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder(); MailLogDO.MailLogDOBuilder logDOBuilder = MailLogDO.builder();
logDOBuilder.from(mailAccountDO.getFrom()); logDOBuilder.fromAddress(mailAccountDO.getFromAddress());
logDOBuilder.accountId(mailAccountDO.getId()); logDOBuilder.accountId(mailAccountDO.getId());
logDOBuilder.content(content); logDOBuilder.content(content);
logDOBuilder.title(title); logDOBuilder.title(title);