From 3c8d864b5f68af5167199e0d5c9ff6c0c5852638 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:35:45 +0800
Subject: [PATCH] !639 发布 5.3.0-BETA 公测版本 Merge pull request !639 from 疯狂的狮子Li/dev
---
ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java
index 07302bc..3767fa2 100644
--- a/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java
+++ b/ruoyi-common/ruoyi-common-tenant/src/main/java/org/dromara/common/tenant/config/TenantConfig.java
@@ -4,7 +4,6 @@
import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.extension.plugins.inner.TenantLineInnerInterceptor;
import org.dromara.common.core.utils.reflect.ReflectUtils;
-import org.dromara.common.mybatis.config.MybatisPlusConfig;
import org.dromara.common.redis.config.RedisConfig;
import org.dromara.common.redis.config.properties.RedissonProperties;
import org.dromara.common.tenant.core.TenantSaTokenDao;
@@ -16,7 +15,7 @@
import org.redisson.config.SingleServerConfig;
import org.redisson.spring.starter.RedissonAutoConfigurationCustomizer;
import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.cache.CacheManager;
@@ -33,8 +32,8 @@
@ConditionalOnProperty(value = "tenant.enable", havingValue = "true")
public class TenantConfig {
- @ConditionalOnBean(MybatisPlusConfig.class)
- @AutoConfiguration(after = {MybatisPlusConfig.class})
+ @ConditionalOnClass(TenantLineInnerInterceptor.class)
+ @AutoConfiguration
static class MybatisPlusConfiguration {
/**
@@ -56,14 +55,12 @@
// 浣跨敤鍗曟満妯″紡
// 璁剧疆澶氱鎴� redis key鍓嶇紑
singleServerConfig.setNameMapper(nameMapper);
- ReflectUtils.invokeSetter(config, "singleServerConfig", singleServerConfig);
}
ClusterServersConfig clusterServersConfig = ReflectUtils.invokeGetter(config, "clusterServersConfig");
// 闆嗙兢閰嶇疆鏂瑰紡 鍙傝�冧笅鏂规敞閲�
if (ObjectUtil.isNotNull(clusterServersConfig)) {
// 璁剧疆澶氱鎴� redis key鍓嶇紑
clusterServersConfig.setNameMapper(nameMapper);
- ReflectUtils.invokeSetter(config, "clusterServersConfig", clusterServersConfig);
}
};
}
--
Gitblit v1.9.3