From 08ad4178329d0d356891aa2fef60eccb5e33970d Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 21 十二月 2022 13:45:04 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

---
 ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
index 639a7d0..04e0ea9 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
@@ -4,8 +4,8 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.ycl.controller.video.common.constant.ChannelCode;
-import com.ycl.controller.video.common.util.CommonUtils;
+import com.ycl.common.constant.ChannelCode;
+import com.ycl.common.util.CommonUtils;
 import com.ycl.dto.message.MessageParam;
 import com.ycl.entity.message.Message;
 import com.ycl.entity.message.SendReq;
@@ -35,6 +35,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Properties;
 import java.util.stream.Collectors;
 
 /**
@@ -91,7 +92,7 @@
         }
 
         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);
@@ -182,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());

--
Gitblit v1.8.0