From 035addd8710ad8d1b27e78ac6043b1f90c56ea7c Mon Sep 17 00:00:00 2001 From: HuangHai <10402852@qq.com> Date: Sun, 18 May 2025 09:50:54 +0800 Subject: [PATCH] 'commit' --- .../java/com/dsideal/aiSupport/Util/AiPpt/Kit/ApiKit.java | 5 ++--- .../com/dsideal/aiSupport/Util/DashScope/ImgSong.java | 5 ++--- .../com/dsideal/aiSupport/Util/DashScope/ImgSpeak.java | 5 ++--- .../aiSupport/Util/DashScope/Kit/DashScopeCommon.java | 5 +++++ .../aiSupport/Util/DashScope/VideoStyleTransform.java | 6 ++---- dsAiSupport/src/main/resources/application_dev.yaml | 8 -------- dsAiSupport/target/classes/application_dev.yaml | 8 -------- 7 files changed, 13 insertions(+), 29 deletions(-) create mode 100644 dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/DashScopeCommon.java diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/ApiKit.java b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/ApiKit.java index 30ec3f6e..7a065c30 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/ApiKit.java +++ b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/AiPpt/Kit/ApiKit.java @@ -19,9 +19,8 @@ import java.util.Objects; * @date 2024/7/15 */ public class ApiKit { - protected static String BASE_URL = AiSupportApplication.PropKit.get("AIPPT.BASE_URL"); - protected static String apiKey = AiSupportApplication.PropKit.get("AIPPT.API_KEY"); - + protected static String BASE_URL = "https://open.docmee.cn"; + protected static String apiKey = "ak_uKoKrRF63333E2lcBq"; public static String createApiToken(String uid, Integer limit) { String url = BASE_URL + "/api/user/createApiToken"; diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSong.java b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSong.java index 5e34a9d7..961f8f01 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSong.java +++ b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSong.java @@ -3,6 +3,7 @@ package com.dsideal.aiSupport.Util.DashScope; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.dsideal.aiSupport.Util.DashScope.Kit.DashScopeCommon; import lombok.SneakyThrows; import okhttp3.*; import org.slf4j.Logger; @@ -10,14 +11,12 @@ import org.slf4j.LoggerFactory; import java.util.concurrent.TimeUnit; -import static com.dsideal.aiSupport.AiSupportApplication.PropKit; /** * 阿里云达摩院EMO视频合成API工具类 */ -public class ImgSong { +public class ImgSong extends DashScopeCommon { private static final Logger log = LoggerFactory.getLogger(ImgSong.class); private static final String API_URL = "https://dashscope.aliyuncs.com/api/v1/services/aigc/image2video/video-synthesis/"; - private static final String API_KEY= PropKit.get("aliyun.API_KEY"); // 获取项目根目录路径 protected static String projectRoot = System.getProperty("user.dir").replace("\\", "/") + "/dsAiSupport"; // 拼接相对路径 diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSpeak.java b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSpeak.java index 94810a5c..56dc322a 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSpeak.java +++ b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/ImgSpeak.java @@ -2,6 +2,7 @@ package com.dsideal.aiSupport.Util.DashScope; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.dsideal.aiSupport.Util.DashScope.Kit.DashScopeCommon; import lombok.SneakyThrows; import okhttp3.*; import org.slf4j.Logger; @@ -9,16 +10,14 @@ import org.slf4j.LoggerFactory; import java.util.concurrent.TimeUnit; -import static com.dsideal.aiSupport.AiSupportApplication.PropKit; /** * 阿里云达摩院灵动人像LivePortrait视频合成API工具类 */ -public class ImgSpeak { +public class ImgSpeak extends DashScopeCommon { private static final Logger log = LoggerFactory.getLogger(ImgSpeak.class); private static final String API_URL = "https://dashscope.aliyuncs.com/api/v1/services/aigc/image2video/video-synthesis/"; private static final String FACE_DETECT_URL = "https://dashscope.aliyuncs.com/api/v1/services/aigc/image2video/face-detect"; private static final String TASK_URL = "https://dashscope.aliyuncs.com/api/v1/tasks/"; - private static final String API_KEY=PropKit.get("aliyun.API_KEY"); // 获取项目根目录路径 protected static String projectRoot = System.getProperty("user.dir").replace("\\", "/") + "/dsAiSupport"; // 拼接相对路径 diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/DashScopeCommon.java b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/DashScopeCommon.java new file mode 100644 index 00000000..dc68a997 --- /dev/null +++ b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/Kit/DashScopeCommon.java @@ -0,0 +1,5 @@ +package com.dsideal.aiSupport.Util.DashScope.Kit; + +public class DashScopeCommon { + protected static final String API_KEY= "sk-01d13a39e09844038322108ecdbd1bbc"; +} diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/VideoStyleTransform.java b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/VideoStyleTransform.java index e409c13f..b670298e 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/VideoStyleTransform.java +++ b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/DashScope/VideoStyleTransform.java @@ -2,6 +2,7 @@ package com.dsideal.aiSupport.Util.DashScope; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.dsideal.aiSupport.Util.DashScope.Kit.DashScopeCommon; import com.dsideal.aiSupport.Util.DashScope.Kit.VideoStyleEnum; import lombok.SneakyThrows; import okhttp3.*; @@ -10,15 +11,12 @@ import org.slf4j.LoggerFactory; import java.util.concurrent.TimeUnit; -import static com.dsideal.aiSupport.AiSupportApplication.PropKit; - /** * 阿里云达摩院视频风格转换API工具类 */ -public class VideoStyleTransform { +public class VideoStyleTransform extends DashScopeCommon { private static final Logger log = LoggerFactory.getLogger(VideoStyleTransform.class); private static final String API_URL = "https://dashscope.aliyuncs.com/api/v1/services/aigc/video-generation/video-synthesis"; - private static final String API_KEY = PropKit.get("aliyun.API_KEY"); // 获取项目根目录路径 protected static String projectRoot = System.getProperty("user.dir").replace("\\", "/") + "/dsAiSupport"; // 拼接相对路径 diff --git a/dsAiSupport/src/main/resources/application_dev.yaml b/dsAiSupport/src/main/resources/application_dev.yaml index 8e77c56e..86446acd 100644 --- a/dsAiSupport/src/main/resources/application_dev.yaml +++ b/dsAiSupport/src/main/resources/application_dev.yaml @@ -73,14 +73,6 @@ KeLing: GPTNB: sk: sk-amQHwiEzPIZIB2KuF5A10dC23a0e4b02B48a7a2b6aFa0662 -# 人工智能生成PPT -AIPPT: - BASE_URL: https://open.docmee.cn - API_KEY: ak_uKoKrRF63333E2lcBq - -# 阿里云API KEY -aliyun: - API_KEY: sk-01d13a39e09844038322108ecdbd1bbc # LIBLIB LIBLIB: diff --git a/dsAiSupport/target/classes/application_dev.yaml b/dsAiSupport/target/classes/application_dev.yaml index 8e77c56e..86446acd 100644 --- a/dsAiSupport/target/classes/application_dev.yaml +++ b/dsAiSupport/target/classes/application_dev.yaml @@ -73,14 +73,6 @@ KeLing: GPTNB: sk: sk-amQHwiEzPIZIB2KuF5A10dC23a0e4b02B48a7a2b6aFa0662 -# 人工智能生成PPT -AIPPT: - BASE_URL: https://open.docmee.cn - API_KEY: ak_uKoKrRF63333E2lcBq - -# 阿里云API KEY -aliyun: - API_KEY: sk-01d13a39e09844038322108ecdbd1bbc # LIBLIB LIBLIB: