From 56ad29d44839887cb814d9f39c3d2082f29d7cba Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 8 Dec 2023 21:09:04 +0800 Subject: [PATCH] fix --- open-api/src/main/resources/application-dev.yml | 7 ++++--- open-api/src/main/resources/application-prod.yml | 6 ++++-- .../src/main/resources/application-dev.yml | 7 ++++--- .../src/main/resources/application-prod.yml | 9 +++++---- suimangCApi/src/main/resources/application-dev.yml | 7 ++++--- .../src/main/resources/application-prod.yml | 9 +++++---- .../src/main/resources/application-dev.yml | 7 ++++--- .../src/main/resources/application-prod.yml | 9 +++++---- .../com/iformall/sm/AiDigitalAvatarHelper.java | 4 +++- .../src/main/java/com/iformall/sm/AiTtsHelper.java | 14 +++++++------- .../main/java/com/iformall/sm/AiVideoHelper.java | 10 ++++++++-- 11 files changed, 53 insertions(+), 36 deletions(-) diff --git a/open-api/src/main/resources/application-dev.yml b/open-api/src/main/resources/application-dev.yml index 8fdd368..54d5258 100644 --- a/open-api/src/main/resources/application-dev.yml +++ b/open-api/src/main/resources/application-dev.yml @@ -204,9 +204,10 @@ logging: suimang: oral_broadcasting: http://nas.pucao.cn:50014 - video_tts: http://nas.pucao.cn:22222 - photo_speak: http://111.198.0.15:22299 - photo_speak_hy: http://111.198.0.15:22288 + video_tts: http:nas.pucao.cn:50015 + huibo_tts_wav: http:nas.pucao.cn:50015 + photo_speak: http:nas.pucao.cn:50015 + photo_speak_hy: http:nas.pucao.cn:50013 digital_avatar: http://nas.pucao.cn:2005 digital_avatar_hy: http://nas.pucao.cn:2003 callbackUrl: https://mtest.metavatar.cc/C diff --git a/open-api/src/main/resources/application-prod.yml b/open-api/src/main/resources/application-prod.yml index f00608c..e953109 100644 --- a/open-api/src/main/resources/application-prod.yml +++ b/open-api/src/main/resources/application-prod.yml @@ -160,10 +160,12 @@ logging: suimang: oral_broadcasting: 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 photo_speak_hy: http://111.198.0.15:22288 digital_avatar: http://111.198.0.15:22200 - digital_avatar_hy: http://nas.pucao.cn:2003 - callbackUrl: https://metavatar.cc/C + digital_avatar_hy: http://*****:2003 + callbackUrl: https://neuver.metavatar.cc/C local_deploy: false token: fm2023 \ No newline at end of file diff --git a/suimangAdmin/src/main/resources/application-dev.yml b/suimangAdmin/src/main/resources/application-dev.yml index 91bc365..58ea2cc 100644 --- a/suimangAdmin/src/main/resources/application-dev.yml +++ b/suimangAdmin/src/main/resources/application-dev.yml @@ -205,9 +205,10 @@ logging: suimang: oral_broadcasting: http://nas.pucao.cn:50014 callbackUrl: https://mtest.metavatar.cc/C - video_tts: http://nas.pucao.cn:22222 - photo_speak: http://111.198.0.15:22299 - photo_speak_hy: http://111.198.0.15:22288 + video_tts: http:nas.pucao.cn:50015 + huibo_tts_wav: http:nas.pucao.cn:50015 + photo_speak: http:nas.pucao.cn:50015 + photo_speak_hy: http:nas.pucao.cn:50013 digital_avatar: http://nas.pucao.cn:2005 digital_avatar_hy: http://nas.pucao.cn:2003 local_deploy: true diff --git a/suimangAdmin/src/main/resources/application-prod.yml b/suimangAdmin/src/main/resources/application-prod.yml index a9f63e4..1cc280a 100644 --- a/suimangAdmin/src/main/resources/application-prod.yml +++ b/suimangAdmin/src/main/resources/application-prod.yml @@ -160,12 +160,13 @@ logging: suimang: oral_broadcasting: http://111.198.0.15:22266 - callbackUrl: https://mtest.metavatar.cc/C - video_tts: http://111.198.0.15:22222 + callbackUrl: https://neuver.metavatar.cc/C + 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 photo_speak_hy: http://111.198.0.15:22288 - digital_avatar: http://nas.pucao.cn:2005 - digital_avatar_hy: http://nas.pucao.cn:2003 + digital_avatar: http://111.198.0.15:22200 + digital_avatar_hy: http://*****:2003 local_deploy: false token: fm2023 sdk: diff --git a/suimangCApi/src/main/resources/application-dev.yml b/suimangCApi/src/main/resources/application-dev.yml index 4fe7447..62e968f 100644 --- a/suimangCApi/src/main/resources/application-dev.yml +++ b/suimangCApi/src/main/resources/application-dev.yml @@ -191,9 +191,10 @@ logging: suimang: oral_broadcasting: http://nas.pucao.cn:50014 callbackUrl: https://mtest.metavatar.cc/C - video_tts: http://nas.pucao.cn:22222 - photo_speak: http://111.198.0.15:22299 - photo_speak_hy: http://111.198.0.15:22288 + video_tts: http:nas.pucao.cn:50015 + huibo_tts_wav: http:nas.pucao.cn:50015 + photo_speak: http:nas.pucao.cn:50015 + photo_speak_hy: http:nas.pucao.cn:50013 digital_avatar: http://nas.pucao.cn:2005 digital_avatar_hy: http://nas.pucao.cn:2003 local_deploy: true diff --git a/suimangCApi/src/main/resources/application-prod.yml b/suimangCApi/src/main/resources/application-prod.yml index 56dab35..9f710b1 100644 --- a/suimangCApi/src/main/resources/application-prod.yml +++ b/suimangCApi/src/main/resources/application-prod.yml @@ -145,12 +145,13 @@ logging: suimang: oral_broadcasting: http://111.198.0.15:22266 - callbackUrl: https://mtest.metavatar.cc/C - video_tts: http://111.198.0.15:22222 + callbackUrl: https://neuver.metavatar.cc/C + 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 photo_speak_hy: http://111.198.0.15:22288 - digital_avatar: http://nas.pucao.cn:2005 - digital_avatar_hy: http://nas.pucao.cn:2003 + digital_avatar: http://111.198.0.15:22200 + digital_avatar_hy: http://****:2003 local_deploy: false token: fm2023 sdk: diff --git a/suimangSchedule/src/main/resources/application-dev.yml b/suimangSchedule/src/main/resources/application-dev.yml index dd771d1..eacad20 100644 --- a/suimangSchedule/src/main/resources/application-dev.yml +++ b/suimangSchedule/src/main/resources/application-dev.yml @@ -194,9 +194,10 @@ logging: suimang: oral_broadcasting: http://nas.pucao.cn:50014 callbackUrl: https://mtest.metavatar.cc/C - video_tts: http://nas.pucao.cn:22222 - photo_speak: http://111.198.0.15:22299 - photo_speak_hy: http://111.198.0.15:22288 + video_tts: http:nas.pucao.cn:50015 + huibo_tts_wav: http:nas.pucao.cn:50015 + photo_speak: http:nas.pucao.cn:50015 + photo_speak_hy: http:nas.pucao.cn:50013 digital_avatar: http://nas.pucao.cn:2005 digital_avatar_hy: http://nas.pucao.cn:2003 local_deploy: true diff --git a/suimangSchedule/src/main/resources/application-prod.yml b/suimangSchedule/src/main/resources/application-prod.yml index c67d433..62d8b7d 100644 --- a/suimangSchedule/src/main/resources/application-prod.yml +++ b/suimangSchedule/src/main/resources/application-prod.yml @@ -149,11 +149,12 @@ logging: suimang: oral_broadcasting: http://111.198.0.15:22266 - callbackUrl: https://mtest.metavatar.cc/C - video_tts: http://111.198.0.15:22222 + callbackUrl: https://neuver.metavatar.cc/C + 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 photo_speak_hy: http://111.198.0.15:22288 - digital_avatar: http://nas.pucao.cn:2005 - digital_avatar_hy: http://nas.pucao.cn:2003 + digital_avatar: http://111.198.0.15:22200 + digital_avatar_hy: http://*****:2003 local_deploy: false token: fm2023 \ No newline at end of file diff --git a/suimangService/src/main/java/com/iformall/sm/AiDigitalAvatarHelper.java b/suimangService/src/main/java/com/iformall/sm/AiDigitalAvatarHelper.java index af88e03..035ff79 100644 --- a/suimangService/src/main/java/com/iformall/sm/AiDigitalAvatarHelper.java +++ b/suimangService/src/main/java/com/iformall/sm/AiDigitalAvatarHelper.java @@ -37,7 +37,7 @@ public class AiDigitalAvatarHelper { this.callbackUrl = callbackUrl; } - + //智象小程序人脸检测 public static AiCheckPhotoResult checkPhoto(AiCheckPhotoParam param) { // String response = HttpUtil.doAiVideoPost("http://nas.pucao.cn:2005/dec_face", JSONObject.toJSONString(param)); String response = HttpUtil.doAiVideoPost(digital_avatar + "/dec_face", JSONObject.toJSONString(param)); @@ -70,6 +70,7 @@ public class AiDigitalAvatarHelper { return result; } + //智象小程序生成 public static DigitalAvatarResult digitalAvatarPhoto(DigitalAvatarParam param,Long taskId) { param.setTask_id(taskId); @@ -154,6 +155,7 @@ public class AiDigitalAvatarHelper { } + //智象小程序生成logo public static ShareImgResult createShareImg(ShareImgParam param) { // log.info("生成照片start request:" + param.getBg_img()); diff --git a/suimangService/src/main/java/com/iformall/sm/AiTtsHelper.java b/suimangService/src/main/java/com/iformall/sm/AiTtsHelper.java index 4fd65bf..f1e0d52 100644 --- a/suimangService/src/main/java/com/iformall/sm/AiTtsHelper.java +++ b/suimangService/src/main/java/com/iformall/sm/AiTtsHelper.java @@ -13,10 +13,10 @@ import org.springframework.stereotype.Component; @Component public class AiTtsHelper { - public static String video_tts; - @Value("${suimang.video_tts}") - public void setVideoTts(String video_tts){ - this.video_tts = video_tts; + public static String huibo_tts_wav; + @Value("${suimang.huibo_tts_wav}") + public void setHuiboTtsWav(String huibo_tts_wav) { + this.huibo_tts_wav = huibo_tts_wav; } @@ -24,9 +24,9 @@ public class AiTtsHelper { return HttpUtil.doAiVideoPost(url,params); } - + //慧播预览 public static AiPreviewResult voicePreview(AiPreviewParam param) { - String response = doPost(video_tts + "/tts_wav", JSONObject.toJSONString(param)); + String response = doPost(huibo_tts_wav + "/tts_wav", JSONObject.toJSONString(param)); log.info("TTS音色预览 end response:" + response); AiPreviewResult result = new AiPreviewResult(); @@ -52,7 +52,7 @@ public class AiTtsHelper { result.setCode(200); result.setSuccess(true); - result.setUrl(video_tts + strURL); + result.setUrl(huibo_tts_wav + strURL); result.setTime(Double.valueOf(time)); result.setMsg("(MetaService) error."+msg); } else { diff --git a/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java b/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java index 33c0042..0fe8ebb 100644 --- a/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java +++ b/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java @@ -42,8 +42,9 @@ public class AiVideoHelper { public void setPhotoSpeak(String photo_speak){ this.photo_speak = photo_speak; } - + public static String photo_speak_hy; + @Value("${suimang.photo_speak_hy}") public void setPhotoSpeakHy(String photo_speak_hy){ this.photo_speak_hy = photo_speak_hy; @@ -71,6 +72,7 @@ public class AiVideoHelper { return HttpUtil.doAiVideoPost(url,params); } + //慧影生成视频 public static AiVideoResult createVideo(AiVideoParam videoParam) { // videoParam.setTask_id(taskId); @@ -139,6 +141,7 @@ public class AiVideoHelper { // } } + //慧语(照片说话)图片质量检查 public static AiCheckPhotoResult checkPhoto(AiCheckPhotoParam param) { // String response = doPost("http://111.198.0.15:22299" + "/image_qualit", JSONObject.toJSONString(param)); param.setToken(token); @@ -174,6 +177,7 @@ public class AiVideoHelper { return result; } + //慧语(照片说话)+慧影 预览 public static AiPreviewResult voicePreview(AiPreviewParam param) { param.setToken(token); log.info("TTS音色预览 start request:" + JSONObject.toJSONString(param)); @@ -216,7 +220,8 @@ public class AiVideoHelper { } return result; } - + + //慧语(照片说话)生成 public static AiPhotoSpeakResult createPhotoSpeakVideo(AiPhotoSpeakParam videoParam,Long taskId) { videoParam.setTask_id(taskId); @@ -261,6 +266,7 @@ public class AiVideoHelper { return result; } + //慧语(照片说话)超分生成 public static AiVideoHqResult videoHq(AiVideoHqParam param,Long taskId) { param.setTask_id(taskId);