场景查看接口增加boxvidoes出参

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

@@ -69,7 +69,7 @@ public class TestController {
 //        }
 
         redisUtil.lLeftPush("downloads:task:v4", JSON
-            .toJSONString(DownLoadTaskBean.builder().num("t-5YwC6wb").type("local").build()));
+            .toJSONString(DownLoadTaskBean.builder().num("eur-3wdeOQaa0").type("local").build()));
         downloadHandlerService.download4Ali();
 
 //        List<String> strings = uploadToOssUtil.listKeysFromAws("data/datawJ6cAq3tc");

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

@@ -29,6 +29,7 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
@@ -42,6 +43,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import lombok.var;
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.tools.zip.ZipFile;
 import org.apache.tools.zip.ZipOutputStream;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -158,11 +160,11 @@ public class SceneDownloadHandlerServiceImpl {
                 imagesVersion = getInfoJson.getInt("imagesVersion");
             }
 
-//            //固定文件写入
-//            count = this.zipLocalFiles(out, v3localFilePaths, v3localPath, num, count, total);
-//
-//            //oss文件写入
-//            count = this.zipOssFiles(out, ossFilePaths, num, count, total, resolution, imagesVersion, cacheKeys);
+            //固定文件写入
+            count = this.zipLocalFiles(out, v3localFilePaths, v3localPath, num, count, total);
+
+            //oss文件写入
+            count = this.zipOssFiles(out, ossFilePaths, num, count, total, resolution, imagesVersion, cacheKeys);
 
             //写入启动命令
             this.zipBat(out, num);
@@ -185,7 +187,7 @@ public class SceneDownloadHandlerServiceImpl {
                 //删除正在下载任务
                 redisUtil.lRemove(RedisKey.SCENE_DOWNLOAD_ING, 1, num);
                 //删除本地zip包
-                FileUtils.deleteFile(zipPath);
+//                FileUtils.deleteFile(zipPath);
             }
         }
     }
@@ -266,7 +268,7 @@ public class SceneDownloadHandlerServiceImpl {
     }
 
     private JSONObject zipGetInfoJson(ZipOutputStream out, String num) throws Exception{
-        String url = serverUrl + " api/scene/getInfo?num=t-YhBCzQr";
+        String url = serverUrl + "api/scene/getInfo?num=" + num;
         String getInfoStr = restTemplate.getForObject(url, String.class);
         ResultData resultData = JSONUtil.toBean(getInfoStr, ResultData.class);
         if(resultData == null || ServerCode.SUCCESS.code() != resultData.getCode()){
@@ -339,14 +341,15 @@ public class SceneDownloadHandlerServiceImpl {
                     par += "&imagesVersion="+ imagesVersion;
                 }
 
-                var url = this.resourceUrl + key;
+                var url = this.
+                    resourceUrl + key;
                 StorageType storageType = StorageType.get(uploadType);
                 switch (storageType){
                     case OSS:
                         url += par;
                         break;
                     case AWS:
-                        url += par;
+                        url += URLEncoder.encode(par.replace("/", "@"), "UTF-8");
                         break;
                 }
                 var fky = key.split("/" + resolution + "/")[0] + "/" + dir + "/" + imageType.getName() +  num + "_" + item.getI()  + "_" + item.getJ() + ext;

4dkankan-center-scene-download/src/main/resources/bootstrap.yml

@@ -25,7 +25,7 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-upload-config.yaml
+          - data-id: common-upload-config2.yaml
             group: DEFAULT_GROUP
             refresh: true
       discovery:
@@ -34,11 +34,17 @@ spring:
 
 download:
   config:
-    server-url: https://test.4dkankan.com/
-    public-url: https://4dkk.4dage.com/
-    resource-url: https://4dkankan.oss-cn-shenzhen.aliyuncs.com/
+#    server-url: https://test.4dkankan.com/
+#    public-url: https://4dkk.4dage.com/
+#    resource-url: https://4dkankan.oss-cn-shenzhen.aliyuncs.com/
+    server-url: https://eur.4dkankan.com/
+    public-url: https://eurs3.4dkankan.com/
+    resource-url: https://eurs3.4dkankan.com/
     exe-name: start-browser.bat
-    exe-content: taskkill /f /t /im http.exe \\r\\n start http://127.0.0.1:9000/spc.html?m=%s \\r\\n http.exe -nc -p 9000 -r wwwroot
+    exe-content: | # | 表示不转义特殊字符
+      taskkill /f /t /im http.exe
+      start http://127.0.0.1:9000/spc.html?m=%s
+      http.exe -nc -p 9000 -r wwwroot
 
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/bean/SceneJsonBean.java

@@ -137,4 +137,9 @@ public class SceneJsonBean {
      */
     private String sceneFrom;
 
+    /**
+     * 视频覆盖数据
+     */
+    private String boxVideos;
+
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/vo/SceneInfoVO.java

@@ -122,6 +122,11 @@ public class SceneInfoVO {
      */
     private String sceneFrom;
 
+    /**
+     * 视频覆盖数据
+     */
+    private String boxVideos;
+