From 8901ae8f49feb7184eb640b2cdf2ccfd8eaa6d32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 12 Sep 2023 23:56:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E7=94=A8=E6=88=B7=E6=95=B0=E9=87=8F?=
 =?UTF-8?q?=E5=92=8C=E7=A7=9F=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=87=E6=9C=9F=E8=87=AA=E5=8A=A8=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4token=E7=9A=84=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jsh/erp/controller/UserController.java    | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
index 474bcbf6..5a652aae 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/controller/UserController.java
@@ -450,6 +450,12 @@ public class UserController {
             //获取当前用户数
             int userCurrentNum = userService.getUser().size();
             Tenant tenant = tenantService.getTenantByTenantId(user.getTenantId());
+            if(tenant.getExpireTime()!=null && tenant.getExpireTime().getTime()<System.currentTimeMillis()){
+                //租户已经过期，移除token
+                redisService.deleteObjectBySession(request,"userId");
+                redisService.deleteObjectBySession(request,"roleType");
+                redisService.deleteObjectBySession(request,"clientIp");
+            }
             data.put("type", tenant.getType()); //租户类型，0免费租户，1付费租户
             data.put("expireTime", Tools.parseDateToStr(tenant.getExpireTime()));
             data.put("userCurrentNum", userCurrentNum);