feat: 密码找回

1、密码找回短信验证码接口
2、密码找回修改密码接口

 package org.thingsboard.server.controller.yunteng;
 
+import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.thingsboard.server.common.data.exception.ThingsboardException;
+import org.thingsboard.server.common.data.yunteng.dto.request.AccountReqDTO;
+import org.thingsboard.server.common.data.yunteng.dto.request.SendResetPasswordEmailMsg;
+import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
 import org.thingsboard.server.dao.yunteng.service.YtSmsService;
+import org.thingsboard.server.dao.yunteng.service.YtUserService;
 
 import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.CHINA_MOBILE_PATTERN;
 
@@ -16,11 +19,24 @@ import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstan
 public class YtNoAuthController {
 
   private final YtSmsService smsService;
+  private final YtUserService userService;
 
   @PostMapping("/sendLoginSmsCode/{phoneNumber}")
   public boolean sendVerificationCode(@PathVariable("phoneNumber") String phoneNumber) {
     Assert.isTrue(
         CHINA_MOBILE_PATTERN.matcher(phoneNumber).matches(), "please input correct phone number");
-    return smsService.sendLoginSmsCode(phoneNumber);
+    return smsService.sendSmsCode(phoneNumber, MsgTemplatePurposeEnum.FOR_LOGIN);
+  }
+
+  @PostMapping("/reset/{userId}")
+  @ApiOperation("密码找回")
+  public void saveForgetPassword(@PathVariable("phoneNumber") String phoneNumber,@RequestBody AccountReqDTO forget) throws ThingsboardException {
+    userService.forgetPassword(phoneNumber,forget);
+  }
+
+  @PostMapping("/resetCode/{phoneNumber}")
+  @ApiOperation("密码找回短信验证码")
+  public void forgetPasswordCode(@PathVariable("phoneNumber") String phoneNumber) {
+    smsService.sendSmsCode(phoneNumber, MsgTemplatePurposeEnum.FOR_FORGET_PASSWORD);
   }
 }

@@ -10,6 +10,7 @@ import org.thingsboard.server.dao.yunteng.service.YtUserService;
 @RestController
 @RequestMapping("/api/yt/tenant")
 @RequiredArgsConstructor
