From 9476a05949bc5039b3bc19b822a58acf84027523 Mon Sep 17 00:00:00 2001
From: cherishsince <cherishsince@aliyun.com>
Date: Wed, 10 Apr 2024 20:02:33 +0800
Subject: [PATCH] 优化名称，请求增加 req res 后缀，移动到api目录

---
 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/req/AttachmentsReq.java       | 22 ++++++++++++++++++++++
 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/req/DescribeReq.java          | 24 ++++++++++++++++++++++++
 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/req/ReRollReq.java            | 22 ++++++++++++++++++++++
 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/res/UploadAttachmentsRes.java | 36 ++++++++++++++++++++++++++++++++++++
 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/Attachments.java               | 22 ----------------------
 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/Describe.java                  | 26 --------------------------
 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/ReRoll.java                    | 22 ----------------------
 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/UploadAttachmentsRes.java      | 36 ------------------------------------
 8 files changed, 104 insertions(+), 106 deletions(-)
 create mode 100644 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/req/AttachmentsReq.java
 create mode 100644 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/req/DescribeReq.java
 create mode 100644 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/req/ReRollReq.java
 create mode 100644 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/res/UploadAttachmentsRes.java
 delete mode 100644 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/Attachments.java
 delete mode 100644 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/Describe.java
 delete mode 100644 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/ReRoll.java
 delete mode 100644 yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/UploadAttachmentsRes.java

diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/req/AttachmentsReq.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/req/AttachmentsReq.java
new file mode 100644
index 0000000..ed18a48
--- /dev/null
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/req/AttachmentsReq.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.framework.ai.midjourney.api.req;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import org.springframework.core.io.FileSystemResource;
+
+/**
+ * 附件
+ * <p>
+ * author: fansili
+ * time: 2024/4/7 17:18
+ */
+@Data
+@Accessors(chain = true)
+public class AttachmentsReq {
+
+    /**
+     * 创建文件系统资源对象
+     */
+    private FileSystemResource fileSystemResource;
+
+}
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/req/DescribeReq.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/req/DescribeReq.java
new file mode 100644
index 0000000..49a4ab3
--- /dev/null
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/req/DescribeReq.java
@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.framework.ai.midjourney.api.req;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * describe
+ *
+ * author: fansili
+ * time: 2024/4/7 12:30
+ */
+@Data
+@Accessors(chain = true)
+public class DescribeReq {
+
+    /**
+     * 文件名字
+     */
+    private String fileName;
+    /**
+     * UploadAttachmentsRes 里面的 finalFileName
+     */
+    private String finalFileName;
+}
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/req/ReRollReq.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/req/ReRollReq.java
new file mode 100644
index 0000000..0d83689
--- /dev/null
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/req/ReRollReq.java
@@ -0,0 +1,22 @@
+package cn.iocoder.yudao.framework.ai.midjourney.api.req;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * author: fansili
+ * time: 2024/4/6 21:33
+ */
+@Data
+@Accessors(chain = true)
+public class ReRollReq {
+
+    /**
+     * socket 消息里面收到的 messageId
+     */
+    private String messageId;
+    /**
+     * socket 消息里面的，操作按钮id（MJ::JOB::upsample::3::2aeefbef-43e2-4057-bcf1-43b5f39ab6f7）
+     */
+    private String customId;
+}
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/res/UploadAttachmentsRes.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/res/UploadAttachmentsRes.java
new file mode 100644
index 0000000..cba21c9
--- /dev/null
+++ b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/api/res/UploadAttachmentsRes.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.framework.ai.midjourney.api.res;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 上传附件 - res
+ *
+ * author: fansili
+ * time: 2024/4/8 13:32
+ */
+@Data
+@Accessors(chain = true)
+public class UploadAttachmentsRes {
+
+    private List<Attachment> attachments;
+
+    @Data
+    @Accessors(chain = true)
+    public static class Attachment {
+        /**
+         * 附件的ID。
+         */
+        private int id;
+        /**
+         * 附件的上传URL。
+         */
+        private String uploadUrl;
+        /**
+         * 上传到服务器的文件名。
+         */
+        private String uploadFilename;
+    }
+}
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/Attachments.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/Attachments.java
deleted file mode 100644
index 133a703..0000000
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/Attachments.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.framework.ai.midjourney.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-import org.springframework.core.io.FileSystemResource;
-
-/**
- * 附件
- * <p>
- * author: fansili
- * time: 2024/4/7 17:18
- */
-@Data
-@Accessors(chain = true)
-public class Attachments {
-
-    /**
-     * 创建文件系统资源对象
-     */
-    private FileSystemResource fileSystemResource;
-
-}
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/Describe.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/Describe.java
deleted file mode 100644
index 6517f7b..0000000
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/Describe.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.iocoder.yudao.framework.ai.midjourney.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.io.File;
-
-/**
- * describe
- *
- * author: fansili
- * time: 2024/4/7 12:30
- */
-@Data
-@Accessors(chain = true)
-public class Describe {
-
-    /**
-     * 文件名字
-     */
-    private String fileName;
-    /**
-     * UploadAttachmentsRes 里面的 finalFileName
-     */
-    private String finalFileName;
-}
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/ReRoll.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/ReRoll.java
deleted file mode 100644
index a285174..0000000
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/ReRoll.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package cn.iocoder.yudao.framework.ai.midjourney.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-/**
- * author: fansili
- * time: 2024/4/6 21:33
- */
-@Data
-@Accessors(chain = true)
-public class ReRoll {
-
-    /**
-     * socket 消息里面收到的 messageId
-     */
-    private String messageId;
-    /**
-     * socket 消息里面的，操作按钮id（MJ::JOB::upsample::3::2aeefbef-43e2-4057-bcf1-43b5f39ab6f7）
-     */
-    private String customId;
-}
diff --git a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/UploadAttachmentsRes.java b/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/UploadAttachmentsRes.java
deleted file mode 100644
index b06c1c3..0000000
--- a/yudao-module-ai/yudao-spring-boot-starter-ai/src/main/java/cn/iocoder/yudao/framework/ai/midjourney/vo/UploadAttachmentsRes.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package cn.iocoder.yudao.framework.ai.midjourney.vo;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.util.List;
-
-/**
- * 上传附件 - res
- *
- * author: fansili
- * time: 2024/4/8 13:32
- */
-@Data
-@Accessors(chain = true)
-public class UploadAttachmentsRes {
-
-    private List<Attachment> attachments;
-
-    @Data
-    @Accessors(chain = true)
-    public static class Attachment {
-        /**
-         * 附件的ID。
-         */
-        private int id;
-        /**
-         * 附件的上传URL。
-         */
-        private String uploadUrl;
-        /**
-         * 上传到服务器的文件名。
-         */
-        private String uploadFilename;
-    }
-}
--
libgit2 0.21.4