From 44d4bac3591cf94ea8876ae7155173b2707ffd1a Mon Sep 17 00:00:00 2001 From: smallchill Date: Mon, 27 Jun 2022 22:11:11 +0800 Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E7=A7=9F=E6=88=B7?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=8C=85=E6=9B=B4=E6=96=B0=E5=90=8E=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E6=9C=AA=E5=88=B7=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/system/cache/SysCache.java | 10 +++++----- .../system/controller/TenantController.java | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java index 26573de5..bf5b87a7 100644 --- a/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java +++ b/blade-service-api/blade-system-api/src/main/java/org/springblade/system/cache/SysCache.java @@ -54,9 +54,9 @@ public class SysCache { private static final String ROLE_NAMES_ID = "roleNames:id:"; private static final String ROLE_ALIAS_ID = "roleAlias:id:"; private static final String ROLE_ALIASES_ID = "roleAliases:id:"; - private static final String TENANT_ID = "tenant:id:"; - private static final String TENANT_TENANT_ID = "tenant:tenantId:"; - private static final String TENANT_PACKAGE_ID = "tenant:packageId:"; + public static final String TENANT_ID = "tenant:id:"; + public static final String TENANT_TENANT_ID = "tenant:tenantId:"; + public static final String TENANT_PACKAGE_ID = "tenant:packageId:"; private static ISysClient sysClient; @@ -341,7 +341,7 @@ public class SysCache { return CacheUtil.get(SYS_CACHE, TENANT_ID, id, () -> { R result = getSysClient().getTenant(id); return result.getData(); - }); + }, Boolean.FALSE); } /** @@ -354,7 +354,7 @@ public class SysCache { return CacheUtil.get(SYS_CACHE, TENANT_TENANT_ID, tenantId, () -> { R result = getSysClient().getTenant(tenantId); return result.getData(); - }); + }, Boolean.FALSE); } /** diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java index e6d619a3..64401714 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TenantController.java @@ -46,8 +46,11 @@ import java.util.Date; import java.util.List; import java.util.Map; +import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE; import static org.springblade.core.tenant.constant.TenantBaseConstant.TENANT_DATASOURCE_CACHE; import static org.springblade.core.tenant.constant.TenantBaseConstant.TENANT_DATASOURCE_EXIST_KEY; +import static org.springblade.system.cache.SysCache.TENANT_PACKAGE_ID; +import static org.springblade.system.cache.SysCache.TENANT_TENANT_ID; /** * 控制器 @@ -222,6 +225,8 @@ public class TenantController extends BladeController { @PreAuth(RoleConstant.HAS_ROLE_ADMINISTRATOR) @ApiOperation(value = "产品包配置", notes = "传入packageId") public R packageSetting(@ApiParam(value = "租户ID", required = true) @RequestParam String tenantId, @ApiParam(value = "产品包ID") Long packageId) { + CacheUtil.evict(SYS_CACHE, TENANT_TENANT_ID, tenantId, Boolean.FALSE); + CacheUtil.evict(SYS_CACHE, TENANT_PACKAGE_ID, tenantId, Boolean.FALSE); return R.status(tenantService.update(Wrappers.update().lambda().set(Tenant::getPackageId, packageId).eq(Tenant::getTenantId, tenantId))); }