From 0da66ff210c12748746816a4a9ce319eda50a10a Mon Sep 17 00:00:00 2001 From: litianxiang Date: Fri, 27 Mar 2026 15:16:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?print=20t2i=E6=A8=A1=E5=9E=8B=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/common/constant/ModelConstants.java | 2 +- .../java/com/ai/da/service/impl/GenerateServiceImpl.java | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ai/da/common/constant/ModelConstants.java b/src/main/java/com/ai/da/common/constant/ModelConstants.java index bc0b1745..6ae98a81 100644 --- a/src/main/java/com/ai/da/common/constant/ModelConstants.java +++ b/src/main/java/com/ai/da/common/constant/ModelConstants.java @@ -20,7 +20,7 @@ public class ModelConstants { public static final String PRINTBOARD_ADVANCED_T2I = "qwen-image"; public static final String MOODBOARD_ADVANCED = "doubao-seedream-3-0-t2i-250415"; public static final String PRINTBOARD_HIGH_T2I = "doubao-seedream-3-0-t2i-250415"; - public static final String PRINTBOARD_HIGH_I2I = "doubao-seededit-3-0-i2i-250628"; + public static final String PRINTBOARD_HIGH_I2I = "doubao-seedream-4-0-250828"; public static final String PRINTBOARD_ADVANCED_I2I = "doubao-seedream-4-0-250828"; public static final String IMAGEN_MODEL = "imagen-4.0-generate-001"; public static final String NANO_BANANA = "gemini-2.5-flash-image"; diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index 2bab0e43..a309e4b6 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -1550,6 +1550,11 @@ public class GenerateServiceImpl extends ServiceImpl i if (imagePath != null) { requestBuilder.image(finalImagePath1); } + if (useModel.equals(ModelConstants.PRINTBOARD_HIGH_I2I)) { + GenerateImagesRequest.OptimizePromptOptions optimizePromptOptions = new GenerateImagesRequest.OptimizePromptOptions(); + optimizePromptOptions.setMode("fast"); + requestBuilder.optimizePromptOptions(optimizePromptOptions); + } // 保存生成记录到数据库 Generate generate = new Generate( From e4940019bf1cccb9e3bac99e87902fb177e03af1 Mon Sep 17 00:00:00 2001 From: litianxiang Date: Fri, 27 Mar 2026 15:19:38 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A1=86=E9=80=89=E9=80=82=E9=85=8Dpy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/python/PythonService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ai/da/python/PythonService.java b/src/main/java/com/ai/da/python/PythonService.java index 3ffad287..4ba86ce3 100644 --- a/src/main/java/com/ai/da/python/PythonService.java +++ b/src/main/java/com/ai/da/python/PythonService.java @@ -72,6 +72,8 @@ public class PythonService { private String accessPythonPort; @Value("${minio.bucketName.gradient}") private String gradientBucketName; + @Value("${minio.bucketName.users}") + private String userBucketName; @Value("${access.python.generate_sr_port}") private String srServicePort; @@ -3343,7 +3345,7 @@ public class PythonService { throw new BusinessException("system error!"); } - public Boolean generateSketchOrPrint(String params, String port, String servicePath,String taskId) { + public Boolean generateSketchOrPrint(String params, String port, String servicePath, String taskId) { //限流校验 // AccessLimitUtils.validate("generateSketchOrPrint", 5); OkHttpClient client = new OkHttpClient().newBuilder() @@ -3405,7 +3407,7 @@ public class PythonService { if (result && jsonObject.get("code").equals(200)) { log.info("Generate##responseObject###{}", jsonObject); // return setGenerateImageList(jsonObject.getJSONObject("data")); - if (servicePath== CommonConstant.GENERATE_PATH_FLUX2_KLEIN){ + if (servicePath == CommonConstant.GENERATE_PATH_FLUX2_KLEIN) { //放入结果到mq JSONObject data = jsonObject.getJSONObject("data"); String outputPath = data.getString("output_path"); @@ -4172,6 +4174,9 @@ public class PythonService { .writeTimeout(60, TimeUnit.SECONDS) .build(); MediaType mediaType = MediaType.parse("application/json"); + content.put("bucket", userBucketName); + content.put("object_name", content.get("user_id") + "/" + "segment" + "/" + UUID.randomUUID() + ".png"); + content.remove("user_id"); RequestBody body = RequestBody.create(mediaType, JSON.toJSONString(content)); String url = accessPythonIp + ":" + accessPythonPort + "/api/seg_anything"; From 0faf77899b17776b240abda46bfa12a9cbe8b7e5 Mon Sep 17 00:00:00 2001 From: litianxiang Date: Fri, 27 Mar 2026 16:49:10 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:PRINTBOARD=5FHIGH=5FI2I=E4=B8=8EPRINTBO?= =?UTF-8?q?ARD=5FADVANCED=5FI2I=E4=BD=BF=E7=94=A8=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E4=B8=80=E8=87=B4=E5=AF=BC=E8=87=B4=E7=A7=AF=E5=88=86=E6=89=A3?= =?UTF-8?q?=E9=99=A4=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/common/constant/ModelConstants.java | 2 +- src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ai/da/common/constant/ModelConstants.java b/src/main/java/com/ai/da/common/constant/ModelConstants.java index 6ae98a81..fab503bb 100644 --- a/src/main/java/com/ai/da/common/constant/ModelConstants.java +++ b/src/main/java/com/ai/da/common/constant/ModelConstants.java @@ -20,7 +20,7 @@ public class ModelConstants { public static final String PRINTBOARD_ADVANCED_T2I = "qwen-image"; public static final String MOODBOARD_ADVANCED = "doubao-seedream-3-0-t2i-250415"; public static final String PRINTBOARD_HIGH_T2I = "doubao-seedream-3-0-t2i-250415"; - public static final String PRINTBOARD_HIGH_I2I = "doubao-seedream-4-0-250828"; + public static final String PRINTBOARD_HIGH_I2I = "doubao-seedream-4-0-250828-fast"; public static final String PRINTBOARD_ADVANCED_I2I = "doubao-seedream-4-0-250828"; public static final String IMAGEN_MODEL = "imagen-4.0-generate-001"; public static final String NANO_BANANA = "gemini-2.5-flash-image"; diff --git a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java index a309e4b6..672e31f0 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -1554,6 +1554,8 @@ public class GenerateServiceImpl extends ServiceImpl i GenerateImagesRequest.OptimizePromptOptions optimizePromptOptions = new GenerateImagesRequest.OptimizePromptOptions(); optimizePromptOptions.setMode("fast"); requestBuilder.optimizePromptOptions(optimizePromptOptions); + //由于PRINTBOARD_HIGH_I2I与PRINTBOARD_ADVANCED_I2I使用模型一致，为了区别积分扣除，PRINTBOARD_HIGH_I2I加入了-fast，但传入模型时需要去掉-fast，用PRINTBOARD_ADVANCED_I2I的常量做替代 + requestBuilder.model(ModelConstants.PRINTBOARD_ADVANCED_I2I); } // 保存生成记录到数据库