Commit 7e65ede92d1e6e31f36a66692ac3936c398be456
1 parent
1a4bea8c
邮箱模块:优化注释 + 方法名
Showing
8 changed files
with
51 additions
and
9 deletions
yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApi.java
| ... | ... | @@ -19,7 +19,7 @@ public interface MailSendApi { |
| 19 | 19 | * @param reqDTO 发送请求 |
| 20 | 20 | * @return 发送日志编号 |
| 21 | 21 | */ |
| 22 | - Long sendSingleSmsToAdmin(@Valid MailSendSingleToUserReqDTO reqDTO); | |
| 22 | + Long sendSingleMailToAdmin(@Valid MailSendSingleToUserReqDTO reqDTO); | |
| 23 | 23 | |
| 24 | 24 | /** |
| 25 | 25 | * 发送单条邮箱给 Member 用户 |
| ... | ... | @@ -29,6 +29,6 @@ public interface MailSendApi { |
| 29 | 29 | * @param reqDTO 发送请求 |
| 30 | 30 | * @return 发送日志编号 |
| 31 | 31 | */ |
| 32 | - Long sendSingleSmsToMember(@Valid MailSendSingleToUserReqDTO reqDTO); | |
| 32 | + Long sendSingleMailToMember(@Valid MailSendSingleToUserReqDTO reqDTO); | |
| 33 | 33 | |
| 34 | 34 | } | ... | ... |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/mail/MailSendApiImpl.java
| ... | ... | @@ -20,13 +20,13 @@ public class MailSendApiImpl implements MailSendApi { |
| 20 | 20 | private MailSendService mailSendService; |
| 21 | 21 | |
| 22 | 22 | @Override |
| 23 | - public Long sendSingleSmsToAdmin(MailSendSingleToUserReqDTO reqDTO) { | |
| 23 | + public Long sendSingleMailToAdmin(MailSendSingleToUserReqDTO reqDTO) { | |
| 24 | 24 | return mailSendService.sendSingleMailToAdmin(reqDTO.getMail(), reqDTO.getUserId(), |
| 25 | 25 | reqDTO.getTemplateCode(), reqDTO.getTemplateParams()); |
| 26 | 26 | } |
| 27 | 27 | |
| 28 | 28 | @Override |
| 29 | - public Long sendSingleSmsToMember(MailSendSingleToUserReqDTO reqDTO) { | |
| 29 | + public Long sendSingleMailToMember(MailSendSingleToUserReqDTO reqDTO) { | |
| 30 | 30 | return mailSendService.sendSingleMailToMember(reqDTO.getMail(), reqDTO.getUserId(), |
| 31 | 31 | reqDTO.getTemplateCode(), reqDTO.getTemplateParams()); |
| 32 | 32 | } | ... | ... |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailAccountRefreshConsumer.java
0 → 100644
| 1 | +package cn.iocoder.yudao.module.system.mq.consumer.mail; | |
| 2 | + | |
| 3 | +import cn.iocoder.yudao.framework.mq.core.pubsub.AbstractChannelMessageListener; | |
| 4 | +import cn.iocoder.yudao.module.system.mq.message.mail.MailAccountRefreshMessage; | |
| 5 | +import cn.iocoder.yudao.module.system.mq.message.mail.MailTemplateRefreshMessage; | |
| 6 | +import cn.iocoder.yudao.module.system.service.mail.MailAccountService; | |
| 7 | +import cn.iocoder.yudao.module.system.service.mail.MailTemplateService; | |
| 8 | +import lombok.extern.slf4j.Slf4j; | |
| 9 | +import org.springframework.stereotype.Component; | |
| 10 | + | |
| 11 | +import javax.annotation.Resource; | |
| 12 | + | |
| 13 | +/** | |
| 14 | + * 针对 {@link MailAccountRefreshMessage} 的消费者 | |
| 15 | + * | |
| 16 | + * @author wangjingyi | |
| 17 | + */ | |
| 18 | +@Component | |
| 19 | +@Slf4j | |
| 20 | +public class MailAccountRefreshConsumer extends AbstractChannelMessageListener<MailAccountRefreshMessage> { | |
| 21 | + | |
| 22 | + @Resource | |
| 23 | + private MailAccountService mailAccountService; | |
| 24 | + | |
| 25 | + @Override | |
| 26 | + public void onMessage(MailAccountRefreshMessage message) { | |
| 27 | + log.info("[onMessage][收到 Mail Account 刷新信息]"); | |
| 28 | + mailAccountService.initLocalCache(); | |
| 29 | + } | |
| 30 | + | |
| 31 | +} | ... | ... |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailSendConsumer.java
| ... | ... | @@ -2,19 +2,25 @@ package cn.iocoder.yudao.module.system.mq.consumer.mail; |
| 2 | 2 | |
| 3 | 3 | import cn.iocoder.yudao.framework.mq.core.stream.AbstractStreamMessageListener; |
| 4 | 4 | import cn.iocoder.yudao.module.system.mq.message.mail.MailSendMessage; |
| 5 | +import cn.iocoder.yudao.module.system.mq.message.sms.SmsSendMessage; | |
| 5 | 6 | import cn.iocoder.yudao.module.system.service.mail.MailSendService; |
| 6 | 7 | import lombok.extern.slf4j.Slf4j; |
| 7 | 8 | import org.springframework.stereotype.Component; |
| 8 | 9 | |
| 9 | 10 | import javax.annotation.Resource; |
| 10 | 11 | |
| 11 | - | |
| 12 | +/** | |
| 13 | + * 针对 {@link MailSendMessage} 的消费者 | |
| 14 | + * | |
| 15 | + * @author 芋道源码 | |
| 16 | + */ | |
| 12 | 17 | @Component |
| 13 | 18 | @Slf4j |
| 14 | 19 | public class MailSendConsumer extends AbstractStreamMessageListener<MailSendMessage> { |
| 15 | 20 | |
| 16 | 21 | @Resource |
| 17 | 22 | private MailSendService mailSendService; |
| 23 | + | |
| 18 | 24 | @Override |
| 19 | 25 | public void onMessage(MailSendMessage message) { |
| 20 | 26 | log.info("[onMessage][消息内容({})]", message); | ... | ... |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/consumer/mail/MailTemplateRefreshConsumer.java
| ... | ... | @@ -22,7 +22,8 @@ public class MailTemplateRefreshConsumer extends AbstractChannelMessageListener< |
| 22 | 22 | |
| 23 | 23 | @Override |
| 24 | 24 | public void onMessage(MailTemplateRefreshMessage message) { |
| 25 | - log.info("[onMessage][收到 MailTemplate 刷新信息]"); | |
| 25 | + log.info("[onMessage][收到 Mail Template 刷新信息]"); | |
| 26 | 26 | mailTemplateService.initLocalCache(); |
| 27 | 27 | } |
| 28 | + | |
| 28 | 29 | } | ... | ... |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailAccountRefreshMessage.java
| ... | ... | @@ -5,15 +5,17 @@ import lombok.Data; |
| 5 | 5 | import lombok.EqualsAndHashCode; |
| 6 | 6 | |
| 7 | 7 | /** |
| 8 | - * 邮箱账号的数据刷新 Message | |
| 8 | + * 邮箱账号的数据刷新 Message | |
| 9 | 9 | * |
| 10 | 10 | * @author wangjingyi |
| 11 | 11 | */ |
| 12 | 12 | @Data |
| 13 | 13 | @EqualsAndHashCode(callSuper = true) |
| 14 | 14 | public class MailAccountRefreshMessage extends AbstractChannelMessage { |
| 15 | + | |
| 15 | 16 | @Override |
| 16 | 17 | public String getChannel() { |
| 17 | 18 | return "system.mail-account.refresh"; |
| 18 | 19 | } |
| 20 | + | |
| 19 | 21 | } | ... | ... |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/message/mail/MailTemplateRefreshMessage.java
| ... | ... | @@ -5,15 +5,17 @@ import lombok.Data; |
| 5 | 5 | import lombok.EqualsAndHashCode; |
| 6 | 6 | |
| 7 | 7 | /** |
| 8 | - * 邮箱模板的数据刷新 Message | |
| 8 | + * 邮箱模板的数据刷新 Message | |
| 9 | 9 | * |
| 10 | 10 | * @author wangjingyi |
| 11 | 11 | */ |
| 12 | 12 | @Data |
| 13 | 13 | @EqualsAndHashCode(callSuper = true) |
| 14 | 14 | public class MailTemplateRefreshMessage extends AbstractChannelMessage { |
| 15 | + | |
| 15 | 16 | @Override |
| 16 | 17 | public String getChannel() { |
| 17 | 18 | return "system.mail-template.refresh"; |
| 18 | 19 | } |
| 20 | + | |
| 19 | 21 | } | ... | ... |
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/mq/producer/mail/MailProducer.java
| ... | ... | @@ -31,7 +31,7 @@ public class MailProducer { |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | 33 | /** |
| 34 | - * 发送 {@link MailTemplateRefreshMessage} 消息 | |
| 34 | + * 发送 {@link MailAccountRefreshMessage} 消息 | |
| 35 | 35 | */ |
| 36 | 36 | public void sendMailAccountRefreshMessage() { |
| 37 | 37 | MailAccountRefreshMessage message = new MailAccountRefreshMessage(); | ... | ... |