dsx 1 년 전
부모
커밋
58a3b76c2d
2개의 변경된 파일9개의 추가작업 그리고 8개의 파일을 삭제
  1. 8 7
      src/main/java/com/fdkankan/download/service/impl/DownloadServiceImpl.java
  2. 1 1
      src/main/resources/application-prod.yml

+ 8 - 7
src/main/java/com/fdkankan/download/service/impl/DownloadServiceImpl.java

@@ -207,13 +207,14 @@ public class DownloadServiceImpl implements IDownloadService {
 
     private void zipOssFiles(String num, String resolution, int imagesVersion, Set<String> cacheKeys, String version) throws Exception{
 
-//        fYunFileService.downloadFileByCommand(String.format(sourceLocal, num, this.wwwroot), String.format(UploadFilePath.VIEW_PATH, num));
-        List<String> strings = fYunFileService.listRemoteFiles(String.format(UploadFilePath.VIEW_PATH, num));
-        strings.stream().forEach(str->{
-            if(!str.contains("/tiles/4k/") && !str.contains("/tiles/2k/")){
-                fYunFileService.downloadFile(str, String.format(sourceLocal, num, this.wwwroot).concat(str));
-            }
-        });
+        fYunFileService.downloadFileByCommand(String.format(sourceLocal, num, this.wwwroot), String.format(UploadFilePath.VIEW_PATH, num));
+        FileUtil.del(String.format(sourceLocal, num, this.wwwroot).concat(String.format(UploadFilePath.IMG_VIEW_PATH, num)).concat("tiles"));
+//        List<String> strings = fYunFileService.listRemoteFiles(String.format(UploadFilePath.VIEW_PATH, num));
+//        strings.stream().forEach(str->{
+//            if(!str.contains("/tiles/4k/") && !str.contains("/tiles/2k/")){
+//                fYunFileService.downloadFile(str, String.format(sourceLocal, num, this.wwwroot).concat(str));
+//            }
+//        });
 //        fYunFileService.downloadFile(String.format(UploadFilePath.VIEW_PATH, num), String.format(sourceLocal, num, this.wwwroot));
 
         //特殊文件处理

+ 1 - 1
src/main/resources/application-prod.yml

@@ -87,7 +87,7 @@ zip:
   nThreads: 10
 path:
   v4school: /mnt/scene_download_statics/v4local/
-  source-local: /home/backend/downloads/scenes/%s/%s
+  source-local: /mnt/downloads/scenes/%s/%s
   zip-local: /mnt/scenes/%s/%s.zip
   zip-root: wwwroot/
   zip-oss: downloads/scenes/%s.zip