From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +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 | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 7208238..f57fa44 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
@@ -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;
/**
@@ -80,6 +81,7 @@
@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())
@@ -90,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);
@@ -181,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