From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001 From: KonBAI <1527468660@qq.com> Date: 星期六, 02 四月 2022 13:02:56 +0800 Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本,处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。 --- ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginBody.java | 92 ++++++++++++++++++++++++--------------------- 1 files changed, 49 insertions(+), 43 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 d470536..f13de97 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,43 +1,49 @@ -package com.ruoyi.common.core.domain.model; - -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; -import lombok.experimental.Accessors; - -/** - * 鐢ㄦ埛鐧诲綍瀵硅薄 - * - * @author Lion Li - */ - -@Data -@Accessors(chain = true) -@ApiModel("鐢ㄦ埛鐧诲綍瀵硅薄") -public class LoginBody { - - /** - * 鐢ㄦ埛鍚� - */ - @ApiModelProperty(value = "鐢ㄦ埛鍚�") - private String username; - - /** - * 鐢ㄦ埛瀵嗙爜 - */ - @ApiModelProperty(value = "鐢ㄦ埛瀵嗙爜") - private String password; - - /** - * 楠岃瘉鐮� - */ - @ApiModelProperty(value = "楠岃瘉鐮�") - private String code; - - /** - * 鍞竴鏍囪瘑 - */ - @ApiModelProperty(value = "鍞竴鏍囪瘑") - private String 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