修改文件上传逻辑

src/main/java/com/fdkankan/contro/service/impl/BuildScenePostServiceImpl.java

@@ -17,6 +17,7 @@ import com.fdkankan.contro.bean.*;
 import com.fdkankan.contro.entity.*;
 import com.fdkankan.contro.service.*;
 import com.fdkankan.contro.vo.SceneEditControlsVO;
+import com.fdkankan.fyun.config.FYunFileConfig;
 import com.fdkankan.fyun.constant.FYunTypeEnum;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.image.MatrixToImageWriterUtil;
@@ -57,13 +58,6 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
     private String mainUrl;
     @Value("${scene.pro.new.url}")
     private String sceneProNewUrl;
-    @Value("${upload.type}")
-    private String ossType;
-    @Value("${oss.prefix.ali}")
-    private String prefixAli;
-    @Value("${oss.bucket:4dkankan}")
-    private String bucket;
-
     @Autowired
     private ISceneFileBuildService sceneFileBuildService;
     @Autowired
@@ -75,6 +69,9 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
     @Autowired
     private FYunFileServiceInterface fYunFileService;
     @Autowired
+    private FYunFileConfig fYunFileConfig;
+
+    @Autowired
     private RedisUtil redisUtil;
     @Autowired
     private IScenePlusService scenePlusService;
@@ -421,25 +418,14 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
         videosJson.put("data", jsonArray);
         if(Objects.nonNull(videoVersion) && videoVersion >= 4){
             videosJson.put("version", 3);
-            if(FYunTypeEnum.OSS.code().equals(fYunFileService.getFyunType())){
-                videosJson.put("upPath", prefixAli + "data/data" + projectNum + "/Up.xml");
-            }
-            if(FYunTypeEnum.AWS.code().equals(fYunFileService.getFyunType())){
-                videosJson.put("upPath", ConstantUrl.PREFIX_AWS + "data/data" + projectNum + "/Up.xml");
-            }
+            videosJson.put("upPath", fYunFileConfig.getHost() + "data/data" + projectNum + "/Up.xml");
             if(cameraType == 13){
                 //转台相机
                 videosJson.put("upPath", videosJson.getString("upPath").replace(".xml", ".txt"));
             }
         }else {
             videosJson.put("version", 1);
-            if("oss".equals(ossType)){
-                videosJson.put("upPath", prefixAli + "data/data" + projectNum + "/Up2.xml");
-            }
-            if("aws".equals(ossType)){
-                videosJson.put("upPath", ConstantUrl.PREFIX_AWS + "data/data" + projectNum + "/Up2.xml");
-            }
-
+            videosJson.put("upPath", fYunFileConfig.getHost() + "data/data" + projectNum + "/Up2.xml");
             if(cameraType == 13){
                 //转台相机
                 videosJson.put("upPath", videosJson.getString("upPath").replace(".xml", ".txt"));
@@ -448,12 +434,7 @@ public class BuildScenePostServiceImpl implements IBuildScenePostService {
 
         if(cameraType == 5 || cameraType == 6){
             videosJson.put("version", 1);
-            if("oss".equals(ossType)){
-                videosJson.put("upPath", prefixAli + "data/data" + projectNum + "/stitch_params.txt");
-            }
-            if("aws".equals(ossType)){
-                videosJson.put("upPath", ConstantUrl.PREFIX_AWS + "data/data" + projectNum + "/stitch_params.txt");
-            }
+            videosJson.put("upPath", fYunFileConfig.getHost() + "data/data" + projectNum + "/stitch_params.txt");
         }
 
         return videosJson;

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -16,6 +16,7 @@ import com.fdkankan.contro.mapper.ISceneFileBuildMapper;
 import com.fdkankan.contro.service.*;
 import com.fdkankan.contro.vo.ResponseSceneFile;
 import com.fdkankan.contro.vo.ScenePlusVO;
+import com.fdkankan.fyun.config.FYunFileConfig;
 import com.fdkankan.fyun.constant.FYunTypeEnum;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.image.MatrixToImageWriterUtil;
@@ -60,9 +61,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     @Value("${scene.pro.new.url}")
     private String sceneProNewUrl;
 
-    @Value("${oss.prefix.ali}")
-    private String prefixAli;
-
     @Value("${queue.modeling.modeling-call}")
     private String queueModelingCall;
     @Value("${queue.modeling.modeling-pre}")
@@ -115,6 +113,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
     @Autowired
     private FYunFileServiceInterface fYunFileService;
 
+    @Autowired
+    private FYunFileConfig fYunFileConfig;
+
     @Override
     public SceneFileBuild findByFileId(String fileId) {
 
@@ -314,10 +315,10 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 String icon = null;
                 if(jsonObject.containsKey("icon") && StrUtil.isNotEmpty(jsonObject.getString("icon"))){
                     CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath);
-                    icon = prefixAli + "images/images" + sceneNum + "/" + jsonObject.getString("icon");
+                    icon = fYunFileConfig.getHost() + "images/images" + sceneNum + "/" + jsonObject.getString("icon");
                     if(FYunTypeEnum.AWS.code().equals(fYunFileService.getFyunType())){
                         CreateObjUtil.ossFileCp(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath + jsonObject.getString("icon"));
-                        icon = ConstantUrl.PREFIX_AWS + imgViewPath + jsonObject.getString("icon");
+                        icon = fYunFileConfig.getHost() + imgViewPath + jsonObject.getString("icon");
                     }
                     fYunFileService.uploadFile(filePath + jsonObject.getString("icon"), imgViewPath + jsonObject.getString("icon"));
                 }
@@ -637,10 +638,10 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         String icon = null;
         if(jsonObject.containsKey("icon") && StrUtil.isNotEmpty(jsonObject.getString("icon"))){
             CreateObjUtil.ossUtilCp(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath);
-            icon = prefixAli + imageViewPath + jsonObject.getString("icon");
+            icon = fYunFileConfig.getHost() + imageViewPath + jsonObject.getString("icon");
             if(FYunTypeEnum.AWS.code().equals(fYunFileService.getFyunType())){
                 CreateObjUtil.ossFileCp(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath + jsonObject.getString("icon"));
-                icon = ConstantUrl.PREFIX_AWS + imageViewPath + jsonObject.getString("icon");
+                icon = fYunFileConfig.getHost() + imageViewPath + jsonObject.getString("icon");
             }
             fYunFileService.uploadFile(filePath + jsonObject.getString("icon"), imageViewPath + jsonObject.getString("icon"));
 

src/main/resources/bootstrap-test.yml

@@ -26,10 +26,6 @@ spring:
             group: DEFAULT_GROUP
             refresh: true
 
-          - data-id: common-upload-config.yaml
-            group: DEFAULT_GROUP
-            refresh: true
-
           - data-id: common-mq-config.yaml
             group: DEFAULT_GROUP
             refresh: true