代码优化

This commit is contained in:
2025-10-13 10:43:08 +08:00
parent b6818b179c
commit bc3ed2d872
40 changed files with 3189 additions and 788 deletions
@@ -4,38 +4,31 @@ import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
/**
* 登录请求
*
* 简化版:仅需手机号和短信验证码
*
* @author emotion-museum
* @date 2025-07-23
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class LoginRequest extends BaseRequest {
/**
*
* 手机
*/
@NotBlank(message = "号不能为空")
private String account;
@NotBlank(message = "手机号不能为空")
@Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
private String phone;
/**
*
*/
@NotBlank(message = "密码不能为空")
private String password;
/**
* 验证码
* 短信验证
*/
@NotBlank(message = "验证码不能为空")
private String captcha;
/**
* 验证码key
*/
@NotBlank(message = "验证码key不能为空")
private String captchaKey;
@Size(min = 6, max = 6, message = "验证码必须为6位")
private String smsCode;
}
@@ -3,72 +3,39 @@ package com.emotion.dto.request;
import lombok.Data;
import lombok.EqualsAndHashCode;
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
/**
* 注册请求
*
* 简化版:仅需要手机号、密码和验证码
*
* @author emotion-museum
* @date 2025-07-23
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class RegisterRequest extends BaseRequest {
/**
* 账号
* 手机号(作为账号
*/
@NotBlank(message = "号不能为空")
@Size(min = 3, max = 20, message = "账号长度必须在3-20个字符之间")
private String account;
@NotBlank(message = "手机号不能为空")
@Pattern(regexp = "^1[3-9]\\d{9}$", message = "手机号格式不正确")
private String phone;
/**
* 密码
*/
@NotBlank(message = "密码不能为空")
@Size(min = 6, max = 20, message = "密码长度必须在6-20个字符之间")
private String password;
/**
* 确认密
*/
@NotBlank(message = "确认密码不能为空")
private String confirmPassword;
/**
* 用户名
*/
private String username;
/**
* 昵称
*/
private String nickname;
/**
* 邮箱
*/
@Email(message = "邮箱格式不正确")
private String email;
/**
* 手机号
*/
@Pattern(regexp = "^$|^1[3-9]\\d{9}$", message = "手机号格式不正确")
private String phone;
/**
* 验证码
* 短信验证
*/
@NotBlank(message = "验证码不能为空")
private String captcha;
/**
* 验证码key
*/
@NotBlank(message = "验证码key不能为空")
private String captchaKey;
@Size(min = 6, max = 6, message = "验证码必须为6位")
private String smsCode;
}
@@ -1,16 +0,0 @@
package com.emotion.dto.request;
import javax.validation.constraints.NotBlank;
public class TokenRequest {
@NotBlank(message = "token不能为空")
private String token;
public String getToken() {
return token;
}
public void setToken(String token) {
this.token = token;
}
}
@@ -0,0 +1,35 @@
package com.emotion.dto.response;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* 短信验证码响应
*
* @author emotion-museum
* @date 2025-10-06
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SmsCodeResponse {
/**
* 验证码(开发环境返回,生产环境不返回)
*/
private String code;
/**
* 过期时间(秒)
*/
private Long expiresIn;
/**
* 提示信息
*/
private String message;
}
@@ -1,62 +0,0 @@
package com.emotion.dto.response;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
/**
* WebSocket响应对象
*
* @author emotion-museum
* @date 2025-09-08
*/
@Data
@EqualsAndHashCode(callSuper = true)
public class WebSocketResponse extends BaseResponse {
/**
* 消息ID
*/
private String messageId;
/**
* 会话ID
*/
private String conversationId;
/**
* 消息类型
*/
private String type;
/**
* 消息内容
*/
private String content;
/**
* 发送者ID
*/
private String senderId;
/**
* 发送者类型
*/
private String senderType;
/**
* 消息状态
*/
private String status;
/**
* 创建时间
*/
private LocalDateTime createTime;
/**
* 扩展数据
*/
private Object data;
}