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; }