From a2ba906b00f9a239ebe3ddb8bdc35bb69b9cca19 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 19 十月 2022 14:06:45 +0800
Subject: [PATCH] 发送邮件优化。
---
ycl-platform/src/main/java/com/ycl/service/message/factory/MailSender.java | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/factory/MailSender.java b/ycl-platform/src/main/java/com/ycl/service/message/factory/MailSender.java
index c13045a..b272553 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/factory/MailSender.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/factory/MailSender.java
@@ -6,6 +6,7 @@
import com.ycl.exception.ApiException;
import com.ycl.service.message.ISmsAuditService;
import com.ycl.service.message.Sender;
+import com.ycl.service.user.UmsAdminService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,12 +43,23 @@
MailSender.iSmsAuditService = iSmsAuditService;
}
+ private static UmsAdminService adminService;
+ @Autowired
+ public void setUmsAdminService(UmsAdminService adminService) {
+ MailSender.adminService = adminService;
+ }
+
@Override
public Message sendMessage(MessageParam messageParam) {
//鍏ュ簱淇濆瓨
Message message = innerSender.sendMessage(messageParam);
//鍙戣捣瀹℃牳
iSmsAuditService.startAuditSms(message);
+ //id鎹㈡垚閭鍙�
+ String targetToMail = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
+ message.setTargetTo(targetToMail);
+ //鍙戦�侀偖浠�
+ sendMail(message);
return message;
}
@@ -58,12 +70,12 @@
sender.setUsername(propertyValueUtil.getUsername());
sender.setPassword(propertyValueUtil.getAuthorizationCode());
- String[] mailUrls = message.getTargetTo().split(",");
- SimpleMailMessage[] messageList = new SimpleMailMessage[mailUrls.length];
+ String[] mails = message.getTargetTo().split(",");
+ SimpleMailMessage[] messageList = new SimpleMailMessage[mails.length];
for (int i=0;i<messageList.length;i++) {
SimpleMailMessage messageTo = new SimpleMailMessage();
- messageTo.setFrom(message.getTargetFrom());
- messageTo.setTo(mailUrls[i]);
+ messageTo.setFrom(propertyValueUtil.getUsername());
+ messageTo.setTo(mails[i]);
messageTo.setSubject(message.getHead());
messageTo.setText(message.getBody());
messageList[i] = messageTo;
--
Gitblit v1.8.0