代码优化

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

 package com.zjty.ftp.service.impl;
 
-import com.zjty.ftp.base.response.ServerResponse;
 import com.zjty.ftp.service.FileDownLoadService;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.*;
+import java.util.List;
 
 @Service
 public class FileDownLoadServiceImpl implements FileDownLoadService {
 
+    @Value("${file.address}")
+    private String fileAddress;
+
     @Override
     public void fileDownLoad(String fileName, HttpServletResponse response, HttpServletRequest httpServletRequest) {
-        /*response.setContentType("application/force-download");// 设置强制下载不打开
-        response.addHeader("Content-Disposition", "attachment;fileName=" + fileName);// 设置文件名
-        */
-        response.setHeader("content-type", "application/octet-stream");
-        response.setContentType("application/octet-stream");
-        try {
-            response.setHeader("Content-Disposition", "attachment;filename="+new String(fileName.getBytes("utf-8"),"utf-8"));
-        } catch (UnsupportedEncodingException e) {
-            e.printStackTrace();
-        }
-        setFileDownloadHeader(httpServletRequest,response,fileName);
-        OutputStream os = null;
-        InputStream is = null;
-        BufferedInputStream bs = null;
-        byte[] buffer = new byte[1024];
-        try {
-           is = new FileInputStream(new File("/file/uploads/" + fileName));
-           bs = new BufferedInputStream(is);
-           os = response.getOutputStream();
-           int i = bs.read(buffer);
-           while (i != -1) {
-               os.write(buffer, 0, i);
-               i = bs.read(buffer);
-           }
-           os.flush();
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
+        if(fileName != null){
+            response.setHeader("content-type", "application/octet-stream");
+            response.setContentType("application/octet-stream");
+            try {
+                response.setHeader("Content-Disposition", "attachment;filename="+new String(fileName.getBytes("utf-8"),"utf-8"));
+            } catch (UnsupportedEncodingException e) {
+                e.printStackTrace();
+            }
+            File sourceFile = new File(fileAddress);
+            File[] files = sourceFile.listFiles();
+            if(files != null && files.length != 0){
+                for (File f:files){
+                    if (f.getName().startsWith(fileName)){
+                        fileName = f.getName();
+                        break;
+                    }
+                }
+            }
+            File file = new File(fileAddress + "/" + fileName);
+            setFileDownloadHeader(httpServletRequest,response,fileName);
+            OutputStream os = null;
+            InputStream is = null;
+            BufferedInputStream bs = null;
+            byte[] buffer = new byte[1024];
             try {
-                bs.close();
-                is.close();
-                os.close();
+                is = new FileInputStream(file);
+                bs = new BufferedInputStream(is);
+                os = response.getOutputStream();
+                int i = bs.read(buffer);
+                while (i != -1) {
+                    os.write(buffer, 0, i);
+                    i = bs.read(buffer);
+                }
+                os.flush();
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
             } catch (IOException e) {
                 e.printStackTrace();
+            } finally {
+                try {
+                    bs.close();
+                    is.close();
+                    os.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
             }
         }
     }

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 org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.MultipartHttpServletRequest;
@@ -16,6 +17,9 @@ import java.util.UUID;
 @Service
 public class FileUploadServiceImpl implements FileUploadService {
 
+    @Value("${file.address}")
+    private String fileAddress;
+
     /**
      * 前台文件上传
      * @param request
@@ -35,7 +39,7 @@ public class FileUploadServiceImpl implements FileUploadService {
             //String suffix = sourceName.substring(sourceName.lastIndexOf("."));
             //String fileName = UUID.randomUUID().toString() + suffix;
             //不存在该目录，创建目录
-            File file = new File("/file/uploads");
+            File file = new File(fileAddress);
             if(!file.exists()){
                 file.mkdirs();
             }

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

@@ -3,3 +3,5 @@ server.port=8093
 # spring-http-ļϴ
 spring.servlet.multipart.max-file-size=200MB
 spring.servlet.multipart.max-request-size=200MB
+
+file.address=/file/uploads