Browse Source

Merge branch 'hotfix-34068-20221230' into release

dsx 2 years ago
parent
commit
a7bd066189

+ 14 - 1
src/main/java/com/fdkankan/scene/service/impl/SceneUpgradeToV4Service.java

@@ -393,6 +393,19 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
 
             scenePlusExt.setThumb(thumbUrl);
             scenePlusExt.setWebSite(webSite);
+            if(StrUtil.isNotEmpty(scenePlusExt.getVideos())){
+                JSONObject videosJson = JSON.parseObject(scenePlusExt.getVideos());
+                String upPath = videosJson.getString("upPath");
+                if(StrUtil.isNotEmpty(upPath)){
+                    String fileName = "Up.txt";
+                    if(!fYunFileService.fileExist(dataViewPath + fileName)){
+                        fileName = "Up.xml";
+                    }
+                    String upXMLUrl = ossUrlPrefix + dataViewPath + fileName;
+                    videosJson.replace("upPath", upXMLUrl);
+                    scenePlusExt.setVideos(videosJson.toJSONString());
+                }
+            }
             scenePlusExtService.updateById(scenePlusExt);
 
             if(StrUtil.isNotEmpty(sceneEditInfo.getBoxVideos())){
@@ -455,7 +468,7 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
             sceneJson.setSceneFrom(scenePlusExt.getSceneFrom());
             sceneJson.setSceneKind(scenePlusExt.getSceneKind());
             if(StrUtil.isNotEmpty(scenePro.getVideos())){
-                sceneJson.setVideos(JSON.parseObject(scenePro.getVideos()));
+                sceneJson.setVideos(JSON.parseObject(scenePlusExt.getVideos()));
             }
             sceneJson.setVersion(sceneEditInfo.getVersion());
             //发布马赛克列表