From 19368e14388acd7b4383cda9378f333413114d64 Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Thu, 31 Oct 2024 19:26:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/file/FileController.java       | 41 ++++++++++++-------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/cultural/heritage/controller/file/FileController.java b/src/main/java/com/cultural/heritage/controller/file/FileController.java
index 4892f58..c0f0f1e 100644
--- a/src/main/java/com/cultural/heritage/controller/file/FileController.java
+++ b/src/main/java/com/cultural/heritage/controller/file/FileController.java
@@ -59,20 +59,20 @@ public class FileController {
         //文件目录:根据业务、用户来划分
         String uuid = RandomStringUtils.randomAlphabetic(8);
         String filename = uuid + "-" + multipartFile.getOriginalFilename();
-        String filepath = String.format("/%s/%s", fileUploadBizEnum.getValue(), filename);
+        String filepath = String.format("/%s/%s/%s", fileUploadBizEnum.getValue(), 0, filename);
 
-            // 判断目录是否存在
-            File file = new File(FileConstant.SERVER_UPLOAD_DIR, filepath);
-            if (!file.exists()) {
-                // 创建目录
-                boolean mkdirs = file.mkdirs();
-                if (!mkdirs) {
-                    throw new BusinessException(ErrorCode.SYSTEM_ERROR, "创建目录失败");
-                }
+        // 判断目录是否存在
+        File file = new File(FileConstant.SERVER_UPLOAD_DIR, filepath);
+        if (!file.exists()) {
+            // 创建目录
+            boolean mkdirs = file.mkdirs();
+            if (!mkdirs) {
+                throw new BusinessException(ErrorCode.SYSTEM_ERROR, "创建目录失败");
             }
-            //返回可访问地址
-            String test = iHweiYunOBSService.fileUpload(multipartFile, "feiyi" + filepath);
-            return ResultUtils.success(test);
+        }
+        //返回可访问地址
+        String url = iHweiYunOBSService.fileUpload(multipartFile, "feiyi" + filepath);
+        return ResultUtils.success(url);
     }
 
 
@@ -93,8 +93,21 @@ public class FileController {
         }
         // 文件目录:根据业务、用户来划分
         String uuid = RandomStringUtils.randomAlphabetic(8);
-        String s = uuid + "-" + multipartFile.getOriginalFilename();
-        return null;
+        String filename = uuid + "-" + multipartFile.getOriginalFilename();
+        String filepath = String.format("/%s/%s/%s", fileUploadBizEnum.getValue(), loginUser.getId(), filename);
+
+        // 判断目录是否存在
+        File file = new File(FileConstant.SERVER_UPLOAD_DIR, filepath);
+        if (!file.exists()) {
+            // 创建目录
+            boolean mkdirs = file.mkdirs();
+            if (!mkdirs) {
+                throw new BusinessException(ErrorCode.SYSTEM_ERROR, "创建目录失败");
+            }
+        }
+        //返回可访问地址
+        String url = iHweiYunOBSService.fileUpload(multipartFile, "feiyi" + filepath);
+        return ResultUtils.success(url);
     }