代码优化

ds-ftp/src/main/java/com/zjty/ftp/service/impl/FileDownLoadServiceImpl.java

 package com.zjty.ftp.service.impl;
 
 import com.zjty.ftp.service.FileDownLoadService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
@@ -10,6 +11,7 @@ import java.io.*;
 import java.util.List;
 
 @Service
+@Slf4j
 public class FileDownLoadServiceImpl implements FileDownLoadService {
 
     @Value("${file.address}")
@@ -26,15 +28,18 @@ public class FileDownLoadServiceImpl implements FileDownLoadService {
                 e.printStackTrace();
             }
             File sourceFile = new File(fileAddress);
+            boolean fileExist = false;
             File[] files = sourceFile.listFiles();
             if(files != null && files.length != 0){
                 for (File f:files){
                     if (f.getName().startsWith(fileName)){
                         fileName = f.getName();
+                        fileExist = true;
                         break;
                     }
                 }
             }
+            if(fileExist){
                 File file = new File(fileAddress + "/" + fileName);
                 setFileDownloadHeader(httpServletRequest,response,fileName);
                 OutputStream os = null;
@@ -64,6 +69,9 @@ public class FileDownLoadServiceImpl implements FileDownLoadService {
                         e.printStackTrace();
                     }
                 }
+            }else {
+                log.info("该文件不存在");
+            }
         }
     }
 

ds-ftp/src/main/java/com/zjty/ftp/service/impl/FileUploadServiceImpl.java

@@ -3,6 +3,7 @@ package com.zjty.ftp.service.impl;
 import com.zjty.ftp.service.FileUploadService;
 import com.zjty.ftp.base.response.ServerResponse;
 import com.zjty.ftp.entity.FileReturn;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
@@ -15,6 +16,7 @@ import java.util.List;
 import java.util.UUID;
 
 @Service
+@Slf4j
 public class FileUploadServiceImpl implements FileUploadService {
 
     @Value("${file.address}")
@@ -29,6 +31,7 @@ public class FileUploadServiceImpl implements FileUploadService {
     public ServerResponse fileUpload(HttpServletRequest request) {
         List<MultipartFile> multipartFiles = ((MultipartHttpServletRequest)request).getFiles("file");
         List<FileReturn> fileReturns = new ArrayList<>();
+        if(multipartFiles != null && multipartFiles.size() != 0){
             for(MultipartFile multipartFile:multipartFiles){
                 InputStream is = null;
                 BufferedInputStream bis = null;
@@ -44,9 +47,6 @@ public class FileUploadServiceImpl implements FileUploadService {
                     file.mkdirs();
                 }
                 String savePath = file.getAbsolutePath() + "/" + sourceName;
-            fileReturn.setName(sourceName);
-            fileReturn.setPath(savePath);
-            fileReturns.add(fileReturn);
                 File createFile = new File(savePath);
                 try {
                     is = multipartFile.getInputStream();
@@ -58,8 +58,12 @@ public class FileUploadServiceImpl implements FileUploadService {
                     while ((len = bis.read(b)) != -1){
                         bos.write(b,0,len);
                     }
+                    fileReturn.setName(sourceName);
+                    //fileReturn.setPath(savePath);
+                    fileReturns.add(fileReturn);
                 } catch (IOException e) {
                     e.printStackTrace();
+                    continue;
                 }finally {
                     try {
                         bis.close();
@@ -71,6 +75,10 @@ public class FileUploadServiceImpl implements FileUploadService {
                     }
                 }
             }
+        }else {
+            log.info("上传失败，请重新确定key值，重新上传");
+            return ServerResponse.error("上传失败，请重新确定key值，重新上传");
+        }
         return ServerResponse.success(fileReturns);
     }
 }

ds-ftp/src/main/resources/application.properties

@@ -5,3 +5,6 @@ spring.servlet.multipart.max-file-size=200MB
 spring.servlet.multipart.max-request-size=200MB
 
 file.address=/file/uploads
+
+#日志文件
+logging.file.path=./log/ds.log
\ No newline at end of file