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){