Merge branch 'dev/dev' into dev/dev_shb

# Conflicts:
#	src/main/java/com/ai/da/controller/AccountController.java
#	src/main/java/com/ai/da/mapper/primary/entity/GenerateCancel.java
#	src/main/java/com/ai/da/mapper/primary/entity/LibraryCopy.java
#	src/main/java/com/ai/da/mapper/primary/entity/LibraryModelPointCopy.java
#	src/main/java/com/ai/da/service/AccountService.java
#	src/main/java/com/ai/da/service/LibraryService.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
#	src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
#	src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
#	src/main/resources/application-prod.properties
#	src/main/resources/application-test.properties

src/main/java/com/ai/da/model/dto/GenerateThroughImageTextDTO.java

@@ -5,10 +5,14 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 @Data
 @ApiModel("GenerateThroughImageTextDTO")
 public class GenerateThroughImageTextDTO {
+    @NotNull(message = "userId cannot be empty")
+    @ApiModelProperty("用户id")
+    Long userId;
 
     @ApiModelProperty("caption")
     String text;
@@ -40,4 +44,7 @@ public class GenerateThroughImageTextDTO {
     @NotBlank(message = "timeZone cannot be empty!")
     @ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取")
     String timeZone;
+
+    @ApiModelProperty("唯一id，用于保持消息唯一性")
+    String uniqueId;
 }

src/main/java/com/ai/da/model/dto/GenerateToPythonDTO.java

@@ -0,0 +1,27 @@
+package com.ai.da.model.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class GenerateToPythonDTO {
+
+    private Long user_id;
+
+    private String image_url;
+
+    private String category;
+
+    private String content;
+
+    private Integer mode;
+
+    private String version;
+
+    private String gender;
+
+    private String tasks_id;
+}

src/main/java/com/ai/da/model/vo/GenerateCollectionVO.java

@@ -19,6 +19,13 @@ public class GenerateCollectionVO {
     @ApiModelProperty("生成的图片信息")
     private List<GenerateCollectionItemVO> generatedCollectionItems;
 
+    @ApiModelProperty("在当前队列中的排序")
+    private Long rankPosition;
+
+    public GenerateCollectionVO(Long rankPosition) {
+        this.rankPosition = rankPosition;
+    }
+
     public GenerateCollectionVO(Long generateId, Long collectionId, List<GenerateCollectionItemVO> generatedCollectionItems) {
         this.generateId = generateId;
         this.collectionId = collectionId;

src/main/java/com/ai/da/model/vo/PageQueryBaseVo.java

@@ -18,6 +18,6 @@ public class PageQueryBaseVo {
 
     @ApiModelProperty("每页数量")
     @Min(value = 0, message = "The minimum size is 1")
-    @Max(value = 50, message = "The maximum size is 50")
+//    @Max(value = 50, message = "The maximum size is 50")
     private Integer size = 20;
 }