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/model/dto/EmailSendDTO.java

@@ -15,7 +15,7 @@ public class EmailSendDTO {
     private String email;
 
     @NotBlank(message = "operationType.cannot.be.empty")
-    @ApiModelProperty("操作类型  LOGIN 注册  FORGET_PWD 忘记密码 BIND_MAILBOX 绑定邮箱")
+    @ApiModelProperty("操作类型  LOGIN 注册  FORGET_PWD 忘记密码 BIND_MAILBOX 绑定邮箱 CHANGE_MAILBOX 更改邮箱")
     private String operationType;
 
     @ApiModelProperty("异常ip")

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

@@ -4,15 +4,27 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.validation.constraints.NotNull;
+
 @ApiModel("修改imageToSketch提取出的sketch")
 @Data
 public class GenerateModifyDTO {
-    @ApiModelProperty("需要保存的图片的base64格式")
+    @NotNull(message = "image cannot be empty")
+    @ApiModelProperty(value = "需要保存的图片的base64格式", required = true)
     private String base64;
 
-    @ApiModelProperty("sketch所属性别")
+    @NotNull(message = "gender cannot be empty")
+    @ApiModelProperty(value = "sketch所属性别", required = true)
     private String gender;
 
-    @ApiModelProperty("sketch所属分类")
+    @NotNull(message = "category cannot be empty")
+    @ApiModelProperty(value = "sketch所属分类", required = true)
     private String category;
+
+    @NotNull(message = "id cannot be empty")
+    @ApiModelProperty(value = "原图id", required = true)
+    private String originalId;
+
+    @ApiModelProperty("是否覆盖原图")
+    private Boolean isOverride;
 }

src/main/java/com/ai/da/model/enums/SketchStyle.java

@@ -6,7 +6,9 @@ public enum SketchStyle implements IEnumDisplay{
 
     MEDIUM("2"),
 
-    THIN("3");
+    THIN("3"),
+
+    CUSTOM("Custom");
 
     private String value;