From 2a5fdba39b431f19430c8d85e8033d0166b93af3 Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 26 Dec 2023 14:51:26 +0800 Subject: [PATCH] fix config --- open-api/src/main/resources/application-dev.yml | 1 + open-api/src/main/resources/application-prod.yml | 1 + suimangAdmin/src/main/resources/application-dev.yml | 1 + suimangAdmin/src/main/resources/application-prod.yml | 1 + suimangAdmin/src/main/resources/application-yqzj.yml | 3 ++- suimangCApi/src/main/resources/application-dev.yml | 1 + suimangCApi/src/main/resources/application-prod.yml | 1 + suimangCApi/src/main/resources/application-yqzj.yml | 1 + suimangSchedule/src/main/resources/application-dev.yml | 1 + suimangSchedule/src/main/resources/application-prod.yml | 1 + suimangSchedule/src/main/resources/application-yqzj.yml | 3 ++- .../iformall/service/sm/impl/UserMouldVideoServiceImpl.java | 2 +- .../src/main/java/com/iformall/sm/AiVideoHelper.java | 6 ++++++ 13 files changed, 20 insertions(+), 3 deletions(-) diff --git a/open-api/src/main/resources/application-dev.yml b/open-api/src/main/resources/application-dev.yml index 07ba499..c074ef6 100644 --- a/open-api/src/main/resources/application-dev.yml +++ b/open-api/src/main/resources/application-dev.yml @@ -204,6 +204,7 @@ logging: suimang: oral_broadcasting: http://nas.pucao.cn:50014 + video_path: http://nas.pucao.cn:50014 video_tts: http://111.198.0.15:22299 huibo_tts_wav: http://111.198.0.15:22222 photo_speak: http://nas.pucao.cn:50015 diff --git a/open-api/src/main/resources/application-prod.yml b/open-api/src/main/resources/application-prod.yml index e953109..7a4ba84 100644 --- a/open-api/src/main/resources/application-prod.yml +++ b/open-api/src/main/resources/application-prod.yml @@ -160,6 +160,7 @@ logging: suimang: oral_broadcasting: http://111.198.0.15:22266 + video_path: http://111.198.0.15:22266 video_tts: http://111.198.0.15:22299 huibo_tts_wav: http://111.198.0.15:22222 photo_speak: http://111.198.0.15:22299 diff --git a/suimangAdmin/src/main/resources/application-dev.yml b/suimangAdmin/src/main/resources/application-dev.yml index 4d7128f..29b8716 100644 --- a/suimangAdmin/src/main/resources/application-dev.yml +++ b/suimangAdmin/src/main/resources/application-dev.yml @@ -204,6 +204,7 @@ logging: suimang: oral_broadcasting: http://nas.pucao.cn:50014 + video_path: http://nas.pucao.cn:50014 callbackUrl: https://mtest.metavatar.cc/C video_tts: http://111.198.0.15:22299 huibo_tts_wav: http://111.198.0.15:22222 diff --git a/suimangAdmin/src/main/resources/application-prod.yml b/suimangAdmin/src/main/resources/application-prod.yml index 21d270b..aefb4d3 100644 --- a/suimangAdmin/src/main/resources/application-prod.yml +++ b/suimangAdmin/src/main/resources/application-prod.yml @@ -160,6 +160,7 @@ logging: suimang: oral_broadcasting: http://111.198.0.15:22266 + video_path: http://111.198.0.15:22266 callbackUrl: https://neuver.metavatar.cc/C video_tts: http://111.198.0.15:22299 huibo_tts_wav: http://111.198.0.15:22222 diff --git a/suimangAdmin/src/main/resources/application-yqzj.yml b/suimangAdmin/src/main/resources/application-yqzj.yml index 975632e..af40210 100644 --- a/suimangAdmin/src/main/resources/application-yqzj.yml +++ b/suimangAdmin/src/main/resources/application-yqzj.yml @@ -160,7 +160,8 @@ logging: suimang: oral_broadcasting: x.x.x.x - callbackUrl: x.x.x.x + video_path: http://111.198.0.15:22266 + callbackUrl: https://neuver.meta-autotv.com/C/callback/oral/broadcasting video_tts: x.x.x.x huibo_tts_wav: x.x.x.x photo_speak: x.x.x.x diff --git a/suimangCApi/src/main/resources/application-dev.yml b/suimangCApi/src/main/resources/application-dev.yml index d9eb49d..dc31b2c 100644 --- a/suimangCApi/src/main/resources/application-dev.yml +++ b/suimangCApi/src/main/resources/application-dev.yml @@ -190,6 +190,7 @@ logging: suimang: oral_broadcasting: http://nas.pucao.cn:50014 + video_path: http://nas.pucao.cn:50014 callbackUrl: https://mtest.metavatar.cc/C video_tts: http://111.198.0.15:22299 huibo_tts_wav: http://111.198.0.15:22222 diff --git a/suimangCApi/src/main/resources/application-prod.yml b/suimangCApi/src/main/resources/application-prod.yml index e17adb9..75da71d 100644 --- a/suimangCApi/src/main/resources/application-prod.yml +++ b/suimangCApi/src/main/resources/application-prod.yml @@ -145,6 +145,7 @@ logging: suimang: oral_broadcasting: http://111.198.0.15:22266 + video_path: http://111.198.0.15:22266 callbackUrl: https://neuver.metavatar.cc/C video_tts: http://111.198.0.15:22299 huibo_tts_wav: http://111.198.0.15:22222 diff --git a/suimangCApi/src/main/resources/application-yqzj.yml b/suimangCApi/src/main/resources/application-yqzj.yml index 0b7b172..a328dd3 100644 --- a/suimangCApi/src/main/resources/application-yqzj.yml +++ b/suimangCApi/src/main/resources/application-yqzj.yml @@ -153,6 +153,7 @@ logging: suimang: oral_broadcasting: x.x.x.x + video_path: http://111.198.0.15:22266 callbackUrl: https://neuver.meta-autotv.com/C/callback/oral/broadcasting video_tts: x.x.x.x huibo_tts_wav: x.x.x.x diff --git a/suimangSchedule/src/main/resources/application-dev.yml b/suimangSchedule/src/main/resources/application-dev.yml index c8cbf4b..08f0658 100644 --- a/suimangSchedule/src/main/resources/application-dev.yml +++ b/suimangSchedule/src/main/resources/application-dev.yml @@ -193,6 +193,7 @@ logging: suimang: oral_broadcasting: http://nas.pucao.cn:50014 + video_path: http://nas.pucao.cn:50014 callbackUrl: https://mtest.metavatar.cc/C video_tts: http://111.198.0.15:22299 huibo_tts_wav: http://111.198.0.15:22222 diff --git a/suimangSchedule/src/main/resources/application-prod.yml b/suimangSchedule/src/main/resources/application-prod.yml index 62d8b7d..5a67ec1 100644 --- a/suimangSchedule/src/main/resources/application-prod.yml +++ b/suimangSchedule/src/main/resources/application-prod.yml @@ -149,6 +149,7 @@ logging: suimang: oral_broadcasting: http://111.198.0.15:22266 + video_path: http://111.198.0.15:22266 callbackUrl: https://neuver.metavatar.cc/C video_tts: http://111.198.0.15:22299 huibo_tts_wav: http://111.198.0.15:22222 diff --git a/suimangSchedule/src/main/resources/application-yqzj.yml b/suimangSchedule/src/main/resources/application-yqzj.yml index d209b5a..00c1767 100644 --- a/suimangSchedule/src/main/resources/application-yqzj.yml +++ b/suimangSchedule/src/main/resources/application-yqzj.yml @@ -157,7 +157,8 @@ logging: suimang: oral_broadcasting: x.x.x.x - callbackUrl: x.x.x.x + video_path: http://111.198.0.15:22266 + callbackUrl: https://neuver.meta-autotv.com/C/callback/oral/broadcasting video_tts: x.x.x.x huibo_tts_wav: x.x.x.x photo_speak: x.x.x.x diff --git a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java index 55a67ca..244c586 100644 --- a/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java +++ b/suimangService/src/main/java/com/iformall/service/sm/impl/UserMouldVideoServiceImpl.java @@ -478,7 +478,7 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { UserMouldVideo userMouldVideo = this.getById(mouldVideo.getId()); if(EnumVideoStatus.success.getCode().equals(userMouldVideo.getVideoStatus()) || EnumVideoStatus.upload_fail.getCode().equals(userMouldVideo.getVideoStatus())){ - String url = AiVideoHelper.oral_broadcasting + mouldVideo.getVideoPath(); + String url = AiVideoHelper.video_path + mouldVideo.getVideoPath(); VideUploadResult result = videoFactory.getExcutor(videoType).uploadVideoPath(mouldVideo.getTitle(), url); if(result.isSuccess()){ diff --git a/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java b/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java index 1521447..cba4228 100644 --- a/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java +++ b/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java @@ -36,6 +36,12 @@ public class AiVideoHelper { public void setOralBroadcasting(String oral_broadcasting){ this.oral_broadcasting = oral_broadcasting; } + + public static String video_path; + @Value("${suimang.video_path}") + public void setVideoPath(String video_path){ + this.video_path = video_path; + } public static String video_tts; @Value("${suimang.video_tts}")