From e46f74096736c408328cf588e55ea2152f436de4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 04 Mar 2024 16:00:00 +0800
Subject: [PATCH] 邮箱管理

---
 src/main/java/org/springblade/modules/email/service/impl/EmailAccountServiceImpl.java |   22 +++++++++++++++-------
 1 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/springblade/modules/email/service/impl/EmailAccountServiceImpl.java b/src/main/java/org/springblade/modules/email/service/impl/EmailAccountServiceImpl.java
index 37b6db1..1bf4c3f 100644
--- a/src/main/java/org/springblade/modules/email/service/impl/EmailAccountServiceImpl.java
+++ b/src/main/java/org/springblade/modules/email/service/impl/EmailAccountServiceImpl.java
@@ -1,6 +1,9 @@
 package org.springblade.modules.email.service.impl;
 
+import com.xxl.job.core.util.DateUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.modules.email.config.MailProperties;
 import org.springblade.modules.email.config.MailSenderConfig;
@@ -16,12 +19,15 @@
 import javax.annotation.Resource;
 import javax.mail.MessagingException;
 import javax.mail.internet.MimeMessage;
+import java.io.File;
 import java.util.List;
 import java.util.stream.Collectors;
 
 @Service
 @Slf4j
 public class EmailAccountServiceImpl implements IEmailAccountService {
+
+	private static Logger logger = LoggerFactory.getLogger(EmailAccountServiceImpl.class);
 
 	@Autowired
 	MailSenderConfig senderConfig;
@@ -30,11 +36,10 @@
 	MailProperties mailProperties;
 
 
-
 	@Override
-	public void senderEmail(EmailAccount account) {
+	public Boolean senderEmail(EmailAccount account) {
 
-		if (account.getEmails().size()>0){
+		if (account.getEmails().size() > 0) {
 			log.info(Thread.currentThread().getName());
 			JavaMailSenderImpl javaMailSender = senderConfig.getSender();
 			//一个复杂的邮件
@@ -46,22 +51,25 @@
 				//主题(标题)
 				helper.setSubject(account.getSubject());
 
-				helper.setText(account.getContent(),true);
+				helper.setText(account.getContent(), true);
 
 				helper.setTo(account.getEmails().toArray(new String[account.getEmails().size()]));
 
 				helper.setFrom(javaMailSender.getUsername());
 
 				javaMailSender.send(message);
+				return true;
 
 			} catch (MessagingException e) {
-				e.printStackTrace();
+				logger.error("邮件发送失败!", e);
+				return false;
 			}
 		}
+		return false;
 	}
 
 	@Override
-	public void sendMessageUserEmail(String title, String content, List<MessageUser> messageUserList) {
+	public Boolean sendMessageUserEmail(String title, String content, List<MessageUser> messageUserList) {
 
 		List<String> emails = messageUserList.stream().filter(e -> StringUtil.isNotBlank(e.getEmail())).map(MessageUser::getEmail).collect(Collectors.toList());
 
@@ -71,6 +79,6 @@
 		emailAccount.setSubject(title);
 		emailAccount.setContent(content);
 
-		senderEmail(emailAccount);
+		return  senderEmail(emailAccount);
 	}
 }

--
Gitblit v1.9.3