feat: ftp新增时间戳

master
李小林 9 months ago
parent dd565dabf9
commit 9f578f48c8
  1. 1
      src/main/java/com/bellmann/common/util/FTPUtils.java
  2. 7
      src/main/java/com/bellmann/service/impl/FileOptionServiceImpl.java

@ -339,6 +339,7 @@ public class FTPUtils {
String ftpName = new String(fileName.getBytes(SERVER_CHARSET), LOCAL_CHARSET); String ftpName = new String(fileName.getBytes(SERVER_CHARSET), LOCAL_CHARSET);
if (StringUtils.equals(ftpName,filename)) { if (StringUtils.equals(ftpName,filename)) {
isSuccess = ftpClient.deleteFile(fileName); isSuccess = ftpClient.deleteFile(fileName);
ftpClient.removeDirectory(path);
break; break;
} }
} }

@ -18,8 +18,6 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@Service @Service
@Slf4j @Slf4j
@ -41,7 +39,8 @@ public class FileOptionServiceImpl implements FileOptionService {
String originalFilename = file.getOriginalFilename(); String originalFilename = file.getOriginalFilename();
//文件存放地址 //文件存放地址
//文件在FTP服务器所在文件夹目录 //文件在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()) { try(InputStream in = file.getInputStream()) {
boolean upload = FTPUtils.upload(fileServer, originalFilename, dirPath, in); boolean upload = FTPUtils.upload(fileServer, originalFilename, dirPath, in);
if (!upload){ if (!upload){
@ -125,7 +124,7 @@ public class FileOptionServiceImpl implements FileOptionService {
String newFileName = String.format("%s.%s",fileName,extension); String newFileName = String.format("%s.%s",fileName,extension);
//文件存放地址 //文件存放地址
//文件在FTP服务器所在文件夹目录 //文件在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()) { try(InputStream in = file.getInputStream()) {
boolean upload = FTPUtils.upload(fileServer, newFileName, dirPath, in); boolean upload = FTPUtils.upload(fileServer, newFileName, dirPath, in);
if (!upload){ if (!upload){

Loading…
Cancel
Save