From 6e9d42088bea5b97de23fa484419558fe187a486 Mon Sep 17 00:00:00 2001
From: dataprince <dataprince@163.com>
Date: Mon, 1 Jan 2024 15:20:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E2=80=9Cruoyi-common-tenant?=
 =?UTF-8?q?=E2=80=9C=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/common/core/enums/TenantStatus.java | 30 +++++++++++++++++++
 .../common/tenant/handle/MyTenantFactory.java |  2 +-
 .../common/tenant/helper/TenantHelper.java    |  9 ++++--
 .../manager/TenantSpringCacheManager.java     |  4 +--
 .../tenant/properties/TenantProperties.java   |  5 ----
 5 files changed, 40 insertions(+), 10 deletions(-)
 create mode 100644 ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/TenantStatus.java

diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/TenantStatus.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/TenantStatus.java
new file mode 100644
index 0000000..166804b
--- /dev/null
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/enums/TenantStatus.java
@@ -0,0 +1,30 @@
+package com.ruoyi.common.core.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 用户状态
+ *
+ * @author LionLi
+ */
+@Getter
+@AllArgsConstructor
+public enum TenantStatus {
+    /**
+     * 正常
+     */
+    OK("0", "正常"),
+    /**
+     * 停用
+     */
+    DISABLE("1", "停用"),
+    /**
+     * 删除
+     */
+    DELETED("2", "删除");
+
+    private final String code;
+    private final String info;
+
+}
diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/handle/MyTenantFactory.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/handle/MyTenantFactory.java
index bcfe59e..101a0fb 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/handle/MyTenantFactory.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/handle/MyTenantFactory.java
@@ -7,7 +7,7 @@ import com.ruoyi.common.tenant.helper.TenantHelper;
 import lombok.AllArgsConstructor;
 
 /**
- * 自定义租户处理器
+ * 自定义租户工厂
  *
  * @author 数据小王子
  */
diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/helper/TenantHelper.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/helper/TenantHelper.java
index 8e37328..3f935f6 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/helper/TenantHelper.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/helper/TenantHelper.java
@@ -109,8 +109,13 @@ public class TenantHelper {
         if (ObjectUtil.isNotNull(tenantId)) {
             return tenantId;
         }
-        tenantId = RedisUtils.getCacheObject(cacheKey);
-        SaHolder.getStorage().set(cacheKey, tenantId);
+        System.out.println("####################：RedisUtils.getCacheObject("+cacheKey+")="+RedisUtils.getCacheObject(cacheKey));
+        if (ObjectUtil.isNotNull(RedisUtils.getCacheObject(cacheKey))) {
+            tenantId = Long.valueOf(RedisUtils.getCacheObject(cacheKey));
+        }
+        if (ObjectUtil.isNotNull(tenantId)) {
+            SaHolder.getStorage().set(cacheKey, tenantId);
+        }
         return tenantId;
     }
 
diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/manager/TenantSpringCacheManager.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/manager/TenantSpringCacheManager.java
index 68e9f70..2ef0929 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/manager/TenantSpringCacheManager.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/manager/TenantSpringCacheManager.java
@@ -21,8 +21,8 @@ public class TenantSpringCacheManager extends FlexSpringCacheManager {
         if (StringUtils.contains(name, GlobalConstants.GLOBAL_REDIS_KEY)) {
             return super.getCache(name);
         }
-        String tenantId = TenantHelper.getTenantId();
-        if (StringUtils.startsWith(name, tenantId)) {
+        Long tenantId = TenantHelper.getTenantId();
+        if (StringUtils.startsWith(name, tenantId + "")) {
             // 如果存在则直接返回
             return super.getCache(name);
         }
diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/properties/TenantProperties.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/properties/TenantProperties.java
index 473ea77..4cd4fa0 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/properties/TenantProperties.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/com/ruoyi/common/tenant/properties/TenantProperties.java
@@ -19,9 +19,4 @@ public class TenantProperties {
      */
     private Boolean enable;
 
-    /**
-     * 排除表
-     */
-    private List<String> excludes;
-
 }