'commit'

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";

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";
     // 拼接相对路径

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";
     // 拼接相对路径

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";
+}

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";
     // 拼接相对路径

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:

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: