TASK: 全局异常处理,代码优化,测试数据库连接信息变更;

This commit is contained in:
shahaibo
2023-10-27 10:09:19 +08:00
parent 9fa605f83e
commit bedc640e13
27 changed files with 377 additions and 242 deletions

View File

@@ -11,15 +11,15 @@ import javax.validation.constraints.NotNull;
@ApiModel("绑定邮箱")
public class AccountBindEmailDTO {
@NotNull(message = "userId cannot be empty!")
@NotNull(message = "userId.cannot.be.empty")
@ApiModelProperty("用户id")
private Long userId;
@NotBlank(message = "Please input email!")
@NotBlank(message = "email.cannot.be.empty")
@ApiModelProperty("邮箱")
private String userEmail;
@NotBlank(message = "Please input the email verification code !")
@NotBlank(message = "emailVerifyCode.cannot.be.empty")
@ApiModelProperty("邮箱验证码")
private String emailVerifyCode;
}

View File

@@ -11,11 +11,11 @@ import javax.validation.constraints.NotNull;
@ApiModel("登入")
public class AccountLoginDTO {
@NotNull(message = "userId cannot be empty !")
@NotNull(message = "userId.cannot.be.empty")
@ApiModelProperty("userId")
private Long userId;
@NotBlank(message = "Please input email !")
@NotBlank(message = "email.cannot.be.empty")
@ApiModelProperty("邮箱")
private String email;
@@ -25,7 +25,7 @@ public class AccountLoginDTO {
@ApiModelProperty("密码")
private String password;
@NotBlank(message = "Please input loginType !")
@NotBlank(message = "loginType.cannot.be.empty")
@ApiModelProperty("登入类型 EMAIL - >邮箱 , PASSWORD ->密码")
private String loginType;

View File

@@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull;
@ApiModel("登出")
public class AccountLogoutDTO {
@NotNull(message = "userId cannot be empty !")
@NotNull(message = "userId.cannot.be.empty")
@ApiModelProperty("userId")
private Long userId;

View File

@@ -10,20 +10,20 @@ import javax.validation.constraints.NotBlank;
@ApiModel("预先登入")
public class AccountPreLoginDTO {
@NotBlank(message = "userName cannot be empty!")
@NotBlank(message = "userName.cannot.be.empty")
@ApiModelProperty("用户名")
private String userName;
/*新增字段*/
@NotBlank(message = "Please input email !")
@NotBlank(message = "email.cannot.be.empty")
@ApiModelProperty("邮箱")
private String email;
@NotBlank(message = "password cannot be empty!")
@NotBlank(message = "password.cannot.be.empty")
@ApiModelProperty("密码")
private String password;
@NotBlank(message = "operationType cannot be empty")
@NotBlank(message = "operationType.cannot.be.empty")
@ApiModelProperty("操作类型 LOGIN 注册 FORGET_PWD 忘记密码 BIND_MAILBOX 绑定邮箱")
private String operationType;

View File

@@ -10,15 +10,15 @@ import javax.validation.constraints.NotBlank;
@ApiModel("账户")
public class AccountRegisterDTO {
@NotBlank(message = "Please input email !")
@NotBlank(message = "email.cannot.be.empty")
@ApiModelProperty("邮箱")
private String email;
@NotBlank(message = "Please input password !")
@NotBlank(message = "password.cannot.be.empty")
@ApiModelProperty("密码")
private String password;
@NotBlank(message = "Please input the email verification code !")
@NotBlank(message = "emailVerifyCode.cannot.be.empty")
@ApiModelProperty("邮箱验证码")
private String emailVerifyCode;

View File

@@ -20,41 +20,49 @@ public class DesignCollectionDTO {
@ApiModelProperty("印花板图片 数组")
private List<DesignCollectionPrintElementDTO> printBoards;
@NotEmpty(message = "colorBoardRgbValues cannot be empty!")
@NotEmpty(message = "colorBoards.cannot.be.empty")
@ApiModelProperty("颜色板RGB值 数组")
private List<CollectionColorDTO> colorBoards;
@ApiModelProperty("手稿板图片id 数组")
private List<CollectionSketchDTO> sketchBoards;
@ApiModelProperty("市场手稿板图片id 数组")
private List<DesignCollectionElementDTO> marketingSketchs;
// 2023.10版本去除该入参
// @ApiModelProperty("市场手稿板图片id 数组")
// private List<DesignCollectionElementDTO> marketingSketchs;
@NotNull(message = "systemScale cannot be empty!")
@NotNull(message = "systemScale.cannot.be.empty")
@ApiModelProperty("系统取图比列")
private BigDecimal systemScale;
@NotBlank(message = "modelType.cannot.be.empty")
@ApiModelProperty("模特类型:System,Library")
private String modelType;
@NotBlank(message = "modelSex.cannot.be.empty")
@ApiModelProperty("模特性别")
private String modelSex;
@ApiModelProperty("templateId")
@NotNull(message = "templateId.cannot.be.empty")
@ApiModelProperty("模特ID")
private Long templateId;
@ApiModelProperty("mood版本id 没有传null")
private String moodTemplateId;
@NotBlank(message = "singleOverall cannot be empty!")
@NotBlank(message = "singleOverall.cannot.be.empty")
@ApiModelProperty("控制生成类型的参数两个选项outfit时候传 single , 另外一个传 overall")
private String singleOverall;
@ApiModelProperty("single模式下的类别选择参数 选项有outwear,dress,blouse,skirt,trousers")
private String switchCategory;
@NotBlank(message = "timeZone cannot be empty!")
@NotBlank(message = "timeZone.cannot.be.empty")
@ApiModelProperty("本地时区,比如 'Asia/Tokyo' 东京时间 , 'Asia/Shanghai' 北京时间 由js本地获取")
private String timeZone;
@NotBlank(message = "processId.cannot.be.empty")
@ApiModelProperty("python端design进程ID")
private String processId;
}

View File

@@ -10,11 +10,11 @@ import javax.validation.constraints.NotBlank;
@ApiModel("邮箱发送")
public class EmailSendDTO {
@NotBlank(message = "Please input email!")
@NotBlank(message = "email.cannot.be.empty")
@ApiModelProperty("邮箱")
private String email;
@NotBlank(message = "operationType cannot be empty")
@NotBlank(message = "operationType.cannot.be.empty")
@ApiModelProperty("操作类型 LOGIN 注册 FORGET_PWD 忘记密码 BIND_MAILBOX 绑定邮箱")
private String operationType;