feat:邮件解析-加上邮箱参数输出

service-base/src/main/java/com/simuwang/base/common/util/EmailUtil.java

@@ -214,7 +214,8 @@ public class EmailUtil {
                 return store;
             }
         } catch (Exception e) {
-            logger.error("用户:{},邮箱:{} 无法连接到邮箱,连接邮箱报错堆栈信息:{}", mailboxInfoDTO.getUserId(), mailboxInfoDTO.getAccount(), ExceptionUtil.stacktraceToString(e));
+            logger.error("邮箱信息:{},服务器参数:{}", mailboxInfoDTO, props);
+            logger.error("连接邮箱报错堆栈信息:{}", ExceptionUtil.stacktraceToString(e));
             return null;
         }
     }

service-daq/src/main/java/com/simuwang/daq/service/EmailParseService.java

@@ -465,9 +465,9 @@ public class EmailParseService {
         Folder folder = store.getFolder("INBOX");
         folder.open(Folder.READ_ONLY);
         // 获取邮件日期大于等于startDate的邮件(搜索条件只支持按天)
-         SearchTerm startDateTerm = new ReceivedDateTerm(ComparisonTerm.GE, startDate);
-         Message[] messages = folder.search(startDateTerm);
-       // Message[] messages = folder.getMessages();
+//         SearchTerm startDateTerm = new ReceivedDateTerm(ComparisonTerm.GE, startDate);
+//         Message[] messages = folder.search(startDateTerm);
+        Message[] messages = folder.getMessages();
         Map<String, List<EmailContentInfoDTO>> emailMessageMap = MapUtil.newHashMap();
         for (Message message : messages) {
             List<EmailContentInfoDTO> emailContentInfoDTOList = CollUtil.newArrayList();
@@ -476,8 +476,8 @@ public class EmailParseService {
             String senderEmail;
             try {
                 Date emailDate = message.getSentDate();
-                boolean isParseConditionSatisfied = emailDate == null || (endDate == null && emailDate.compareTo(startDate) > 0) || (startDate != null && emailDate.compareTo(startDate) < 0);
-                if (isParseConditionSatisfied) {
+                boolean isNotParseConditionSatisfied = emailDate == null || (endDate == null && emailDate.compareTo(startDate) > 0) || (startDate != null && emailDate.compareTo(startDate) < 0);
+                if (isNotParseConditionSatisfied) {
                     continue;
                 }
                 senderEmail = message.getFrom()[0].toString();