From 2bd592e352bd679639d561353fdd61dfe0576a58 Mon Sep 17 00:00:00 2001
From: Afly <Afly@fanruan.com>
Date: Thu, 15 Jun 2023 09:58:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A0jira=E4=BB=BB=E5=8A=A1=20fix:=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=BF=9E=E6=8E=A5=E5=90=8E=E9=87=8A=E6=94=BE?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90;list=E6=8E=A5=E5=8F=A3=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E8=87=AA=E8=BA=AB=E7=9B=AE=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repository/core/S3RepositoryFactory.java  |  7 ++++++-
 .../repository/core/S3ResourceRepository.java | 20 ++++++++++++-------
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/fanruan/fs/s3/repository/core/S3RepositoryFactory.java b/src/main/java/com/fanruan/fs/s3/repository/core/S3RepositoryFactory.java
index 2aecad2..5de506c 100644
--- a/src/main/java/com/fanruan/fs/s3/repository/core/S3RepositoryFactory.java
+++ b/src/main/java/com/fanruan/fs/s3/repository/core/S3RepositoryFactory.java
@@ -40,6 +40,7 @@ public class S3RepositoryFactory extends ConfigRepositoryFactory<S3Config> {
 
     @Override
     public boolean verifyConfig(S3Config config) {
+        AmazonS3 s3 = null;
         try {
             BasicAWSCredentials credentials = new BasicAWSCredentials(config.getAccessKeyId(), config.getPassword());
             AmazonS3ClientBuilder amazonS3ClientBuilder = AmazonS3ClientBuilder.standard()
@@ -57,11 +58,15 @@ public class S3RepositoryFactory extends ConfigRepositoryFactory<S3Config> {
                 clientConfiguration.setProtocol(Protocol.HTTP);
             }
             amazonS3ClientBuilder = amazonS3ClientBuilder.withClientConfiguration(clientConfiguration);
-            AmazonS3 s3 = amazonS3ClientBuilder.build();
+            s3 = amazonS3ClientBuilder.build();
             s3.listObjects(config.getBucket());
         } catch (Exception e) {
             LogKit.error(e.getMessage(), e);
             return false;
+        } finally {
+            if (s3 != null) {
+                s3.shutdown();
+            }
         }
         return true;
     }
diff --git a/src/main/java/com/fanruan/fs/s3/repository/core/S3ResourceRepository.java b/src/main/java/com/fanruan/fs/s3/repository/core/S3ResourceRepository.java
index 0f7b77a..d771bd2 100644
--- a/src/main/java/com/fanruan/fs/s3/repository/core/S3ResourceRepository.java
+++ b/src/main/java/com/fanruan/fs/s3/repository/core/S3ResourceRepository.java
@@ -99,15 +99,15 @@ public class S3ResourceRepository extends BaseResourceRepository {
         ListObjectsRequest listObjectsRequest = new ListObjectsRequest().withBucketName(bucket)
                 .withPrefix(dir).withDelimiter(DELIMITER);
         ObjectListing objectListing = s3.listObjects(listObjectsRequest);
-        collectFileEntry(result, objectListing);
+        collectFileEntry(dir, result, objectListing);
         while (objectListing.isTruncated()) {
             objectListing = s3.listNextBatchOfObjects(objectListing);
-            collectFileEntry(result, objectListing);
+            collectFileEntry(dir, result, objectListing);
         }
         return result.toArray(new FineFileEntry[0]);
     }
 
-    private void collectFileEntry(List<FineFileEntry> result, ObjectListing objectListing) {
+    private void collectFileEntry(String dir, List<FineFileEntry> result, ObjectListing objectListing) {
         for (S3ObjectSummary summary : objectListing.getObjectSummaries()) {
             String key = summary.getKey();
             if (!key.endsWith(DELIMITER)) {
@@ -115,9 +115,11 @@ public class S3ResourceRepository extends BaseResourceRepository {
             }
         }
         for (String prefix : objectListing.getCommonPrefixes()) {
-            FineFileEntry entry = new FineFileEntry(prefix);
-            entry.setDirectory(true);
-            result.add(entry);
+            if (StringUtils.isNotEmpty(prefix.substring(dir.length()).replaceAll(DELIMITER, StringUtils.EMPTY))) {
+                FineFileEntry entry = new FineFileEntry(prefix);
+                entry.setDirectory(true);
+                result.add(entry);
+            }
         }
     }
 
@@ -319,7 +321,11 @@ public class S3ResourceRepository extends BaseResourceRepository {
             result.add(key.substring(key.lastIndexOf(DELIMITER) + 1));
         }
         for (String prefix : objectListing.getCommonPrefixes()) {
-            result.add(prefix.substring(prefix.lastIndexOf(DELIMITER) + 1));
+            if (StringUtils.isNotEmpty(prefix.substring(dir.length()).replaceAll(DELIMITER, StringUtils.EMPTY))) {
+                String[] arr = prefix.split(DELIMITER);
+                String name = arr[arr.length - 1] + DELIMITER;
+                result.add(name);
+            }
         }
     }