Merge branch 'dev/dev_xp' into dev/dev

# Conflicts:
#	src/main/java/com/ai/da/common/utils/RedisUtil.java
#	src/main/java/com/ai/da/service/AccountService.java

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

@@ -219,4 +219,40 @@ public class AccountController {
     public Response<PersonalHomepageVO> getPersonalHomepage(@RequestParam("id") Long id){
         return Response.success(accountService.getPersonalHomepage(id));
     }
+
+    @ApiOperation(value = "getUsernameModifyTimes")
+    @GetMapping("/getNicknameModifyTimes")
+    public Response<Map<String, Long>> getNicknameModifyTimes(){
+        return Response.success(accountService.getNicknameModifyTimes());
+    }
+
+    @ApiOperation(value = "editUserName")
+    @GetMapping("/editUserName")
+    public Response<String> editUserName(@RequestParam("newUserName") String newUserName){
+        accountService.editUserName(newUserName);
+        return Response.success("success");
+    }
+
+    @ApiOperation(value = "verifyUserEmail")
+    @GetMapping("/verifyUserEmail")
+    public Response<String> verifyUserEmail(@RequestParam("verifyCode") String verifyCode){
+        accountService.verifyUserEmail(verifyCode);
+        return Response.success("success");
+    }
+
+    @ApiOperation(value = "changeUserEmail")
+    @GetMapping("/changeUserEmail")
+    public Response<String> changeUserEmail(@RequestParam("newMailbox") String newMailbox){
+        accountService.changeUserEmail(newMailbox);
+        return Response.success("success");
+    }
+
+    @ApiOperation(value = "activateNewEmail")
+    @GetMapping("/activateNewEmail")
+    public Response<String> activateNewEmail(@RequestParam("token") String token){
+        accountService.activateNewEmail(token);
+        return Response.success("success");
+    }
+
+
 }

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

@@ -94,7 +94,7 @@ public class GenerateController {
     // modifySketch
     @ApiOperation(value = "modifySketch")
     @PostMapping("/modifySketch")
-    public Response<CollectionElementVO> modifySketch(@Valid @RequestBody GenerateModifyDTO generateModifyDTO) {
+    public Response<GenerateResultVO> modifySketch(@Valid @RequestBody GenerateModifyDTO generateModifyDTO) {
         return Response.success(generateService.modifySketch(generateModifyDTO));
     }