lyhzzz преди 2 години
родител
ревизия
1294450e11
променени са 1 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 2 2
      4dkankan-utils-fyun-oss/src/main/java/com/fdkankan/fyun/oss/OssFileService.java

+ 2 - 2
4dkankan-utils-fyun-oss/src/main/java/com/fdkankan/fyun/oss/OssFileService.java

@@ -184,7 +184,7 @@ public class OssFileService extends AbstractFYunFileService {
                 listObjectsRequest.setMarker(nextMaker);
                 ObjectListing objectListing = ossClient.listObjects(listObjectsRequest);
                 List<String> collect = objectListing.getObjectSummaries().parallelStream()
-                        .map(OSSObjectSummary::getKey).collect(Collectors.toList());
+                        .map(OSSObjectSummary::getKey).filter(entity -> entity.contains(".")).collect(Collectors.toList());
                 if (!CollectionUtils.isEmpty(collect)) {
                     keyList.addAll(collect);
                 }
@@ -342,7 +342,7 @@ public class OssFileService extends AbstractFYunFileService {
             objectMetadata =  ossClient.getObjectMetadata(bucket, objectName);
             // 校验Object是否为归档类型Object。
             StorageClass storageClass = objectMetadata.getObjectStorageClass();
-            if (storageClass == StorageClass.Archive) {
+            if (storageClass == StorageClass.ColdArchive) {
                 // 解冻Object。
                 ossClient.restoreObject(bucket, objectName);
             }