From c7945897b26e0b5972cda19cfe261caa52fe2a36 Mon Sep 17 00:00:00 2001
From: zengwh <zengwh>
Date: Wed, 28 Jun 2023 14:56:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dftp=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=E6=8F=90=E4=BA=A4=E5=85=B3=E9=97=AD=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                               | 2 +-
 src/main/java/com/ann/utils/FTPUtil.java | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index edc0d20..dc26a69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-target/
+/target/
 !.mvn/wrapper/maven-wrapper.jar
 
 ### STS ###
diff --git a/src/main/java/com/ann/utils/FTPUtil.java b/src/main/java/com/ann/utils/FTPUtil.java
index 5faeba4..6bc49f8 100644
--- a/src/main/java/com/ann/utils/FTPUtil.java
+++ b/src/main/java/com/ann/utils/FTPUtil.java
@@ -66,9 +66,6 @@ public class FTPUtil {
             }
         } catch (IOException e) {
             throw e;
-        }finally {
-            ftpClient.abort();
-            ftpClient.disconnect();
         }
         return ftpClient;
     }
@@ -107,7 +104,6 @@ public class FTPUtil {
                 while ((i = is.read(bytes)) != -1) {
                     fos.write(bytes, 0, i);
                 }
-                closeFTPConnect(ftp);
             }
             if(file.length() == 0 || file.length() < 10){
                 FileUtils.deleteImageFile(file);
@@ -129,6 +125,7 @@ public class FTPUtil {
                 FileUtils.deleteImageFile(file);
                 throw e;
             }
+            closeFTPConnect(ftp);
         }
         return result;
     }