From 47ff5bf814490791317f654e9515364fca05aedd Mon Sep 17 00:00:00 2001
From: cherishsince <cherishsince@aliyun.com>
Date: Fri, 31 May 2024 14:25:03 +0800
Subject: [PATCH] 【增加】midjourney 增加版本号设置

---
 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageMidjourneyImagineReqVO.java | 7 +++++--
 yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/image/AiImageServiceImpl.java                        | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageMidjourneyImagineReqVO.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageMidjourneyImagineReqVO.java
index b4398ad..e83dd2c 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageMidjourneyImagineReqVO.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/image/vo/AiImageMidjourneyImagineReqVO.java
@@ -26,12 +26,15 @@ public class AiImageMidjourneyImagineReqVO {
     @Schema(description = "模型(midjourney、niji)")
     private String model;
 
-    @Schema(description = "图片宽度")
+    @Schema(description = "图片宽度 --ar 设置")
     private String width;
 
-    @Schema(description = "图片高度")
+    @Schema(description = "图片高度 --ar 设置")
     private String height;
 
+    @Schema(description = "版本号 --v 设置")
+    private String version;
+
     @Schema(description = "垫图(参考图)base64数组")
     private List<String> base64Array;
 }
diff --git a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/image/AiImageServiceImpl.java b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/image/AiImageServiceImpl.java
index ee45eee..67884e2 100644
--- a/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/image/AiImageServiceImpl.java
+++ b/yudao-module-ai/yudao-module-ai-biz/src/main/java/cn/iocoder/yudao/module/ai/service/image/AiImageServiceImpl.java
@@ -158,7 +158,9 @@ public class AiImageServiceImpl implements AiImageService {
         MidjourneyImagineReqVO imagineReqVO = BeanUtils.toBean(req, MidjourneyImagineReqVO.class);
         imagineReqVO.setNotifyHook(midjourneyNotifyUrl);
         // 设置 midjourney 扩展参数，通过 --ar 来设置尺寸
-        imagineReqVO.setState(String.format("--ar %s:%s", req.getWidth(), req.getHeight()));
+        String midjourneySizeParam = String.format("--ar %s:%s", req.getWidth(), req.getHeight());
+        String midjourneyVersionParam = String.format("--v %s", req.getVersion());
+        imagineReqVO.setState(midjourneySizeParam.concat(" ").concat(midjourneyVersionParam));
         MidjourneySubmitRespVO submitRespVO = midjourneyProxyClient.imagine(imagineReqVO);
 
         // 4、保存任务 id (状态码: 1(提交成功), 21(已存在), 22(排队中), other(错误))
--
libgit2 0.21.4