From 7cb83976d2aec0e0d3617ba21a3257383dd98a47 Mon Sep 17 00:00:00 2001
From: linjj <850658129@qq.com>
Date: Wed, 28 Jun 2023 09:19:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=AE=8C=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E6=B5=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/ann/job/ScheduledJob.java | 7 +++----
 src/main/java/com/ann/utils/FTPUtil.java    | 3 +++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ann/job/ScheduledJob.java b/src/main/java/com/ann/job/ScheduledJob.java
index 2294c7c..ba9c7fd 100644
--- a/src/main/java/com/ann/job/ScheduledJob.java
+++ b/src/main/java/com/ann/job/ScheduledJob.java
@@ -5,10 +5,7 @@ import com.ann.service.MessageSubordinateService;
 import com.ann.service.impl.QueueService;
 import com.ann.utils.ExceptionPrintUtil;
 import com.ann.utils.QuartzUtils;
-import org.quartz.Job;
-import org.quartz.JobExecutionContext;
-import org.quartz.JobExecutionException;
-import org.quartz.Scheduler;
+import org.quartz.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +13,7 @@ import org.springframework.util.StopWatch;
 
 import java.time.LocalTime;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * 取从属表未解析的数据
@@ -23,6 +21,7 @@ import java.util.List;
  * @Author: LeiJiaXin
  * @Date: 2019/8/16 10:11
  */
+@DisallowConcurrentExecution
 public class ScheduledJob implements Job {
 
     static final Logger logger = LoggerFactory.getLogger(ScheduledJob.class);
diff --git a/src/main/java/com/ann/utils/FTPUtil.java b/src/main/java/com/ann/utils/FTPUtil.java
index 4155cbb..5faeba4 100644
--- a/src/main/java/com/ann/utils/FTPUtil.java
+++ b/src/main/java/com/ann/utils/FTPUtil.java
@@ -66,6 +66,9 @@ public class FTPUtil {
             }
         } catch (IOException e) {
             throw e;
+        }finally {
+            ftpClient.abort();
+            ftpClient.disconnect();
         }
         return ftpClient;
     }