Browse Source

Pull request #34: 11.0-发布版本-1027版本插件代码合并

Merge in PG/plugin-repository-s3 from release/11.0 to persist/11.0

* commit '6d75e6924cf3f52631afb25e1e82ad431a838129':
  无jira任务 chore: 要发布了,修改change-note
  DEC-20707 fix: s3直接通过判断名称 + "/"是否存在,来判断是否为文件夹
persist/jsy-11.0
Icey.Zhang 3 years ago
parent
commit
102dc533e4
  1. 1
      plugin.xml
  2. 15
      src/main/java/com/fanruan/fs/s3/repository/core/S3ResourceRepository.java

1
plugin.xml

@ -11,6 +11,7 @@
<vendor>richie</vendor>
<description><![CDATA[使用支持S3协议的云存储文件系统作为文件服务器。]]></description>
<change-notes><![CDATA[
[2021-10-08]修复文件夹误判问题。<br/>
[2021-07-16]提供韩文、日文、繁体等国际化文件。 <br/>
[2021-04-23]copyFile接口兼容。 <br/>
[2021-03-30]修复copy文件耗时问题。<br/>

15
src/main/java/com/fanruan/fs/s3/repository/core/S3ResourceRepository.java

@ -249,20 +249,7 @@ public class S3ResourceRepository extends BaseResourceRepository {
@Override
public boolean isDirectory(String path) {
if (path.endsWith(DELIMITER) && exist(path)) {
return true;
}
ObjectListing listing = s3.listObjects(bucket, path);
if (listing.getObjectSummaries().isEmpty()) {
return false;
}
if (listing.getObjectSummaries().size() > 1) {
return true;
} else {
S3ObjectSummary summary = listing.getObjectSummaries().get(0);
return !StringKit.equals(listing.getPrefix(), summary.getKey());
}
return exist(path.endsWith(DELIMITER) ? path : path + DELIMITER);
}
@Override

Loading…
Cancel
Save