Skip to content

Commit c6d4406

Browse files
committed
修复删除key后不删除资源的问题
添加控制台账号删除功能
1 parent 8181c27 commit c6d4406

2 files changed

Lines changed: 21 additions & 5 deletions

File tree

src/main/java/com/common/aliyun/product/OSS.java

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,26 @@ public static List<OSSObjectSummary> getFileLists(Key key, com.domain.Bucket buc
133133

134134
public static List<OSSObjectSummary> getAllFileLists(Key key, com.domain.Bucket bucket){
135135
com.aliyun.oss.OSS ossClient = getOssClient(key,bucket.getEndPoint());
136-
ListObjectsRequest listObjectsRequest = new ListObjectsRequest();
137-
listObjectsRequest.setBucketName(bucket.getName());
138-
ObjectListing objectListing = ossClient.listObjects(listObjectsRequest);
139-
return objectListing.getObjectSummaries();
136+
List<OSSObjectSummary> result = new ArrayList<>();
137+
try {
138+
String nextMarker = null;
139+
ObjectListing objectListing;
140+
do {
141+
objectListing = ossClient.listObjects(new ListObjectsRequest(bucket.getName()).withMarker(nextMarker).withMaxKeys(200));
142+
143+
List<OSSObjectSummary> sums = objectListing.getObjectSummaries();
144+
result.addAll(sums);
145+
nextMarker = objectListing.getNextMarker();
146+
} while (objectListing.isTruncated());
147+
}catch (Exception e){
148+
logger.error(e.getMessage());
149+
}finally {
150+
if (ossClient != null) {
151+
ossClient.shutdown();
152+
}
153+
}
154+
return result;
155+
140156
}
141157
private static com.aliyun.oss.OSS getOssClient(Key key,String endpoint){
142158
if (endpoint != null) OSS.endpoint = endpoint;

src/main/java/com/config/ExecutorServiceConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ public class ExecutorServiceConfiguration {
1313

1414
@Bean
1515
public ExecutorService executorService() {
16-
return Executors.newFixedThreadPool(10);
16+
return Executors.newFixedThreadPool(200);
1717
}
1818
}

0 commit comments

Comments
 (0)