24282 2 лет назад
Родитель
Сommit
95798a9c2f

+ 1 - 1
src/main/java/com/fjhx/email/controller/MailController.java

@@ -150,7 +150,7 @@ public class MailController {
     }
 
     /**
-     * 添加企业邮箱
+     * 添加个人邮箱
      */
     @PostMapping("addPersonalMailbox")
     public R addPersonalMailbox(@RequestBody PersonalMailbox personalMailbox) {

+ 7 - 5
src/main/java/com/fjhx/email/service/impl/MailServiceImpl.java

@@ -54,6 +54,7 @@ public class MailServiceImpl implements IMailService {
             TimeUnit.MINUTES,
             new ArrayBlockingQueue<>(10)
     );
+
     @Autowired
     private MailMapper mailMapper;
     @Autowired
@@ -145,7 +146,7 @@ public class MailServiceImpl implements IMailService {
 
         MessageDetailVo messageDetailVo = new MessageDetailVo();
 
-        // 正文附件已同步
+        // 已同步
         if (syncStatus.equals(1)) {
             if (type.equals(1)) {
                 setPersonalMessageDetailVo(messageDetailVo, messageId);
@@ -165,7 +166,7 @@ public class MailServiceImpl implements IMailService {
             IMAPMessage message = (IMAPMessage) folder.getMessageByUID(uid);
 
             if (message == null) {
-                throw new ServiceException("没有找到邮箱详情,邮件可能已被删除");
+                throw new ServiceException("没有找到邮件详情,此邮件可能已被删除");
             }
 
             List<CompletableFuture<MessageDetailVo.MessageAttachment>> list = new ArrayList<>();
@@ -339,7 +340,9 @@ public class MailServiceImpl implements IMailService {
      * 保存附件和正文
      */
     @SneakyThrows
-    private void getMessageAndAttachment(MessageDetailVo messageDetailVo, Part part, Long messageId,
+    private void getMessageAndAttachment(MessageDetailVo messageDetailVo,
+                                         Part part,
+                                         Long messageId,
                                          List<CompletableFuture<MessageDetailVo.MessageAttachment>> completableFutureList) {
 
         // 正文:文本格式
@@ -390,8 +393,7 @@ public class MailServiceImpl implements IMailService {
                 }
 
                 // 附件
-                else if (disposition != null
-                        && (disposition.equalsIgnoreCase(Part.ATTACHMENT) || disposition.equalsIgnoreCase(Part.INLINE))) {
+                else if (disposition != null && (disposition.equalsIgnoreCase(Part.ATTACHMENT) || disposition.equalsIgnoreCase(Part.INLINE))) {
                     completableFutureList.add(CompletableFuture.supplyAsync(() -> getMessageAttachment(bodyPart), executorService));
                 }