Merge remote-tracking branch 'refs/remotes/origin/sleepDownload' into mdc-merge

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

@@ -1,8 +1,6 @@
 package org.jeecg.common.email;
 
 import cn.hutool.core.util.ArrayUtil;
-import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.StrUtil;
 import com.google.common.collect.Lists;
 import com.sun.mail.imap.IMAPStore;
@@ -34,7 +32,6 @@ import java.io.*;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.util.*;
-import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
@@ -129,7 +126,7 @@ public class EmailServiceManager {
     /**
      * 接收邮件
      */
-    public Message[] receiveMail() throws MessagingException {
+    public Message[] receiveMail() throws Exception {
         String status = EmailLogManager.STATUS_SUCCESS;
         try{
             //配置邮件服务属性
@@ -137,6 +134,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"); // 设置连接超时时间为3秒
+            properties.put("mail.imap.timeout", "3000"); // 设置读取超时时间为3秒
             if (email.getIsQiye() == 1) {
                 properties.put("mail.imap.ssl.enable", "true");
             } else {
@@ -179,6 +178,7 @@ public class EmailServiceManager {
                         return o1.getReceivedDate().compareTo(o2.getReceivedDate());
                     } catch (MessagingException e) {
                         e.printStackTrace();
+                        log.error(e.getMessage(), e);
                     }
                     return 0;
                 });
@@ -188,7 +188,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;
@@ -729,6 +729,7 @@ public class EmailServiceManager {
             status = EmailLogManager.STATUS_ERROR;
             log.error("Email deletion failed, the subject of the email is :{}, the reason is :{}.",subject,e.getMessage());
             e.printStackTrace();
+            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);
@@ -750,7 +751,7 @@ public class EmailServiceManager {
             if(null != store){
                 store.close();
             }
-            log.info("EmailServiceManage资源关闭完成.");
+            log.info(Thread.currentThread().getName() + ",EmailServiceManage资源关闭完成.");
 //            for(String messageId : messageIds){
 //                String key = RedisConstant.EMAIL_MSG_ID+StringConstant.COLON+messageId;
 //                redisUtil.del(key);
@@ -758,6 +759,7 @@ public class EmailServiceManager {
         } catch (MessagingException e) {
             log.error("Email closure failed, email address is: {}, reason is: {}",email.getUsername(),e.getMessage());
             e.printStackTrace();
+            log.error(e.getMessage(), e);
         }
     }
 

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

@@ -119,6 +119,7 @@ public class AutoProcessManager{
                         TimeUnit.MILLISECONDS.sleep(sleepTime);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
+                        log.error(e.getMessage(), e);
                     }
                 }
             }
@@ -168,6 +169,7 @@ public class AutoProcessManager{
                 //捕获异常不处理保障线程异常不退出
                 }catch (Exception e){
                     e.printStackTrace();
+                    log.error(e.getMessage(), e);
                 }
                 long end = System.currentTimeMillis();
                 long sleepTime = taskProperties.getMonitoringMailCommStatusCycle() - (end-start);
@@ -177,6 +179,7 @@ public class AutoProcessManager{
                         TimeUnit.MILLISECONDS.sleep(sleepTime);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
+                        log.error(e.getMessage(), e);
                     }
                 }
             }
@@ -250,6 +253,7 @@ public class AutoProcessManager{
                 //捕获异常不处理保障线程异常不退出
                 }catch (Exception e){
                     e.printStackTrace();
+                    log.error(e.getMessage(), e);
                 }
                 long end = System.currentTimeMillis();
                 long sleepTime = taskProperties.getMonitoringMailDataCycle() - (end-start);
@@ -259,6 +263,7 @@ public class AutoProcessManager{
                         TimeUnit.MILLISECONDS.sleep(sleepTime);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
+                        log.error(e.getMessage(), e);
                     }
                 }
             }
@@ -303,6 +308,7 @@ public class AutoProcessManager{
                             }
                         }catch (Exception e){
                             e.printStackTrace();
+                            log.error(e.getMessage(), e);
                         }finally {
                             if(emailExecThread.getState() != State.TERMINATED && emailExecThread.isStop()){
                                 final long nowTime = System.currentTimeMillis();
@@ -324,6 +330,7 @@ public class AutoProcessManager{
                         TimeUnit.MILLISECONDS.sleep(sleepTime);
                     } catch (InterruptedException e) {
                         e.printStackTrace();
+                        log.error(e.getMessage(), e);
                     }
                 }
             }

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

@@ -86,8 +86,8 @@ public class EmailParsingActuator extends Thread{
             List<String> messageIds = new ArrayList<>();
             try {
                 Message[] messages = emailServiceManager.receiveMail();
+                log.info("EmailParsingActuator本次{}获取邮件数量为：{}", Thread.currentThread().getName(), ArrayUtils.isEmpty(messages) ? 0 : messages.length);
                 if(ArrayUtils.isNotEmpty(messages)){
-                    log.info("EmailParsingActuator本次{}获取邮件数量为：{}", Thread.currentThread().getName(), messages.length);
                     //检验获取的邮件是否在之前删除失败列表中，若在直接调用邮件API删除，并且此次数组里元素也删除
                     for(int i=messages.length-1;i>=0;i--){
                         if (null == messages[i].getHeader("Message-ID")) {
@@ -124,6 +124,7 @@ public class EmailParsingActuator extends Thread{
                 log.error("EmailParsingActuator has exception: {}", e.getMessage());
                 log.info("Mail-Parsing线程池资源关闭...");
                 closeResource();
+                log.error(e.getMessage(), e);
                 throw new RuntimeException(e);
             } finally {
                 //清除本批次邮件日志缓存
@@ -144,6 +145,8 @@ public class EmailParsingActuator extends Thread{
                     TimeUnit.MILLISECONDS.sleep(sleepTime);
                 } catch (InterruptedException e) {
                     e.printStackTrace();
+                    log.error(e.getMessage(), e);
+                    throw new RuntimeException();
                 }
             }
         }

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

@@ -316,7 +316,7 @@ public abstract class AbstractSpectrumHandler extends AbstractChain {
                 ex.printStackTrace();
             }
         } else if(SpectrumSource.FROM_FILE_SOURCE.getSourceType().equals(spectrumSource) && (e instanceof FileRepeatException)){
-            this.spectrumFile.delete(); // TODO 删除原始谱文件
+            //this.spectrumFile.delete(); // TODO 删除原始谱文件
         } else if (SpectrumSource.FORM_FILE_UNDEL.getSourceType().equals(spectrumSource) && !(e instanceof FileRepeatException)) {
             try {
                 if (isDateFormatErr) {