场景下载服务目录更换

4dkankan-center-scene-download/src/main/java/com/fdkankan/download/config/TestController.java

@@ -26,12 +26,6 @@ import org.springframework.web.client.RestTemplate;
 @Slf4j
 public class TestController {
 
-    @Value("${download.config.server-url}")
-    private String serverUrl;
-
-    @Autowired
-    private RestTemplate restTemplate;
-
     @Autowired
     UploadToOssUtil uploadToOssUtil;
 

4dkankan-center-scene-download/src/main/java/com/fdkankan/download/service/impl/SceneDownloadHandlerServiceImpl.java

@@ -63,13 +63,26 @@ import org.springframework.web.client.RestTemplate;
 @Service
 public class SceneDownloadHandlerServiceImpl {
 
-    //    @Autowired
-//    private PlatformUserClient platformUserClient;
+    private static final String[] prefixArr = new String[]{
+        UploadFilePath.DATA_VIEW_PATH,
+        UploadFilePath.VOICE_VIEW_PATH,
+        UploadFilePath.VIDEOS_VIEW_PATH,
+        UploadFilePath.IMG_VIEW_PATH,
+        UploadFilePath.USER_VIEW_PATH,
+    };
+
+    private static final List<ImageType> imageTypes = Lists.newArrayList();
+    static{
+        imageTypes.add(ImageType.builder().name("2k_face").size("2048").ranges(new String[]{"0", "511", "1023", "1535"}).build());
+        imageTypes.add(ImageType.builder().name("1k_face").size("1024").ranges(new String[]{"0", "511"}).build());
+        imageTypes.add(ImageType.builder().name("512_face").size("512").ranges(new String[]{"0"}).build());
+    }
+
     @Autowired
     private SceneUserSceneClient sceneUserSceneClient;
 
-    @Value("${path.v3school}")
-    private String v3localPath;
+    @Value("${path.v4school}")
+    private String v4localPath;
 
     @Value("${path.zip-local}")
     private String zipLocalFormat;
@@ -83,25 +96,8 @@ public class SceneDownloadHandlerServiceImpl {
     @Value("${zip.nThreads}")
     private int zipNthreads;
 
-    private static final String[] prefixArr = new String[]{
-        UploadFilePath.DATA_VIEW_PATH,
-        UploadFilePath.VOICE_VIEW_PATH,
-        UploadFilePath.VIDEOS_VIEW_PATH,
-        UploadFilePath.IMG_VIEW_PATH,
-        UploadFilePath.USER_VIEW_PATH,
-    };
-
-    private static final List<ImageType> imageTypes = Lists.newArrayList();
-    static{
-        imageTypes.add(ImageType.builder().name("2k_face").size("2048").ranges(new String[]{"0", "511", "1023", "1535"}).build());
-        imageTypes.add(ImageType.builder().name("1k_face").size("1024").ranges(new String[]{"0", "511"}).build());
-        imageTypes.add(ImageType.builder().name("512_face").size("512").ranges(new String[]{"0"}).build());
-    }
-
     @Value("${upload.type:oss}")
     private String uploadType;
-    @Value("${download.config.server-url}")
-    private String serverUrl;
     @Value("${download.config.resource-url}")
     private String resourceUrl;
     @Value("${download.config.public-url}")
@@ -159,7 +155,7 @@ public class SceneDownloadHandlerServiceImpl {
         try {
             Set<String> cacheKeys = new ConcurrentHashSet<>();
 
-            Map<String, List<String>> allFiles = this.getAllFiles(num, v3localPath);
+            Map<String, List<String>> allFiles = this.getAllFiles(num, v4localPath);
             List<String> ossFilePaths = allFiles.get("ossFilePaths");
             List<String> v3localFilePaths = allFiles.get("v3localFilePaths");
 
@@ -191,8 +187,9 @@ public class SceneDownloadHandlerServiceImpl {
 
 
             long start = Calendar.getInstance().getTimeInMillis();
+
             //固定文件写入
-            this.zipLocalFiles(out, v3localFilePaths, v3localPath, num, count, total);
+            this.zipLocalFiles(out, v3localFilePaths, v4localPath, num, count, total);
             long end1 = Calendar.getInstance().getTimeInMillis();
             log.info("打包固定文件耗时, num:{}, time:{}", num, end1 - start);