Schisandra-Cloud-Storage/schisandra-cloud-storage
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug修复

Browse Source
This commit is contained in:
zlg
2024-07-05 09:35:32 +08:00
parent ac72f4ed82
commit 96a48a271b
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
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
View File

@@ -82,12 +82,11 @@ public class SchisandraOssMinioController {
* @date: 2024/6/26 13:55 * @date: 2024/6/26 13:55
*/ */
@GetMapping("listMinioDir") @GetMapping("listMinioDir")
public Result<String> listMinioInfo(@RequestParam String target, @RequestParam String userId, @RequestParam String dirName,@RequestParam String bucket) throws Exception { public Result<String> listMinioInfo( @RequestParam String userId, @RequestParam String dirName,@RequestParam String bucket) throws Exception {
Preconditions.checkNotNull(target, "不能为空");
Preconditions.checkNotNull(userId, "不能为空"); Preconditions.checkNotNull(userId, "不能为空");
MinioOssClient bean = SpringUtil.getBean(userId); MinioOssClient bean = SpringUtil.getBean(userId);
bean.getMinioOssConfig().setBucketName(bucket); bean.getMinioOssConfig().setBucketName(bucket);
return Result.ok(bean.listDir(target, dirName)); return Result.ok(bean.listDir(bucket, dirName));
} }
/** /**

2
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
View File

@@ -221,7 +221,7 @@ public class MinioOssClient implements StandardOssClient {
info.setName(files[files.length - 1]); info.setName(files[files.length - 1]);
info.setPath(item.objectName()); info.setPath(item.objectName());
info.setIsDir(item.isDir()); info.setIsDir(item.isDir());
info.setLength(String.valueOf(item.size())); info.setLength( DataSizeUtil.format(item.size()));
info.setCreateTime(String.valueOf(item.lastModified())); info.setCreateTime(String.valueOf(item.lastModified()));
} }
infos.add(info); infos.add(info);