fix：解决自动处理网络不好下载会中断问题

jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java

@@ -111,7 +111,7 @@ public class EmailServiceManager {
             log.info("{}邮件服务连接测试成功",email.getName());
             flag = true;
         } catch (IOException e) {
-            log.error("{}邮件服务连接测试失败，请检查邮件服务属性配置是否正确或邮件服务未开启，原因{}",email.getName(),e.getMessage());
+            log.error("{}邮件服务连接测试失败，请检查邮件服务属性配置是否正确或邮件服务未开启，原因: ",email.getName(),e);
         }finally {
             try {
                 if(null != socket){
@@ -127,7 +127,7 @@ public class EmailServiceManager {
     /**
      * 接收邮件
      */
-    public Message[] receiveMail() throws MessagingException {
+    public Message[] receiveMail() throws Exception {
         String status = EmailLogManager.STATUS_SUCCESS;
         try{
             //配置邮件服务属性
@@ -135,6 +135,8 @@ public class EmailServiceManager {
             properties.put("mail.store.protocol", "imap");
             properties.put("mail.imap.host", email.getEmailServerAddress());
             properties.put("mail.imap.port",email.getPort());
+            properties.put("mail.imap.connectiontimeout", "3000");
+            properties.put("mail.imap.timeout", "3000");
             if (email.getIsQiye() == 1) {
                 properties.put("mail.imap.ssl.enable", "true");
             } else {
@@ -177,6 +179,7 @@ public class EmailServiceManager {
                         return o1.getReceivedDate().compareTo(o2.getReceivedDate());
                     } catch (MessagingException e) {
                         e.printStackTrace();
+                        log.error(e.getMessage(), e);
                     }
                     return 0;
                 });
@@ -186,7 +189,7 @@ public class EmailServiceManager {
                     return Arrays.copyOfRange(messages,0,this.receiveNum-1);
                 }
             }
-        } catch (MessagingException e){
+        } catch (Exception e){
             status = EmailLogManager.STATUS_ERROR;
             log.error("Email connection is abnormal, account is {}, service is {},the reason is {}.",email.getName(),email.getEmailServerAddress(),e.getMessage());
             throw e;
@@ -590,6 +593,7 @@ public class EmailServiceManager {
                 throw new DownloadEmailException(errorMsg);
             }catch (Exception e) {
                 log.error("",e);
+                throw new RuntimeException(e);
             }finally {
                 EmailLogEvent event = new EmailLogEvent(batchesCounter,Thread.currentThread().getId(),EmailLogManager.GS_TYPE_GET,status,EmailLogManager.GETIDEML,subject,DateUtils.formatDate(receivedDate,"yyyy-MM-dd HH:mm:ss:SSS"),
                         (Objects.isNull(emlFile)?" ":emlFile.getAbsolutePath()));
@@ -725,8 +729,10 @@ public class EmailServiceManager {
             // log.info("EmailServiceManager: Remove Email:{},receiveTime:{}",message.getSubject(), DateUtils.formatDate(message.getReceivedDate(),"yyyy-MM-dd HH:mm:ss"));
         } catch (MessagingException | UnsupportedEncodingException e) {
             status = EmailLogManager.STATUS_ERROR;
-            log.error("Email deletion failed, the subject of the email is :{}, the reason is :{}.",subject,e.getMessage());
+            log.error("Email deletion failed, the subject of the email is :{}, the reason is :",subject, e);
             e.printStackTrace();
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
         } finally {
             EmailLogEvent removeEvent = new EmailLogEvent(batchesCounter,Thread.currentThread().getId(),EmailLogManager.GS_TYPE_GET,status,EmailLogManager.DELETEID,subject,DateUtils.formatDate(receivedDate,"yyyy-MM-dd HH:mm:ss:SSS"));
             EmailLogManager.getInstance().offer(Thread.currentThread().getId(),removeEvent);
@@ -748,13 +754,13 @@ public class EmailServiceManager {
             if(null != store){
                 store.close();
             }
-            log.info("EmailServiceManage资源关闭完成.");
+            log.info("{}: EmailServiceManage资源关闭完成.", Thread.currentThread().getName());
 //            for(String messageId : messageIds){
 //                String key = RedisConstant.EMAIL_MSG_ID+StringConstant.COLON+messageId;
 //                redisUtil.del(key);
 //            }
         } catch (MessagingException e) {
-            log.error("Email closure failed, email address is: {}, reason is: {}",email.getUsername(),e.getMessage());
+            log.error("Email closure failed, email address is: {}, reason is: {}",email.getUsername(),e);
             e.printStackTrace();
         }
     }

jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
 /**
@@ -40,12 +41,12 @@ public class AutoProcessManager{
     /**
      * 以邮件Id为key，邮件信息为value
      */
-    private Map<String,EmailProperties> emailMap = new HashMap<>();
+    private Map<String,EmailProperties> emailMap = new ConcurrentHashMap<>();
 
     /**
      * 以邮件id为key，以邮件执行线程为value
      */
-    private Map<String,EmailParsingActuator> emailExecThreadMap = new HashMap<>();
+    private Map<String,EmailParsingActuator> emailExecThreadMap = new ConcurrentHashMap<>();
 
     /**
      * 启动自动处理
@@ -82,6 +83,7 @@ public class AutoProcessManager{
         public void run() {
             for(;;){
                 long start = System.currentTimeMillis();
+                try {
                     if(!CollectionUtils.isEmpty(emailMap)){
                         synchronized (lock){
                             Iterator<EmailProperties> iterator = emailMap.values().iterator();
@@ -111,6 +113,10 @@ public class AutoProcessManager{
                             }
                         }
                     }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error(e.getMessage(), e);
+                }
                 long end = System.currentTimeMillis();
                 long sleepTime = taskProperties.getMonitoringMailDataCycle() - (end-start);
                 //如果sleepTime > 0 需要睡眠到指定时间，否则继续下次获取邮件
@@ -282,6 +288,7 @@ public class AutoProcessManager{
         public void run() {
             for(;;){
                 long start = System.currentTimeMillis();
+                try {
                     if(!CollectionUtils.isEmpty(emailExecThreadMap)){
                         //遍历邮箱执行线程，如果状态为已停止则删除
                         final Iterator<Map.Entry<String, EmailParsingActuator>> checkStopThreads = emailExecThreadMap.entrySet().iterator();
@@ -298,6 +305,7 @@ public class AutoProcessManager{
                         final Iterator<Map.Entry<String, EmailParsingActuator>> iterator = emailExecThreadMap.entrySet().iterator();
                         emailExecThreadMap.forEach((emailId,emailExecThread)->{
                             try{
+                                log.info("当前线程状态：{}", emailExecThread.getState());
                                 if(emailExecThread.getState() != State.TERMINATED && emailExecThread.isStop()){
                                     final long nowTime = System.currentTimeMillis();
                                     final long setStoptime = emailExecThread.getStopTime().getTime();
@@ -323,6 +331,10 @@ public class AutoProcessManager{
                             }
                         });
                     }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error(e.getMessage(), e);
+                }
                 long end = System.currentTimeMillis();
                 long sleepTime = taskProperties.getDeletedMailThreadExecCycle() - (end-start);
                 //如果sleepTime > 0 需要睡眠到指定时间，否则继续下次监测

jeecg-module-auto-process/src/main/java/org/jeecg/modules/EmailParsingActuator.java

@@ -119,7 +119,7 @@ public class EmailParsingActuator extends Thread{
                     }
                 }
             } catch (Exception e) {
-                log.error("EmailParsingActuator has exception: {}", e.getMessage());
+                log.error("EmailParsingActuator has exception: ", e);
                 log.info("Mail-Parsing线程池资源关闭...");
                 closeResource();
                 throw new RuntimeException(e);

jeecg-module-auto-process/src/main/java/org/jeecg/modules/spectrum/SpectrumParsingActuator.java

@@ -152,13 +152,15 @@ public class SpectrumParsingActuator implements Runnable{
                 }
             }
         } catch (Exception e) {
+            //输出异常信息
+            log.error("邮件处理异常{}，邮件主题:{}：", e, subject);
+            // todo  需要解决其他异常会进入if 删除邮件
             // 如果不是下载导致的失败 并且 下载成功，则删除下载的邮件对象
             if(!(e instanceof DownloadEmailException) && downloadFlag){
                 log.error("Catch Remove Email："+ subject + StringPool.UNDERSCORE + receiveDate + StringPool.UNDERSCORE);
                 emailServiceManager.removeMail(message,batchesCounter);
             }
-            //输出异常信息
+
-            log.error("邮件处理异常{}，邮件主题:{}：", e, subject);
         }finally {
             try {
                 EmailLogEvent expungeEvent = new EmailLogEvent(this.batchesCounter,Thread.currentThread().getId(),EmailLogManager.GS_TYPE_GET,EmailLogManager.DONE);