From 83c0b70a2d8e67e371b40322f1a8529ca13e3827 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期五, 11 二月 2022 17:30:38 +0800 Subject: [PATCH] fix 修复 验证码 强制校验问题 --- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java | 118 ++++++++++++++++++++++++---------------------------------- 1 files changed, 49 insertions(+), 69 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java index a1f8b83..0626b15 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java @@ -1,69 +1,49 @@ -package com.ruoyi.common.core.domain.model; - -/** - * 鐢ㄦ埛鐧诲綍瀵硅薄 - * - * @author ruoyi - */ -public class LoginBody -{ - /** - * 鐢ㄦ埛鍚� - */ - private String username; - - /** - * 鐢ㄦ埛瀵嗙爜 - */ - private String password; - - /** - * 楠岃瘉鐮� - */ - private String code; - - /** - * 鍞竴鏍囪瘑 - */ - private String uuid = ""; - - public String getUsername() - { - return username; - } - - public void setUsername(String username) - { - this.username = username; - } - - public String getPassword() - { - return password; - } - - public void setPassword(String password) - { - this.password = password; - } - - public String getCode() - { - return code; - } - - public void setCode(String code) - { - this.code = code; - } - - public String getUuid() - { - return uuid; - } - - public void setUuid(String uuid) - { - this.uuid = uuid; - } -} +package com.ruoyi.common.core.domain.model; + +import com.ruoyi.common.constant.UserConstants; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; + +/** + * 鐢ㄦ埛鐧诲綍瀵硅薄 + * + * @author Lion Li + */ + +@Data +@ApiModel("鐢ㄦ埛鐧诲綍瀵硅薄") +public class LoginBody { + + /** + * 鐢ㄦ埛鍚� + */ + @NotBlank(message = "{user.username.not.blank}") + @Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}") + @ApiModelProperty(value = "鐢ㄦ埛鍚�") + private String username; + + /** + * 鐢ㄦ埛瀵嗙爜 + */ + @NotBlank(message = "{user.password.not.blank}") + @Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}") + @ApiModelProperty(value = "鐢ㄦ埛瀵嗙爜") + private String password; + + /** + * 楠岃瘉鐮� + */ + @ApiModelProperty(value = "楠岃瘉鐮�") + private String code; + + /** + * 鍞竴鏍囪瘑 + */ + @ApiModelProperty(value = "鍞竴鏍囪瘑") + private String uuid = ""; + +} -- Gitblit v1.9.3