添加、删除马赛克，更新版本号

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

@@ -54,6 +54,8 @@ public class Scene3dfamilyServiceImpl extends ServiceImpl<IScene3dfamilyMapper,
     @Autowired
     @Qualifier("uploadToOssUtil")
     UploadToOssUtil uploadToOssUtil;
+    @Value("${oss.bucket}")
+    private String bucket;
 
 
     @Override
@@ -78,7 +80,7 @@ public class Scene3dfamilyServiceImpl extends ServiceImpl<IScene3dfamilyMapper,
             //生成vision.json
             sceneProService.downloadVisionData(SceneEditParamVO.builder().num(sceneProVo.getNum()).build());
             //拉取data
-            CreateObjUtil.ossUtilCp("data" + File.separator + "data" + sceneProVo.getNum()  + File.separator,
+            CreateObjUtil.ossUtilCp(bucket, "data" + File.separator + "data" + sceneProVo.getNum()  + File.separator,
                     path + File.separator + "scene" + File.separator + "data" + File.separator + "data" + sceneProVo.getNum());
 
 
@@ -91,29 +93,29 @@ public class Scene3dfamilyServiceImpl extends ServiceImpl<IScene3dfamilyMapper,
                     + sceneProVo.getNum() + File.separator + "getinfo.json", dataJson.toString());
 
             //拉取images
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "floorLogoImg.png",
+            CreateObjUtil.ossUtilCp(bucket, "images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "floorLogoImg.png",
                     path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getNum());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "floorplan.png",
+            CreateObjUtil.ossUtilCp(bucket, "images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "floorplan.png",
                     path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getNum());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "logo-main.png",
+            CreateObjUtil.ossUtilCp(bucket, "images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "logo-main.png",
                     path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getNum());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "logo-main-en.png",
+            CreateObjUtil.ossUtilCp(bucket, "images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "logo-main-en.png",
                     path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getNum());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "smallPic.jpg",
+            CreateObjUtil.ossUtilCp(bucket, "images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "smallPic.jpg",
                     path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getNum());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "thumbBigImg.jpg",
+            CreateObjUtil.ossUtilCp(bucket, "images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "thumbBigImg.jpg",
                     path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getNum());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "thumbSmallImg.jpg",
+            CreateObjUtil.ossUtilCp(bucket, "images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "thumbSmallImg.jpg",
                     path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getNum());
