From 9f578f48c8a9754fd85e8d249c7173d1643a5258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=B0=8F=E6=9E=97?= <320730042@qq.com>
Date: Tue, 4 Jun 2024 15:09:16 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20ftp=E6=96=B0=E5=A2=9E=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=88=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/bellmann/common/util/FTPUtils.java       | 1 +
 .../com/bellmann/service/impl/FileOptionServiceImpl.java   | 7 +++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/bellmann/common/util/FTPUtils.java b/src/main/java/com/bellmann/common/util/FTPUtils.java
index c4a06b9..a6b4b7c 100644
--- a/src/main/java/com/bellmann/common/util/FTPUtils.java
+++ b/src/main/java/com/bellmann/common/util/FTPUtils.java
@@ -339,6 +339,7 @@ public class FTPUtils {
                     String ftpName = new String(fileName.getBytes(SERVER_CHARSET), LOCAL_CHARSET);
                     if (StringUtils.equals(ftpName,filename)) {
                         isSuccess = ftpClient.deleteFile(fileName);
+                        ftpClient.removeDirectory(path);
                         break;
                     }
                 }
diff --git a/src/main/java/com/bellmann/service/impl/FileOptionServiceImpl.java b/src/main/java/com/bellmann/service/impl/FileOptionServiceImpl.java
index b2d7235..9380242 100644
--- a/src/main/java/com/bellmann/service/impl/FileOptionServiceImpl.java
+++ b/src/main/java/com/bellmann/service/impl/FileOptionServiceImpl.java
@@ -18,8 +18,6 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 
 @Service
 @Slf4j
@@ -41,7 +39,8 @@ public class FileOptionServiceImpl implements FileOptionService {
         String originalFilename = file.getOriginalFilename();
         //文件存放地址
         //文件在FTP服务器所在文件夹目录
-        String dirPath = fileServer.getFtpRootDir() + String.format(IBaseEnum.getLabelByValue(fileType,FileUrlEnum.class),fileType);
+        String dirPath = fileServer.getFtpRootDir() + String.format(IBaseEnum.getLabelByValue(fileType,FileUrlEnum.class),fileType)+"/"+System.currentTimeMillis()/1000;
+        log.info("dirPath:{}",dirPath);
         try(InputStream in = file.getInputStream()) {
             boolean upload = FTPUtils.upload(fileServer, originalFilename, dirPath, in);
             if (!upload){
@@ -125,7 +124,7 @@ public class FileOptionServiceImpl implements FileOptionService {
         String newFileName = String.format("%s.%s",fileName,extension);
         //文件存放地址
         //文件在FTP服务器所在文件夹目录
-        String dirPath = fileServer.getFtpRootDir() + String.format(IBaseEnum.getLabelByValue(fileType,FileUrlEnum.class),fileType);
+        String dirPath = fileServer.getFtpRootDir() + String.format(IBaseEnum.getLabelByValue(fileType,FileUrlEnum.class),fileType)+System.currentTimeMillis()/1000;
         try(InputStream in = file.getInputStream()) {
             boolean upload = FTPUtils.upload(fileServer, newFileName, dirPath, in);
             if (!upload){