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

@@ -2,11 +2,13 @@ package com.ai.da.controller;
 
 import com.ai.da.common.response.PageBaseResponse;
 import com.ai.da.common.response.Response;
-import com.ai.da.mapper.primary.entity.TrialOrder;
-import com.ai.da.mapper.secondary.entity.FemaleDress;
+import com.ai.da.common.security.jwt.JWTTokenHelper;
+import com.ai.da.mapper.entity.TrialOrder;
 import com.ai.da.model.dto.*;
+import com.ai.da.model.enums.Language;
 import com.ai.da.model.vo.AccountLoginVO;
 import com.ai.da.model.vo.AccountPreLoginVO;
+import com.ai.da.model.vo.QueryLibraryPageVO;
 import com.ai.da.service.AccountService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -148,10 +150,10 @@ public class AccountController {
         return Response.success(accountService.noLoginRequired(noLoginRequiredDTO, request));
     }
 
-    @ApiOperation(value = "免密登录")
-    @PostMapping("/test")
-    public Response<FemaleDress> test(){
-        return Response.success(accountService.test());
+    @PostMapping("upgradeNotification")
+    @ApiOperation(value = "升级邮件通知")
+    public Response<Boolean> upgradeNotification() {
+        accountService.upgradeNotification();
+        return Response.success(true);
     }
-
 }

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

@@ -53,4 +53,25 @@ public class GenerateController {
         return Response.success(generateService.generateDislike(generateDetailId, timeZone));
     }
 
+    @ApiOperation(value = "发起生成请求，异步获取结果")
+    @PostMapping("/prepare")
+    public Response<String> prepareForGenerate(@Valid @RequestBody GenerateThroughImageTextDTO generateThroughImageTextDTO) {
+        return Response.success(generateService.prepareForGenerate(generateThroughImageTextDTO));
+    }
+
+    @ApiOperation(value = "取消继续生成")
+    @GetMapping("/stopWaiting")
+    public Response<String> stopWaiting(@RequestParam("userId") Long userId,
+                                        @RequestParam("uniqueId") String uniqueId,
+                                        @RequestParam("timeZone") String timeZone) {
+        generateService.cancelGenerate(userId, uniqueId, timeZone);
+        return Response.success("stop waiting successfully");
+    }
+
+    @ApiOperation(value = "获取生成结果")
+    @GetMapping("/result")
+    public Response<GenerateCollectionVO> getGenerateResult(@RequestParam("uniqueId") String uniqueId) {
+        GenerateCollectionVO generateResult = generateService.getGenerateResult(uniqueId);
+        return Response.success(generateResult);
+    }
 }

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

@@ -26,6 +26,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.io.File;
+import java.text.ParseException;
 import java.util.Date;
 import java.util.Objects;
 import java.util.UUID;
@@ -194,4 +195,11 @@ public class LibraryController {
         return "/workspace/python_code/Multi-layer-Virtual-Try-on/dataset_for_test/Img_model.png";
     }
 
+    @PostMapping("moveLibraryData")
+    @ApiOperation(value = "用户library数据迁移")
+    public Response<Boolean> moveLibraryDate() throws ParseException {
+        libraryService.moveLibraryDate();
+        return Response.success(true);
+    }
+
 }