From b36247352cb5e57ea090c7fff6fdb635c1b657aa Mon Sep 17 00:00:00 2001
From: Wang Chen Chen <932560435@qq.com>
Date: Thu, 23 Nov 2023 14:37:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=20=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E7=A7=9F=E6=88=B7=E8=BF=87=E6=9C=9F=E6=97=A5=E6=9C=9F=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E8=A6=81=E5=85=B7=E4=BD=93=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xaaef/molly/auth/service/impl/UserLoginServiceImpl.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/plugins/auth-jwt/src/main/java/com/xaaef/molly/auth/service/impl/UserLoginServiceImpl.java b/server/plugins/auth-jwt/src/main/java/com/xaaef/molly/auth/service/impl/UserLoginServiceImpl.java
index 292ca29..de0232b 100644
--- a/server/plugins/auth-jwt/src/main/java/com/xaaef/molly/auth/service/impl/UserLoginServiceImpl.java
+++ b/server/plugins/auth-jwt/src/main/java/com/xaaef/molly/auth/service/impl/UserLoginServiceImpl.java
@@ -92,11 +92,11 @@ public class UserLoginServiceImpl implements UserLoginService {
         }
         // 判断租户状态
         if (!Objects.equals(currentTenant.getStatus(), StatusEnum.NORMAL.getCode())) {
-            throw new JwtAuthException(StrUtil.format("租户 {} 被禁用！", currentTenant.getName()));
+            throw new JwtAuthException(StrUtil.format("租户 {} 被停用！", currentTenant.getName()));
         }
         // 判断租户是否过期
         if (LocalDateTime.now().isAfter(currentTenant.getExpired())) {
-            var format = LocalDateTimeUtil.formatNormal(currentTenant.getExpired());
+            var format = LocalDateTimeUtil.formatNormal(currentTenant.getExpired().toLocalDate());
             throw new JwtAuthException(StrUtil.format("租户 {} 已经在 {} 过期了！", currentTenant.getName(), format));
         }
         // 把表单提交的 username  password 封装到 UsernamePasswordAuthenticationToken中