-            CreateObjUtil.ossUtilCp("images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "pan",
+            CreateObjUtil.ossUtilCp(bucket, "images" + File.separator + "images" + sceneProVo.getNum()  + File.separator + "pan",
                     path + File.separator + "scene"  + File.separator + "images" + File.separator + "images" + sceneProVo.getNum());
 
             //拉取video
-            CreateObjUtil.ossUtilCp("video" + File.separator + "video" + sceneProVo.getNum()  + File.separator,
+            CreateObjUtil.ossUtilCp(bucket, "video" + File.separator + "video" + sceneProVo.getNum()  + File.separator,
                     path + File.separator + "scene"  + File.separator + "video" + File.separator + "video" + sceneProVo.getNum());
 
             //拉取voice
-            CreateObjUtil.ossUtilCp("voice" + File.separator + "voice" + sceneProVo.getNum()  + File.separator,
+            CreateObjUtil.ossUtilCp(bucket, "voice" + File.separator + "voice" + sceneProVo.getNum()  + File.separator,
                     path + File.separator + "scene"  + File.separator + "voice" + File.separator + "voice" + sceneProVo.getNum());
 
             //压缩zip

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

@@ -141,8 +141,10 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
     private String ossUrlPrefix;
     @Value("${upload.type}")
     private String type;
-    @Value("${oss.bucket:4dkankan}")
+    @Value("${oss.bucket}")
     private String bucket;
+    @Value("${oss.orig-bucket}")
+    private String origBucket;
     @Value("${main.url}")
     private String mainUrl;
     @Value("${ecs.checkFile.maxTimes:5}")
@@ -1121,7 +1123,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             //亚马逊保持旧方式，超链接capture
             CreateObjUtil.createSoftConnection(path + File.separator + "capture", target + File.separator + "capture");
         }
-        CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", target + File.separator + "capture/");
+        CreateObjUtil.ossUtilCp(origBucket,ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", target + File.separator + "capture/");
         CreateObjUtil.build3dModel(target , "1");
 
         String uploadJsonPath= target + File.separator + "results" +File.separator+"upload.json";
@@ -1273,7 +1275,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             log.info("打包耗时：" + (end1 - start));
             //上传压缩包
 //            uploadToOssUtil.upload(zipPath, String.format(cacheFormat, num) + downloadName);
-            uploadToOssUtil.uploadBySh(zipPath, String.format(cacheFormat, num) + downloadName);
+            uploadToOssUtil.uploadBySh(bucket, zipPath, String.format(cacheFormat, num) + downloadName);
             url = ossUrlPrefix + String.format(cacheFormat, num) + downloadName;
             long end2 = Calendar.getInstance().getTimeInMillis();
             log.info("上传耗时：" + (end2 - end1));
@@ -1890,7 +1892,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             //亚马逊保持旧方式，超链接capture
             CreateObjUtil.createSoftConnection(path + File.separator + "capture", capturePath);
         }
-        CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", capturePath);
+        CreateObjUtil.ossUtilCp(origBucket,ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", capturePath);
         CreateObjUtil.build3dModel(target , "1");
 
         //读取upload文件，获取需要上传的文件

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

@@ -86,6 +86,8 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
     @Value("${upload.type}")
     private String type;
+    @Value("${oss.bucket}")
+    private String bucket;
 
     @Value("${oss.prefix.ali}")
     private String prefixAli;
@@ -1014,7 +1016,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         if("aws".equals(this.type)){
             CreateObjUtil.ossFileCp("voice"+File.separator+"voice"+sceneNum + "/" + soundFile, partPath + File.separator + fileName);
         }else {
-            CreateObjUtil.ossUtilCp("voice"+File.separator+"voice"+sceneNum + "/" + soundFile, partPath + File.separator);
+            CreateObjUtil.ossUtilCp(bucket, "voice"+File.separator+"voice"+sceneNum + "/" + soundFile, partPath + File.separator);
             new File(partPath + File.separator + soundFile).renameTo(new File(partPath + File.separator + fileName));
         }
 
@@ -1626,7 +1628,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         if("aws".equals(this.type)){
             CreateObjUtil.ossFileCp("voice"+File.separator+"voice"+sceneNum + "/" + soundFile, partPath + File.separator + fileName);
         }else {
-            CreateObjUtil.ossUtilCp("voice"+File.separator+"voice"+sceneNum + "/" + soundFile, partPath + File.separator);
+            CreateObjUtil.ossUtilCp(bucket,"voice"+File.separator+"voice"+sceneNum + "/" + soundFile, partPath + File.separator);
             new File(partPath + File.separator + soundFile).renameTo(new File(partPath + File.separator + fileName));
         }
 

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

@@ -156,6 +156,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     private String fkankanMiniHost;
     @Value("${http.api-v4.upgradeToV4ResultSync}")
     private String URL_UPGRADE_TO_V4_RESULT_SYNC;
+    @Value("${oss.bucket}")
+    private String bucket;
+    @Value("${oss.orig-bucket}")
+    private String origBucket;
 
     @Autowired
     @Qualifier("uploadToOssUtil")
@@ -2013,7 +2017,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                         //亚马逊保持旧方式，超链接capture
                         CreateObjUtil.createSoftConnection(path + File.separator + "capture", target + File.separator + "capture");
                     }
-                    CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", target + File.separator + "capture/");
+                    CreateObjUtil.ossUtilCp(origBucket,ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", target + File.separator + "capture/");
 
                     CreateObjUtil.build3dModel(target , "1");
 
@@ -4698,7 +4702,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             //V3版本去oss下载2048模型
             String meshPath =  String.format(ConstantFilePath.DATABUFFER_FORMAT, num) + "mesh";
             FileUtils.deleteDirectory(meshPath);
-            CreateObjUtil.ossUtilCp(dataViewPath + "mesh", meshPath);
+            CreateObjUtil.ossUtilCp(bucket,dataViewPath + "mesh", meshPath);
             log.info("meshPath="+meshPath);
             if(!new File(meshPath).exists()){
                 throw new BusinessException(ErrorCode.FAILURE_CODE_7006);
@@ -4839,7 +4843,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         SceneProExt sceneProExt = sceneProExtService.findBySceneProId(scenePro.getId());
         data = sceneProExt.getDataSource();
-        CreateObjUtil.ossUtilCp(data.replace(ConstantFilePath.BUILD_MODEL_PATH, ConstantFilePath.OSS_PREFIX) + File.separator,
+        CreateObjUtil.ossUtilCp(origBucket,data.replace(ConstantFilePath.BUILD_MODEL_PATH, ConstantFilePath.OSS_PREFIX) + File.separator,
                 data + "/capture");
         return ResultData.ok(data);