From 95095f35c0c98bf57fe73f268e06855eae374536 Mon Sep 17 00:00:00 2001 From: Chopper Date: Wed, 29 Sep 2021 14:52:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E7=AE=A1=E7=90=86=E5=91=98?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E5=A4=B4=E5=83=8F=E6=97=A0=E6=B3=95=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/modules/permission/entity/dos/AdminUser.java | 5 +++++ .../modules/permission/entity/dto/AdminUserDTO.java | 11 +++++++++-- .../passport/AdminUserManagerController.java | 5 +++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java b/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java index 2ab76c5c..0c5a2f38 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dos/AdminUser.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.validator.constraints.Length; /** @@ -21,18 +22,22 @@ public class AdminUser extends BaseEntity { private static final long serialVersionUID = 2918352800205024873L; @ApiModelProperty(value = "用户名") + @Length(max = 20,message = "用户名长度不能超过20个字符") private String username; @ApiModelProperty(value = "密码") private String password; @ApiModelProperty(value = "昵称") + @Length(max = 10,message = "昵称长度不能超过10个字符") private String nickName; @ApiModelProperty(value = "手机") + @Length(max = 11,message = "手机号长度不能超过11") private String mobile; @ApiModelProperty(value = "邮件") + @Length(max = 100,message = "又想长度不能超过100") private String email; @ApiModelProperty(value = "用户头像") diff --git a/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java b/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java index b6ad8e7e..c6715cd9 100644 --- a/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java +++ b/framework/src/main/java/cn/lili/modules/permission/entity/dto/AdminUserDTO.java @@ -4,6 +4,7 @@ import cn.lili.mybatis.BaseEntity; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotEmpty; @@ -19,23 +20,29 @@ public class AdminUserDTO extends BaseEntity { private static final long serialVersionUID = 1L; + @ApiModelProperty(value = "用户名") - @NotEmpty(message = "用户名不能为空") + @Length(max = 20,message = "用户名长度不能超过20个字符") private String username; - @NotEmpty(message = "密码不能为空") @ApiModelProperty(value = "密码") private String password; @ApiModelProperty(value = "昵称") + @Length(max = 10,message = "昵称长度不能超过10个字符") private String nickName; @ApiModelProperty(value = "手机") + @Length(max = 11,message = "手机号长度不能超过11") private String mobile; @ApiModelProperty(value = "邮件") + @Length(max = 100,message = "又想长度不能超过100") private String email; + @ApiModelProperty(value = "头像") + private String avatar; + @ApiModelProperty(value = "描述/详情/备注") private String description; diff --git a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java index af17fd09..227c8e8d 100644 --- a/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/passport/AdminUserManagerController.java @@ -29,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import javax.validation.constraints.NotNull; import java.util.List; @@ -110,7 +111,7 @@ public class AdminUserManagerController { @PutMapping(value = "/admin/edit") @ApiOperation(value = "超级管理员修改其他管理员资料") @DemoSite - public ResultMessage edit(AdminUser adminUser, + public ResultMessage edit(@Valid AdminUser adminUser, @RequestParam(required = false) List roles) { if (!adminUserService.updateAdminUser(adminUser, roles)) { throw new ServiceException(ResultCode.USER_EDIT_ERROR); @@ -154,7 +155,7 @@ public class AdminUserManagerController { @PostMapping @ApiOperation(value = "添加用户") - public ResultMessage register(AdminUserDTO adminUser, + public ResultMessage register(@Valid AdminUserDTO adminUser, @RequestParam(required = false) List roles) { int rolesMaxSize=10; try {