From 6b72a0eddfce6eb8af9309c523539c5c06b3ac8a Mon Sep 17 00:00:00 2001
From: zlg <482370576@qq.com>
Date: Mon, 15 Jul 2024 14:22:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9F=A5=E8=AF=A2=E6=A1=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oss/application/oss/core/ali/AliOssClient.java    | 11 +++++++----
 .../application/oss/core/qiniu/QiNiuOssClient.java    | 11 +++++++----
 .../oss/core/tencent/TencentOssClient.java            | 11 +++++++----
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/ali/AliOssClient.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/ali/AliOssClient.java
index 9d0a487..17a2ad0 100644
--- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/ali/AliOssClient.java
+++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/ali/AliOssClient.java
@@ -67,13 +67,16 @@ public class AliOssClient implements StandardOssClient {
         return DataSizeUtil.format(x);
     }
 
-    public HashMap<String,String> selectAllBucket() {
+    public List<HashMap<String,String>> selectAllBucket() {
         List<Bucket> buckets = oss.listBuckets();
-        HashMap<String,String> names = new HashMap<>();
+        List<HashMap<String,String>> list1 = new ArrayList<>();
         buckets.forEach(bucket -> {
-            names.put(bucket.getName(),getAliBucketSize(bucket.getName()));
+            HashMap<String, String> names = new HashMap<>();
+            names.put("name",bucket.getName());
+            names.put("size",getAliBucketSize(bucket.getName()));
+            list1.add(names);
         });
-        return names;
+        return list1;
     }
 
     /**
diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/qiniu/QiNiuOssClient.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/qiniu/QiNiuOssClient.java
index 3176eea..d5c58ef 100644
--- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/qiniu/QiNiuOssClient.java
+++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/qiniu/QiNiuOssClient.java
@@ -148,13 +148,16 @@ public class QiNiuOssClient implements StandardOssClient {
         }
     }
 
-    public HashMap<String, String> selectAllBucket() throws  IOException{
+    public List<HashMap<String, String> >selectAllBucket() throws  IOException{
         String[] list = bucketManager.buckets();
-        HashMap<String, String> names = new HashMap<>();
+        List<HashMap<String, String>> list1 = new ArrayList<>();
         for(int i=0;i<list.length;i++){
-            names.put(list[i],getQiniuBucketSize(list[i]));
+            HashMap<String, String> names = new HashMap<>();
+            names.put("name",list[i]);
+            names.put("size",getQiniuBucketSize(list[i]));
+            list1.add(names);
         }
-        return names;
+        return list1;
     }
 
 
diff --git a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/tencent/TencentOssClient.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/tencent/TencentOssClient.java
index 72518b0..4350f4b 100644
--- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/tencent/TencentOssClient.java
+++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/oss/core/tencent/TencentOssClient.java
@@ -134,13 +134,16 @@ public class TencentOssClient implements StandardOssClient {
      * @author zlg
      * @date: 2024/6/29 10:13
      */
-    public HashMap<String, String> selectAllBucket() throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
+    public List<HashMap<String, String>> selectAllBucket() throws ServerException, InsufficientDataException, ErrorResponseException, IOException, NoSuchAlgorithmException, InvalidKeyException, InvalidResponseException, XmlParserException, InternalException {
         List<Bucket> list = cosClient.listBuckets();
-        HashMap<String, String> names = new HashMap<>();
+        List<HashMap<String, String>> list1 = new ArrayList<>();
         list.forEach(bucket -> {
-            names.put(bucket.getName(), getTencentBucketSize(bucket.getName()));
+            HashMap<String, String> names = new HashMap<>();
+            names.put("name",bucket.getName());
+            names.put("size",getTencentBucketSize(bucket.getName()));
+            list1.add(names);
         });
-        return names;
+        return list1;
     }
 
     public String getTencentBucketSize(String bucket) {