fix: 消息发送端口

wl

2022-12-09 bb2c38a25ff3eb8bac25a3938d53f79ea1836515

 ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java

@@ -1,9 +1,6 @@
package com.ycl.service.message.impl;

import cn.hutool.core.net.url.UrlBuilder;
import cn.hutool.core.net.url.UrlPath;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -13,12 +10,12 @@
import com.ycl.entity.message.Message;
import com.ycl.entity.message.SendReq;
import com.ycl.entity.message.SendRes;
import com.ycl.entity.user.UmsAdmin;
import com.ycl.exception.ApiException;
import com.ycl.mapper.message.MessageMapper;
import com.ycl.mapper.user.UmsAdminMapper;
import com.ycl.service.message.IMessageService;
import com.ycl.utils.MD5Util;
import com.ycl.vo.message.MessageVO;
import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -38,6 +35,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Properties;
import java.util.stream.Collectors;

/**
@@ -83,15 +81,18 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public String sendMessage(Message message) {

        Message savedMessage = messageMapper.selectOne(new LambdaQueryWrapper<Message>()
                .eq(Message::getTargetTo, message.getTargetTo())
                .eq(Message::getTargetFrom, message.getTargetFrom()));
                .eq(Message::getTargetFrom, message.getTargetFrom())
                .eq(Message::getBody, message.getBody())
                .eq(Message::getHead, message.getHead()));
        if (savedMessage != null) {
            messageMapper.deleteById(savedMessage);
        }

        ArrayList<Long> ids = new ArrayList<>();

        message.setTargetFrom(umsAdminMapper.selectById(message.getCreateUser()).getUsername());
        for (String receive : message.getTargetTo().split(",")) {
            Message sendMessage = new Message();
            BeanUtils.copyProperties(message, sendMessage);
@@ -110,6 +111,8 @@
            //短信发送
            case ChannelCode.MAIL:
                sendMail(message);
                break;
            case ChannelCode.INNER:
                break;
            default:
                throw new ApiException("未匹配到该类型");
@@ -180,6 +183,14 @@
        javaMailSender.setHost(sendHost);
        javaMailSender.setUsername(userName);
        javaMailSender.setPassword(password);
        javaMailSender.setPort(465);
        Properties properties = new Properties();
        properties.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
        properties.put("mail.smtp.auth", "true");//必须是字符串而不能是boolean否则报错
        properties.put("mail.smtp.starttls.enable", "true");
        properties.put("mail.smtp.timeout", "1000");
        properties.put("mail.smtp.host", sendHost);
        javaMailSender.setJavaMailProperties(properties);
        MimeMessage mimeMessage = javaMailSender.createMimeMessage();
        MimeMessageHelper helper = new MimeMessageHelper(mimeMessage);
        helper.setText(message.getBody());
@@ -195,9 +206,9 @@
    }

    @Override
    public Page<Message> list(MessageParam messageParam) {
    public Page<MessageVO> list(MessageParam messageParam) {
        Page<Message> page = new Page<>(messageParam.getCurrent(), messageParam.getPageSize());
        return messageMapper.selectMessagePage(page,messageParam);
        return messageMapper.selectMessagePage(page, messageParam);
    }

    @Override