11111

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

@@ -316,7 +316,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         String voiceSrc = prefixAli+"voice/voice"+sceneNum+"/"+originalFileName;
         if(StorageType.AWS.code().equals(this.ossType)){
-            voiceSrc = ConstantUrl.PREFIX_AWS+"voice/voice"+sceneNum+"/"+originalFileName;
+            voiceSrc =this.prefixS3+"voice/voice"+sceneNum+"/"+originalFileName;
         }
 
         Map map = new HashMap();
@@ -397,7 +397,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
         map.put("screencapVoiceSoundsyncFileName", originalFileName);
         String voiceSrc = prefixAli+"voice/voice"+base.getSceneNum()+"/"+originalFileName;
         if(StorageType.AWS.code().equals(ossType)){
-            voiceSrc = ConstantUrl.PREFIX_AWS+"voice/voice"+base.getSceneNum()+"/"+originalFileName;
+            voiceSrc =this.prefixS3+"voice/voice"+base.getSceneNum()+"/"+originalFileName;
         }
         map.put("screencapVoiceSoundsync", voiceSrc);
         log.info("微信上传的音频路径：" + voiceSrc);
@@ -1126,7 +1126,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
             String voiceSrc = prefixAli+"voice/voice"+sceneNum+"/"+originalFileName;
             if(StorageType.AWS.code().equals(this.ossType)){
-                voiceSrc = ConstantUrl.PREFIX_AWS+"voice/voice"+sceneNum+"/"+originalFileName;
+                voiceSrc =this.prefixS3+"voice/voice"+sceneNum+"/"+originalFileName;
             }
 
             Map map = new HashMap();
@@ -1158,7 +1158,7 @@ public class SceneProAppServiceImpl extends ServiceImpl<ISceneProMapper, ScenePr
 
         String voiceSrc = prefixAli+"voice/voice"+sceneNum+"/"+originalFileName;
         if(StorageType.AWS.code().equals(this.ossType)){
-            voiceSrc = ConstantUrl.PREFIX_AWS+"voice/voice"+sceneNum+"/"+originalFileName;
+            voiceSrc =this.prefixS3+"voice/voice"+sceneNum+"/"+originalFileName;
         }
 
         Map map = new HashMap();

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

@@ -1797,7 +1797,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
         String modeldataUrl = prefixAli + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
         if(StorageType.AWS.equals(this.ossType)){
-            modeldataUrl = ConstantUrl.PREFIX_AWS + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
+            modeldataUrl =this.prefixS3 + imagesBuf.toString() + "vision.modeldata?t=" + System.currentTimeMillis();
         }
         FileUtils.downLoadFromUrl(modeldataUrl, "vision.modeldata", dataBuffer.toString());
         File file = new File(dataBuffer.toString() + "vision.modeldata");

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

@@ -114,7 +114,7 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
 
     @Value("${queue.modeling.queue-video-a}")
     private String queueVideoA;
-    @Value("${queue.modeling.queue_pic_a}")
+    @Value("${queue.modeling.queue-pic-a}")
     private String queuePicA;
     @Value("${expected-time}")
     private String expectedTime;