mirror of
https://gitee.com/dromara/RuoYi-Cloud-Plus.git
synced 2026-04-27 05:49:37 +08:00
update 优化 重构登录策略增加扩展性降低复杂度
This commit is contained in:
@@ -1,13 +1,8 @@
|
||||
package org.dromara.common.core.domain.model;
|
||||
|
||||
import jakarta.validation.constraints.Email;
|
||||
import org.dromara.common.core.constant.UserConstants;
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
import lombok.Data;
|
||||
import lombok.NoArgsConstructor;
|
||||
import org.dromara.common.core.validate.auth.*;
|
||||
import org.hibernate.validator.constraints.Length;
|
||||
|
||||
import jakarta.validation.constraints.NotBlank;
|
||||
|
||||
/**
|
||||
* 用户登录对象
|
||||
@@ -24,16 +19,6 @@ public class LoginBody {
|
||||
@NotBlank(message = "{auth.clientid.not.blank}")
|
||||
private String clientId;
|
||||
|
||||
/**
|
||||
* 客户端key
|
||||
*/
|
||||
private String clientKey;
|
||||
|
||||
/**
|
||||
* 客户端秘钥
|
||||
*/
|
||||
private String clientSecret;
|
||||
|
||||
/**
|
||||
* 授权类型
|
||||
*/
|
||||
@@ -45,20 +30,6 @@ public class LoginBody {
|
||||
*/
|
||||
private String tenantId;
|
||||
|
||||
/**
|
||||
* 用户名
|
||||
*/
|
||||
@NotBlank(message = "{user.username.not.blank}", groups = {PasswordGroup.class})
|
||||
@Length(min = UserConstants.USERNAME_MIN_LENGTH, max = UserConstants.USERNAME_MAX_LENGTH, message = "{user.username.length.valid}", groups = {PasswordGroup.class})
|
||||
private String username;
|
||||
|
||||
/**
|
||||
* 用户密码
|
||||
*/
|
||||
@NotBlank(message = "{user.password.not.blank}", groups = {PasswordGroup.class})
|
||||
@Length(min = UserConstants.PASSWORD_MIN_LENGTH, max = UserConstants.PASSWORD_MAX_LENGTH, message = "{user.password.length.valid}", groups = {PasswordGroup.class})
|
||||
private String password;
|
||||
|
||||
/**
|
||||
* 验证码
|
||||
*/
|
||||
@@ -69,53 +40,4 @@ public class LoginBody {
|
||||
*/
|
||||
private String uuid;
|
||||
|
||||
/**
|
||||
* 手机号
|
||||
*/
|
||||
@NotBlank(message = "{user.phonenumber.not.blank}", groups = {SmsGroup.class})
|
||||
private String phonenumber;
|
||||
|
||||
/**
|
||||
* 短信code
|
||||
*/
|
||||
@NotBlank(message = "{sms.code.not.blank}", groups = {SmsGroup.class})
|
||||
private String smsCode;
|
||||
|
||||
/**
|
||||
* 邮箱
|
||||
*/
|
||||
@NotBlank(message = "{user.email.not.blank}", groups = {EmailGroup.class})
|
||||
@Email(message = "{user.email.not.valid}")
|
||||
private String email;
|
||||
|
||||
/**
|
||||
* 邮箱code
|
||||
*/
|
||||
@NotBlank(message = "{email.code.not.blank}", groups = {EmailGroup.class})
|
||||
private String emailCode;
|
||||
|
||||
/**
|
||||
* 小程序code
|
||||
*/
|
||||
@NotBlank(message = "{xcx.code.not.blank}", groups = {WechatGroup.class})
|
||||
private String xcxCode;
|
||||
|
||||
/**
|
||||
* 第三方登录平台
|
||||
*/
|
||||
@NotBlank(message = "{social.source.not.blank}" , groups = {SocialGroup.class})
|
||||
private String source;
|
||||
|
||||
/**
|
||||
* 第三方登录code
|
||||
*/
|
||||
@NotBlank(message = "{social.code.not.blank}" , groups = {SocialGroup.class})
|
||||
private String socialCode;
|
||||
|
||||
/**
|
||||
* 第三方登录socialState
|
||||
*/
|
||||
@NotBlank(message = "{social.state.not.blank}" , groups = {SocialGroup.class})
|
||||
private String socialState;
|
||||
|
||||
}
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
package org.dromara.common.core.validate.auth;
|
||||
|
||||
/**
|
||||
* @author Michelle.Chung
|
||||
*/
|
||||
public interface EmailGroup {
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
package org.dromara.common.core.validate.auth;
|
||||
|
||||
/**
|
||||
* @author Michelle.Chung
|
||||
*/
|
||||
public interface PasswordGroup {
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
package org.dromara.common.core.validate.auth;
|
||||
|
||||
/**
|
||||
* @author Michelle.Chung
|
||||
*/
|
||||
public interface SmsGroup {
|
||||
}
|
||||
@@ -1,4 +0,0 @@
|
||||
package org.dromara.common.core.validate.auth;
|
||||
|
||||
public interface SocialGroup {
|
||||
}
|
||||
@@ -1,7 +0,0 @@
|
||||
package org.dromara.common.core.validate.auth;
|
||||
|
||||
/**
|
||||
* @author Michelle.Chung
|
||||
*/
|
||||
public interface WechatGroup {
|
||||
}
|
||||
Reference in New Issue
Block a user