From 2a862862846fc4693aefe308215079a409e9c493 Mon Sep 17 00:00:00 2001 From: lrh <1585126058@qq.com> Date: Thu, 6 Jul 2023 15:54:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/VideoCallbackController.java | 2 +- .../service/sm/impl/PhotoSpeakVideoServiceImpl.java | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/suimangCApi/src/main/java/com/iformall/controller/VideoCallbackController.java b/suimangCApi/src/main/java/com/iformall/controller/VideoCallbackController.java index 1c2b3f8..e2962e6 100644 --- a/suimangCApi/src/main/java/com/iformall/controller/VideoCallbackController.java +++ b/suimangCApi/src/main/java/com/iformall/controller/VideoCallbackController.java @@ -54,7 +54,7 @@ public class VideoCallbackController extends BaseController { private PhotoSpeakVideoService photoSpeakVideoService; @AuthIgnore - @ApiOperation("新增接口") + @ApiOperation("视频回调") @PostMapping(value = "/photo/speak") public ResultData photoSpeak(@RequestBody Map paranMap) { logger.debug("[" + getIpAddr() + "] VideoCallbackController::photoSpeak"); diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java index a3807c1..d46a07b 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/PhotoSpeakVideoServiceImpl.java @@ -77,6 +77,13 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { @Qualifier("objectCommonRedisTemplate") RedisTemplate redisTemplate; + @Value("${photo.url}") + private String url; + @Value("${photo.hy_url}") + private String hy_url; + @Value("${photo.talk}") + private String talk_url; + private final static String str = "\uD83D\uDD57"; @Value("${photo.callbackUrl}") @@ -258,8 +265,8 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { public void uploadVideo(PhotoSpeakVideo mouldVideo){ if(EnumVideoStatus.success.getCode().equals(mouldVideo.getVideoStatus()) || EnumVideoStatus.upload_fail.getCode().equals(mouldVideo.getVideoStatus())){ - String url = mouldVideo.getPhotoSpeakPathUri() + mouldVideo.getVideoPath(); - VideUploadResult result = videoFactory.getExcutor(videoType).uploadVideoPath(mouldVideo.getTitle(), url); + String url1 = url + mouldVideo.getVideoPath(); + VideUploadResult result = videoFactory.getExcutor(videoType).uploadVideoPath(mouldVideo.getTitle(), url1); if(result.isSuccess()){ PhotoSpeakVideo videoUpd = new PhotoSpeakVideo(); videoUpd.setId(mouldVideo.getId()); @@ -380,7 +387,7 @@ public class PhotoSpeakVideoServiceImpl implements PhotoSpeakVideoService { public void uploadHyVideo(PhotoSpeakVideo mouldVideo){ if(EnumVideoStatus.success.getCode().equals(mouldVideo.getVideoHyStatus()) || EnumVideoStatus.upload_fail.getCode().equals(mouldVideo.getVideoHyStatus())){ - String url = mouldVideo.getPhotoSpeakPathUri() + mouldVideo.getVideoPath(); + String url = hy_url + mouldVideo.getVideoPath(); VideUploadResult result = videoFactory.getExcutor(videoType).uploadVideoPath(mouldVideo.getTitle(), url); if(result.isSuccess()){ PhotoSpeakVideo videoUpd = new PhotoSpeakVideo();