修复文件上传并发问题

len-core/src/main/java/com/len/util/UploadUtil.java

@@ -1,6 +1,7 @@
 package com.len.util;
 
 import com.len.exception.MyException;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.io.FileUtils;
@@ -25,11 +26,6 @@ import java.util.UUID;
 @Component
 public class UploadUtil {
 
-    /**
-     * 上传请求资源
-     */
-    private MultipartFile multipartFile = null;
-
     /**
      * 按照当日创建文件夹
      */
@@ -46,27 +42,22 @@ public class UploadUtil {
 
     public static final String IMAGE_SUFFIX = "bmp,jpg,png,gif,jpeg";
 
-    private File currentFile;
-
-    public UploadUtil(MultipartFile multipartFile) {
-        this.multipartFile = multipartFile;
-    }
 
     public UploadUtil() {
     }
 
-    public String upload() {
+    public String upload(MultipartFile multipartFile) {
-        if (isNull()) {
+        if (isNull(multipartFile)) {
             throw new MyException("上传数据/地址获取异常");
         }
 
-        String fileName = fileNameStyle();
+        LoadType loadType = fileNameStyle(multipartFile);
         try {
-            FileUtils.copyInputStreamToFile(multipartFile.getInputStream(), currentFile);
+            FileUtils.copyInputStreamToFile(multipartFile.getInputStream(), loadType.getCurrentFile());
         } catch (IOException e) {
             e.printStackTrace();
         }
-        return fileName;
+        return loadType.getFileName();
     }
 
     /**
@@ -74,7 +65,7 @@ public class UploadUtil {
      *
      * @return
      */
-    public String fileNameStyle() {
+    public LoadType fileNameStyle(MultipartFile multipartFile) {
         String curr = multipartFile.getOriginalFilename();
         int suffixLen = curr.lastIndexOf(".");
         if (suffixLen == -1) {
@@ -85,21 +76,26 @@ public class UploadUtil {
                 suffix.replace(".", ""));
 
         curr = UUID.randomUUID() + suffix;
-        String filename=curr;
+        LoadType loadType = new LoadType();
+        loadType.setFileName(curr);
         //image 情况
         curr = StringUtils.isEmpty(imagePath) || index == -1 ?
                 uploadPath + File.separator + curr : imagePath + File.separator + curr;
-        currentFile = new File(curr);
+        loadType.setCurrentFile(new File(curr));
-
+        return loadType;
-        return filename;
     }
 
-    private boolean isNull() {
+    private boolean isNull(MultipartFile multipartFile) {
         if (null != multipartFile) {
             return false;
         }
         return true;
     }
 
-
+}
+
+@Data
+class LoadType {
+    private String fileName;
+    private File currentFile;
 }

len-sys/src/main/java/com/len/controller/UserController.java

@@ -240,8 +240,7 @@ public class UserController extends BaseController {
     @ResponseBody
     public JsonUtil imgUpload(HttpServletRequest req, @RequestParam("file") MultipartFile file,
                               ModelMap model) {
-        uploadUtil.setMultipartFile(file);
+        String fileName=uploadUtil.upload(file);
-        String fileName=uploadUtil.upload();
         JsonUtil j = new JsonUtil();
         j.setMsg(fileName);
         return j;