Merge branch 'release/11.0' of ssh://code.fineres.com:7999/pg/plugin-repository-s3 into release/11.0

plugin.xml

@@ -5,12 +5,13 @@
     <main-package>com.fanruan.fs</main-package>
     <active>yes</active>
     <hidden>no</hidden>
-    <version>1.3.8</version>
+    <version>1.3.9</version>
     <env-version>11.0~11.0</env-version>
     <jartime>2023-03-14</jartime>
     <vendor>richie</vendor>
     <description><![CDATA[使用支持S3协议的云存储文件系统作为文件服务器。]]></description>
     <change-notes><![CDATA[
+        [2023-06-30]修复默认配置获取错误的问题，过滤有问题的路径。 <br/>
         [2023-03-28]第三方组件升级。 <br/>
         [2023-01-03]优化写文件性能; 修复文件太多显示不全的问题。<br/>
         [2022-09-22]第三方组件升级。 <br/>

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;
     }

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);
+            }
         }
     }