1111

pom.xml

@@ -38,30 +38,36 @@
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-common-web</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-rabbitmq</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-redis</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-db</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-fyun</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <artifactId>4dkankan-utils-fyun-oss</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fdkankan</groupId>
+            <artifactId>4dkankan-utils-fyun-s3</artifactId>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
@@ -89,12 +95,12 @@
         <dependency>
             <artifactId>4dkankan-utils-app-push</artifactId>
             <groupId>com.fdkankan</groupId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-dingtalk</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+            <version>3.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>

src/main/java/com/fdkankan/scene/controller/SceneEditController.java

@@ -1,7 +1,7 @@
 package com.fdkankan.scene.controller;
 
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.scene.annotation.CheckCurrentUser;
 import com.fdkankan.scene.annotation.SystemControllerLog;
 import com.fdkankan.scene.bean.RequestSceneEdit;
@@ -26,7 +26,7 @@ public class SceneEditController extends BaseController {
     @Autowired
     private ISceneProService sceneProService;
     @Autowired
-    private UploadToOssUtil uploadToOssUtil;
+    private FYunFileServiceInterface fYunFileService;
 
     /**
      * 修改logoBottom状态
@@ -71,7 +71,7 @@ public class SceneEditController extends BaseController {
     @CheckCurrentUser(description = "删除oss的数据")
     @RequestMapping(value = "/deleteOss", method = RequestMethod.POST)
     public ResultData deleteOss(@RequestParam("filePath")String filePath) throws Exception {
-        uploadToOssUtil.deleteFile(filePath);
+        fYunFileService.deleteFile(filePath);
         return ResultData.ok();
     }
 

src/main/java/com/fdkankan/scene/service/impl/SceneProAppServiceImpl.java

@@ -14,8 +14,8 @@ import com.fdkankan.common.util.CreateObjUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.OkHttpUtils;
 import com.fdkankan.common.util.WeiXinUtils;
-import com.fdkankan.fyun.constant.StorageType;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.fyun.constant.FYunTypeEnum;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.scene.bean.RequestSceneEdit;
 import com.fdkankan.scene.entity.ScenePro;
 import com.fdkankan.scene.entity.SceneProEdit;
@@ -52,22 +52,14 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
     @Autowired
     private ISceneProEditService sceneProEditService;
     @Autowired
-    private UploadToOssUtil uploadToOssUtil;
-    @Value("${main.url}")
-    private String mainUrl;
-    @Value("${scene.pro.url}")
-    private String sceneProUrl;
-    @Value("${scene.pro.new.url}")
-    private String sceneProNewUrl;
+    private FYunFileServiceInterface fYunFileService;
     @Value("${hot.domain.list}")
     private String hotDomainList;
     @Value("${hot.delete}")
     private String hotDelete;
-    @Value("${prefix.ali}")
-    private String prefixAli;
-    @Value("${prefix.s3}")
-    private String prefixS3;
-    @Value("upload.type")
+    @Value("${fyun.host}")
+    private String ossPrefixUrl;
+    @Value("fyun.type")
     private String ossType;
 
 
@@ -132,7 +124,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         sceneProEditEntity.setVersion(sceneProEditEntity.getVersion() + 1);
 
         Map<String, Object> oss = new HashMap<>();
-        uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+floorPlanPng, floorPlanPng);
+        fYunFileService.uploadFile(ConstantFilePath.SCENE_PATH+floorPlanPng, floorPlanPng);
         sceneProEditService.updateById(sceneProEditEntity);
 
         return ResultData.ok("images"+File.separator+"images"+sceneNum + File.separator + fileName);
@@ -199,7 +191,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             sceneProEditEntity.setFloorEditVer(sceneProEditEntity.getFloorPublishVer() + 1);
             sceneProEditEntity.setFloorPublishVer(sceneProEditEntity.getFloorPublishVer() + 1);
             sceneProEditService.updateById(sceneProEditEntity);
-            uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"data"+File.separator+"data"+sceneEdit.getSceneNum() + File.separator + "floor.json",
+            fYunFileService.uploadFile(ConstantFilePath.SCENE_PATH+"data"+File.separator+"data"+sceneEdit.getSceneNum() + File.separator + "floor.json",
                 "data"+File.separator+"data"+sceneEdit.getSceneNum() + File.separator + "floor.json");
         }
 
@@ -312,12 +304,9 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             FileUtils.copyFile(partPath + File.separator + "0.mp3", path + File.separator + originalFileName, true);
         }
 
-        uploadToOssUtil.upload(path+File.separator +originalFileName, "voice/voice"+sceneNum+"/"+originalFileName);
+        fYunFileService.uploadFile(path+File.separator +originalFileName, "voice/voice"+sceneNum+"/"+originalFileName);
 
-        String voiceSrc = prefixAli+"voice/voice"+sceneNum+"/"+originalFileName;
-        if(StorageType.AWS.code().equals(this.ossType)){
-            voiceSrc =this.prefixS3+"voice/voice"+sceneNum+"/"+originalFileName;
-        }
+        String voiceSrc = ossPrefixUrl+"voice/voice"+sceneNum+"/"+originalFileName;
 
         Map map = new HashMap();
         map.put("screencapVoiceSoundsyncFileName", originalFileName);
@@ -391,14 +380,11 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             return ResultData.error(ErrorCode.FAILURE_CODE_5005);
         }
         String originalFileName = ConstantFileName.WECHAT_VOICE_NAME+".mp3";
-        uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator +originalFileName, "voice/voice"+base.getSceneNum()+"/"+originalFileName);
+        fYunFileService.uploadFile(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator +originalFileName, "voice/voice"+base.getSceneNum()+"/"+originalFileName);
 
         Map map = new HashMap();
         map.put("screencapVoiceSoundsyncFileName", originalFileName);
-        String voiceSrc = prefixAli+"voice/voice"+base.getSceneNum()+"/"+originalFileName;
-        if(StorageType.AWS.code().equals(ossType)){
-            voiceSrc =this.prefixS3+"voice/voice"+base.getSceneNum()+"/"+originalFileName;
-        }
+        String voiceSrc = ossPrefixUrl+"voice/voice"+base.getSceneNum()+"/"+originalFileName;
         map.put("screencapVoiceSoundsync", voiceSrc);
         log.info("微信上传的音频路径：" + voiceSrc);
         map.put("screencapVoiceType", "soundsync");
@@ -410,10 +396,10 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         sceneProEditEntity.setVersion(sceneProEditEntity.getVersion());
         sceneProEditService.updateById(sceneProEditEntity);
         FileUtils.deleteFile(ConstantFilePath.SCENE_PATH+"voice"+File.separator+"voice"+base.getSceneNum()+File.separator+ConstantFileName.WECHAT_VOICE_NAME+".amr");
-        if(StorageType.AWS.code().equals(ossType)){
+        if(FYunTypeEnum.AWS.code().equals(ossType)){
             return ResultData.ok(ConstantUrl.PREFIX_AWS+"voice/voice"+base.getSceneNum()+"/"+originalFileName);
         }
-        return ResultData.ok(prefixAli+"voice/voice"+base.getSceneNum()+"/"+originalFileName);
+        return ResultData.ok(ossPrefixUrl+"voice/voice"+base.getSceneNum()+"/"+originalFileName);
     }
 
     @Override
@@ -631,17 +617,14 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         uploadMap.put(imagesBuffer.toString() + "smallPic.jpg", imagesBuf.toString() + "smallPic.jpg");
         uploadMap.put(dataBuffer.toString() + "scene.json", dataBuf.toString() + "scene.json");
 
-        uploadToOssUtil.uploadMulFiles(uploadMap);
+        fYunFileService.uploadMulFiles(uploadMap);
 
         sceneProEditEntity.setEntry(base.getInitialPoint());
         sceneProEditEntity.setThumbStatus(1);
         sceneProEditEntity.setVersion(sceneProEditEntity.getVersion() + 1);
         sceneProEditService.updateById(sceneProEditEntity);
 
-        sceneProEntity.setThumb(prefixAli + imagesBuf.toString() + "thumbSmallImg.jpg");
-        if(StorageType.AWS.code().equals(ossType)){
-            sceneProEntity.setThumb(ConstantUrl.PREFIX_AWS + imagesBuf.toString() + "thumbSmallImg.jpg");
-        }
+        sceneProEntity.setThumb(ossPrefixUrl + imagesBuf.toString() + "thumbSmallImg.jpg");
         sceneProService.updateById(sceneProEntity);
 
         return ResultData.ok();
@@ -718,8 +701,8 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         sceneProEditEntity.setVersion(sceneProEditEntity.getVersion() + 1);
         sceneProEditService.updateById(sceneProEditEntity);
 
-        uploadToOssUtil.upload(imagesBuffer.toString() + "floorLogoImg.png", imagesBuf.toString() + "floorLogoImg.png");
-        uploadToOssUtil.upload(dataBuffer.toString() + "scene.json", dataBuf.toString() + "scene.json");
+        fYunFileService.uploadFile(imagesBuffer.toString() + "floorLogoImg.png", imagesBuf.toString() + "floorLogoImg.png");
+        fYunFileService.uploadFile(dataBuffer.toString() + "scene.json", dataBuf.toString() + "scene.json");
         return ResultData.ok();
     }
 
@@ -794,7 +777,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         }
 
         if(map.size()>0) {
-            uploadToOssUtil.uploadMulFiles(map);
+            fYunFileService.uploadMulFiles(map);
         }
         sceneProEditEntity.setVersion(scenejson.getIntValue("version") + 1);
         sceneProEditService.updateById(sceneProEditEntity);
@@ -898,7 +881,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
                     jsonhots.remove(i);
                     jsonhot = ele;
 
-                    if(!StorageType.AWS.code().equals(this.ossType)){
+                    if(!FYunTypeEnum.AWS.code().equals(this.ossType)){
                         JSONObject paramData = new JSONObject();
                         paramData.put("hotId", sid);
                         JSONObject hotListJson = JSONObject.parseObject(OkHttpUtils.httpGet(hotDomainList));
@@ -990,7 +973,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
             map.put(dataBuffer.toString() + "screencapThumb.json", dataBuf.toString() + "screencapThumb.json");
         }
 
-        uploadToOssUtil.uploadMulFiles(map);
+        fYunFileService.uploadMulFiles(map);
 
         sceneProEditEntity.setHotsIds(hotsids);
         sceneProEditEntity.setVersion(sceneProEditEntity.getVersion() + 1);
@@ -1122,12 +1105,9 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
                 CreateObjUtil.mergeVideo(partPath + File.separator + "0.mp3", partPath + File.separator + "1.mp3", path + File.separator + originalFileName);
             }
 
-            uploadToOssUtil.upload(path+File.separator +originalFileName, "voice/voice"+sceneNum+"/"+originalFileName);
+            fYunFileService.uploadFile(path+File.separator +originalFileName, "voice/voice"+sceneNum+"/"+originalFileName);
 
-            String voiceSrc = prefixAli+"voice/voice"+sceneNum+"/"+originalFileName;
-            if(StorageType.AWS.code().equals(this.ossType)){
-                voiceSrc =this.prefixS3+"voice/voice"+sceneNum+"/"+originalFileName;
-            }
+            String voiceSrc = ossPrefixUrl+"voice/voice"+sceneNum+"/"+originalFileName;
 
             Map map = new HashMap();
             map.put("screencapVoiceSoundsyncFileName", originalFileName);
@@ -1154,12 +1134,9 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         FileUtils.copyFile(partPath+File.separator+fileName, path + File.separator + originalFileName, true);
 
-        uploadToOssUtil.upload(path+File.separator +originalFileName, "voice/voice"+sceneNum+"/"+originalFileName);
+        fYunFileService.uploadFile(path+File.separator +originalFileName, "voice/voice"+sceneNum+"/"+originalFileName);
 
-        String voiceSrc = prefixAli+"voice/voice"+sceneNum+"/"+originalFileName;
-        if(StorageType.AWS.code().equals(this.ossType)){
-            voiceSrc =this.prefixS3+"voice/voice"+sceneNum+"/"+originalFileName;
-        }
+        String voiceSrc = ossPrefixUrl+"voice/voice"+sceneNum+"/"+originalFileName;
 
         Map map = new HashMap();
         map.put("screencapVoiceSoundsyncFileName", originalFileName);
@@ -1213,7 +1190,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         //上传文件
         file.transferTo(buMusicFile);
 
-        uploadToOssUtil.upload(imagesBuffer.toString() + fileName, imagesBuf + fileName);
+        fYunFileService.uploadFile(imagesBuffer.toString() + fileName, imagesBuf + fileName);
 
         String strsceneInfos = FileUtils.readFile(dataBuffer.toString() + "scene.json");
         JSONObject scenejson = new JSONObject();

src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -20,11 +20,10 @@ import com.fdkankan.common.util.CreateObjUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.MatrixToImageWriterUtil;
 import com.fdkankan.common.util.OkHttpUtils;
-import com.fdkankan.fyun.constant.StorageType;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.fyun.constant.FYunTypeEnum;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
-import com.fdkankan.scene.annotation.CheckCurrentUser;
 import com.fdkankan.scene.annotation.SystemServiceLog;
 import com.fdkankan.scene.bean.RequestSceneEdit;
 import com.fdkankan.scene.bean.RequestSceneProV4;
@@ -56,8 +55,6 @@ import java.util.Objects;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
 import net.coobird.thumbnailator.Thumbnails;
 import org.joda.time.DateTime;
@@ -67,8 +64,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -94,7 +89,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     @Autowired
     private ISceneProEditService sceneProEditService;
     @Autowired
-    private UploadToOssUtil uploadToOssUtil;
+    private FYunFileServiceInterface fYunFileService;
     @Autowired
     private ISceneService sceneService;
 
@@ -108,11 +103,9 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     private String hotDomainList;
     @Value("${hot.delete}")
     private String hotDelete;
-    @Value("${prefix.ali}")
-    private String prefixAli;
-    @Value("${prefix.s3}")
-    private String prefixS3;
-    @Value("upload.type")
+    @Value("${fyun.host}")
+    private String ossPrefixUrl;
+    @Value("fyun.type")
     private String ossType;
 
     @Override
@@ -344,7 +337,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
 
         if(toOss != null && "1".equals(toOss)){
-            uploadToOssUtil.upload(path + File.separator + fileName, "images"+File.separator+"images"+sceneNum + File.separator + fileName);
+            fYunFileService.uploadFile(path + File.separator + fileName, "images"+File.separator+"images"+sceneNum + File.separator + fileName);
         }
 
         return ResultData.ok(targetFile.getName());
@@ -754,10 +747,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
             if(sceneProEditEntity.getThumbStatus() == 1)
             {
-                sceneProEntity.setThumb(prefixAli + imagesBuf.toString() + "thumbSmallImg.jpg");
-                if(StorageType.AWS.code().equals(this.ossType)){
-                    sceneProEntity.setThumb(prefixS3 + imagesBuf.toString() + "thumbSmallImg.jpg");
-                }
+                sceneProEntity.setThumb(ossPrefixUrl + imagesBuf.toString() + "thumbSmallImg.jpg");
             }
 
         }
@@ -947,12 +937,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
             if(scenejson.getIntValue("buildImages") == 1){
                 log.info("下载vision.modeldata文件");
-                if(StorageType.AWS.code().equals(this.ossType)){
+                if(FYunTypeEnum.AWS.code().equals(this.ossType)){
                     FileUtils.downLoadFromUrl(ConstantUrl.PREFIX_AWS + "images/images" + sceneProEntity.getNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
                         "vision.modeldata", target + File.separator + "extras" + File.separator);
                 }
-                if(StorageType.OSS.code().equals(this.ossType)){
-                    FileUtils.downLoadFromUrl(prefixAli + "images/images" + sceneProEntity.getNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
+                if(FYunTypeEnum.OSS.code().equals(this.ossType)){
+                    FileUtils.downLoadFromUrl(ossPrefixUrl + "images/images" + sceneProEntity.getNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
                         "vision.modeldata", target + File.separator + "extras" + File.separator);
                 }
                 CreateObjUtil.convertVisionmodeldataToTxt(target + File.separator + "extras" + File.separator + "vision.modeldata",
@@ -993,7 +983,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                         FileUtils.delAllFile(target + File.separator + "results");
                     }
                     //下载data.fdage
-                    if(StorageType.AWS.code().equals(this.ossType)){
+                    if(FYunTypeEnum.AWS.code().equals(this.ossType)){
                         //亚马逊保持旧方式，超链接capture
                         CreateObjUtil.createSoftConnection(path + File.separator + "capture", target + File.separator + "capture");
                     }
@@ -1059,13 +1049,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 }
                 if(video.exists() && video.listFiles() != null && video.listFiles().length > 0){
                     for(String videoName : video.list()){
-                        uploadToOssUtil.upload(target + File.separator + "extras/video/" + videoName,"video/video"+
+                        fYunFileService.uploadFile(target + File.separator + "extras/video/" + videoName,"video/video"+
                             sceneProEntity.getNum()+ File.separator + videoName);
 
                         CreateObjUtil.mp4ToFlv(target + File.separator + "extras/video/" + videoName,
                             target + File.separator + "extras/video/" + videoName.replace("mp4", "flv"));
 
-                        uploadToOssUtil.upload(target + File.separator + "extras/video/" + videoName.replace("mp4", "flv"),"video/video"+
+                        fYunFileService.uploadFile(target + File.separator + "extras/video/" + videoName.replace("mp4", "flv"),"video/video"+
                             sceneProEntity.getNum()+ File.separator + videoName.replace("mp4", "flv"));
 
                         //覆盖原始视频资源
@@ -1100,13 +1090,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }else if(scenejson.getIntValue("buildImages") == 2){
                 if(video.exists() && video.listFiles() != null && video.listFiles().length > 0){
                     for(String videoName : video.list()){
-                        uploadToOssUtil.upload(target + File.separator + "extras/video/" + videoName,"video/video"+
+                        fYunFileService.uploadFile(target + File.separator + "extras/video/" + videoName,"video/video"+
                             sceneProEntity.getNum()+ File.separator + videoName);
 
                         CreateObjUtil.mp4ToFlv(target + File.separator + "extras/video/" + videoName,
                             target + File.separator + "extras/video/" + videoName.replace("mp4", "flv"));
 
-                        uploadToOssUtil.upload(target + File.separator + "extras/video/" + videoName.replace("mp4", "flv"),"video/video"+
+                        fYunFileService.uploadFile(target + File.separator + "extras/video/" + videoName.replace("mp4", "flv"),"video/video"+
                             sceneProEntity.getNum()+ File.separator + videoName.replace("mp4", "flv"));
 
                         //覆盖原始视频资源
@@ -1210,7 +1200,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         FileUtils.writeFile(dataBuffer.toString() + "scene.json", scenejson.toString());
 
         if(map.size()>0) {
-            uploadToOssUtil.uploadMulFiles(map);
+            fYunFileService.uploadMulFiles(map);
         }
         this.updateById(sceneProEntity);
         sceneProEditService.updateById(sceneProEditEntity);
@@ -1419,12 +1409,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             FileUtils.writeFile(ConstantFilePath.SCENE_PATH+"data"+File.separator+"data"+sceneEdit.getSceneNum() + File.separator + "floor.json", new String(sceneEdit.getWebFloor().getBytes(), "UTF-8"));
             //下载vision.modeldata，解压成vision.txt,并且删除vision.modeldata
             log.info("下载vision.modeldata文件");
-            if(StorageType.AWS.code().equals(ossType)){
+            if(FYunTypeEnum.AWS.code().equals(ossType)){
                 FileUtils.downLoadFromUrl(ConstantUrl.PREFIX_AWS + "images/images" + sceneEdit.getSceneNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
                     "vision.modeldata", target + File.separator + "extras" + File.separator);
             }
-            if(StorageType.OSS.code().equals(this.ossType)){
-                FileUtils.downLoadFromUrl(prefixAli + "images/images" + sceneEdit.getSceneNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
+            if(FYunTypeEnum.OSS.code().equals(this.ossType)){
+                FileUtils.downLoadFromUrl(ossPrefixUrl + "images/images" + sceneEdit.getSceneNum() + "/vision.modeldata" + "?m="+new Date().getTime(),
                     "vision.modeldata", target + File.separator + "extras" + File.separator);
             }
             CreateObjUtil.convertVisionmodeldataToTxt(target + File.separator + "extras" + File.separator + "vision.modeldata",
@@ -1433,11 +1423,11 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             FileUtils.deleteFile(target + File.separator + "extras" + File.separator + "vision.modeldata");
 
             log.info("下载vision2.modeldata文件");
-            if(StorageType.OSS.code().equals(ossType)){
-                FileUtils.downLoadFromUrl(prefixAli + "images/images" + sceneEdit.getSceneNum() + "/vision2.modeldata" + "?m="+new Date().getTime(),
+            if(FYunTypeEnum.OSS.code().equals(ossType)){
+                FileUtils.downLoadFromUrl(ossPrefixUrl + "images/images" + sceneEdit.getSceneNum() + "/vision2.modeldata" + "?m="+new Date().getTime(),
                     "vision2.modeldata", target + File.separator + "extras" + File.separator);
             }
-            if(StorageType.AWS.code().equals(ossType)){
+            if(FYunTypeEnum.AWS.code().equals(ossType)){
                 FileUtils.downLoadFromUrl(ConstantUrl.PREFIX_AWS + "images/images" + sceneEdit.getSceneNum() + "/vision2.modeldata" + "?m="+new Date().getTime(),
                     "vision2.modeldata", target + File.separator + "extras" + File.separator);
             }
@@ -1526,7 +1516,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             }
 
             FileUtils.copyFile(sceneProEntity.getDataSource() + "/results/floor.json", dataBuffer.toString() + "houst_floor.json", true);
-            uploadToOssUtil.upload(dataBuffer.toString() + "houst_floor.json", dataBuf.toString() + "houst_floor.json");
+            fYunFileService.uploadFile(dataBuffer.toString() + "houst_floor.json", dataBuf.toString() + "houst_floor.json");
 
             String result = FileUtils.readFile(dataBuffer.toString() + "houst_floor.json");
             return ResultData.ok(result);
@@ -1534,7 +1524,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         FileUtils.writeFile(dataBuffer.toString() + "houst_floor.json", floorJsonData);
 
-        uploadToOssUtil.upload(dataBuffer.toString() + "houst_floor.json", dataBuf.toString() + "houst_floor.json");
+        fYunFileService.uploadFile(dataBuffer.toString() + "houst_floor.json", dataBuf.toString() + "houst_floor.json");
         return ResultData.ok(floorJsonData);
     }
 
@@ -1637,7 +1627,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                         }
                     }
 
-                    if(!StorageType.AWS.code().equals(this.ossType)){
+                    if(!FYunTypeEnum.AWS.code().equals(this.ossType)){
                         JSONObject paramData = new JSONObject();
                         paramData.put("hotId", sid);
                         JSONObject hotListJson = JSONObject.parseObject(OkHttpUtils.httpGet(hotDomainList));
@@ -1795,10 +1785,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         JSONArray inputdata =  JSONArray.parseArray(base.getData());
 
-        String modeldataUrl = prefixAli + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
-        if(StorageType.AWS.equals(this.ossType)){
-            modeldataUrl =this.prefixS3 + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
-        }
+        String modeldataUrl = ossPrefixUrl + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
         FileUtils.downLoadFromUrl(modeldataUrl, "vision.modeldata", dataBuffer.toString());
         File file = new File(dataBuffer.toString() + "vision.modeldata");
         if(!file.exists()) {
@@ -1826,7 +1813,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         FileUtils.deleteFile(dataBuffer.toString() + "vision.modeldata");
         FileUtils.writeFile(dataBuffer.toString() + "vision.json", json.toString());
         ConvertUtils.convertTxtToVisionModelData(dataBuffer.toString() + "vision.json", dataBuffer.toString() + "vision.modeldata");
-        uploadToOssUtil.upload(dataBuffer.toString() + "vision.modeldata", imagesBuf.toString() + "vision.modeldata");
+        fYunFileService.uploadFile(dataBuffer.toString() + "vision.modeldata", imagesBuf.toString() + "vision.modeldata");
 
         String strsceneInfos = FileUtils.readFile(dataBuffer.toString() + "scene.json");
         JSONObject scenejson = new JSONObject();
@@ -2207,8 +2194,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
             CreateObjUtil.mp4ToFlv(path + File.separator + fileName, path + File.separator + fileName.replace("mp4", "flv"));
 
-            uploadToOssUtil.upload(path + File.separator + fileName, "images"+File.separator+"images"+sceneNum + File.separator + fileName);
-            uploadToOssUtil.upload(path + File.separator + fileName.replace("mp4", "flv"), "images"+File.separator+"images"+sceneNum + File.separator + fileName.replace("mp4", "flv"));
+            fYunFileService.uploadFile(path + File.separator + fileName, "images"+File.separator+"images"+sceneNum + File.separator + fileName);
+            fYunFileService.uploadFile(path + File.separator + fileName.replace("mp4", "flv"), "images"+File.separator+"images"+sceneNum + File.separator + fileName.replace("mp4", "flv"));
         }
 
         return ResultData.ok(fileName);
@@ -2327,7 +2314,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
 
         String path = ConstantFilePath.SCENE_PATH+"data"+File.separator+"data"+sceneNum;
-        uploadToOssUtil.upload(path + File.separator + "hot.json", "data"+File.separator+"data"+sceneNum + File.separator + "hot.json");
+        fYunFileService.uploadFile(path + File.separator + "hot.json", "data"+File.separator+"data"+sceneNum + File.separator + "hot.json");
 
         return ResultData.ok();
     }
@@ -2438,7 +2425,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             FileUtils.delAllFile(target + File.separator + "results");
         }
         //下载data.fdage
-        if(StorageType.AWS.code().equals(this.ossType)){
+        if(FYunTypeEnum.AWS.code().equals(this.ossType)){
             //亚马逊保持旧方式，超链接capture
             CreateObjUtil.createSoftConnection(path + File.separator + "capture", target + File.separator + "capture");
         }
@@ -2495,7 +2482,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         //上传全景图
         map.put(filePath, "images/images"+ sceneProEntity.getNum()+ File.separator + "pan/high/" + imagesName);
 
-        uploadToOssUtil.uploadMulFiles(map);
+        fYunFileService.uploadMulFiles(map);
 
         String strsceneInfos = FileUtils.readFile(dataBuffer.toString() + "scene.json");
         JSONObject scenejson = new JSONObject();
@@ -2560,7 +2547,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             String target = imagesBuffer.toString() + "panorama/" + sid;
             FileUtils.deleteDirectory(target);
 //            uploadToOssUtil.deleteFile(imagesBuf.toString() + "panorama/" + sid);
-            uploadToOssUtil.deleteFile(imagesBuf.toString() + "panorama_edit/" + sid);
+            fYunFileService.deleteFolder(imagesBuf.toString() + "panorama_edit/" + sid);
         }
 
         return ResultData.ok();
@@ -2701,7 +2688,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         if("video".equals(type)){
             //使用oss的路径
-            url = prefixAli + "video/video" + sceneProEntity.getNum() + "/" + planId + ".mp4";
+            url = ossPrefixUrl + "video/video" + sceneProEntity.getNum() + "/" + planId + ".mp4";
         }
         Map<String, Object> map = new HashMap<>();
         map.put("fileUrl", url + "?t=" + System.currentTimeMillis());

src/main/java/com/fdkankan/scene/service/impl/SceneRepairService.java

@@ -5,7 +5,7 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.scene.entity.ScenePro;
 import com.fdkankan.scene.service.ISceneEditControlsService;
 import com.fdkankan.scene.service.ISceneEditInfoExtService;
@@ -34,12 +34,14 @@ public class SceneRepairService {
 
     @Value("${main.url}")
     private String mainUrl;
-
     @Value("${scene.pro.new.url}")
     private String sceneProNewUrl;
-
-    @Value("${oss.prefix.url}")
+    @Value("${fyun.host}")
     private String ossUrlPrefix;
+    @Value("${fyun.type}")
+    private String ossType;
+    @Value("${fyun.bucket:4dkankan}")
+    private String bucket;
 
     @Autowired
     private ISceneEditInfoService sceneEditInfoService;
@@ -51,22 +53,16 @@ public class SceneRepairService {
     private ISceneEditControlsService sceneEditControlsService;
     @Autowired
     private ISceneRepairLogService sceneRepairLogService;
-    @Value("${oss.bucket:4dkankan}")
-    private String bucket;
     @Autowired
     private ISceneProService sceneProService;
     @Autowired
     private IScenePlusExtService scenePlusExtService;
-
-
+    @Autowired
+    private FYunFileServiceInterface fYunFileService;
     /**
      * 当前正在执行的线程数
      */
     private int currentThreadCnt = 0;
-    @Autowired
-    private UploadToOssUtil uploadToOssUtil;
-    @Value("${upload.type:oss}")
-    private String uploadType;
 
     private static final String[] prefixArr = new String[]{
         "data/data%s/",
@@ -409,7 +405,7 @@ public class SceneRepairService {
 
     private Float getFloorPlanCompass(String num){
         String objectContent =
-            uploadToOssUtil.getObjectContent(bucket, "data/data" + num + "/houst_floor.json");
+            fYunFileService.getFileContent(bucket, "data/data" + num + "/houst_floor.json");
         if(StrUtil.isEmpty(objectContent)){
             return null;
         }

src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -12,7 +12,7 @@ import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.util.CreateObjUtil;
 import com.fdkankan.common.util.DateUtil;
 import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.constant.RedisLockKey;
@@ -99,7 +99,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
     @Autowired
     private IScenePlusExtService scenePlusExtService;
     @Autowired
-    private UploadToOssUtil uploadToOssUtil;
+    private FYunFileServiceInterface fYunFileService;
     @Autowired
     private IVideoSceneProgressService videoSceneProgressService;
     @Autowired
@@ -405,7 +405,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
             }
             //上传
             log.info("上传内容 ===== + " + map);
-            uploadToOssUtil.uploadMulFiles(map);
+            fYunFileService.uploadMulFiles(map);
             FileUtils.deleteDirectory(backpathtemp);
         }
 

src/main/java/com/fdkankan/scene/service/impl/SceneUpgradeToV4Service.java

@@ -16,7 +16,7 @@ import com.fdkankan.common.util.FileUtil;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.common.util.MatrixToImageWriterUtil;
 import com.fdkankan.common.util.SceneUtil;
-import com.fdkankan.fyun.oss.UploadToOssUtil;
+import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisLockUtil;
@@ -75,13 +75,8 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
     private String mainUrl;
     @Value("${scene.pro.new.url}")
     private String sceneProNewUrl;
-    @Value("${oss.prefix.url}")
+    @Value("${fyun.host}")
     private String ossUrlPrefix;
-    @Value("${http.host.4dkankanMini}")
-    private String fkankanMiniHost;
-    @Value("${http.api-v4.upgradeToV4ResultSync}")
-    private String URL_UPGRADE_TO_V4_RESULT_SYNC;
-
 
     @Autowired
     private RedisLockUtil redisLockUtil;
@@ -95,14 +90,14 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
     private ISceneEditControlsService sceneEditControlsService;
     @Autowired
     private ISceneRepairLogService sceneRepairLogService;
-    @Value("${oss.bucket:4dkankan}")
+    @Value("${fyun.bucket:4dkankan}")
     private String bucket;
     @Autowired
     private ISceneProService sceneProService;
     @Autowired
     private IScenePlusExtService scenePlusExtService;
     @Autowired
-    private UploadToOssUtil uploadToOssUtil;
+    private FYunFileServiceInterface fYunFileService;
     @Autowired
     private RedisUtil redisUtil;
 
@@ -156,7 +151,7 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
             SceneEditControls sceneEditControls = null;
             if(sceneEditInfo == null){
 
-                List<String> loadingLogoFile = uploadToOssUtil.listKeys(imagePath + "logo-main.png");
+                List<String> loadingLogoFile = fYunFileService.listRemoteFiles(imagePath + "logo-main.png");
                 if(CollUtil.isNotEmpty(loadingLogoFile)){
                     existLoadingLogo = true;
                 }
@@ -256,10 +251,10 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
             AtomicInteger count = new AtomicInteger(0);
             AtomicInteger completeCnt = new AtomicInteger(0);
             List<String> list = new ArrayList<>();
-            List<String> dataKeys = uploadToOssUtil.listKeys(dataPath);
-            List<String> imageKeys = uploadToOssUtil.listKeys(imagePath);
-            List<String> videoKeys = uploadToOssUtil.listKeys(videoPath);
-            List<String> voiceKeys = uploadToOssUtil.listKeys(voicePath);
+            List<String> dataKeys = fYunFileService.listRemoteFiles(dataPath);
+            List<String> imageKeys = fYunFileService.listRemoteFiles(imagePath);
+            List<String> videoKeys = fYunFileService.listRemoteFiles(videoPath);
+            List<String> voiceKeys = fYunFileService.listRemoteFiles(voicePath);
             if(CollUtil.isNotEmpty(dataKeys)) count.addAndGet(dataKeys.size());
             if(CollUtil.isNotEmpty(imageKeys)) count.addAndGet(imageKeys.size());
             if(CollUtil.isNotEmpty(videoKeys)) count.addAndGet(videoKeys.size());
@@ -296,8 +291,8 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
                     String substring = str.substring(str.lastIndexOf(File.separator) + 1);
                     String[] arr = substring.split("floor");
                     String[] arr2 = arr[1].split("\\.");
-                    uploadToOssUtil.upload(str, String.format(userEditPath, num, arr2[0], arr2[1]));
-                    uploadToOssUtil.upload(str, String.format(userViewPath, num, arr2[0], arr2[1]));
+                    fYunFileService.uploadFile(str, String.format(userEditPath, num, arr2[0], arr2[1]));
+                    fYunFileService.uploadFile(str, String.format(userViewPath, num, arr2[0], arr2[1]));
                 });
             }
 
