From 42273750f49287274e896046c3891062d3d257f8 Mon Sep 17 00:00:00 2001 From: xupei Date: Fri, 15 Aug 2025 18:00:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?BUGFIX:=E4=BB=8E=E7=BC=93=E5=AD=98=E8=8E=B7?= =?UTF-8?q?=E5=8F=96=E6=A8=A1=E7=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java b/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java index 81c0fca6..24e89777 100644 --- a/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java @@ -216,10 +216,11 @@ public class SysFileServiceImpl extends ServiceImpl impl sysFile = CopyUtil.copyObject(sysFileMapper.selectById(id), SysFileVO.class); if (Objects.nonNull(sysFile)){ LocalCacheUtils.setSysFileCache(id, sysFile); - return sysFile; + } else { + return null; } } - return null; + return sysFile; } @Override From 59a301517016b11f8655b3915fd6e5101d752d83 Mon Sep 17 00:00:00 2001 From: xupei Date: Wed, 20 Aug 2025 09:37:35 +0800 Subject: [PATCH 2/3] =?UTF-8?q?TASK:=E6=9F=A5affiliate=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=EF=BC=9B=E6=89=93=E5=BC=80=E4=BD=A3=E9=87=91=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E5=AE=9A=E6=97=B6=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ai/da/common/task/PaymentTask.java | 2 +- src/main/java/com/ai/da/controller/AffiliateController.java | 2 +- src/main/java/com/ai/da/model/dto/AffiliateQueryDTO.java | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/ai/da/common/task/PaymentTask.java b/src/main/java/com/ai/da/common/task/PaymentTask.java index b780b3a2..1b77e452 100644 --- a/src/main/java/com/ai/da/common/task/PaymentTask.java +++ b/src/main/java/com/ai/da/common/task/PaymentTask.java @@ -96,7 +96,7 @@ public class PaymentTask { // } -// @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes + @Scheduled(cron = "0 */5 * * * *") // Run every 5 minutes public void updateAffiliateInfoWithPayment(){ // log.info("佣金计算定时器"); affiliateService.updateAffiliateInfoWithPayment(); diff --git a/src/main/java/com/ai/da/controller/AffiliateController.java b/src/main/java/com/ai/da/controller/AffiliateController.java index 853580bf..ba6887eb 100644 --- a/src/main/java/com/ai/da/controller/AffiliateController.java +++ b/src/main/java/com/ai/da/controller/AffiliateController.java @@ -43,7 +43,7 @@ public class AffiliateController { @ApiOperation(value = "获取affiliate列表") @PostMapping("/list") - public Response> getAffiliateList(@Valid @RequestBody AffiliateQueryDTO affiliateQueryDTO) { + public Response> getAffiliateList(@Validated @RequestBody AffiliateQueryDTO affiliateQueryDTO) { return Response.success(affiliateService.getAffiliateList(affiliateQueryDTO)); } diff --git a/src/main/java/com/ai/da/model/dto/AffiliateQueryDTO.java b/src/main/java/com/ai/da/model/dto/AffiliateQueryDTO.java index 54fbf7fc..da414a82 100644 --- a/src/main/java/com/ai/da/model/dto/AffiliateQueryDTO.java +++ b/src/main/java/com/ai/da/model/dto/AffiliateQueryDTO.java @@ -6,6 +6,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.Pattern; @EqualsAndHashCode(callSuper = true) @Data @@ -18,6 +19,7 @@ public class AffiliateQueryDTO extends TimeQueryBaseDTO{ private Long affiliateId; @NotBlank(message = "orderBy cannot be empty") + @Pattern(regexp = "id|createTime|totalIncome", message = "允许排序字段只有id|createTime|totalIncome") @ApiModelProperty("目前允许按id, createTime, totalIncome进行排序") private String orderBy; From 1089a5a2a57ef8adfb608f5efa7a5ddd6fba4fa3 Mon Sep 17 00:00:00 2001 From: xupei Date: Wed, 20 Aug 2025 18:15:46 +0800 Subject: [PATCH 3/3] =?UTF-8?q?TASK:flux=20=E7=94=9F=E6=88=90pattern?= =?UTF-8?q?=E6=97=B6=E8=BE=93=E5=87=BA=E5=9B=BE=E7=89=87=E6=AF=94=E4=BE=8B?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=B8=BA1=EF=BC=9A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ai/da/service/impl/GenerateServiceImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 13487a6a..0851d50e 100644 --- a/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java @@ -2808,7 +2808,11 @@ public class GenerateServiceImpl extends ServiceImpl i requestBody.set("prompt", prompt); requestBody.set("seed", 42); - requestBody.set("aspect_ratio", "9:16"); + if (func.equals(PATTERN)){ + requestBody.set("aspect_ratio", "1:1"); + } else { + requestBody.set("aspect_ratio", "9:16"); + } requestBody.set("output_format", "png"); log.info("flux 请求入参：{}", requestBody);