diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java index 7896a3ad1..8911f49d5 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java @@ -118,11 +118,18 @@ public class YudaoTenantAutoConfiguration { }; } - @Bean - @Primary - public RedisCacheManager tenantRedisCacheManager( - RedisTemplate redisTemplate, - RedisCacheConfiguration redisCacheConfiguration) { + /** + * 引入租户时,tenantRedisCacheManager为主Bean + * + * @param redisTemplate + * @param redisCacheConfiguration + * @return + */ + @Bean + @Primary + public RedisCacheManager tenantRedisCacheManager( + RedisTemplate redisTemplate, + RedisCacheConfiguration redisCacheConfiguration) { RedisCacheWriter cacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter( Objects.requireNonNull(redisTemplate.getConnectionFactory())); diff --git a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java index ab191f0d4..fa5adfa4d 100644 --- a/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java +++ b/yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java @@ -8,10 +8,15 @@ import org.springframework.data.redis.cache.RedisCacheManager; import org.springframework.data.redis.cache.RedisCacheWriter; /** + * 租户缓存管理 + * + * 为cacheName增加自动增加租户表示,格式:name+":"+tenantId + * * @author airhead */ @Slf4j public class TenantRedisCacheManager extends RedisCacheManager { + public TenantRedisCacheManager( RedisCacheWriter cacheWriter, RedisCacheConfiguration defaultCacheConfiguration) { super(cacheWriter, defaultCacheConfiguration); @@ -19,6 +24,7 @@ public class TenantRedisCacheManager extends RedisCacheManager { @Override public Cache getCache(String name) { + //租户未设置时,返回原始name if (TenantContextHolder.getTenantId() == null) { return super.getCache(name); }