Merge branch '20200305' into 'master'

feat: 密码找回

See merge request huang/thingsboard3.3.2!56

@@ -28,7 +28,7 @@ public class YtNoAuthController {
     return smsService.sendSmsCode(phoneNumber, MsgTemplatePurposeEnum.FOR_LOGIN);
   }
 
-  @PostMapping("/reset/{userId}")
+  @PostMapping("/reset/{phoneNumber}")
   @ApiOperation("密码找回")
   public void saveForgetPassword(@PathVariable("phoneNumber") String phoneNumber,@RequestBody AccountReqDTO forget) throws ThingsboardException {
     userService.forgetPassword(phoneNumber,forget);

@@ -465,8 +465,9 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     }
     String pwd = forget.getPassword();
     if (StringUtils.isEmpty(pwd)
-            || StringUtils.isEmpty(forget.getResetPassword())
-            || !pwd.equals(forget.getResetPassword())) {
+//            || StringUtils.isEmpty(forget.getResetPassword())
+//            || !pwd.equals(forget.getResetPassword())
+    ) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
 
@@ -476,12 +477,12 @@ public class YtUserServiceImpl extends AbstractBaseService<UserMapper, User>
     UserCredentials userCredentials =
             tbUserService.findUserCredentialsByUserId(TenantId.SYS_TENANT_ID, userId);
 
-    String encodePwd = passwordEncoder.encode(pwd);
-    userCredentials.setPassword(encodePwd);
-    user.setPassword(encodePwd);
+
+    userCredentials.setPassword(passwordEncoder.encode(pwd));
     tbUserService.replaceUserCredentials(new TenantId(UUID.fromString(user.getTenantId())), userCredentials);
-    eventPublisher.publishEvent(new UserAuthDataChangedEvent(userId));
+//    eventPublisher.publishEvent(new UserAuthDataChangedEvent(userId));
 
+    user.setPassword(pwd);
     changePassword(user);
   }