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/controller/AccountController.java

@@ -153,4 +153,10 @@ public class AccountController {
         accountService.upgradeNotification();
         return Response.success(true);
     }
+
+    @ApiOperation(value = "广场用户注册")
+    @PostMapping("/designWorksRegister")
+    public Response<Boolean> designWorksRegister(@Valid @RequestBody AccountDesignWorksRegisterDTO accountDesignWorksRegisterDTO) {
+        return Response.success(accountService.designWorksRegister(accountDesignWorksRegisterDTO));
+    }
 }

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

@@ -2,6 +2,7 @@ package com.ai.da.controller;
 
 import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.common.response.Response;
+import com.ai.da.model.dto.DesignWorksRegisterDTO;
 import com.ai.da.model.dto.PortfolioDTO;
 import com.ai.da.model.dto.QueryPortfolioPageDTO;
 import com.ai.da.model.vo.PortfolioVO;
@@ -10,10 +11,8 @@ import com.ai.da.service.PortfolioService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -29,16 +28,18 @@ public class PortfolioController {
 
     @ApiOperation(value = "发布作品集")
     @PostMapping("/publish")
-    public Response<Boolean> preLogin(@Valid @RequestBody PortfolioDTO portfolioDTO) {
-        return Response.success(portfolioService.publish(portfolioDTO));
+    public Response<Boolean> preLogin(@RequestParam("file") MultipartFile canvas, @RequestParam("data") String data) {
+        return Response.success(portfolioService.publish(canvas, data));
     }
 
+    @CrossOrigin
     @ApiOperation(value = "作品集page")
     @PostMapping("/page")
     public Response<PageBaseResponse<PortfolioVO>> page(@Valid @RequestBody QueryPortfolioPageDTO query) {
         return Response.success(portfolioService.page(query));
     }
 
+    @CrossOrigin
     @ApiOperation(value = "作品详情")
     @PostMapping("/detail")
     public Response<PortfolioVO> detail(@Valid @RequestBody PortfolioDTO portfolioDTO) {
@@ -56,4 +57,10 @@ public class PortfolioController {
     public Response<PortfolioVO> update(@Valid @RequestBody PortfolioDTO portfolioDTO) {
         return Response.success(portfolioService.update(portfolioDTO));
     }
+
+    @ApiOperation(value = "广场用户注册")
+    @PostMapping("/designWorksRegister")
+    public Response<Boolean> designWorksRegister(@Valid @RequestBody DesignWorksRegisterDTO designWorksRegisterDTO) {
+        return Response.success(portfolioService.designWorksRegister(designWorksRegisterDTO));
+    }
 }

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

@@ -8,13 +8,11 @@ import com.ai.da.common.response.Response;
 import com.ai.da.common.utils.CopyUtil;
 import com.ai.da.common.utils.MinioUtil;
 import com.ai.da.mapper.primary.TDesignPythonOutfitMapper;
-import com.ai.da.mapper.primary.entity.Account;
-import com.ai.da.mapper.primary.entity.Library;
-import com.ai.da.mapper.primary.entity.TDesignPythonOutfit;
-import com.ai.da.mapper.primary.entity.UserLikeGroup;
+import com.ai.da.mapper.primary.entity.*;
 import com.ai.da.model.dto.*;
 import com.ai.da.model.vo.*;
 import com.ai.da.service.*;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -26,6 +24,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -159,4 +158,52 @@ public class SavedCollectionController {
         return Response.success(userLikeGroupService.choose(userGroupId));
     }
 
+    @ApiOperation(value = "exportSave")
+    @PostMapping("/exportSave")
+    public Response<Boolean> exportSave(@RequestParam("file") MultipartFile file, @RequestParam("userLikeGroupId") Long userLikeGroupId) {
+        return Response.success(userLikeGroupService.exportSave(file, userLikeGroupId));
+    }
+
+    @ApiOperation(value = "exportSearch")
+    @PostMapping("/exportSearch")
+    public Response<JSONObject> exportSearch(@Valid @RequestBody ExportSearchDTO exportSearchDTO) {
+        return Response.success(userLikeGroupService.exportSearch(exportSearchDTO.getUserLikeGroupId()));
+    }
+
+    @ApiOperation(value = "toProduct")
+    @PostMapping("/toProduct")
+    public Response<List<ToProductImageResult>> toProduct(@Valid @RequestBody ToProductImageDTO toProductImageDTO) {
+        return Response.success(userLikeGroupService.toProduct(toProductImageDTO));
+    }
+
+    @ApiOperation(value = "toProductImageElementUpload")
+    @PostMapping("/toProductImageElementUpload")
+    public Response<ToProductElementVO> toProductImageElementUpload(@RequestParam("file") MultipartFile file, @RequestParam(value = "userlikeGroupId") Long userLikeGroupId) {
+        return Response.success(userLikeGroupService.toProductImageElementUpload(file, userLikeGroupId));
+    }
+
+    @ApiOperation(value = "productImageLike")
+    @PostMapping("/productImageLike")
+    public Response<Boolean> productImageLike(@Valid @RequestBody ProductImageLikeDTO productImageLikeDTO) {
+        return Response.success(userLikeGroupService.productImageLike(productImageLikeDTO));
+    }
+
+    @ApiOperation(value = "获取生成结果")
+    @PostMapping("/toProductImageResult")
+    public Response<List<GenerateResultVO>> getToProductImageResult(@Valid @RequestBody List<String> taskIdList) {
+        List<GenerateResultVO> generateResult = userLikeGroupService.getToProductImageResultList(taskIdList);
+        return Response.success(generateResult);
+    }
+
+    @ApiOperation(value = "画布用户上传元素")
+    @PostMapping("/canvasElementUpload")
+    public Response<CanvasElementUpload> canvasElementUpload(@RequestParam("file") MultipartFile file) {
+        return Response.success(userLikeGroupService.canvasElementUpload(file));
+    }
+
+    @ApiOperation("productImageLikeList")
+    @PostMapping("/productImageLikeList")
+    public Response<List<ToProductImageResult>> productImageLikeList(@Valid @RequestBody ToProductImageDTO toProductImageDTO) {
+        return Response.success(userLikeGroupService.productImageLikeList(toProductImageDTO));
+    }
 }