@@ -311,7 +306,7 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
             map2.put(editImagesPath + "vision2.modeldata", viewImagesPath + "vision2.modeldata");
             map2.put(editDataPath + "floorplan_cad.json", viewDataPath + "floorplan_cad.json");
             for (Entry<String, String> entry : map2.entrySet()) {
-                uploadToOssUtil.copyFiles(entry.getValue(), entry.getKey());
+                fYunFileService.copyFileInBucket(entry.getValue(), entry.getKey());
             }
 
             //完成数据库操作更新进度条为10
@@ -323,23 +318,23 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
             String outPathEn = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/" + num + "_en.png";
             MatrixToImageWriterUtil.createQRCode(sceneUrl + num, outPathZh, false,null);
             MatrixToImageWriterUtil.createQRCode(sceneUrl + num + "&lang=en", outPathEn, false, null);
-            uploadToOssUtil.upload(outPathZh, String.format(UploadFilePath.DOWNLOADS_QRCODE, num) + num + ".png");
-            uploadToOssUtil.upload(outPathEn, String.format(UploadFilePath.DOWNLOADS_QRCODE, num) + num + "_en.png");
+            fYunFileService.uploadFile(outPathZh, String.format(UploadFilePath.DOWNLOADS_QRCODE, num) + num + ".png");
+            fYunFileService.uploadFile(outPathEn, String.format(UploadFilePath.DOWNLOADS_QRCODE, num) + num + "_en.png");
 
             //根据编辑表 上传用户目录  包括编辑目录 查看目录
             String editUsersPath = String.format(UploadFilePath.USER_EDIT_PATH, num);
             String viewUsersPath = String.format(UploadFilePath.USER_VIEW_PATH, num);
             if("user".equals(sceneProEdit.getFloorLogo())){
-                uploadToOssUtil.copyFiles(imagePath + "floorLogoImg.png", editUsersPath + "floorLogo-user.png");
-                uploadToOssUtil.copyFiles(imagePath + "floorLogoImg.png", viewUsersPath + "floorLogo-user.png");
+                fYunFileService.copyFileInBucket(imagePath + "floorLogoImg.png", editUsersPath + "floorLogo-user.png");
+                fYunFileService.copyFileInBucket(imagePath + "floorLogoImg.png", viewUsersPath + "floorLogo-user.png");
             }
             if("user".equals(sceneProEdit.getBgMusic())){
-                uploadToOssUtil.copyFiles(imagePath + sceneProEdit.getBgMusicName(), editUsersPath + "music-user.mp3");
-                uploadToOssUtil.copyFiles(imagePath + sceneProEdit.getBgMusicName(), viewUsersPath + "music-user.mp3");
+                fYunFileService.copyFileInBucket(imagePath + sceneProEdit.getBgMusicName(), editUsersPath + "music-user.mp3");
+                fYunFileService.copyFileInBucket(imagePath + sceneProEdit.getBgMusicName(), viewUsersPath + "music-user.mp3");
             }
             if(existLoadingLogo){
-                uploadToOssUtil.copyFiles(imagePath + "logo-main.png", editUsersPath + "loadingLogo-user.png");
-                uploadToOssUtil.copyFiles(imagePath + "logo-main.png", viewUsersPath + "loadingLogo-user.png");
+                fYunFileService.copyFileInBucket(imagePath + "logo-main.png", editUsersPath + "loadingLogo-user.png");
+                fYunFileService.copyFileInBucket(imagePath + "logo-main.png", viewUsersPath + "loadingLogo-user.png");
             }
             ScenePlusExt scenePlusExt = scenePlusExtService.getOne(
                 new LambdaQueryWrapper<ScenePlusExt>()
@@ -348,12 +343,12 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
                 && scenePro.getThumb().contains(imagePath)){
                 String thumbUrl = null;
                 if(scenePro.getThumb().contains("thumbSmallImg.jpg")){
-                    uploadToOssUtil.copyFiles(imagePath + "thumbBigImg.jpg", editUsersPath + "thumb-1k.jpg");
-                    uploadToOssUtil.copyFiles(imagePath + "thumbBigImg.jpg", viewUsersPath + "thumb-1k.jpg");
-                    uploadToOssUtil.copyFiles(imagePath + "thumbBigImg.jpg", editUsersPath + "thumb-2k.jpg");
-                    uploadToOssUtil.copyFiles(imagePath + "thumbBigImg.jpg", viewUsersPath + "thumb-2k.jpg");
-                    uploadToOssUtil.copyFiles(imagePath + "thumbSmallImg.jpg", editUsersPath + "thumb-128.jpg");
-                    uploadToOssUtil.copyFiles(imagePath + "thumbSmallImg.jpg", viewUsersPath + "thumb-128.jpg");
+                    fYunFileService.copyFileInBucket(imagePath + "thumbBigImg.jpg", editUsersPath + "thumb-1k.jpg");
+                    fYunFileService.copyFileInBucket(imagePath + "thumbBigImg.jpg", viewUsersPath + "thumb-1k.jpg");
+                    fYunFileService.copyFileInBucket(imagePath + "thumbBigImg.jpg", editUsersPath + "thumb-2k.jpg");
+                    fYunFileService.copyFileInBucket(imagePath + "thumbBigImg.jpg", viewUsersPath + "thumb-2k.jpg");
+                    fYunFileService.copyFileInBucket(imagePath + "thumbSmallImg.jpg", editUsersPath + "thumb-128.jpg");
+                    fYunFileService.copyFileInBucket(imagePath + "thumbSmallImg.jpg", viewUsersPath + "thumb-128.jpg");
                     thumbUrl = this.ossUrlPrefix + String.format(UploadFilePath.USER_VIEW_PATH, num) + "thumb-128.jpg";
                 }else{
                     thumbUrl = scenePro.getThumb().replace(imagePath, viewImagesPath);
@@ -373,10 +368,10 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
                 for(int i = 0; i < boxVideoArr.size(); i++){
                     JSONObject boxVideo = boxVideoArr.getJSONObject(i);
                     String sid = boxVideo.getString("sid");
-                    uploadToOssUtil.copyFiles(imagePath + "overlay" + sid + ".mp4", editUsersPath + sid + ".mp4");
-                    uploadToOssUtil.copyFiles(imagePath + "overlay" + sid + ".mp4", viewUsersPath + sid + ".mp4");
-                    uploadToOssUtil.copyFiles(imagePath + "overlay" + sid + ".flv", editUsersPath + sid + ".flv");
-                    uploadToOssUtil.copyFiles(imagePath + "overlay" + sid + ".flv", viewUsersPath + sid + ".flv");
+                    fYunFileService.copyFileInBucket(imagePath + "overlay" + sid + ".mp4", editUsersPath + sid + ".mp4");
+                    fYunFileService.copyFileInBucket(imagePath + "overlay" + sid + ".mp4", viewUsersPath + sid + ".mp4");
+                    fYunFileService.copyFileInBucket(imagePath + "overlay" + sid + ".flv", editUsersPath + sid + ".flv");
+                    fYunFileService.copyFileInBucket(imagePath + "overlay" + sid + ".flv", viewUsersPath + sid + ".flv");
                 }
             }
 
@@ -386,7 +381,7 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
             List<String> mappingList = FileUtils.list(new File(mappingPath));
             if(CollUtil.isNotEmpty(mappingList)){
                 mappingList.parallelStream().forEach(mapping->{
-                    uploadToOssUtil.upload(mapping, mapping.replace(mappingPath, mappingOssPath));
+                    fYunFileService.uploadFile(mapping, mapping.replace(mappingPath, mappingOssPath));
                 });
             }
 
@@ -408,7 +403,7 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
             sceneJson.setVersion(sceneEditInfo.getVersion());
             //上传sceneJson文件
             String sceneJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH+"scene.json", num);
