From 5fa50709c50f1b288187380a915ff4e28d160aca Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 02 十一月 2023 09:26:52 +0800
Subject: [PATCH] 邮件发送失败处理

---
 src/main/java/com/whyc/service/MailService.java |   26 +++++++++++++-------------
 1 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/whyc/service/MailService.java b/src/main/java/com/whyc/service/MailService.java
index e9e3780..a1037e5 100644
--- a/src/main/java/com/whyc/service/MailService.java
+++ b/src/main/java/com/whyc/service/MailService.java
@@ -7,6 +7,7 @@
 import com.whyc.util.ActionUtil;
 import com.whyc.util.MailUtil;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.mail.MailException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -32,24 +33,23 @@
     public Response sendMail(MailDTO mailDTO) {
         Long uId = ActionUtil.getUser().getId();
         String name=ActionUtil.getUser().getName();
+        //鏃ュ織鍐呭鍑嗗
         StringBuilder mailUserStr = new StringBuilder();
+        List<String> mailList = mailDTO.getMailList();
+        for (int i = 0; i < mailList.size(); i++) {
+            if(i==0){
+                mailUserStr.append(mailList.get(i));
+            }else{
+                mailUserStr.append(","+mailList.get(i));
+            }
+        }
         try {
             mailUtil.sendMailBatch(name,mailDTO.getMailList(),mailDTO.getTitle(),mailDTO.getContent());
-
-            //鏃ュ織
-            List<String> mailList = mailDTO.getMailList();
-            for (int i = 0; i < mailList.size(); i++) {
-                if(i==0){
-                    mailUserStr.append(mailList.get(i));
-                }else{
-                    mailUserStr.append(","+mailList.get(i));
-                }
-            }
 
             String msgDetail = "鍙戦�佺粰閭" + mailUserStr + ",鏍囬涓�:" + mailDTO.getTitle() + ",鍐呭涓�:" + mailDTO.getContent();
             logService.record(uId, name, UserOperation.TYPE_SEND_MAIL.getType(), "閭欢鍙戦��", msgDetail);
             return new Response().set(1,true,"鍙戦�佸畬鎴�");
-        } catch (MessagingException ex) { //閭欢鍙戦�佸紓甯�,瀛樺叆鏁版嵁搴撳緟閲嶆柊鍙戦�佸垪琛�
+        } catch (MessagingException | MailException ex) { //閭欢鍙戦�佸紓甯�,瀛樺叆鏁版嵁搴撳緟閲嶆柊鍙戦�佸垪琛�
             MailQueue queue = new MailQueue();
             queue.setMails(mailUserStr.toString());
             queue.setTitle(mailDTO.getTitle());
@@ -75,8 +75,8 @@
             mailQueueService.deleteById(queue.getId());
             //鏃ュ織
             String msgDetail = "鍙戦�佺粰閭" + mails + ",鏍囬涓�:" + queue.getTitle() + ",鍐呭涓�:" + queue.getContent();
-            logService.record(uId, name, UserOperation.TYPE_SEND_MAIL.getType(), "閭欢鍙戦��", msgDetail);
-        } catch (MessagingException ex) { //閭欢鍙戦�佸紓甯�
+            logService.record(uId, name, UserOperation.TYPE_SEND_MAIL.getType(), "閭欢鍥犵綉缁滈棶棰樼敱绯荤粺寤舵椂鍙戦��", msgDetail);
+        } catch (MessagingException | MailException ex) { //閭欢鍙戦�佸紓甯�
             //System.out.println("閭欢鍙戦�佸紓甯�,鍚庣画浼氭寔缁彂閫佺洿鍒版垚鍔�");
         }
     }

--
Gitblit v1.9.1