优化代码

4dkankan-utils-fyun-local/src/main/java/com/fdkankan/fyun/local/LocalFileService.java

@@ -102,10 +102,6 @@ public class LocalFileService extends AbstractFYunFileService {
 
     @Override
     public void copyFileBetweenBucket(String sourceBucketName, String sourcePath, String targetBucketName, String targetPath) {
-        copyFileBetweenBucket(sourceBucketName, sourcePath, targetBucketName, targetPath, true);
-    }
-
-    private void copyFileBetweenBucket(String sourceBucketName, String sourcePath, String targetBucketName, String targetPath, Boolean shutdown) {
         FileUtil.copyContent(new File(getOssPath(sourceBucketName, sourcePath)), new File(getOssPath(targetBucketName, targetPath)), true);
     }
 
@@ -116,7 +112,7 @@ public class LocalFileService extends AbstractFYunFileService {
         }
         try {
             for (Map.Entry<String, String> entry : pathMap.entrySet()) {
-                copyFileBetweenBucket(sourceBucketName, entry.getKey(), targetBucketName, entry.getValue(), false);
+                copyFileBetweenBucket(sourceBucketName, entry.getKey(), targetBucketName, entry.getValue());
             }
         } catch (Exception e) {
             log.error("批量复制文件失败!");

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

@@ -115,7 +115,7 @@ public class OssFileService extends AbstractFYunFileService {
     @Override
     public void deleteFolder(String bucket, String remoteFolderPath) {
         try {
-            List<String> remoteFiles = listRemoteFiles(bucket, remoteFolderPath, false);
+            List<String> remoteFiles = listRemoteFiles(bucket, remoteFolderPath);
             if (CollectionUtils.isEmpty(remoteFiles)) {
                 return;
             }
@@ -139,13 +139,8 @@ public class OssFileService extends AbstractFYunFileService {
         }
     }
 
-
     @Override
     public List<String> listRemoteFiles(String bucket, String sourcePath) {
-        return listRemoteFiles(bucket, sourcePath, true);
-    }
-
-    private List<String> listRemoteFiles(String bucket, String sourcePath, Boolean shutdown) {
         List<String> keyList = new ArrayList<>();
         try {
             boolean flag = true;
@@ -177,12 +172,8 @@ public class OssFileService extends AbstractFYunFileService {
 
     @Override
     public void copyFileBetweenBucket(String sourceBucketName, String sourcePath, String targetBucketName, String targetPath) {
-        copyFileBetweenBucket(sourceBucketName, sourcePath, targetBucketName, targetPath, true);
-    }
-
-    private void copyFileBetweenBucket(String sourceBucketName, String sourcePath, String targetBucketName, String targetPath, Boolean shutdown) {
         try {
-            List<String> files = listRemoteFiles(sourceBucketName, sourcePath, false);
+            List<String> files = listRemoteFiles(sourceBucketName, sourcePath);
             if (ObjectUtils.isEmpty(files)) {
                 log.error("源文件夹为空：{}", sourcePath);
             }
@@ -201,7 +192,7 @@ public class OssFileService extends AbstractFYunFileService {
         }
         try {
             for (Map.Entry<String, String> entry : pathMap.entrySet()) {
-                copyFileBetweenBucket(sourceBucketName, entry.getKey(), targetBucketName, entry.getValue(), false);
+                copyFileBetweenBucket(sourceBucketName, entry.getKey(), targetBucketName, entry.getValue());
             }
         } catch (Exception e) {
             log.error("批量复制文件失败!");

4dkankan-utils-fyun-s3/src/main/java/com/fdkankan/fyun/s3/S3FileService.java

@@ -166,11 +166,7 @@ public class S3FileService extends AbstractFYunFileService {
     }
 
     @Override
-    public List<String> listRemoteFiles(String bucket, String sourcePath){
-        return listRemoteFiles(bucket, sourcePath, true);
-    }
-
-    private List<String> listRemoteFiles(String bucket, String sourcePath, Boolean shutdown) {
+    public List<String> listRemoteFiles(String bucket, String sourcePath) {
         List<String> keyList = new ArrayList<>();
         try {
             boolean flag = true;
@@ -200,12 +196,8 @@ public class S3FileService extends AbstractFYunFileService {
 
     @Override
     public void copyFileBetweenBucket(String sourceBucketName, String sourcePath, String targetBucketName, String targetPath){
-        copyFileBetweenBucket(sourceBucketName, sourcePath, targetBucketName, targetPath, true);
-    }
-
-    private void copyFileBetweenBucket(String sourceBucketName, String sourcePath, String targetBucketName, String targetPath, Boolean shutdown){
         try {
-            List<String> files = listRemoteFiles(sourceBucketName, sourcePath, false);
+            List<String> files = listRemoteFiles(sourceBucketName, sourcePath);
             if (ObjectUtils.isEmpty(files)) {
                 log.error("源文件夹为空：{}", sourcePath);
             }
@@ -226,7 +218,7 @@ public class S3FileService extends AbstractFYunFileService {
         }
         try {
             for (Map.Entry<String, String> entry : pathMap.entrySet()) {
-                copyFileBetweenBucket(sourceBucketName, entry.getKey(), targetBucketName, entry.getValue(), false);
+                copyFileBetweenBucket(sourceBucketName, entry.getKey(), targetBucketName, entry.getValue());
             }
         } catch (Exception e) {
             log.error("批量复制文件失败!");