mg
2022-10-19 a2ba906b00f9a239ebe3ddb8bdc35bb69b9cca19
 发送邮件优化。
4个文件已修改
37 ■■■■■ 已修改文件
ycl-platform/src/main/java/com/ycl/scheduling/SchedulingConfiguration.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/message/factory/MailSender.java 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-platform/src/main/java/com/ycl/scheduling/SchedulingConfiguration.java
@@ -4,12 +4,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
@Configuration
@EnableScheduling
//@Configuration
//@EnableScheduling
public class SchedulingConfiguration {
    private Logger logger = LoggerFactory.getLogger(getClass());
ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java
@@ -45,9 +45,15 @@
        String messageNumber = UtilNumber.getNumber("MC", 6);
        List<Message> messages = new ArrayList<>();
        BeanUtils.copyProperties(messageParam, message);
        //父Id为0
        message.setParentId(0L);
        //生成消息编码
        message.setMessageNumber(messageNumber);
        //生成默认参数
        //发送时间
        if (message.getSendTime() == null) {
            message.setSendTime(new Date());
        }
        message.setIsView(0);
        message.setVersion(0);
        message.setIsScan(1);
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;
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
@@ -15,8 +15,6 @@
import com.ycl.service.message.factory.InnerFactory;
import com.ycl.service.message.factory.MailFactory;
import com.ycl.service.message.factory.SmsFactory;
import com.ycl.service.user.UmsAdminService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -29,9 +27,6 @@
 */
@Service
public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements IMessageService {
    @Autowired
    private UmsAdminService adminService;
    @Override
    public Message sendMessage(MessageParam messageParam) {