From 7f4df15c3445196428ee3b09bdd93ffcd77b67c2 Mon Sep 17 00:00:00 2001
From: Jerome <1051461805@qq.com>
Date: Fri, 19 Aug 2022 23:22:31 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9E=E4=BA=86oss=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E6=96=87=E4=BB=B6=E5=A4=B9=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/oss/core/OssClient.java    | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java b/ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java
index cc79a6bb9..8339fc345 100644
--- a/ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java
+++ b/ruoyi-oss/src/main/java/com/ruoyi/oss/core/OssClient.java
@@ -118,6 +118,10 @@ public class OssClient {
         return upload(inputStream, getPath(properties.getPrefix(), suffix), contentType);
     }
 
+    public UploadResult uploadByFolder(byte[] data, String suffix, String contentType,String folder) {
+        return upload(data, getFolderPath(properties.getPrefix(),folder, suffix), contentType);
+    }
+
     /**
      * 获取文件元数据
      *
@@ -157,6 +161,24 @@ public class OssClient {
         return path + suffix;
     }
 
+    public String getFolderPath(String prefix, String folder, String suffix) {
+        // 生成uuid
+        String uuid = IdUtil.fastSimpleUUID();
+        // 文件路径
+        String path = DateUtils.datePath() + "/" + uuid;
+        if(StringUtils.isNotBlank(prefix) && StringUtils.isNotBlank(folder)){
+            path = prefix + "/" + folder + "/" + path;
+        }else{
+            if(StringUtils.isNotBlank(prefix)){
+                path = folder + "/" + path;
+            }
+            if(StringUtils.isNotBlank(folder)){
+                path = prefix + "/" + path;
+            }
+        }
+        return path + suffix;
+    }
+
 
     public String getConfigKey() {
         return configKey;