合并代码

service-deploy/src/test/java/com/simuwang/ApplicationTest.java

@@ -45,13 +45,8 @@ public class ApplicationTest {
     @Test
     public void reportTest() {
         MailboxInfoDTO emailInfoDTO = this.buildMailbox();
-<<<<<<< HEAD
-        Date startDate = DateUtil.parse("2024-10-14 15:10:30", DateConst.YYYY_MM_DD_HH_MM_SS);
-        Date endDate = DateUtil.parse("2024-10-14 17:50:30", DateConst.YYYY_MM_DD_HH_MM_SS);
-=======
         Date startDate = DateUtil.parse("2024-10-15 11:10:30", DateConst.YYYY_MM_DD_HH_MM_SS);
         Date endDate = DateUtil.parse("2024-10-15 17:50:30", DateConst.YYYY_MM_DD_HH_MM_SS);
->>>>>>> origin/develop
         try {
             emailParseService.parseEmail(emailInfoDTO, startDate, endDate);
         } catch (Exception e) {
@@ -82,8 +77,8 @@ public class ApplicationTest {
     private MailboxInfoDTO buildMailbox() {
         MailboxInfoDTO emailInfoDTO = new MailboxInfoDTO();
         emailInfoDTO.setUserId(1);
-        emailInfoDTO.setAccount("wangzaijun@simuwang.com");
-        emailInfoDTO.setPassword("WZJ2twy1314");
+        emailInfoDTO.setAccount("*");
+        emailInfoDTO.setPassword("*");
         emailInfoDTO.setHost("imap.exmail.qq.com");
         emailInfoDTO.setPort("993");
         emailInfoDTO.setProtocol("imap");