feat(DEFECT-765): 手机验证码登录，账号已过期任然可以登录问题

@@ -340,6 +340,9 @@ public class RestAuthenticationProvider implements AuthenticationProvider {
     User user = new User();
     User user = new User();
     String tbEmail = optionalUser.get().getUsername() + "@" + accountProperties.getEmailSuffix();
     String tbEmail = optionalUser.get().getUsername() + "@" + accountProperties.getEmailSuffix();
     UserDetailsDTO ytDetailDTO = optionalUser.get();
     UserDetailsDTO ytDetailDTO = optionalUser.get();
+    if(ytDetailDTO.getAccountExpireTime() != null && ytDetailDTO.getAccountExpireTime().isBefore(LocalDateTime.now())){
+      throw  new AccountExpiredException(ErrorMessage.ACCOUNT_HAS_EXPIRED.getMessage());
+    }
     //如果是平台管理员
     //如果是平台管理员
     if(isPlatFormUser(ytDetailDTO)){
     if(isPlatFormUser(ytDetailDTO)){
       user.setAuthority(Authority.PLATFORM_USER);
       user.setAuthority(Authority.PLATFORM_USER);

@@ -17,7 +17,6 @@ public enum ErrorMessage {
   USERNAME_PASSWORD_INCORRECT(401001, "用户名或密码错误"),
   USERNAME_PASSWORD_INCORRECT(401001, "用户名或密码错误"),
   TOKEN_EXPIRED(401002, "token已过期，请重新登录"),
   TOKEN_EXPIRED(401002, "token已过期，请重新登录"),
   NONE_TENANT_ASSET(401003, "非当前租户资产"),
   NONE_TENANT_ASSET(401003, "非当前租户资产"),
-  AUTHENTICATION_FAILED_ACCOUNT_EXPIRED(401003, "账号已过期，请联系你的管理员"),
   BAD_PARAMETER(400000, "查询参数无效"),
   BAD_PARAMETER(400000, "查询参数无效"),
   INVALID_PARAMETER(400001, "无效参数"),
   INVALID_PARAMETER(400001, "无效参数"),
   TOO_MANY_REQUEST(429001, "请求过多"),
   TOO_MANY_REQUEST(429001, "请求过多"),

@@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.common.util.JacksonUtil;
@@ -133,6 +134,9 @@ public class YtSmsServiceImpl implements YtSmsService {
     if (users.isEmpty()) {
     if (users.isEmpty()) {
       throw new YtDataValidationException("电话号码未在系统注册，请联系你的管理员");
       throw new YtDataValidationException("电话号码未在系统注册，请联系你的管理员");
     }
     }
+    if(users.get(0).getAccountExpireTime() != null && users.get(0).getAccountExpireTime().isBefore(LocalDateTime.now())){
+      throw  new YtDataValidationException(ErrorMessage.ACCOUNT_HAS_EXPIRED.getMessage());
+    }
     // 获取是否有验证码存在，防止发送数量过多
     // 获取是否有验证码存在，防止发送数量过多
     String key =
     String key =
         purpose.name()
         purpose.name()