|
@@ -147,6 +147,11 @@ public class UploadToOssUtil {
|
|
|
* @return
|
|
|
*/
|
|
|
public List<String> listKeysFromAli(String sourcePath) {
|
|
|
+
|
|
|
+ return listKeysFromAli(sourcePath,bucket);
|
|
|
+ }
|
|
|
+
|
|
|
+ public List<String> listKeysFromAli(String sourcePath,String bucket) {
|
|
|
if("local".equals(type)){
|
|
|
return localToOssUtil.listKeysFromAli(sourcePath);
|
|
|
}
|
|
@@ -155,7 +160,7 @@ public class UploadToOssUtil {
|
|
|
try {
|
|
|
boolean flag = true;
|
|
|
String nextMaker = null;
|
|
|
- ListObjectsRequest listObjectsRequest = new ListObjectsRequest(this.bucket);
|
|
|
+ ListObjectsRequest listObjectsRequest = new ListObjectsRequest(bucket);
|
|
|
//指定下一级文件
|
|
|
listObjectsRequest.setPrefix(sourcePath);
|
|
|
//设置分页的页容量
|
|
@@ -354,7 +359,7 @@ public class UploadToOssUtil {
|
|
|
OSSClient ossClient = new OSSClient(point, key, secrey);
|
|
|
Long total = 0L;
|
|
|
try {
|
|
|
- List<String> files = listKeysFromAli( filePath);
|
|
|
+ List<String> files = listKeysFromAli( filePath,bucket);
|
|
|
if (ObjectUtils.isEmpty(files)) {
|
|
|
return 0L;
|
|
|
}
|