mirror of
https://github.com/xinnan-tech/xiaozhi-esp32-server.git
synced 2026-07-22 23:23:55 +08:00
测试,修复业务流程bug,添加新的错误代码和说明
--ErrorCode.java 新的错误代码 --LoginController.java 修复业务流程bug --messages.properties 添加新的业务说明
This commit is contained in:
@@ -20,7 +20,7 @@ public interface ErrorCode {
|
||||
int ACCOUNT_DISABLE = 10005;
|
||||
int IDENTIFIER_NOT_NULL = 10006;
|
||||
int CAPTCHA_ERROR = 10007;
|
||||
int SUB_MENU_EXIST = 10008;
|
||||
int PHONE_NOT_NULL = 10008;
|
||||
int PASSWORD_ERROR = 10009;
|
||||
|
||||
int SUPERIOR_DEPT_ERROR = 10011;
|
||||
|
||||
+5
-7
@@ -59,8 +59,8 @@ public class LoginController {
|
||||
@GetMapping("/smsVerification")
|
||||
@Operation(summary = "短信验证码")
|
||||
public void smsVerification(String phone) throws IOException {
|
||||
// uuid不能为空
|
||||
AssertUtils.isBlank(phone, ErrorCode.IDENTIFIER_NOT_NULL);
|
||||
// 手机号码不能为空
|
||||
AssertUtils.isBlank(phone, ErrorCode.PHONE_NOT_NULL);
|
||||
// 发送短信验证码
|
||||
captchaService.sendSMSValidateCode(phone);
|
||||
}
|
||||
@@ -99,7 +99,7 @@ public class LoginController {
|
||||
if (isMobileRegister) {
|
||||
// 验证用户是否是手机号码
|
||||
boolean validPhone = ValidatorUtils.isValidPhone(login.getUsername());
|
||||
if (validPhone) {
|
||||
if (!validPhone) {
|
||||
throw new RenException("用户名不是手机号码,请重新输入");
|
||||
}
|
||||
// 验证短信验证码是否正常
|
||||
@@ -156,8 +156,8 @@ public class LoginController {
|
||||
ValidatorUtils.validateEntity(dto);
|
||||
// 验证用户是否是手机号码
|
||||
boolean validPhone = ValidatorUtils.isValidPhone(dto.getPhone());
|
||||
if (validPhone) {
|
||||
throw new RenException("用户名不是手机号码,请重新输入");
|
||||
if (!validPhone) {
|
||||
throw new RenException("用户名不是手机号码,无法提供找回密码服务");
|
||||
};
|
||||
|
||||
// 按照用户名获取用户
|
||||
@@ -165,8 +165,6 @@ public class LoginController {
|
||||
if (userDTO == null) {
|
||||
throw new RenException("用户名或验证码错误");
|
||||
}
|
||||
// 验证用户是否是手机号码
|
||||
ValidatorUtils.isValidPhone(dto.getPhone());
|
||||
// 验证短信验证码是否正常
|
||||
boolean validate = captchaService.validateSMSValidateCode(dto.getPhone(),dto.getCode());
|
||||
// 判断是否通过验证
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
10005=\u8D26\u53F7\u5DF2\u88AB\u505C\u7528
|
||||
10006=\u552F\u4E00\u6807\u8BC6\u4E0D\u80FD\u4E3A\u7A7A
|
||||
10007=\u9A8C\u8BC1\u7801\u4E0D\u6B63\u786E
|
||||
10008=\u624B\u673A\u53F7\u7801\u4E0D\u53EF\u4EE5\u4E3A\u7A7A
|
||||
10009=\u539F\u5BC6\u7801\u4E0D\u6B63\u786E
|
||||
10010=\u8D26\u53F7\u6216\u5BC6\u7801\u4E0D\u6B63\u786E,\u60A8\u8FD8\u6709\u53EF\u4EE5\u5C1D\u8BD5{0}\u6B21
|
||||
10011=\u4E0A\u7EA7\u90E8\u95E8\u9009\u62E9\u9519\u8BEF
|
||||
|
||||
Reference in New Issue
Block a user