From 47ff5bf814490791317f654e9515364fca05aedd Mon Sep 17 00:00:00 2001 From: cherishsince Date: Fri, 31 May 2024 14:25:03 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=8A=A0=E3=80=91midjourney?= =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E7=89=88=E6=9C=AC=E5=8F=B7=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/image/vo/AiImageMidjourneyImagineReqVO.java | 7 +++++-- .../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 b4398ad73..e83dd2c87 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 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 ee45eee73..67884e264 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(错误))