s3配置

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

@@ -848,14 +848,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
         });
 
         String imgViewPath = String.format(UploadFilePath.IMG_VIEW_PATH, num);
-        if(StorageType.AWS.code().equals(this.type)){
-            FileUtils.downLoadFromUrl(ConstantUrl.PREFIX_AWS + imgViewPath + "vision.modeldata" + "?m="+new Date().getTime(),
-                "vision.modeldata", target + File.separator + "extras" + File.separator);
-        }
-        if(StorageType.OSS.code().equals(this.type)){
-            FileUtils.downLoadFromUrl(prefixAli + imgViewPath + "vision.modeldata" + "?m="+new Date().getTime(),
-                "vision.modeldata", target + File.separator + "extras" + File.separator);
-        }
+        FileUtils.downLoadFromUrl(ossUrlPrefix + imgViewPath + "vision.modeldata" + "?m="+new Date().getTime(),
+            "vision.modeldata", target + File.separator + "extras" + File.separator);
         CreateObjUtil.convertVisionmodeldataToTxt(target + File.separator + "extras" + File.separator + "vision.modeldata",
             target + File.separator + "extras" + File.separator + "vision.txt");
 
@@ -1399,7 +1393,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             if(sceneDataDownload == null){
                 sceneDataDownload = new SceneDataDownload();
                 sceneDataDownload.setNum(num);
-                sceneDataDownload.setDownloadPath(prefixAli + "data_download/" + num + ".zip");
+                sceneDataDownload.setDownloadPath(ossUrlPrefix + "data_download/" + num + ".zip");
                 sceneDataDownload.setFileMd5(fileMD5);
                 sceneDataDownloadService.save(sceneDataDownload);
                 return ResultData.ok();