From 7338d7cdc8a50811b2048f8b202e4a60de10f34d Mon Sep 17 00:00:00 2001
From: David Wei <weiguangchun@gmail.com>
Date: Mon, 8 Jan 2024 23:57:41 +0800
Subject: [PATCH] =?UTF-8?q?feature=20=E5=8D=87=E7=BA=A7aws-s3=E5=88=B02.X?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-common/ruoyi-common-oss/pom.xml          | 10 ----------
 .../org/dromara/common/oss/core/OssClient.java | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/ruoyi-common/ruoyi-common-oss/pom.xml b/ruoyi-common/ruoyi-common-oss/pom.xml
index 90cc13c9c..fb0c0868d 100644
--- a/ruoyi-common/ruoyi-common-oss/pom.xml
+++ b/ruoyi-common/ruoyi-common-oss/pom.xml
@@ -29,16 +29,6 @@
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>s3</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>software.amazon.awssdk</groupId>
-                    <artifactId>netty-nio-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>software.amazon.awssdk</groupId>
-                    <artifactId>apache-client</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
diff --git a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
index 62986049e..45ca9d901 100644
--- a/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
+++ b/ruoyi-common/ruoyi-common-oss/src/main/java/org/dromara/common/oss/core/OssClient.java
@@ -74,6 +74,9 @@ public class OssClient {
 
             createBucket();
         } catch (Exception e) {
+            if (e instanceof OssException) {
+                throw e;
+            }
             throw new OssException("配置错误! 请检查系统配置:[" + e.getMessage() + "]");
         }
     }
@@ -168,6 +171,21 @@ public class OssClient {
         return upload(file, getPath(properties.getPrefix(), suffix));
     }
 
+    /**
+     * 获取文件元数据
+     *
+     * @param path 完整文件路径
+     */
+    public HeadObjectResponse getObjectMetadata(String path) {
+        path = path.replace(getUrl() + "/", "");
+        HeadObjectRequest headObjectRequest = HeadObjectRequest.builder()
+            .bucket(properties.getBucketName())
+            .key(path)
+            .build();
+
+        return client.headObject(headObjectRequest);
+    }
+
     public InputStream getObjectContent(String path) {
         path = path.replace(getUrl() + "/", "");