'commit'

2 months ago · 8e1166ca87
parent 035addd871
commit 8e1166ca87
6 changed files with 7 additions and 72 deletions
--- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmCommon.java
+++ b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/JiMeng/Kit/JmCommon.java
@ -52,8 +52,8 @@ public class JmCommon {
    public static final Charset UTF_8 = StandardCharsets.UTF_8;

    // API访问凭证
-    protected static final String ak; // Access Key
-    protected static final String sk; // Secret Key
+    protected static final String ak="AKLTZjVlOGU1NzA1YWZkNDExMzkzYzY5YTNlOTRmMTMxODg"; // Access Key
+    protected static final String sk="WkdabU9UTXdNVEJpTmpWbE5HVTJZVGxtTnpWbU5XSTBaRGN5TW1NMk5tRQ"; // Secret Key
    public static Prop PropKit; // 配置文件工具
    // 获取项目根目录路径
    protected static String projectRoot = System.getProperty("user.dir").replace("\\", "/") + "/dsAiSupport";
@ -65,12 +65,6 @@ public class JmCommon {
     * 加载配置文件并初始化URL编码器
     */
    static {
-        //加载配置文件
-        String configFile = "application_{?}.yaml".replace("{?}", getEnvPrefix());
-        PropKit = new YamlProp(configFile);
-        ak = PropKit.get("JiMeng.ak"); // 从配置文件获取Access Key
-        sk = PropKit.get("JiMeng.sk"); // 从配置文件获取Secret Key
-
        // 初始化URL编码器，设置不需要编码的字符
        int i;
        for (i = 97; i <= 122; ++i) { // a-z
--- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlCommon.java
+++ b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/KeLing/Kit/KlCommon.java
@ -23,13 +23,9 @@ public class KlCommon {
    // 拼接相对路径
    protected static String basePath = projectRoot + "/src/main/java/com/dsideal/aiSupport/Util/KeLing/Example/";

-    static String ak; // 填写access key
-    static String sk; // 填写secret key
+    static String ak="c992fd02624d4900a93ca3b6da03d9e9"; // 填写access key
+    static String sk="b37f67a00eb44f9bb57e4d530c328e1d"; // 填写secret key

-    static {
-        ak = PropKit.get("KeLing.ak");
-        sk = PropKit.get("KeLing.sk");
-    }

    public static String getJwt() {
        try {
--- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibCommon.java
+++ b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibCommon.java
@ -29,19 +29,13 @@ public class LibLibCommon {
    // API基础URL
    protected static final String API_BASE_URL = "https://openapi.liblibai.cloud";
    // API访问凭证
-    protected static final String accessKey; // Access Key
-    protected static final String secretKey; // Secret Key
-    public static Prop PropKit; // 配置文件工具
+    protected static final String accessKey="sOCtVLVTNOZkRMajlhzCmg"; // Access Key
+    protected static final String secretKey="PUe8QTRG9i0G9EbpedHmIpLQ0FyxoYY9"; // Secret Key
    // 查询任务状态API路径
    protected static final String QUERY_STATUS_PATH = "/api/generate/webui/status";
    // 日志
    private static final Logger log = LoggerFactory.getLogger(LibLibCommon.class);

-    static {
-        accessKey = PropKit.get("LIBLIB.accessKey"); // 从配置文件获取Access Key
-        secretKey = PropKit.get("LIBLIB.secretKey"); // 从配置文件获取Secret Key
-    }
-
    /**
     * 签名信息类，包含签名、时间戳和随机字符串
     */
--- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Kit/MjCommon.java
+++ b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Kit/MjCommon.java
@ -21,14 +21,9 @@ public class MjCommon {
    // 拼接相对路径
    protected static String basePath = projectRoot + "/src/main/java/com/dsideal/aiSupport/Util/Midjourney/Example/";

-    protected static String ak; // 填写access key
+    protected static String ak="sk-amQHwiEzPIZIB2KuF5A10dC23a0e4b02B48a7a2b6aFa0662"; // 填写access key
    protected static final String BASE_URL = "https://goapi.gptnb.ai";

-    static {
-        ak = PropKit.get("GPTNB.sk");
-    }
-
-
    /**
     * 从URL下载文件到指定路径
     * 
--- a/dsAiSupport/src/main/resources/application_dev.yaml
+++ b/dsAiSupport/src/main/resources/application_dev.yaml
@ -55,29 +55,7 @@ excel:
  #  导入excel 的模板配置路径
  ExcelImportTemplatePathSuffix: /ExcelImportTemplate/

-# 即梦
-JiMeng:
-  # Access Key ID
-  ak: AKLTZjVlOGU1NzA1YWZkNDExMzkzYzY5YTNlOTRmMTMxODg
-  # Secret Access Key
-  sk: WkdabU9UTXdNVEJpTmpWbE5HVTJZVGxtTnpWbU5XSTBaRGN5TW1NMk5tRQ==

-# 可灵
-KeLing:
-  # Access Key ID
-  ak: c992fd02624d4900a93ca3b6da03d9e9
-  # Secret Access Key
-  sk: b37f67a00eb44f9bb57e4d530c328e1d
-
-# GPTNB GOAPI
-GPTNB:
-  sk: sk-amQHwiEzPIZIB2KuF5A10dC23a0e4b02B48a7a2b6aFa0662
-
-
-# LIBLIB
-LIBLIB:
-  accessKey: sOCtVLVTNOZkRMajlhzCmg
-  secretKey: PUe8QTRG9i0G9EbpedHmIpLQ0FyxoYY9

 # 火山
 HuoShan:
--- a/dsAiSupport/target/classes/application_dev.yaml
+++ b/dsAiSupport/target/classes/application_dev.yaml
@ -55,29 +55,7 @@ excel:
  #  导入excel 的模板配置路径
  ExcelImportTemplatePathSuffix: /ExcelImportTemplate/

-# 即梦
-JiMeng:
-  # Access Key ID
-  ak: AKLTZjVlOGU1NzA1YWZkNDExMzkzYzY5YTNlOTRmMTMxODg
-  # Secret Access Key
-  sk: WkdabU9UTXdNVEJpTmpWbE5HVTJZVGxtTnpWbU5XSTBaRGN5TW1NMk5tRQ==

-# 可灵
-KeLing:
-  # Access Key ID
-  ak: c992fd02624d4900a93ca3b6da03d9e9
-  # Secret Access Key
-  sk: b37f67a00eb44f9bb57e4d530c328e1d
-
-# GPTNB GOAPI
-GPTNB:
-  sk: sk-amQHwiEzPIZIB2KuF5A10dC23a0e4b02B48a7a2b6aFa0662
-
-
-# LIBLIB
-LIBLIB:
-  accessKey: sOCtVLVTNOZkRMajlhzCmg
-  secretKey: PUe8QTRG9i0G9EbpedHmIpLQ0FyxoYY9

 # 火山
 HuoShan: