From 9151233f115cd9075c14634ebd3be0d5a963c81a Mon Sep 17 00:00:00 2001
From: orgin <feixingyuanup@gmail.com>
Date: Thu, 30 May 2024 16:48:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E8=B6=85=E6=97=B6=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E4=B8=8D=E4=B8=AD=E6=96=AD=E7=BA=BF=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/jeecg/common/email/EmailServiceManager.java    | 4 ++--
 .../src/main/java/org/jeecg/modules/AutoProcessManager.java | 4 ++--
 .../main/java/org/jeecg/modules/EmailParsingActuator.java   | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java
index a3ac56f3..257b0b26 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java
+++ b/jeecg-boot-base-core/src/main/java/org/jeecg/common/email/EmailServiceManager.java
@@ -621,7 +621,7 @@ public class EmailServiceManager {
         try {
             subject = MimeUtility.decodeText(message.getSubject());
             receivedDate = message.getReceivedDate();
-            message.setFlag(Flags.Flag.DELETED,true);
+//            message.setFlag(Flags.Flag.DELETED,true);
 //            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;
@@ -672,7 +672,7 @@ public class EmailServiceManager {
             if(numberKey >= taskProperties.getForceDeletedNumber()){
                 exist = true;
                 log.info("Check: Remove Email:{},receiveTime:{}",message.getSubject(), DateUtils.formatDate(message.getReceivedDate(),"yyyy-MM-dd HH:mm:ss"));
-                message.setFlag(Flags.Flag.DELETED,true);
+//                message.setFlag(Flags.Flag.DELETED,true);
                 redisUtil.del(key);
             }
             return exist;
diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java
index 9460d44d..d62ad50e 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/AutoProcessManager.java
@@ -290,7 +290,7 @@ public class AutoProcessManager{
                     }
 
                     //遍历邮箱执行线程，如果邮箱执行线程stop属性已被设置为true则关闭资源停止线程
-                    final Iterator<Map.Entry<String, EmailParsingActuator>> iterator = emailExecThreadMap.entrySet().iterator();
+                    /*final Iterator<Map.Entry<String, EmailParsingActuator>> iterator = emailExecThreadMap.entrySet().iterator();
                     emailExecThreadMap.forEach((emailId,emailExecThread)->{
                         try{
                             if(emailExecThread.getState() != State.TERMINATED && emailExecThread.isStop()){
@@ -315,7 +315,7 @@ public class AutoProcessManager{
                                 }
                             }
                         }
-                    });
+                    });*/
                 }
                 long end = System.currentTimeMillis();
                 long sleepTime = taskProperties.getDeletedMailThreadExecCycle() - (end-start);
diff --git a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/EmailParsingActuator.java b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/EmailParsingActuator.java
index 2f85fe4f..2b46d2bc 100644
--- a/jeecg-module-auto-process/src/main/java/org/jeecg/modules/EmailParsingActuator.java
+++ b/jeecg-module-auto-process/src/main/java/org/jeecg/modules/EmailParsingActuator.java
@@ -65,7 +65,7 @@ public class EmailParsingActuator extends Thread{
             if (isStop) {
                 String nowDate = DateUtils.formatDate(new Date(), "yyyy-MM-dd HH:mm:ss");
                 log.info(nowDate + " " +this.emailProperties.getName()+" EmailParsingActuator is Stop!");
-                closeResource();
+//                closeResource();
                 return;
             }
             long start = System.currentTimeMillis();
@@ -110,10 +110,10 @@ public class EmailParsingActuator extends Thread{
                 }
             } catch (MessagingException e) {
                 System.out.println("捕获MessagingException！！！！！！！！");
-                closeResource();
+//                closeResource();
                 throw new RuntimeException(e);
             } catch (Exception e) {
-                closeResource();
+//                closeResource();
                 log.error(""+e);
             } finally {
                 //清除本批次邮件日志缓存