Commit 5dd4842d authored by 施翔轲's avatar 施翔轲

修改登录:密码长度相关提示语

parent 2f1eed6c
...@@ -67,16 +67,12 @@ public class SysLoginController { ...@@ -67,16 +67,12 @@ public class SysLoginController {
@SaIgnore @SaIgnore
@PostMapping("/login") @PostMapping("/login")
public R<LoginVo> login(@Validated @RequestBody LoginBody loginBody, HttpServletRequest request) { public R<LoginVo> login(@Validated @RequestBody LoginBody loginBody, HttpServletRequest request) {
// Map<String, Object> ajax = new HashMap<>(); // Map<String, Object> ajax = new HashMap<>();
// 生成令牌 // 生成令牌
// LoginVo loginVo = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(), // LoginVo loginVo = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
// loginBody.getUuid()); // loginBody.getUuid());
// ajax.put(Constants.TOKEN, token); // ajax.put(Constants.TOKEN, token);
// return R.ok(ajax); // return R.ok(ajax);
String ipAddr = IpUtil.getIpAddr(request); String ipAddr = IpUtil.getIpAddr(request);
LoginVo loginVo = loginService.passwordLogin(loginBody, ipAddr); LoginVo loginVo = loginService.passwordLogin(loginBody, ipAddr);
return R.ok(loginVo); return R.ok(loginVo);
......
...@@ -30,7 +30,7 @@ public class LoginBody { ...@@ -30,7 +30,7 @@ public class LoginBody {
* 用户密码 * 用户密码
*/ */
@NotBlank(message = "{user.password.not.blank}") @NotBlank(message = "{user.password.not.blank}")
@Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}") //@Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}")
private String password; private String password;
/** /**
......
package com.dsk.common.core.domain.model; package com.dsk.common.core.domain.model;
import com.dsk.common.constant.UserConstants;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.hibernate.validator.constraints.Length;
import javax.validation.constraints.NotBlank;
/** /**
* 用户注册对象 * 用户注册对象
...@@ -11,7 +15,16 @@ import lombok.EqualsAndHashCode; ...@@ -11,7 +15,16 @@ import lombok.EqualsAndHashCode;
@Data @Data
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
public class RegisterBody extends LoginBody { public class RegisterBody extends LoginBody {
/**
* 用户密码
*/
@NotBlank(message = "{user.password.not.blank}")
@Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}")
private String password;
/**
* 用户类型
*/
private String userType; private String userType;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment