From 8210c7821eb8cc4b14fffa1f4fe21934c998f970 Mon Sep 17 00:00:00 2001 From: winter Date: Fri, 10 Nov 2023 10:54:28 +0800 Subject: [PATCH] fix --- .../src/main/resources/application-dev.yml | 3 ++- .../src/main/resources/application-prod.yml | 15 ++++++++------- .../src/main/resources/application-dev.yml | 3 ++- .../src/main/resources/application-prod.yml | 5 +++-- .../src/main/resources/application-dev.yml | 7 ++++--- .../src/main/resources/application-prod.yml | 7 ++++--- .../java/com/iformall/sm/AiCheckPhotoParam.java | 2 ++ .../main/java/com/iformall/sm/AiPreviewParam.java | 2 +- .../main/java/com/iformall/sm/AiVideoHelper.java | 12 ++++++++++-- .../main/java/com/iformall/sm/AiVideoParam.java | 1 + 10 files changed, 37 insertions(+), 20 deletions(-) diff --git a/suimangAdmin/src/main/resources/application-dev.yml b/suimangAdmin/src/main/resources/application-dev.yml index a92426a..c2f51d0 100644 --- a/suimangAdmin/src/main/resources/application-dev.yml +++ b/suimangAdmin/src/main/resources/application-dev.yml @@ -210,7 +210,8 @@ suimang: photo_speak_hy: http://111.198.0.15:22288 digital_avatar: http://nas.pucao.cn:2005 digital_avatar_hy: http://nas.pucao.cn:2003 - local_deploy: true + local_deploy: false + token: fm2023 sdk: sm: base-url: https://mtest.metavatar.cc/public diff --git a/suimangAdmin/src/main/resources/application-prod.yml b/suimangAdmin/src/main/resources/application-prod.yml index 58baf6d..a9f63e4 100644 --- a/suimangAdmin/src/main/resources/application-prod.yml +++ b/suimangAdmin/src/main/resources/application-prod.yml @@ -159,14 +159,15 @@ logging: path: ./logs/admin suimang: - oral_broadcasting: xxx - video_tts: - photo_speak: xxx - photo_speak_hy: xxx - digital_avatar: xxx - digital_avatar_hy: xxx - callbackUrl: xxx + oral_broadcasting: http://111.198.0.15:22266 + callbackUrl: https://mtest.metavatar.cc/C + video_tts: 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 local_deploy: false + token: fm2023 sdk: sm: base-url: https://test.metavatar.cc/public \ No newline at end of file diff --git a/suimangCApi/src/main/resources/application-dev.yml b/suimangCApi/src/main/resources/application-dev.yml index bbc48b2..bb6970b 100644 --- a/suimangCApi/src/main/resources/application-dev.yml +++ b/suimangCApi/src/main/resources/application-dev.yml @@ -196,7 +196,8 @@ suimang: photo_speak_hy: http://111.198.0.15:22288 digital_avatar: http://nas.pucao.cn:2005 digital_avatar_hy: http://nas.pucao.cn:2003 - local_deploy: true + local_deploy: false + token: fm2023 sdk: sm: base-url: https://mtest.metavatar.cc/public diff --git a/suimangCApi/src/main/resources/application-prod.yml b/suimangCApi/src/main/resources/application-prod.yml index d114f74..56dab35 100644 --- a/suimangCApi/src/main/resources/application-prod.yml +++ b/suimangCApi/src/main/resources/application-prod.yml @@ -145,13 +145,14 @@ logging: suimang: oral_broadcasting: http://111.198.0.15:22266 - callbackUrl: https://metavatar.cc/C + callbackUrl: https://mtest.metavatar.cc/C video_tts: 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: http://nas.pucao.cn:2005 digital_avatar_hy: http://nas.pucao.cn:2003 local_deploy: false + token: fm2023 sdk: sm: base-url: https://neuver.metavatar.cc/public \ No newline at end of file diff --git a/suimangSchedule/src/main/resources/application-dev.yml b/suimangSchedule/src/main/resources/application-dev.yml index 1e09cea..fa8986b 100644 --- a/suimangSchedule/src/main/resources/application-dev.yml +++ b/suimangSchedule/src/main/resources/application-dev.yml @@ -192,11 +192,12 @@ logging: path: ./logs/s suimang: - oral_broadcasting: http://nas.pucao.cn:2001 + oral_broadcasting: http://111.198.0.15:22266 + callbackUrl: https://mtest.metavatar.cc/C video_tts: 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 - callbackUrl: https://mtest.metavatar.cc/C - local_deploy: true \ No newline at end of file + local_deploy: false + token: fm2023 \ No newline at end of file diff --git a/suimangSchedule/src/main/resources/application-prod.yml b/suimangSchedule/src/main/resources/application-prod.yml index 25d0dc1..c67d433 100644 --- a/suimangSchedule/src/main/resources/application-prod.yml +++ b/suimangSchedule/src/main/resources/application-prod.yml @@ -149,10 +149,11 @@ logging: suimang: oral_broadcasting: http://111.198.0.15:22266 + callbackUrl: https://mtest.metavatar.cc/C video_tts: 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: http://nas.pucao.cn:2005 digital_avatar_hy: http://nas.pucao.cn:2003 - callbackUrl: https://metavatar.cc/C - local_deploy: true \ No newline at end of file + local_deploy: false + token: fm2023 \ No newline at end of file diff --git a/suimangService/src/main/java/com/iformall/sm/AiCheckPhotoParam.java b/suimangService/src/main/java/com/iformall/sm/AiCheckPhotoParam.java index ac52220..1028dd2 100644 --- a/suimangService/src/main/java/com/iformall/sm/AiCheckPhotoParam.java +++ b/suimangService/src/main/java/com/iformall/sm/AiCheckPhotoParam.java @@ -6,5 +6,7 @@ import lombok.Data; public class AiCheckPhotoParam { private String img; + + private String token; } diff --git a/suimangService/src/main/java/com/iformall/sm/AiPreviewParam.java b/suimangService/src/main/java/com/iformall/sm/AiPreviewParam.java index dbaf272..a27b5d1 100644 --- a/suimangService/src/main/java/com/iformall/sm/AiPreviewParam.java +++ b/suimangService/src/main/java/com/iformall/sm/AiPreviewParam.java @@ -9,5 +9,5 @@ public class AiPreviewParam { private String voice_style; private String gender; private int speed; - + private String token; } diff --git a/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java b/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java index 538a0c5..69294db 100644 --- a/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java +++ b/suimangService/src/main/java/com/iformall/sm/AiVideoHelper.java @@ -60,12 +60,17 @@ public class AiVideoHelper { public void setLocalDeploy(boolean localDeploy) { this.localDeploy = localDeploy; } + + public static String token;//跟遂芒唯一验证 + @Value("${suimang.token}") + public void setToken(String token) { + this.token = token; + } public static String doPost(String url, String params) { return HttpUtil.doAiVideoPost(url,params); } - - + public static AiVideoResult createVideo(AiVideoParam videoParam) { // videoParam.setTask_id(taskId); @@ -75,6 +80,7 @@ public class AiVideoHelper { videoParam.setCallback_url(callbackUrl + "/callback/oral/broadcasting"); } + videoParam.setToken(token); log.info("生成视频start request:" + videoParam.neglectImgString()); String response = doPost(oral_broadcasting+"/gen_dh_video", JSONObject.toJSONString(videoParam)); log.info("生成视频end response:"+response); @@ -135,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); String response = doPost(photo_speak + "/image_qualit", JSONObject.toJSONString(param)); log.info("图片质量审核 end response:" + response); AiCheckPhotoResult result = new AiCheckPhotoResult(); @@ -168,6 +175,7 @@ public class AiVideoHelper { } public static AiPreviewResult voicePreview(AiPreviewParam param) { + param.setToken(token); log.info("TTS音色预览 start request:" + JSONObject.toJSONString(param)); String response = doPost(photo_speak + "/tts_wav", JSONObject.toJSONString(param)); log.info("TTS音色预览 end response:" + response); diff --git a/suimangService/src/main/java/com/iformall/sm/AiVideoParam.java b/suimangService/src/main/java/com/iformall/sm/AiVideoParam.java index cf1b461..497ea03 100644 --- a/suimangService/src/main/java/com/iformall/sm/AiVideoParam.java +++ b/suimangService/src/main/java/com/iformall/sm/AiVideoParam.java @@ -41,6 +41,7 @@ public class AiVideoParam { private String voice_style; private String url = "None";//预留音频url private VideoFiles video_files; + private String token; private Map subtitle;