wangli/tyr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(permission): 权限缓存测试修复

Browse Source
This commit is contained in:
zhansihu 2024-01-04 15:00:38 +08:00
parent 26cee3d6b5
commit fc1f1d082b
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tyr-api/src/main/java/cn/axzo/tyr/client/model/enums/IdentityType.java
View File

@ -32,6 +32,9 @@ public enum IdentityType implements IEnum{
public static IdentityType getIdentityType(Integer code) { public static IdentityType getIdentityType(Integer code) {
if (code == null) {
return null;
}
IdentityType[] values = values(); IdentityType[] values = values();
for (IdentityType item : values) { for (IdentityType item : values) {
if (item.getCode().equals(code)) { if (item.getCode().equals(code)) {

2
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/PermissionCacheServiceImpl.java
View File

@ -71,7 +71,7 @@ public class PermissionCacheServiceImpl implements PermissionCacheService {
@Override @Override
public void cachePermission(PermissionCacheKey key, IdentityAuthRes.WorkspacePermission permission) { public void cachePermission(PermissionCacheKey key, IdentityAuthRes.WorkspacePermission permission) {
RedisUtil.StringValueOps.setEx(key.buildPersonDisableKey(), RedisUtil.StringValueOps.setEx(key.buildAuthKey(),
JSONObject.toJSONString(permission, SerializerFeature.DisableCircularReferenceDetect), JSONObject.toJSONString(permission, SerializerFeature.DisableCircularReferenceDetect),
expireInMinutes, TimeUnit.MINUTES); expireInMinutes, TimeUnit.MINUTES);
} }

4
tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/TyrSaasAuthServiceImpl.java
View File

@ -694,10 +694,10 @@ public class TyrSaasAuthServiceImpl implements TyrSaasAuthService {
@Override @Override
public IdentityAuthRes findIdentityAuthMix(IdentityAuthReq req) { public IdentityAuthRes findIdentityAuthMix(IdentityAuthReq req) {
List<IdentityAuthRes.WorkspacePermission> permissions = null; List<IdentityAuthRes.WorkspacePermission> permissions = null;
//不走缓存的情况：关闭缓存开关 - 缓存需要刷新 - 请求指明不走缓存 - 角色预览操作 //不走缓存的情况：关闭缓存开关 - 缓存临时禁用 - 请求指明不走缓存 - 角色预览操作
boolean notUseCache = BooleanUtil.isFalse(req.getUseCache()) boolean notUseCache = BooleanUtil.isFalse(req.getUseCache())
|| CollectionUtil.isNotEmpty(req.getSpecifyRoleIds()) || CollectionUtil.isNotEmpty(req.getSpecifyRoleIds())
|| !permissionCacheService.cacheDisable( || permissionCacheService.cacheDisable(
PermissionCacheKey.builder() PermissionCacheKey.builder()
.personId(req.getPersonId()) .personId(req.getPersonId())
.identityId(req.getIdentityId()) .identityId(req.getIdentityId())