From d7de82e75f0cc3ae796dd22fc0485d0682e0d538 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 24 八月 2023 21:57:16 +0800
Subject: [PATCH] 优化代码

---
 java110-utils/src/main/java/com/java110/utils/util/OSSUtil.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/java110-utils/src/main/java/com/java110/utils/util/OSSUtil.java b/java110-utils/src/main/java/com/java110/utils/util/OSSUtil.java
old mode 100644
new mode 100755
index 8b3e3c9..41311b4
--- a/java110-utils/src/main/java/com/java110/utils/util/OSSUtil.java
+++ b/java110-utils/src/main/java/com/java110/utils/util/OSSUtil.java
@@ -18,9 +18,11 @@
     public static final String DOMAIN = "OSS";
     public static final String OSS_SWITCH = "OSS_SWITCH";
     public static final String OSS_SWITCH_OSS = "OSS";
+    public static final String OSS_SWITCH_FTP = "FTP";
     public static final String ENDPOINT = "endpoint";
     public static final String ACCESS_KEY_ID = "accessKeyId";
     public static final String ACCESS_KEY_SECRET = "accessKeySecret";
+    public static final String BUCKET_NAME = "bucketName";
 
     /**
      * @return OSSClient oss瀹㈡埛绔�
@@ -64,6 +66,22 @@
     /**
      * @param ossClient   oss瀹㈡埛绔�
      * @param inputStream 杈撳叆娴�
+     * @param objectName  涓婁紶鏂囦欢鐩綍鍜岋紙鍖呮嫭鏂囦欢鍚嶏級 渚嬪鈥渢est/a.jpg鈥�
+     * @return void        杩斿洖绫诲瀷
+     * @throws
+     * @Title: uploadByInputStream
+     * @Description: 閫氳繃杈撳叆娴佷笂浼犳枃浠�
+     */
+    public static void uploadByInputStream(OSSClient ossClient, InputStream inputStream,
+                                           String objectName) {
+
+        String bucketName = MappingCache.getValue(DOMAIN, BUCKET_NAME);
+        uploadByInputStream(ossClient, inputStream, bucketName, objectName);
+    }
+
+    /**
+     * @param ossClient   oss瀹㈡埛绔�
+     * @param inputStream 杈撳叆娴�
      * @param bucketName  bucket鍚嶇О
      * @param objectName  涓婁紶鏂囦欢鐩綍鍜岋紙鍖呮嫭鏂囦欢鍚嶏級 渚嬪鈥渢est/a.jpg鈥�
      * @return void        杩斿洖绫诲瀷
@@ -77,6 +95,7 @@
             ossClient.putObject(bucketName, objectName, inputStream);
         } catch (Exception e) {
             e.printStackTrace();
+            throw new IllegalArgumentException(e.getMessage());
         } finally {
             if (ossClient != null) {
                 ossClient.shutdown();
@@ -121,6 +140,21 @@
     }
 
     /**
+     * @param ossClient oss瀹㈡埛绔�
+     * @param key       鏂囦欢璺緞鍜屽悕绉�
+     * @return InputStream    鏂囦欢杈撳叆娴�
+     * @throws
+     * @Title: getInputStreamByOSS
+     * @Description:鏍规嵁key鑾峰彇鏈嶅姟鍣ㄤ笂鐨勬枃浠剁殑杈撳叆娴�
+     */
+    public static InputStream getInputStreamByOSS(OSSClient ossClient, String key) {
+        String bucketName = MappingCache.getValue(DOMAIN, BUCKET_NAME);
+        return getInputStreamByOSS(ossClient,bucketName,key);
+
+    }
+
+
+    /**
      * @param ossClient  oss瀹㈡埛绔�
      * @param bucketName bucket鍚嶇О
      * @param key        鏂囦欢璺緞鍜屽悕绉�

--
Gitblit v1.8.0