Merge branch 'dev/dev' into dev/dev_xp

# Conflicts:
#	src/main/java/com/ai/da/common/RabbitMQ/GenerateConsumer.java
#	src/main/java/com/ai/da/service/impl/AccountServiceImpl.java
#	src/main/java/com/ai/da/service/impl/GenerateServiceImpl.java
#	src/main/resources/application-dev.properties
#	src/main/resources/messages_en.properties
#	src/main/resources/messages_zh.properties

src/main/java/com/ai/da/mapper/primary/CanvasMapper.java

@@ -0,0 +1,7 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.Canvas;
+
+public interface CanvasMapper extends CommonMapper<Canvas> {
+}

src/main/java/com/ai/da/mapper/primary/ExportFileMapper.java

@@ -0,0 +1,7 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.ExportFile;
+
+public interface ExportFileMapper extends CommonMapper<ExportFile> {
+}

src/main/java/com/ai/da/mapper/primary/ToProductElementMapper.java

@@ -0,0 +1,8 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.ToProductElement;
+
+public interface ToProductElementMapper extends CommonMapper<ToProductElement> {
+
+}

src/main/java/com/ai/da/mapper/primary/ToProductImageRecordMapper.java

@@ -0,0 +1,7 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.ToProductImageRecord;
+
+public interface ToProductImageRecordMapper extends CommonMapper<ToProductImageRecord> {
+}

src/main/java/com/ai/da/mapper/primary/ToProductImageResultMapper.java

@@ -0,0 +1,7 @@
+package com.ai.da.mapper.primary;
+
+import com.ai.da.common.config.mybatis.plus.CommonMapper;
+import com.ai.da.mapper.primary.entity.ToProductImageResult;
+
+public interface ToProductImageResultMapper extends CommonMapper<ToProductImageResult> {
+}

src/main/java/com/ai/da/mapper/primary/entity/Canvas.java

@@ -0,0 +1,42 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * Attendance
+ *
+ * @author easy-generator
+ * @since 2022-06-13
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("canvas")
+public class Canvas implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty("url")
+    private String url;
+
+    @ApiModelProperty("accountId")
+    private Long accountId;
+
+    @ApiModelProperty("createTime")
+    private LocalDateTime createTime;
+}

src/main/java/com/ai/da/mapper/primary/entity/CanvasElementUpload.java

@@ -0,0 +1,9 @@
+package com.ai.da.mapper.primary.entity;
+
+import lombok.Data;
+
+@Data
+public class CanvasElementUpload {
+    private String url;
+    private String minioUrl;
+}

src/main/java/com/ai/da/mapper/primary/entity/ExportFile.java

@@ -0,0 +1,24 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("export_file")
+public class ExportFile implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    private String url;
+    private Long userLikeGroupId;
+}

src/main/java/com/ai/da/mapper/primary/entity/Portfolio.java

@@ -35,12 +35,18 @@ public class Portfolio implements Serializable {
     @ApiModelProperty(value = "作品类型")
     private String portfolioType;
 
+    @ApiModelProperty(value = "画布ID")
+    private Long canvasId;
+
     @ApiModelProperty(value = "封面ID")
     private Long coverId;
 
     @ApiModelProperty(value = "作品状态1公开0隐藏")
     private Integer status;
 
+    @ApiModelProperty(value = "是否允许二次创作1允许0不允许")
+    private Integer openSource;
+
     @ApiModelProperty(value = "作品集作者ID")
     private Long accountId;
 

src/main/java/com/ai/da/mapper/primary/entity/ToProductElement.java

@@ -0,0 +1,27 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+public class ToProductElement implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "userLikeGroupId")
+    private Long userLikeGroupId;
+
+    @ApiModelProperty(value = "url")
+    private String url;
+
+    @ApiModelProperty(value = "createTime")
+    private LocalDateTime createTime;
+}

src/main/java/com/ai/da/mapper/primary/entity/ToProductImageRecord.java

@@ -0,0 +1,27 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+public class ToProductImageRecord implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "userLikeGroupId")
+    private Long userLikeGroupId;
+
+    @ApiModelProperty(value = "prompt")
+    private String prompt;
+
+    @ApiModelProperty(value = "createTime")
+    private LocalDateTime createTime;
+}

src/main/java/com/ai/da/mapper/primary/entity/ToProductImageResult.java

@@ -0,0 +1,42 @@
+package com.ai.da.mapper.primary.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@Data
+public class ToProductImageResult implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "elementId")
+    private Long elementId;
+
+    @ApiModelProperty(value = "elementType")
+    private String elementType;
+
+    @ApiModelProperty(value = "url")
+    private String url;
+
+    @ApiModelProperty(value = "isLike 1是0否")
+    private Integer isLike;
+
+    @ApiModelProperty(value = "createTime")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "toProductImageRecordId")
+    private Long toProductImageRecordId;
+
+    @ApiModelProperty(value = "taskId")
+    private String taskId;
+
+    @ApiModelProperty(value = "userLikeGroupId")
+    private Long userLikeGroupId;
+}