From bc2ebb48969794a75e5f13ae3b8554557c3e7dbe Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Wed, 10 Apr 2024 18:20:03 +0800
Subject: [PATCH] 完善图斑线上配置

---
 src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java b/src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java
index cebda32..8d59f7f 100644
--- a/src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java
+++ b/src/main/java/com/dji/sample/patches/utils/MultipartFileTOFileUtil.java
@@ -1,19 +1,25 @@
 package com.dji.sample.patches.utils;
 
+import org.apache.http.entity.ContentType;
+import org.apache.tomcat.util.http.fileupload.FileItem;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.MediaType;
+import org.springframework.mock.web.MockMultipartFile;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
+import java.io.*;
 import java.util.UUID;
 
 public class MultipartFileTOFileUtil {
-
-    public File multipartFile2File (MultipartFile multipartFile) {
+    @Value("${Patches.url.path.unzip}")
+    String url;
+    //MultiparFile转File
+    public File multipartFile2File(MultipartFile multipartFile) {
         String tmpFileDir = null;
         // 创建临时文件
         String randomFileName = UUID.randomUUID().toString();
-        tmpFileDir = "D:/tmp/"+randomFileName;
+        tmpFileDir = url+ randomFileName;
         File file = new File(tmpFileDir);
         InputStream inputStream = null;
         FileOutputStream outputStream = null;
@@ -38,4 +44,13 @@
         ZipUtil.deleteFiles(tmpFileDir);
         return file;
     }
+
+    //File转MultiparFile
+    public static MultipartFile convert(File file) throws IOException {
+        FileInputStream input = new FileInputStream(file);
+        MultipartFile multipartFile = new MockMultipartFile("file",
+                file.getName(), "application/octet-stream", input);
+        return multipartFile;
+    }
+
 }

--
Gitblit v1.9.3