瀏覽代碼

下载脚本更换

dengsixing 2 年之前
父節點
當前提交
087d263060

+ 2 - 2
src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -1031,7 +1031,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/");
+        fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", target + File.separator + "capture/data.fdage");
         CreateObjUtil.build3dModel(target , "1");
 
         String uploadJsonPath= target + File.separator + "results" +File.separator+"upload.json";
@@ -1795,7 +1795,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);
+        fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "") + "/data.fdage", capturePath + "/data.fdage");
         CreateObjUtil.build3dModel(target , "1");
 
         //读取upload文件,获取需要上传的文件

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

@@ -920,7 +920,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);
+            fYunFileService.downloadFileByCommand(bucket, meshPath, dataViewPath + "mesh");
             log.info("meshPath="+meshPath);
             if(!new File(meshPath).exists()){
                 throw new BusinessException(ErrorCode.FAILURE_CODE_7006);