提交

src/main/java/com/fjhx/email/entity/vo/MessageDetailVo.java

@@ -10,24 +10,21 @@ import java.util.List;
 public class MessageDetailVo {
 
     /**
-     * 内容
-     */
-    private String content;
-
-    /**
-     * 类型
-     */
-    private String mimeType;
-
-    /**
      * 邮件关联地址
      */
     List<MessageAddress> messageAddressList;
-
     /**
      * 附件
      */
     List<MessageAttachment> messageAttachmentList;
+    /**
+     * 内容
+     */
+    private String content;
+    /**
+     * 类型
+     */
+    private String mimeType;
 
     @Getter
     @Setter

src/main/java/com/fjhx/email/enums/MailFlagEnum.java

@@ -25,7 +25,7 @@ public enum MailFlagEnum {
      */
     DRAFT("3", Flags.Flag.DRAFT),
     /**
-     *标记
+     * 标记
      */
     FLAGGED("4", Flags.Flag.FLAGGED),
     /**
@@ -42,9 +42,6 @@ public enum MailFlagEnum {
     USER("7", Flags.Flag.USER),
     ;
 
-    private final String type;
-    private final Flags.Flag flag;
-
     private static final Map<Flags.Flag, MailFlagEnum> map = new HashMap<>();
 
     static {
@@ -53,6 +50,9 @@ public enum MailFlagEnum {
         }
     }
 
+    private final String type;
+    private final Flags.Flag flag;
+
     public static String getType(Flags.Flag flag) {
         return map.get(flag).getType();
     }

src/main/java/com/fjhx/email/mapper/EnterpriseDomainMapper.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.mapper;
 
-import com.fjhx.email.entity.EnterpriseDomain;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.email.entity.EnterpriseDomain;
 
 /**
  * <p>

src/main/java/com/fjhx/email/mapper/EnterpriseFolderMapper.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.mapper;
 
-import com.fjhx.email.entity.EnterpriseFolder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.email.entity.EnterpriseFolder;
 
 /**
  * <p>

src/main/java/com/fjhx/email/mapper/EnterpriseMailboxMapper.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.mapper;
 
-import com.fjhx.email.entity.EnterpriseMailbox;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.email.entity.EnterpriseMailbox;
 
 /**
  * <p>

src/main/java/com/fjhx/email/mapper/EnterpriseMessageAddressMapper.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.mapper;
 
-import com.fjhx.email.entity.EnterpriseMessageAddress;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.email.entity.EnterpriseMessageAddress;
 
 /**
  * <p>

src/main/java/com/fjhx/email/mapper/EnterpriseMessageAttachmentMapper.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.mapper;
 
-import com.fjhx.email.entity.EnterpriseMessageAttachment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.email.entity.EnterpriseMessageAttachment;
 
 /**
  * <p>

src/main/java/com/fjhx/email/mapper/EnterpriseMessageContentMapper.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.mapper;
 
-import com.fjhx.email.entity.EnterpriseMessageContent;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.email.entity.EnterpriseMessageContent;
 
 /**
  * <p>

src/main/java/com/fjhx/email/mapper/EnterpriseMessageMapper.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.mapper;
 
-import com.fjhx.email.entity.EnterpriseMessage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.email.entity.EnterpriseMessage;
 
 /**
  * <p>

src/main/java/com/fjhx/email/mapper/PersonalFolderMapper.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.mapper;
 
-import com.fjhx.email.entity.PersonalFolder;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.email.entity.PersonalFolder;
 
 /**
  * <p>

src/main/java/com/fjhx/email/mapper/PersonalMailboxMapper.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.mapper;
 
-import com.fjhx.email.entity.PersonalMailbox;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.email.entity.PersonalMailbox;
 
 /**
  * <p>

src/main/java/com/fjhx/email/mapper/PersonalMessageAddressMapper.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.mapper;
 
-import com.fjhx.email.entity.PersonalMessageAddress;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.email.entity.PersonalMessageAddress;
 
 /**
  * <p>

src/main/java/com/fjhx/email/mapper/PersonalMessageAttachmentMapper.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.mapper;
 
-import com.fjhx.email.entity.PersonalMessageAttachment;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.email.entity.PersonalMessageAttachment;
 
 /**
  * <p>

src/main/java/com/fjhx/email/mapper/PersonalMessageContentMapper.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.mapper;
 
-import com.fjhx.email.entity.PersonalMessageContent;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.email.entity.PersonalMessageContent;
 
 /**
  * <p>

src/main/java/com/fjhx/email/mapper/PersonalMessageMapper.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.mapper;
 
-import com.fjhx.email.entity.PersonalMessage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fjhx.email.entity.PersonalMessage;
 
 /**
  * <p>

src/main/java/com/fjhx/email/service/IEnterpriseDomainService.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.service;
 
-import com.fjhx.email.entity.EnterpriseDomain;
 import com.fjhx.email.config.base.BaseService;
+import com.fjhx.email.entity.EnterpriseDomain;
 
 /**
  * <p>

src/main/java/com/fjhx/email/service/IEnterpriseFolderService.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.service;
 
-import com.fjhx.email.entity.EnterpriseFolder;
 import com.fjhx.email.config.base.BaseService;
+import com.fjhx.email.entity.EnterpriseFolder;
 
 /**
  * <p>

src/main/java/com/fjhx/email/service/IEnterpriseMailboxService.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.service;
 
-import com.fjhx.email.entity.EnterpriseMailbox;
 import com.fjhx.email.config.base.BaseService;
+import com.fjhx.email.entity.EnterpriseMailbox;
 
 /**
  * <p>

src/main/java/com/fjhx/email/service/IEnterpriseMessageAddressService.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.service;
 
-import com.fjhx.email.entity.EnterpriseMessageAddress;
 import com.fjhx.email.config.base.BaseService;
+import com.fjhx.email.entity.EnterpriseMessageAddress;
 
 /**
  * <p>

src/main/java/com/fjhx/email/service/IEnterpriseMessageAttachmentService.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.service;
 
-import com.fjhx.email.entity.EnterpriseMessageAttachment;
 import com.fjhx.email.config.base.BaseService;
+import com.fjhx.email.entity.EnterpriseMessageAttachment;
 
 /**
  * <p>

src/main/java/com/fjhx/email/service/IEnterpriseMessageContentService.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.service;
 
-import com.fjhx.email.entity.EnterpriseMessageContent;
 import com.fjhx.email.config.base.BaseService;
+import com.fjhx.email.entity.EnterpriseMessageContent;
 
 /**
  * <p>

src/main/java/com/fjhx/email/service/IEnterpriseMessageService.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.service;
 
-import com.fjhx.email.entity.EnterpriseMessage;
 import com.fjhx.email.config.base.BaseService;
+import com.fjhx.email.entity.EnterpriseMessage;
 
 /**
  * <p>

src/main/java/com/fjhx/email/service/IPersonalFolderService.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.service;
 
-import com.fjhx.email.entity.PersonalFolder;
 import com.fjhx.email.config.base.BaseService;
+import com.fjhx.email.entity.PersonalFolder;
 
 /**
  * <p>

src/main/java/com/fjhx/email/service/IPersonalMailboxService.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.service;
 
-import com.fjhx.email.entity.PersonalMailbox;
 import com.fjhx.email.config.base.BaseService;
+import com.fjhx.email.entity.PersonalMailbox;
 
 /**
  * <p>

src/main/java/com/fjhx/email/service/IPersonalMessageAddressService.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.service;
 
-import com.fjhx.email.entity.PersonalMessageAddress;
 import com.fjhx.email.config.base.BaseService;
+import com.fjhx.email.entity.PersonalMessageAddress;
 
 /**
  * <p>

src/main/java/com/fjhx/email/service/IPersonalMessageAttachmentService.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.service;
 
-import com.fjhx.email.entity.PersonalMessageAttachment;
 import com.fjhx.email.config.base.BaseService;
+import com.fjhx.email.entity.PersonalMessageAttachment;
 
 /**
  * <p>

src/main/java/com/fjhx/email/service/IPersonalMessageContentService.java

@@ -1,7 +1,7 @@
 package com.fjhx.email.service;
 
-import com.fjhx.email.entity.PersonalMessageContent;
 import com.fjhx.email.config.base.BaseService;
+import com.fjhx.email.entity.PersonalMessageContent;
 
 /**
  * <p>

src/main/java/com/fjhx/email/service/impl/CoreServiceImpl.java

@@ -45,6 +45,23 @@ import java.util.stream.Collectors;
 @Service
 public class CoreServiceImpl implements ApplicationRunner {
 
+    /**
+     * 缓存错误次数
+     */
+    private static final Map<Long, Integer> map = new ConcurrentHashMap<>();
+    /**
+     * 正在同步的邮箱集合
+     */
+    private static final List<Long> syncMailList = Collections.synchronizedList(new ArrayList<>());
+    /**
+     * 累计同步次数
+     */
+    private static int num = 0;
+    /**
+     * 单次同步邮件总次数
+     */
+    private static int mailCount;
+
     @Autowired
     private PlatformTransactionManager platformTransactionManager;
 
@@ -71,24 +88,11 @@ public class CoreServiceImpl implements ApplicationRunner {
     private IMailService mailService;
 
     /**
-     * 累计同步次数
-     */
-    private static int num = 0;
-
-    /**
-     * 单次同步邮件总次数
-     */
-    private static int mailCount;
-
-    /**
-     * 缓存错误次数
-     */
-    private static final Map<Long, Integer> map = new ConcurrentHashMap<>();
-
-    /**
-     * 正在同步的邮箱集合
+     * 添加同步邮件数量
      */
-    private static final List<Long> syncMailList = Collections.synchronizedList(new ArrayList<>());
+    private static synchronized void addMailCount() {
+        mailCount++;
+    }
 
     @Override
     public void run(ApplicationArguments args) {
@@ -467,11 +471,4 @@ public class CoreServiceImpl implements ApplicationRunner {
         }
     }
 
-    /**
-     * 添加同步邮件数量
-     */
-    private static synchronized void addMailCount() {
-        mailCount++;
-    }
-
 }

src/main/java/com/fjhx/email/service/impl/EnterpriseDomainServiceImpl.java

@@ -1,9 +1,9 @@
 package com.fjhx.email.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.email.entity.EnterpriseDomain;
 import com.fjhx.email.mapper.EnterpriseDomainMapper;
 import com.fjhx.email.service.IEnterpriseDomainService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/fjhx/email/service/impl/EnterpriseFolderServiceImpl.java

@@ -1,9 +1,9 @@
 package com.fjhx.email.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.email.entity.EnterpriseFolder;
 import com.fjhx.email.mapper.EnterpriseFolderMapper;
 import com.fjhx.email.service.IEnterpriseFolderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/fjhx/email/service/impl/EnterpriseMessageAddressServiceImpl.java

@@ -1,9 +1,9 @@
 package com.fjhx.email.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.email.entity.EnterpriseMessageAddress;
 import com.fjhx.email.mapper.EnterpriseMessageAddressMapper;
 import com.fjhx.email.service.IEnterpriseMessageAddressService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/fjhx/email/service/impl/EnterpriseMessageAttachmentServiceImpl.java

@@ -1,9 +1,9 @@
 package com.fjhx.email.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.email.entity.EnterpriseMessageAttachment;
 import com.fjhx.email.mapper.EnterpriseMessageAttachmentMapper;
 import com.fjhx.email.service.IEnterpriseMessageAttachmentService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/fjhx/email/service/impl/EnterpriseMessageContentServiceImpl.java

@@ -1,9 +1,9 @@
 package com.fjhx.email.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.email.entity.EnterpriseMessageContent;
 import com.fjhx.email.mapper.EnterpriseMessageContentMapper;
 import com.fjhx.email.service.IEnterpriseMessageContentService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/fjhx/email/service/impl/EnterpriseMessageServiceImpl.java

@@ -1,9 +1,9 @@
 package com.fjhx.email.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.email.entity.EnterpriseMessage;
 import com.fjhx.email.mapper.EnterpriseMessageMapper;
 import com.fjhx.email.service.IEnterpriseMessageService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**
@@ -15,6 +15,6 @@ import org.springframework.stereotype.Service;
  * @since 2023-04-06
  */
 @Service
-public class  EnterpriseMessageServiceImpl extends ServiceImpl<EnterpriseMessageMapper, EnterpriseMessage> implements IEnterpriseMessageService {
+public class EnterpriseMessageServiceImpl extends ServiceImpl<EnterpriseMessageMapper, EnterpriseMessage> implements IEnterpriseMessageService {
 
 }

src/main/java/com/fjhx/email/service/impl/MailServiceImpl.java

@@ -44,59 +44,45 @@ import java.util.stream.Collectors;
 @Service
 public class MailServiceImpl implements IMailService {
 
+    /**
+     * 创建一个线程池
+     */
+    private static final ExecutorService executorService = new ThreadPoolExecutor(
+            5,
+            10,
+            1,
+            TimeUnit.MINUTES,
+            new ArrayBlockingQueue<>(10)
+    );
     @Autowired
     private MailMapper mailMapper;
-
     @Autowired
     private IPersonalMessageService personalMessageService;
-
     @Autowired
     private IEnterpriseMessageService enterpriseMessageService;
-
     @Autowired
     private IEnterpriseMessageAddressService enterpriseMessageAddressService;
-
     @Autowired
     private IEnterpriseMessageAttachmentService enterpriseMessageAttachmentService;
-
     @Autowired
     private IEnterpriseMessageContentService enterpriseMessageContentService;
-
     @Autowired
     private IPersonalMessageAddressService personalMessageAddressService;
-
     @Autowired
     private IPersonalMessageAttachmentService personalMessageAttachmentService;
-
     @Autowired
     private IPersonalMessageContentService personalMessageContentService;
-
     @Autowired
     private IPersonalMailboxService personalMailboxService;
-
     @Autowired
     private IEnterpriseMailboxService enterpriseMailboxService;
-
     @Autowired
     private IEnterpriseDomainService enterpriseDomainService;
-
     @Autowired
     private TransactionDefinition transactionDefinition;
-
     @Autowired
     private PlatformTransactionManager platformTransactionManager;
 
-    /**
-     * 创建一个线程池
-     */
-    private static final ExecutorService executorService = new ThreadPoolExecutor(
-            5,
-            10,
-            1,
-            TimeUnit.MINUTES,
-            new ArrayBlockingQueue<>(10)
-    );
-
     @Override
     public List<MailboxInfo> getMailboxInfoListByUserId(List<Long> userIdList) {
         if (ObjectUtil.isEmpty(userIdList)) {

src/main/java/com/fjhx/email/service/impl/PersonalFolderServiceImpl.java

@@ -1,9 +1,9 @@
 package com.fjhx.email.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.email.entity.PersonalFolder;
 import com.fjhx.email.mapper.PersonalFolderMapper;
 import com.fjhx.email.service.IPersonalFolderService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/fjhx/email/service/impl/PersonalMessageAddressServiceImpl.java

@@ -1,9 +1,9 @@
 package com.fjhx.email.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.email.entity.PersonalMessageAddress;
 import com.fjhx.email.mapper.PersonalMessageAddressMapper;
 import com.fjhx.email.service.IPersonalMessageAddressService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/fjhx/email/service/impl/PersonalMessageAttachmentServiceImpl.java

@@ -1,9 +1,9 @@
 package com.fjhx.email.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.email.entity.PersonalMessageAttachment;
 import com.fjhx.email.mapper.PersonalMessageAttachmentMapper;
 import com.fjhx.email.service.IPersonalMessageAttachmentService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/fjhx/email/service/impl/PersonalMessageContentServiceImpl.java

@@ -1,9 +1,9 @@
 package com.fjhx.email.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.email.entity.PersonalMessageContent;
 import com.fjhx.email.mapper.PersonalMessageContentMapper;
 import com.fjhx.email.service.IPersonalMessageContentService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
 /**

src/main/java/com/fjhx/email/utils/ObsFileUtil.java

@@ -33,36 +33,6 @@ public class ObsFileUtil {
         return url + path;
     }
 
-    @Value("${obs.ak}")
-    public void setAk(String ak) {
-        ObsFileUtil.ak = ak;
-    }
-
-    @Value("${obs.sk}")
-    public void setSk(String sk) {
-        ObsFileUtil.sk = sk;
-    }
-
-    @Value("${obs.endPoint}")
-    public void setEndPoint(String endPoint) {
-        ObsFileUtil.endPoint = endPoint;
-    }
-
-    @Value("${obs.url}")
-    public void setUrl(String url) {
-        ObsFileUtil.url = url;
-    }
-
-    @Value("${obs.bucketName}")
-    public void setBucketName(String bucketName) {
-        ObsFileUtil.bucketName = bucketName;
-    }
-
-    @Value("${spring.profiles.active}")
-    public void setActive(String active) {
-        ObsFileUtil.active = active;
-    }
-
     public static String uploadFile(String fileName, InputStream inputStream) {
 
         // 文件后缀名
@@ -101,5 +71,34 @@ public class ObsFileUtil {
         return new ObsClient(ak, sk, endPoint);
     }
 
+    @Value("${obs.ak}")
+    public void setAk(String ak) {
+        ObsFileUtil.ak = ak;
+    }
+
+    @Value("${obs.sk}")
+    public void setSk(String sk) {
+        ObsFileUtil.sk = sk;
+    }
+
+    @Value("${obs.endPoint}")
+    public void setEndPoint(String endPoint) {
+        ObsFileUtil.endPoint = endPoint;
+    }
+
+    @Value("${obs.url}")
+    public void setUrl(String url) {
+        ObsFileUtil.url = url;
+    }
+
+    @Value("${obs.bucketName}")
+    public void setBucketName(String bucketName) {
+        ObsFileUtil.bucketName = bucketName;
+    }
+
+    @Value("${spring.profiles.active}")
+    public void setActive(String active) {
+        ObsFileUtil.active = active;
+    }
 
 }