同步 Master 最新代码

YunaiV
1 parent 25e7c8dc
Showing 2 changed files with 3 additions and 2 deletions
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/config/YudaoTenantAutoConfiguration.java
yudao-framework/yudao-spring-boot-starter-biz-tenant/src/main/java/cn/iocoder/yudao/framework/tenant/core/redis/TenantRedisCacheManager.java
@@ -119,6 +119,8 @@ public class YudaoTenantAutoConfiguration {
         };
     }
  
+    // ========== Redis ==========
+
     @Bean
     @Primary // 引入租户时，tenantRedisCacheManager 为主 Bean
     public RedisCacheManager tenantRedisCacheManager(RedisTemplate<String, Object> redisTemplate,
@@ -2,7 +2,6 @@ package cn.iocoder.yudao.framework.tenant.core.redis;
  
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import lombok.extern.slf4j.Slf4j;
-import org.jetbrains.annotations.NotNull;
 import org.springframework.cache.Cache;
 import org.springframework.data.redis.cache.RedisCacheConfiguration;
 import org.springframework.data.redis.cache.RedisCacheManager;
@@ -24,7 +23,7 @@ public class TenantRedisCacheManager extends RedisCacheManager {
     }
  
     @Override
-    public Cache getCache(@NotNull String name) {
+    public Cache getCache(String name) {
         // 如果开启多租户，则 name 拼接租户后缀
         if (!TenantContextHolder.isIgnore()
             && TenantContextHolder.getTenantId() != null) {