From 96a48a271ba091744907c6a5d75bf211d685ff92 Mon Sep 17 00:00:00 2001
From: zlg <482370576@qq.com>
Date: Fri, 5 Jul 2024 09:35:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../application/controller/SchisandraOssMinioController.java | 5 ++---
 .../oss/application/oss/core/minio/MinioOssClient.java       | 2 +-
 2 files changed, 3 insertions(+), 4 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/controller/SchisandraOssMinioController.java b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java
index bdbb761..a4e7374 100644
--- a/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java
+++ b/schisandra-cloud-storage-oss/schisandra-cloud-storage-oss-application/schisandra-cloud-storage-oss-application-controller/src/main/java/com/schisandra/oss/application/controller/SchisandraOssMinioController.java
@@ -82,12 +82,11 @@ public class SchisandraOssMinioController {
      * @date: 2024/6/26 13:55
      */
     @GetMapping("listMinioDir")
-    public Result<String> listMinioInfo(@RequestParam String target, @RequestParam String userId, @RequestParam String dirName,@RequestParam String bucket) throws Exception {
-        Preconditions.checkNotNull(target, "不能为空");
+    public Result<String> listMinioInfo( @RequestParam String userId, @RequestParam String dirName,@RequestParam String bucket) throws Exception {
         Preconditions.checkNotNull(userId, "不能为空");
         MinioOssClient bean = SpringUtil.getBean(userId);
         bean.getMinioOssConfig().setBucketName(bucket);
-        return Result.ok(bean.listDir(target, dirName));
+        return Result.ok(bean.listDir(bucket, dirName));
     }
 
     /**
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/minio/MinioOssClient.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/minio/MinioOssClient.java
index 9da19c4..1e6abf9 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/minio/MinioOssClient.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/minio/MinioOssClient.java
@@ -221,7 +221,7 @@ public class MinioOssClient implements StandardOssClient {
                     info.setName(files[files.length - 1]);
                     info.setPath(item.objectName());
                     info.setIsDir(item.isDir());
-                    info.setLength(String.valueOf(item.size()));
+                    info.setLength( DataSizeUtil.format(item.size()));
                     info.setCreateTime(String.valueOf(item.lastModified()));
                 }
                 infos.add(info);