+@Deprecated
 public class YtTenantController extends BaseController {
 
   private final YtUserService userService;

@@ -106,9 +106,10 @@ public class YtSmsServiceImpl implements YtSmsService {
     return false;
   }
 
+
   @Override
   @Transactional
-  public boolean sendLoginSmsCode(String phoneNumber) {
+  public boolean sendSmsCode(String phoneNumber,MsgTemplatePurposeEnum purpose) {
     // 检查手机号码是否存在系统，以免乱发消息
     if (userMapper
         .selectList(new QueryWrapper<User>().lambda().eq(User::getPhoneNumber, phoneNumber))
@@ -117,7 +118,7 @@ public class YtSmsServiceImpl implements YtSmsService {
     }
     // 获取是否有验证码存在，防止发送数量过多
     String key =
-        MsgTemplatePurposeEnum.FOR_LOGIN.name()
+        purpose.name()
             + DEFAULT_DELIMITER
             + MessageTypeEnum.PHONE_MESSAGE.name()
             + DEFAULT_DELIMITER
@@ -139,7 +140,7 @@ public class YtSmsServiceImpl implements YtSmsService {
         messageTemplateMapper.selectList(
             new QueryWrapper<MessageTemplate>()
                 .lambda()
-                .eq(MessageTemplate::getTemplatePurpose, MsgTemplatePurposeEnum.FOR_LOGIN.name())
+                .eq(MessageTemplate::getTemplatePurpose, purpose.name())
                 .eq(MessageTemplate::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name()));
     if (messageTemplates.isEmpty()) {
       throw new YtDataValidationException("no sms provider config");
@@ -152,7 +153,7 @@ public class YtSmsServiceImpl implements YtSmsService {
     smsReqDTO.setParams(params);
     smsReqDTO.setPhoneNumbers(phoneNumber);
     smsReqDTO.setId(messageTemplate.getId());
-    smsReqDTO.setTemplatePurpose(MsgTemplatePurposeEnum.FOR_LOGIN.name());
+    smsReqDTO.setTemplatePurpose(purpose.name());
     if (this.sendSms(smsReqDTO)) {
       cacheUtils.put(MOBILE_LOGIN_SMS_CODE, key, new CodeTTL(code, System.currentTimeMillis()));
       return true;

@@ -11,28 +11,34 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.id.EntityId;
+import org.thingsboard.server.common.data.id.TenantId;
+import org.thingsboard.server.common.data.id.UserId;
 import org.thingsboard.server.common.data.query.TsValue;
+import org.thingsboard.server.common.data.security.UserCredentials;
+import org.thingsboard.server.common.data.security.event.UserAuthDataChangedEvent;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.core.cache.CacheUtils;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.NoneTenantAssetException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.*;
-import org.thingsboard.server.common.data.yunteng.dto.request.AccountReqDTO;
-import org.thingsboard.server.common.data.yunteng.dto.request.RoleOrOrganizationReqDTO;
-import org.thingsboard.server.common.data.yunteng.dto.request.SendResetPasswordEmailMsg;
-import org.thingsboard.server.common.data.yunteng.dto.request.SmsReqDTO;
+import org.thingsboard.server.common.data.yunteng.dto.request.*;
 import org.thingsboard.server.common.data.yunteng.enums.MessageTypeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
 import org.thingsboard.server.common.data.yunteng.enums.UserStatusEnum;
 import org.thingsboard.server.common.data.yunteng.utils.ReflectUtils;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
+import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.yunteng.entities.*;
 import org.thingsboard.server.dao.yunteng.mapper.*;
 import org.thingsboard.server.dao.yunteng.service.*;
@@ -43,8 +49,9 @@ import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.stream.Collectors;
 
-import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.CHINA_MOBILE_PATTERN;
-import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.EMAIL_PATTERN;
+import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.*;
+import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.CacheConfigKey.MOBILE_LOGIN_SMS_CODE;
+import static org.thingsboard.server.common.data.yunteng.constant.FastIotConstants.DEFAULT_DELIMITER;
 import static org.thingsboard.server.common.data.yunteng.constant.ModelConstants.TablePropertyMapping.*;
 
 @Service
@@ -68,6 +75,10 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   public static final String ACTIVATE_URL_PATTERN = "%s/api/noauth/activate?activateToken=%s";
   private final PasswordEncoder passwordEncoder;
 
+  private CacheUtils cacheUtils;
+  private final UserService tbUserService;
+  private final ApplicationEventPublisher eventPublisher;
+
   @Override
   public List<UserDetailsDTO> findUserDetailsByUsername(String username) {
     // 多个租户可能存在多个username相同的情况
@@ -427,6 +438,52 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   }
 
   @Override
+  public void forgetPassword(String phoneNumber,AccountReqDTO forget) {
+    String key =
+            MsgTemplatePurposeEnum.FOR_FORGET_PASSWORD.name()
+                    + DEFAULT_DELIMITER
+                    + MessageTypeEnum.PHONE_MESSAGE.name()
+                    + DEFAULT_DELIMITER
+                    + phoneNumber;
+    boolean correct =
+            cacheUtils
+                    .get(MOBILE_LOGIN_SMS_CODE, key)
+                    .map(
+                            o -> {
+                              CodeTTL codeTTL = (CodeTTL) o;
+                              if (System.currentTimeMillis() - codeTTL.getSendTs() < 5 * 60 * 1000) {
+                                return Objects.equals(codeTTL.getCode(), forget.getUserId());
+                              } else {
+                                return false;
+                              }
+                            })
+                    .orElse(false);
+    if (!correct) {
+      throw new BadCredentialsException("验证码不正确");
+    }
+    String pwd = forget.getPassword();
+    if (StringUtils.isEmpty(pwd)
+            || StringUtils.isEmpty(forget.getResetPassword())
+            || !pwd.equals(forget.getResetPassword())) {
+      throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+    }
+
+    User user = baseMapper.selectOne(new QueryWrapper<User>().lambda().eq(User::getPhoneNumber, phoneNumber));
+
+    UserId userId = new UserId(UUID.fromString(user.getTbUser()));
+    UserCredentials userCredentials =
+            tbUserService.findUserCredentialsByUserId(TenantId.SYS_TENANT_ID, userId);
+
+    String encodePwd = passwordEncoder.encode(pwd);
+    userCredentials.setPassword(encodePwd);
+    user.setPassword(encodePwd);
+    tbUserService.replaceUserCredentials(new TenantId(UUID.fromString(user.getTenantId())), userCredentials);
+    eventPublisher.publishEvent(new UserAuthDataChangedEvent(userId));
+
+    changePassword(user);
+  }
+
+  @Override
   public List<UserDetailsDTO> getUserByPhoneNumber(String phoneNumber) {
     return baseMapper.findUserDetailsByPhoneNumber(phoneNumber);
   }
@@ -586,6 +643,11 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
   @Override
   public User validateChangePasswordAccount(AccountReqDTO accountReqDTO) {
     User user = baseMapper.selectById(accountReqDTO.getUserId());
+    checkPassword(accountReqDTO, user);
+    return user;
+  }
+
+  private void checkPassword(AccountReqDTO accountReqDTO, User user) {
     if (null == user
         || StringUtils.isEmpty(accountReqDTO.getPassword())
         || StringUtils.isEmpty(accountReqDTO.getResetPassword())) {
@@ -597,7 +659,6 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
       throw new YtDataValidationException(ErrorMessage.USERNAME_PASSWORD_INCORRECT.getMessage());
     }
     user.setPassword(accountReqDTO.getResetPassword());
-    return user;
   }
 
   /**

@@ -2,9 +2,16 @@ package org.thingsboard.server.dao.yunteng.service;
 
 
 import org.thingsboard.server.common.data.yunteng.dto.request.SmsReqDTO;
+import org.thingsboard.server.common.data.yunteng.enums.MsgTemplatePurposeEnum;
 
 public interface YtSmsService {
   boolean sendSms(SmsReqDTO smsReqDTO);
 
-  boolean sendLoginSmsCode(String phoneNumber);
+  /**
+   * 推送短信验证码
+   * @param phoneNumber   手机号
+   * @param purpose        模板用途
+   * @return
+   */
+  boolean sendSmsCode(String phoneNumber, MsgTemplatePurposeEnum purpose);
 }

@@ -42,6 +42,8 @@ public interface YtUserService {
 
   void resetPassword(String userId, boolean isPtSysadmin, String tenantId);
 
+  void forgetPassword(String phoneNumber,AccountReqDTO forget);
+
   List<UserDetailsDTO> getUserByPhoneNumber(String phoneNumber);
 
   void validateUserNameAndPhoneNumberAndEmail(UserDTO userDTO);