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 240b920..5496f74 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 @@ -26,10 +26,10 @@ public class TenantRedisCacheManager extends TimeoutRedisCacheManager { @Override public Cache getCache(String name) { // 如果开启多租户,则 name 拼接租户后缀 - if (!TenantContextHolder.isIgnore() + /*if (!TenantContextHolder.isIgnore() && TenantContextHolder.getTenantId() != null) { name = name + ":" + TenantContextHolder.getTenantId(); - } + }*/ // 继续基于父方法 return super.getCache(name); diff --git a/yudao-module/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java b/yudao-module/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java index b5de364..50cf572 100644 --- a/yudao-module/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java +++ b/yudao-module/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java @@ -110,12 +110,7 @@ public class AdminAuthServiceImpl implements AdminAuthService { } //清空缓存 permissionService.clearCache(user.getId()); - permissionService.clearCacheIgnoreTenant(user.getId()); - try{ - Thread.sleep(2000L); - }catch (Exception e){ - } // 创建 Token 令牌,记录登录日志 return createTokenAfterLoginSuccess(user.getId(), reqVO.getUsername(), LoginLogTypeEnum.LOGIN_USERNAME); } diff --git a/yudao-module/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionService.java b/yudao-module/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionService.java index 916f9b6..ee235b0 100644 --- a/yudao-module/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionService.java +++ b/yudao-module/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionService.java @@ -146,6 +146,4 @@ public interface PermissionService { //清除缓存 Boolean clearCache(Long userId); - //清除缓存忽略租户 - Boolean clearCacheIgnoreTenant(Long userId); } diff --git a/yudao-module/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java b/yudao-module/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java index d02bbef..3623dd0 100644 --- a/yudao-module/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java +++ b/yudao-module/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/permission/PermissionServiceImpl.java @@ -360,18 +360,6 @@ public class PermissionServiceImpl implements PermissionService { return true; } - //清除缓存忽略租户 - @TenantIgnore - public Boolean clearCacheIgnoreTenant(Long userId){ - try{ - PermissionServiceImpl bean = SpringUtil.getBean(PermissionServiceImpl.class); - bean.clearCache(userId); - Thread.sleep(500L); - }catch (Exception e){ - - } - return true; - } /** * 获得自身的代理对象,解决 AOP 生效问题