From 2dbe9590ed06fc528e1a7836c920ee0e291f4476 Mon Sep 17 00:00:00 2001 From: zhansihu Date: Fri, 5 Jan 2024 14:50:25 +0800 Subject: [PATCH] =?UTF-8?q?fix(permission):=20=E6=9D=83=E9=99=90=E8=AF=B7?= =?UTF-8?q?=E6=B1=82=E9=BB=98=E8=AE=A4=E4=BD=BF=E7=94=A8=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/axzo/tyr/client/model/req/IdentityAuthReq.java | 5 +++-- .../axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/IdentityAuthReq.java b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/IdentityAuthReq.java index 85e8a35c..247c835f 100644 --- a/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/IdentityAuthReq.java +++ b/tyr-api/src/main/java/cn/axzo/tyr/client/model/req/IdentityAuthReq.java @@ -62,8 +62,9 @@ public class IdentityAuthReq { /** 指定角色ID - 预览用，不需要用户已配置角色 **/ private Set specifyRoleIds; - /** 是否使用缓存 **/ - private Boolean useCache; + /** 是否使用缓存 - 默认true **/ + @Builder.Default + private boolean useCache = true; @Data diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java index cbda61f4..dcf365ed 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java @@ -695,7 +695,7 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService { public IdentityAuthRes findIdentityAuthMix(IdentityAuthReq req) { List permissions = null; //不走缓存的情况：关闭缓存开关 - 缓存临时禁用 - 请求指明不走缓存 - 角色预览操作 - boolean notUseCache = BooleanUtil.isFalse(req.getUseCache()) + boolean notUseCache = !req.isUseCache() || CollectionUtil.isNotEmpty(req.getSpecifyRoleIds()) || permissionCacheService.cacheDisable( PermissionCacheKey.builder()