Merge branch 'master_dev' into 'master'

fix: 提交账号过期异常捕获

See merge request yunteng/thingskit!417

@@ -24,6 +24,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.lang.Nullable;
 import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.authentication.AccountExpiredException;
 import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.DisabledException;
 import org.springframework.security.authentication.LockedException;
@@ -227,6 +228,9 @@ public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHand
         } else if (authenticationException instanceof UserPasswordNotValidException) {
             UserPasswordNotValidException expiredException = (UserPasswordNotValidException) authenticationException;
             JacksonUtil.writeValue(response.getWriter(), ThingsboardCredentialsViolationResponse.of(expiredException.getMessage()));
+        }else if(authenticationException instanceof AccountExpiredException) {
+            AccountExpiredException expiredException = (AccountExpiredException) authenticationException;
+            JacksonUtil.writeValue(response.getWriter(), ThingsboardCredentialsExpiredResponse.of(expiredException.getMessage(),ThingsboardErrorCode.AUTHENTICATION, HttpStatus.FORBIDDEN));
         } else {
             JacksonUtil.writeValue(response.getWriter(), ThingsboardErrorResponse.of(ErrorMessage.AUTHENTICATION_METHOD_NOT_SUPPORTED.getMessage(), ThingsboardErrorCode.AUTHENTICATION, HttpStatus.UNAUTHORIZED));
         }