Merge remote-tracking branch 'origin/uat' into uat

4dkankan-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -3064,8 +3064,8 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
             }
             //复制打包数据，并且改名
             FileUtils.copyFile(path + "/caches/images/" + fileName, imagesBuffer.toString() + "caches/" + planId + ".jpg", true);
-//            //将图片打成zip包
-            url = mainIntranetUrl + "scene/" + imagesBuf.toString() + "caches/" + planId + ".jpg";
+            //将图片打成zip包,由前端拼接域名
+            url =  "scene/" + imagesBuf.toString() + "caches/" + planId + ".jpg";
         }
 
         if("video".equals(type)){
@@ -3427,7 +3427,6 @@ public class SceneProServiceImpl extends BaseServiceImpl<SceneProEntity, String>
         if(StringUtils.isNotEmpty(sid)){
             String target = imagesBuffer.toString() + "panorama/" + sid;
             FileUtils.deleteDirectory(target);
-//            uploadToOssUtil.deleteFile(imagesBuf.toString() + "panorama/" + sid);
             uploadToOssUtil.deleteFile(imagesBuf.toString() + "panorama_edit/" + sid);
         }