Merge remote-tracking branch 'shuojin/master'

hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/FtpController.java

@@ -14,10 +14,9 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import java.io.File;
+import java.io.*;
-import java.io.FileOutputStream;
+import java.nio.file.Path;
-import java.io.InputStream;
+import java.nio.file.Paths;
-import java.io.OutputStream;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
@@ -79,11 +78,10 @@ public class FtpController {
         //保存的文件名
         String dFileName = UUID.randomUUID()+substring;
         String url = "";
-        System.out.println("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
         try {
-            File file = multipartFileToFile(mfile);
+            //File file = multipartFileToFile(mfile);
-            InputStream inputStream = FileUtil.getInputStream(file);
+            //InputStream inputStream = FileUtil.getInputStream(file);
-            url = ftpUtils.uploadToFtp(inputStream, dFileName, false);
+            url = ftpUtils.uploadToFtp(mfile.getInputStream(), dFileName, false);
         } catch (Exception e) {
             url = "https://ts1.cn.mm.bing.net/th/id/R-C.987f582c510be58755c4933cda68d525?rik=C0D21hJDYvXosw&riu=http%3a%2f%2fimg.pconline.com.cn%2fimages%2fupload%2fupc%2ftx%2fwallpaper%2f1305%2f16%2fc4%2f20990657_1368686545122.jpg&ehk=netN2qzcCVS4ALUQfDOwxAwFcy41oxC%2b0xTFvOYy5ds%3d&risl=&pid=ImgRaw&r=0";
             e.printStackTrace();
@@ -92,7 +90,7 @@ public class FtpController {
         return ServerResponse.ok(url);
     }
 
-    public static File multipartFileToFile(MultipartFile file) throws Exception {
+    /*public static File multipartFileToFile(MultipartFile file) throws Exception {
         File toFile = null;
         if (file.equals("") || file.getSize() <= 0) {
             file = null;
@@ -104,6 +102,17 @@ public class FtpController {
             ins.close();
         }
         return toFile;
+    }*/
+
+    public static File multipartFileToFile(MultipartFile multipartFile) throws IOException {
+        // 获取文件名
+        String fileName = multipartFile.getOriginalFilename();
+        // 创建临时文件
+        Path path = Paths.get(fileName);
+        File tempFile = path.toFile();
+        // 将MultipartFile内容写入临时文件
+        multipartFile.transferTo(tempFile);
+        return tempFile;
     }
     public static void inputStreamToFile(InputStream ins,File file) {
         try {