From 9969bea2a8c1eab64c12a51a2d24d65e5b6c0dd0 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 24 十月 2022 18:12:41 +0800
Subject: [PATCH] 日志导出乱码 日志查询导出 代码重构
---
ycl-platform/src/main/java/com/ycl/service/message/factory/MailSender.java | 38 ++++++++++++++++++++++++++++++++------
1 files changed, 32 insertions(+), 6 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 0daacdf..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
@@ -3,7 +3,10 @@
import com.ycl.common.util.PropertyValueUtil;
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;
@@ -34,35 +37,58 @@
public void setPropertyValueUtil(PropertyValueUtil propertyValueUtil) {
MailSender.propertyValueUtil = propertyValueUtil;
}
+ private static ISmsAuditService iSmsAuditService;
+ @Autowired
+ public void setISmsAuditService(ISmsAuditService iSmsAuditService) {
+ 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;
+ }
+
+ public Message sendMail(Message message) {
//缁勮閭欢鍙戦��
JavaMailSenderImpl sender = new JavaMailSenderImpl();
sender.setHost(propertyValueUtil.getHost());
sender.setUsername(propertyValueUtil.getUsername());
sender.setPassword(propertyValueUtil.getAuthorizationCode());
- String[] mailUrls = messageParam.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(messageParam.getTargetFrom());
- messageTo.setTo(mailUrls[i]);
- messageTo.setSubject(messageParam.getHead());
+ messageTo.setFrom(propertyValueUtil.getUsername());
+ messageTo.setTo(mails[i]);
+ messageTo.setSubject(message.getHead());
messageTo.setText(message.getBody());
messageList[i] = messageTo;
}
try {
sender.send(messageList);
logger.info("绠�鍗曢偖浠跺凡鍙戦��");
+
}catch (Exception e){
e.printStackTrace();
logger.error("鍙戦�佺畝鍗曢偖浠舵椂鍙戠敓寮傚父锛�", e);
e.printStackTrace();
+ throw new ApiException("鍙戦�佺畝鍗曢偖浠舵椂鍙戠敓寮傚父");
}
return message;
}
--
Gitblit v1.8.0