From 7358084198dc544d1ea6944f2ed3948cf17de322 Mon Sep 17 00:00:00 2001
From: cherishsince <cherishsince@aliyun.com>
Date: Wed, 12 Jun 2024 13:42:29 +0800
Subject: [PATCH] 【优化】重命名 midjourney properties

---
 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/MidjourneyConfig.java     | 27 +++++++++++++++++++++++++++
 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/MidjourneyProperties.java | 18 ------------------
 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/api/MidjourneyApi.java    | 12 ++++++------
 3 files changed, 33 insertions(+), 24 deletions(-)
 create mode 100644 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/MidjourneyConfig.java
 delete mode 100644 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/MidjourneyProperties.java

diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/MidjourneyConfig.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/MidjourneyConfig.java
new file mode 100644
index 0000000..7a4dd9e
--- /dev/null
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/MidjourneyConfig.java
@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.framework.ai.core.model.midjourney;
+
+import lombok.Data;
+
+/**
+ * Midjourney 属性
+ *
+ * @author fansili
+ * @time 2024/6/5 15:02
+ * @since 1.0
+ */
+@Data
+public class MidjourneyConfig {
+
+    /**
+     * keys
+     */
+    private String key;
+    /**
+     * 请求地址
+     */
+    private String url;
+    /**
+     * 通知回调地址
+     */
+    private String notifyUrl;
+}
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/MidjourneyProperties.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/MidjourneyProperties.java
deleted file mode 100644
index fc381a1..0000000
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/MidjourneyProperties.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package cn.iocoder.yudao.framework.ai.core.model.midjourney;
-
-import lombok.Data;
-
-/**
- * Midjourney 属性
- *
- * @author fansili
- * @time 2024/6/5 15:02
- * @since 1.0
- */
-@Data
-public class MidjourneyProperties {
-
-    private String key;
-    private String url;
-    private String notifyUrl;
-}
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/api/MidjourneyApi.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/api/MidjourneyApi.java
index ee5d406..aa0fbda 100644
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/api/MidjourneyApi.java
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/core/model/midjourney/api/MidjourneyApi.java
@@ -1,6 +1,6 @@
 package cn.iocoder.yudao.framework.ai.core.model.midjourney.api;
 
-import cn.iocoder.yudao.framework.ai.core.model.midjourney.MidjourneyProperties;
+import cn.iocoder.yudao.framework.ai.core.model.midjourney.MidjourneyConfig;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
@@ -29,13 +29,13 @@ public class MidjourneyApi {
     private static final String URI_ACTON = "/submit/action";
     private static final String URI_LIST_BY_CONDITION = "/task/list-by-condition";
     private final WebClient webClient;
-    private final MidjourneyProperties midjourneyProperties;
+    private final MidjourneyConfig midjourneyConfig;
 
-    public MidjourneyApi(MidjourneyProperties midjourneyProperties) {
-        this.midjourneyProperties = midjourneyProperties;
+    public MidjourneyApi(MidjourneyConfig midjourneyConfig) {
+        this.midjourneyConfig = midjourneyConfig;
         this.webClient = WebClient.builder()
-                .baseUrl(midjourneyProperties.getUrl())
-                .defaultHeaders(ApiUtils.getJsonContentHeaders(midjourneyProperties.getKey()))
+                .baseUrl(midjourneyConfig.getUrl())
+                .defaultHeaders(ApiUtils.getJsonContentHeaders(midjourneyConfig.getKey()))
                 .build();
     }
 
--
libgit2 0.21.4