From 2998e37b488e8e2c62fc9d934734640f2cb36b0b Mon Sep 17 00:00:00 2001 From: winter Date: Tue, 20 Feb 2024 16:35:51 +0800 Subject: [PATCH] fix --- suimangAdmin/src/main/resources/application-dev.yml | 1 + suimangAdmin/src/main/resources/application-prod.yml | 1 + suimangAdmin/src/main/resources/application-yqzj.yml | 1 + 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 | 1 + .../service/sm/impl/UserMouldVideoServiceImpl.java | 9 ++++++++- 10 files changed, 17 insertions(+), 1 deletion(-) diff --git a/suimangAdmin/src/main/resources/application-dev.yml b/suimangAdmin/src/main/resources/application-dev.yml index 29b8716..815a874 100644 --- a/suimangAdmin/src/main/resources/application-dev.yml +++ b/suimangAdmin/src/main/resources/application-dev.yml @@ -206,6 +206,7 @@ suimang: oral_broadcasting: http://nas.pucao.cn:50014 video_path: http://nas.pucao.cn:50014 callbackUrl: https://mtest.metavatar.cc/C + logo: 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/suimangAdmin/src/main/resources/application-prod.yml b/suimangAdmin/src/main/resources/application-prod.yml index aefb4d3..c568ba8 100644 --- a/suimangAdmin/src/main/resources/application-prod.yml +++ b/suimangAdmin/src/main/resources/application-prod.yml @@ -162,6 +162,7 @@ suimang: oral_broadcasting: http://111.198.0.15:22266 video_path: http://111.198.0.15:22266 callbackUrl: https://neuver.metavatar.cc/C + logo: 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-yqzj.yml b/suimangAdmin/src/main/resources/application-yqzj.yml index af40210..a9d2439 100644 --- a/suimangAdmin/src/main/resources/application-yqzj.yml +++ b/suimangAdmin/src/main/resources/application-yqzj.yml @@ -161,6 +161,7 @@ logging: suimang: oral_broadcasting: x.x.x.x video_path: http://111.198.0.15:22266 + logo: https://yuanqizhijia.oss-accelerate.aliyuncs.com/logo.b9d56282.png 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/suimangCApi/src/main/resources/application-dev.yml b/suimangCApi/src/main/resources/application-dev.yml index dc31b2c..812ea8f 100644 --- a/suimangCApi/src/main/resources/application-dev.yml +++ b/suimangCApi/src/main/resources/application-dev.yml @@ -192,6 +192,7 @@ suimang: oral_broadcasting: http://nas.pucao.cn:50014 video_path: http://nas.pucao.cn:50014 callbackUrl: https://mtest.metavatar.cc/C + logo: 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/suimangCApi/src/main/resources/application-prod.yml b/suimangCApi/src/main/resources/application-prod.yml index 75da71d..76050e1 100644 --- a/suimangCApi/src/main/resources/application-prod.yml +++ b/suimangCApi/src/main/resources/application-prod.yml @@ -147,6 +147,7 @@ suimang: oral_broadcasting: http://111.198.0.15:22266 video_path: http://111.198.0.15:22266 callbackUrl: https://neuver.metavatar.cc/C + logo: 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/suimangCApi/src/main/resources/application-yqzj.yml b/suimangCApi/src/main/resources/application-yqzj.yml index a328dd3..92f5884 100644 --- a/suimangCApi/src/main/resources/application-yqzj.yml +++ b/suimangCApi/src/main/resources/application-yqzj.yml @@ -155,6 +155,7 @@ 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 + logo: https://yuanqizhijia.oss-accelerate.aliyuncs.com/logo.b9d56282.png video_tts: x.x.x.x huibo_tts_wav: x.x.x.x photo_speak: x.x.x.x diff --git a/suimangSchedule/src/main/resources/application-dev.yml b/suimangSchedule/src/main/resources/application-dev.yml index 08f0658..996cac0 100644 --- a/suimangSchedule/src/main/resources/application-dev.yml +++ b/suimangSchedule/src/main/resources/application-dev.yml @@ -195,6 +195,7 @@ suimang: oral_broadcasting: http://nas.pucao.cn:50014 video_path: http://nas.pucao.cn:50014 callbackUrl: https://mtest.metavatar.cc/C + logo: 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/suimangSchedule/src/main/resources/application-prod.yml b/suimangSchedule/src/main/resources/application-prod.yml index 5a67ec1..ae9cbd0 100644 --- a/suimangSchedule/src/main/resources/application-prod.yml +++ b/suimangSchedule/src/main/resources/application-prod.yml @@ -151,6 +151,7 @@ suimang: oral_broadcasting: http://111.198.0.15:22266 video_path: http://111.198.0.15:22266 callbackUrl: https://neuver.metavatar.cc/C + logo: 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/suimangSchedule/src/main/resources/application-yqzj.yml b/suimangSchedule/src/main/resources/application-yqzj.yml index 00c1767..09bceae 100644 --- a/suimangSchedule/src/main/resources/application-yqzj.yml +++ b/suimangSchedule/src/main/resources/application-yqzj.yml @@ -159,6 +159,7 @@ 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 + logo: https://yuanqizhijia.oss-accelerate.aliyuncs.com/logo.b9d56282.png 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 4d20855..0cc3bcf 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 @@ -87,6 +87,12 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { public void setCallbackUrl(String callbackUrl){ this.callbackUrl = callbackUrl; } + + public static String logo; + @Value("${suimang.logo}") + public void setLogo(String logo){ + this.logo = logo; + } @Override public PageInfo listAsPage(UserMouldVideo record, Integer pageIndex, Integer pageSize) { @@ -380,7 +386,8 @@ public class UserMouldVideoServiceImpl implements UserMouldVideoService { videoParam.setSubtitle(subtitleMap); videoParam.setVoice_id(voiceMouldSmId); videoParam.setVoice_style(voiceType); - videoParam.setTenancy_logo(Base64Util.imageUrlToBase64(Constant.hyLogo)); + //videoParam.setTenancy_logo(Base64Util.imageUrlToBase64(Constant.hyLogo)); + videoParam.setTenancy_logo(Base64Util.imageUrlToBase64(logo)); //查询用户是否有付费订单 ProductOrder po = new ProductOrder();