-            uploadToOssUtil.upload(JSON.toJSONBytes(sceneJson), sceneJsonPath);
+            fYunFileService.uploadFile(JSON.toJSONBytes(sceneJson), sceneJsonPath);
 
             redisUtil.del(String.format(RedisKey.SCENE_JSON, num));
 
@@ -453,25 +448,21 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
         if(CollUtil.isEmpty(keyList))
             return;
         keyList.parallelStream().forEach(key->{
-            try {
-                String targetKey = null;
-                if(key.contains(sourcePath)){
-                    targetKey = key.replace(sourcePath, targetPah);
-                }
-                uploadToOssUtil.copyObject(key, targetKey);
-                this.updateProgress(num,
-                    10 +
-                        (new BigDecimal(completeCnt.incrementAndGet())
-                            .divide(new BigDecimal(count.get()), 6, BigDecimal.ROUND_HALF_UP)
-                            .multiply(new BigDecimal(0.7))
-                            .multiply(new BigDecimal(100))
-                            .setScale(0, RoundingMode.UP)
-                            .intValue()),
-                    ProgressStatus.DO_OSS.code()
-                );
-            } catch (IOException e) {
-                log.error("文件拷贝出错，key:{}", key);
+            String targetKey = null;
+            if(key.contains(sourcePath)){
+                targetKey = key.replace(sourcePath, targetPah);
             }
+            fYunFileService.copyFileInBucket(key, targetKey);
+            this.updateProgress(num,
+                10 +
+                    (new BigDecimal(completeCnt.incrementAndGet())
+                        .divide(new BigDecimal(count.get()), 6, BigDecimal.ROUND_HALF_UP)
+                        .multiply(new BigDecimal(0.7))
+                        .multiply(new BigDecimal(100))
+                        .setScale(0, RoundingMode.UP)
+                        .intValue()),
+                ProgressStatus.DO_OSS.code()
+            );
         });
     }
 
