Merge branch 'dev/dev' into dev/dev_xp

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();

src/main/java/com/ai/da/controller/AffiliateController.java

@@ -44,7 +44,7 @@ public class AffiliateController {
 
     @ApiOperation(value = "获取affiliate列表")
     @PostMapping("/list")
-    public Response<PageBaseResponse<AffiliateVO>> getAffiliateList(@Valid @RequestBody AffiliateQueryDTO affiliateQueryDTO) {
+    public Response<PageBaseResponse<AffiliateVO>> getAffiliateList(@Validated @RequestBody AffiliateQueryDTO affiliateQueryDTO) {
         return Response.success(affiliateService.getAffiliateList(affiliateQueryDTO));
     }
 

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;
 

src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java

@@ -2808,7 +2808,11 @@ public class GenerateServiceImpl extends ServiceImpl<GenerateMapper, Generate> 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);

src/main/java/com/ai/da/service/impl/SysFileServiceImpl.java

@@ -216,10 +216,11 @@ public class SysFileServiceImpl extends ServiceImpl<SysFileMapper, SysFile> 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