diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/XingLiuStar3Template.java b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/UltraTemplate.java similarity index 76% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/XingLiuStar3Template.java rename to dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/UltraTemplate.java index e6fed0a9..79f5a0d6 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/XingLiuStar3Template.java +++ b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Enum/UltraTemplate.java @@ -4,7 +4,7 @@ package com.dsideal.aiSupport.Util.Liblib.Enum; * 星流Star3模板枚举类 * 包含文生图和图生图的模板UUID */ -public enum XingLiuStar3Template { +public enum UltraTemplate { /** * 文生图模板 */ @@ -24,7 +24,7 @@ public enum XingLiuStar3Template { * @param name 模板名称 * @param uuid 模板UUID */ - XingLiuStar3Template(String name, String uuid) { + UltraTemplate(String name, String uuid) { this.name = name; this.uuid = uuid; } @@ -53,8 +53,8 @@ public enum XingLiuStar3Template { * @param name 模板名称 * @return 对应的模板，如果未找到则返回null */ - public static XingLiuStar3Template fromName(String name) { - for (XingLiuStar3Template template : XingLiuStar3Template.values()) { + public static UltraTemplate fromName(String name) { + for (UltraTemplate template : UltraTemplate.values()) { if (template.getName().equals(name)) { return template; } @@ -68,8 +68,8 @@ public enum XingLiuStar3Template { * @param uuid 模板UUID * @return 对应的模板，如果未找到则返回null */ - public static XingLiuStar3Template fromUuid(String uuid) { - for (XingLiuStar3Template template : XingLiuStar3Template.values()) { + public static UltraTemplate fromUuid(String uuid) { + for (UltraTemplate template : UltraTemplate.values()) { if (template.getUuid().equals(uuid)) { return template; } diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibUtil.java b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibCommon.java similarity index 96% rename from dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibUtil.java rename to dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibCommon.java index 52580244..b402446a 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibUtil.java +++ b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/Kit/LibLibCommon.java @@ -16,7 +16,7 @@ import org.apache.commons.lang3.RandomStringUtils; import static com.dsideal.aiSupport.AiSupportApplication.getEnvPrefix; -public class LibLibUtil { +public class LibLibCommon { // API基础URL protected static final String API_BASE_URL = "https://openapi.liblibai.cloud"; // API访问凭证 diff --git a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraImg2Img.java b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraImg2Img.java index 89bff1de..c1a3ebc7 100644 --- a/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraImg2Img.java +++ b/dsAiSupport/src/main/java/com/dsideal/aiSupport/Util/Liblib/UltraImg2Img.java @@ -1,21 +1,16 @@ package com.dsideal.aiSupport.Util.Liblib; import com.alibaba.fastjson.JSON; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.dsideal.aiSupport.Plugin.YamlProp; -import com.dsideal.aiSupport.Util.Liblib.Kit.LibLibUtil; -import com.jfinal.kit.Prop; +import com.dsideal.aiSupport.Util.Liblib.Enum.UltraTemplate; +import com.dsideal.aiSupport.Util.Liblib.Kit.LibLibCommon; import okhttp3.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; -import java.util.concurrent.TimeUnit; -import static com.dsideal.aiSupport.AiSupportApplication.getEnvPrefix; - -public class UltraImg2Img extends LibLibUtil { +public class UltraImg2Img extends LibLibCommon { //日志 private static final Logger log = LoggerFactory.getLogger(UltraImg2Img.class); // 图生图API路径 @@ -62,12 +57,17 @@ public class UltraImg2Img extends LibLibUtil { generateParams.put("steps", steps); generateParams.put("restoreFaces", 0); generateParams.put("sourceImage", sourceImageUrl); + + if (controlNetModel != null) { + //TODO + //添加ControlNet参数 + } // 将生成参数添加到请求体 requestBody.put("generateParams", generateParams); // 获取API路径 String uri = IMG_TO_IMG_PATH; // 生成签名信息 - LibLibUtil.SignatureInfo signInfo = LibLibUtil.sign(uri); + LibLibCommon.SignatureInfo signInfo = LibLibCommon.sign(uri); // 构建带签名的URL HttpUrl.Builder urlBuilder = HttpUrl.parse(API_BASE_URL + uri).newBuilder() .addQueryParameter("AccessKey", accessKey) @@ -119,7 +119,7 @@ public class UltraImg2Img extends LibLibUtil { public static void main(String[] args) { try { // 模板UUID - String templateUuid = "07e00af4fc464c7ab55ff906f8acf1b7"; + String templateUuid = UltraTemplate.IMAGE_TO_IMAGE.getUuid(); // 提示词 String prompt = "focus on the cat,there is a cat holding a bag of mcdonald, product advertisement,"; // 源图片URL @@ -133,29 +133,15 @@ public class UltraImg2Img extends LibLibUtil { double cfgScale = 3.5; // 随机种子，-1表示随机 long seed = -1; - // ControlNet模型ID - String controlNetModel = "6f1767b5f9eb47289525d06ae882a0e5"; - // 控制权重 - double controlWeight = 0.9; // 提交图生图任务 String generateUuid = submitImageToImageTask( - templateUuid, - prompt, - sourceImageUrl, - width, - height, - steps, - cfgScale, - seed, - controlNetModel, - controlWeight + templateUuid, prompt, sourceImageUrl, + width, height, steps, cfgScale, seed, null, 0 ); - // 输出生成任务UUID log.info("图生图任务已提交，任务UUID: {}", generateUuid); log.info("请使用此UUID查询任务进度和结果"); - } catch (Exception e) { log.error("图生图任务执行失败", e); }