@@ -540,7 +531,7 @@ public class SceneUpgradeToV4Service implements ISceneUpgradeToV4Service {
 
     private Float getFloorPlanCompass(String num){
         String objectContent =
-            uploadToOssUtil.getObjectContent(bucket, "data/data" + num + "/houst_floor.json");
+            fYunFileService.getFileContent(bucket, "data/data" + num + "/houst_floor.json");
         if(StrUtil.isEmpty(objectContent)){
             return null;
         }

src/main/resources/bootstrap-test.yml

@@ -6,7 +6,7 @@ spring:
       config:
         server-addr: 120.24.144.164:8848
         file-extension: yaml
-        namespace: 4dkankan-test
+        namespace: 4dkankan-v4
         extension-configs:
           - data-id: 4dkankan-center-scene-v3.yaml
             group: DEFAULT_GROUP
@@ -16,7 +16,7 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-redis-config-52.yaml
+          - data-id: common-redis-config.yaml
             group: DEFAULT_GROUP
             refresh: true
 
@@ -28,12 +28,12 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-upload-config.yaml
+          - data-id: common-fyun-config.yaml
             group: DEFAULT_GROUP
             refresh: true
       discovery:
         server-addr: 120.24.144.164:8848
-        namespace: 4dkankan-test
+        namespace: 4dkankan-v4