Merge remote-tracking branch 'origin/release' into release

dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java

@@ -150,6 +150,10 @@ public class SnEmailGatherTask {
                 String uid = inbox.getUID(msg);
                 if(StringUtils.isBlank(maintainVo.getEmailUid()) && i+1 == messages.length){
                     emailMaintainVo.setEmailUid(uid);
+                    buildEmailMaintainVo(emailMaintainVo);
+                } else if(i+1 == messages.length){
+                    emailMaintainVo.setEmailUid(uid);
+                    buildEmailMaintainVo(emailMaintainVo);
                 }
                 //增量处理  等于之后就跳过本地循环
                 if(StringUtils.isNotBlank(maintainVo.getEmailUid()) && maintainVo.getEmailUid().equals(uid)){
@@ -223,6 +227,11 @@ public class SnEmailGatherTask {
         }
     }
 
+    public void buildEmailMaintainVo(EmailMaintainVo emailMaintainVo){
+        emailMaintainService.update(emailMaintainVo);
+    }
+
+
     public void buildMsg(MailGatherLogVo gatherLogVo, String type, String msg){
         gatherLogVo.setOcrType(type);
         gatherLogVo.setErrorMsg(msg);

dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTaskTest.java

@@ -39,8 +39,6 @@ class SnEmailGatherTaskTest {
         String mail_host = "mail.pop3.host";
         String emailName = "745139984@qq.com";
         String password = "ncmydeiilzyabfgb";
-//         String emailName = "15201210373@163.com";
-//        String password = "JKZATQTPHDDQTQSH";
         String mailSuffix = emailName.split("@")[1];
         //邮箱类型
         String mailType = mailSuffix.split("\\.")[0];