邮件服务

bladex-saas-project/new-mail/src/main/java/com/fjhx/service/impl/CoreServiceImpl.java

@@ -16,14 +16,14 @@ import com.fjhx.utils.EmailUtil;
 import com.sun.mail.imap.IMAPMessage;
 import com.sun.mail.imap.IMAPStore;
 import com.sun.mail.util.MailConnectException;
-import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tool.utils.ThreadUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.PostConstruct;
 import javax.mail.*;
 import javax.mail.internet.InternetAddress;
 import java.util.*;
@@ -33,7 +33,7 @@ import java.util.concurrent.Executor;
 
 @Slf4j
 @Service
-public class CoreServiceImpl {
+public class CoreServiceImpl implements ApplicationRunner {
 
     @Autowired
     private MailboxService mailboxService;
@@ -59,27 +59,8 @@ public class CoreServiceImpl {
     // 缓存错误次数
     private static final Map<String, Integer> map = new ConcurrentHashMap<>();
 
-    @AllArgsConstructor
-    class Task implements Runnable {
-
-        private CountDownLatch countDownLatch;
-        private Mailbox mailbox;
-
-        @Override
-        public void run() {
-            try {
-                synchronousMail(mailbox);
-            } catch (Exception e) {
-                log.error("发生未知异常", e);
-            }
-
-            countDownLatch.countDown();
-            // log.info("第 {} 伦同步还剩余 {} 封邮箱需要同步", num, countDownLatch.getCount());
-        }
-    }
-
-    @PostConstruct
-    public void init() {
+    @Override
+    public void run(ApplicationArguments args) {
         // 发起邮件同步
         new Thread(this::monitorMail).start();
     }
@@ -121,11 +102,16 @@ public class CoreServiceImpl {
         // 开启抓取邮件任务
         for (Mailbox mailbox : list) {
 
-            // 创建异步任务
-            Task task = new Task(countDownLatch, mailbox);
-
             // 开启异步操作
-            emailTaskExecutor.execute(task);
+            emailTaskExecutor.execute(() -> {
+                try {
+                    synchronousMail(mailbox);
+                } catch (Exception e) {
+                    log.error("发生未知异常", e);
+                }
+                countDownLatch.countDown();
+                // log.info("第 {} 伦同步还剩余 {} 封邮箱需要同步", num, countDownLatch.getCount());
+            });
 
         }
 

bladex-saas-project/new-mail/src/main/java/com/fjhx/service/impl/MailInfoServiceImpl.java

@@ -49,9 +49,6 @@ public class MailInfoServiceImpl extends ServiceImpl<MailInfoMapper, MailInfo> i
     private MailboxService mailboxService;
 
     @Autowired
-    private MailInfoService mailInfoService;
-
-    @Autowired
     private MailAddressService mailAddressService;
 
     @Autowired
@@ -67,7 +64,7 @@ public class MailInfoServiceImpl extends ServiceImpl<MailInfoMapper, MailInfo> i
     public MailDetailsVo getDetails(Long mailId) {
         MailDetailsVo mailDetailsVo = new MailDetailsVo();
 
-        MailInfo mailInfo = mailInfoService.getById(mailId);
+        MailInfo mailInfo = this.getById(mailId);
         if (mailInfo == null) {
             throw new ServiceException("没有找到邮件信息");
         }
@@ -94,7 +91,7 @@ public class MailInfoServiceImpl extends ServiceImpl<MailInfoMapper, MailInfo> i
                     mailDetailsVo.setMailAddressList(mailAddressList);
                     new Thread(() -> {
                         mailAddressService.saveBatch(mailAddressList);
-                        mailInfoService.update(Wrappers.<MailInfo>lambdaUpdate()
+                        this.update(Wrappers.<MailInfo>lambdaUpdate()
                                 .eq(MailInfo::getId, mailId).set(MailInfo::getAddressSync, 1));
                     }).start();
                 }
@@ -115,7 +112,7 @@ public class MailInfoServiceImpl extends ServiceImpl<MailInfoMapper, MailInfo> i
                         mailMessageService.save(mailMessage);
                         mailAttachmentService.saveBatch(mailAttachmentList);
 
-                        mailInfoService.update(Wrappers.<MailInfo>lambdaUpdate().eq(MailInfo::getId, mailId)
+                        this.update(Wrappers.<MailInfo>lambdaUpdate().eq(MailInfo::getId, mailId)
                                 .set(MailInfo::getMessageSync, 1).set(MailInfo::getAttachmentSync, 1));
                     }).start();