From 39f08dd934cde1a02f1c243faa43174fa474c87f Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 08 十一月 2022 11:11:35 +0800
Subject: [PATCH] 消息中心展示
---
ycl-platform/src/main/java/com/ycl/service/message/factory/MailSender.java | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 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..62a6c88 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
@@ -4,8 +4,8 @@
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
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;
@@ -36,18 +36,23 @@
public void setPropertyValueUtil(PropertyValueUtil propertyValueUtil) {
MailSender.propertyValueUtil = propertyValueUtil;
}
- private static ISmsAuditService iSmsAuditService;
+ private static UmsAdminService adminService;
@Autowired
- public void setISmsAuditService(ISmsAuditService iSmsAuditService) {
- MailSender.iSmsAuditService = iSmsAuditService;
+ public void setUmsAdminService(UmsAdminService adminService) {
+ MailSender.adminService = adminService;
}
@Override
public Message sendMessage(MessageParam messageParam) {
//鍏ュ簱淇濆瓨
Message message = innerSender.sendMessage(messageParam);
- //鍙戣捣瀹℃牳
- iSmsAuditService.startAuditSms(message);
+ if (messageParam.getStatus() == 1) {
+ //id鎹㈡垚閭鍙�
+ String targetToMail = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
+ message.setTargetTo(targetToMail);
+ //鍙戦�侀偖浠�
+ sendMail(message);
+ }
return message;
}
@@ -58,12 +63,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