Commit 68686dba0f0776c304f20cf867454c83d13ee45b

Authored by 云中非
1 parent b1b44710

feat: 密码找回

1、密码验证规则调整
... ... @@ -28,7 +28,7 @@ public class YtNoAuthController {
28 28 return smsService.sendSmsCode(phoneNumber, MsgTemplatePurposeEnum.FOR_LOGIN);
29 29 }
30 30
31   - @PostMapping("/reset/{userId}")
  31 + @PostMapping("/reset/{phoneNumber}")
32 32 @ApiOperation("密码找回")
33 33 public void saveForgetPassword(@PathVariable("phoneNumber") String phoneNumber,@RequestBody AccountReqDTO forget) throws ThingsboardException {
34 34 userService.forgetPassword(phoneNumber,forget);
... ...
... ... @@ -75,7 +75,7 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
75 75 public static final String ACTIVATE_URL_PATTERN = "%s/api/noauth/activate?activateToken=%s";
76 76 private final PasswordEncoder passwordEncoder;
77 77
78   - private CacheUtils cacheUtils;
  78 + private final CacheUtils cacheUtils;
79 79 private final UserService tbUserService;
80 80 private final ApplicationEventPublisher eventPublisher;
81 81
... ... @@ -463,8 +463,9 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
463 463 }
464 464 String pwd = forget.getPassword();
465 465 if (StringUtils.isEmpty(pwd)
466   - || StringUtils.isEmpty(forget.getResetPassword())
467   - || !pwd.equals(forget.getResetPassword())) {
  466 +// || StringUtils.isEmpty(forget.getResetPassword())
  467 +// || !pwd.equals(forget.getResetPassword())
  468 + ) {
468 469 throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
469 470 }
470 471
... ... @@ -474,12 +475,12 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
474 475 UserCredentials userCredentials =
475 476 tbUserService.findUserCredentialsByUserId(TenantId.SYS_TENANT_ID, userId);
476 477
477   - String encodePwd = passwordEncoder.encode(pwd);
478   - userCredentials.setPassword(encodePwd);
479   - user.setPassword(encodePwd);
  478 +
  479 + userCredentials.setPassword(passwordEncoder.encode(pwd));
480 480 tbUserService.replaceUserCredentials(new TenantId(UUID.fromString(user.getTenantId())), userCredentials);
481   - eventPublisher.publishEvent(new UserAuthDataChangedEvent(userId));
  481 +// eventPublisher.publishEvent(new UserAuthDataChangedEvent(userId));
482 482
  483 + user.setPassword(pwd);
483 484 changePassword(user);
484 485 }
485 486
... ...