From a2c90c4d6713338eb50912fef399746e9baf2c12 Mon Sep 17 00:00:00 2001
From: wenbaoquan <1150003126@qq.com>
Date: Tue, 10 Jan 2023 15:33:52 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B41=E6=9C=8810=E6=97=A515:11:00?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../file/controller/FileUploadController.java  |  8 ++++----
 .../zilber/boot/file/service/UploadUtils.java  | 18 +++++++-----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/zilber/boot/file/controller/FileUploadController.java b/src/main/java/com/zilber/boot/file/controller/FileUploadController.java
index 6445183..96f2ade 100644
--- a/src/main/java/com/zilber/boot/file/controller/FileUploadController.java
+++ b/src/main/java/com/zilber/boot/file/controller/FileUploadController.java
@@ -28,8 +28,8 @@ public class FileUploadController {
 
     @ApiOperation("文件上传服务器")
     @PostMapping("/upload")
-    public Map<String, String> uploadFile(MultipartFile file) {
-        return uploadUtils.upload(file);
+    public Map<String, String> uploadFile(MultipartFile file, String md5) {
+        return uploadUtils.upload(file, md5);
     }
 
     @ApiOperation("分片上传服务器")
@@ -52,8 +52,8 @@ public class FileUploadController {
 
     @ApiOperation("文件上传oss服务器")
     @PostMapping("/oss/upload")
-    public Map<String, String> uploadFileToOss(MultipartFile file) {
-        return uploadUtils.upload(file, null);
+    public Map<String, String> uploadFileToOss(MultipartFile file, String md5) {
+        return uploadUtils.upload(file, null, md5);
     }
 
     @ApiOperation("分片上传初始化-oss服务器")
diff --git a/src/main/java/com/zilber/boot/file/service/UploadUtils.java b/src/main/java/com/zilber/boot/file/service/UploadUtils.java
index 082bee8..12f5ae0 100644
--- a/src/main/java/com/zilber/boot/file/service/UploadUtils.java
+++ b/src/main/java/com/zilber/boot/file/service/UploadUtils.java
@@ -43,9 +43,9 @@ public class UploadUtils {
     @Autowired
     private FileDao fileDao;
 
-    public Map<String, String> upload(MultipartFile file) {
+    public Map<String, String> upload(MultipartFile file, String md5) {
         try {
-            Map<String, String> objectMap = fileDao.listFileUrl(MD5Encoder.encode(file.getBytes()), 1);
+            Map<String, String> objectMap = fileDao.listFileUrl(md5, 1);
             if ( objectMap != null ){
                 objectMap.put("name", file.getOriginalFilename());
                 return objectMap;
@@ -94,15 +94,11 @@ public class UploadUtils {
      * @param module           oss目录
      * @return
      */
-    public Map<String, String> upload(MultipartFile file, @Nullable String module) {
-        try {
-            Map<String, String> objectMap = fileDao.listFileUrl(MD5Encoder.encode(file.getBytes()), 2);
-            if ( objectMap != null ){
-                objectMap.put("name", file.getOriginalFilename());
-                return objectMap;
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
+    public Map<String, String> upload(MultipartFile file, @Nullable String module, String md5) {
+        Map<String, String> objectMap = fileDao.listFileUrl(md5, 2);
+        if ( objectMap != null ){
+            objectMap.put("name", file.getOriginalFilename());
+            return objectMap;
         }
         /**
          * 获取oss的属性