From 632056a8c80114d14f229098353d0642c8d5f8f3 Mon Sep 17 00:00:00 2001 From: lilong Date: Mon, 26 Aug 2024 16:50:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:(REQ-2699)=20=E4=BF=AE=E6=94=B9=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E9=85=8D=E7=BD=AE=E4=B8=BA=E5=88=86=E9=92=9F=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=83=E9=99=90=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProductPermissionCacheServiceImpl.java | 6 +++--- .../impl/ProductSaasFeatureResourceCacheServiceImpl.java | 6 +++--- .../service/impl/RolePermissionCacheServiceImpl.java | 6 +++--- .../impl/RoleSaasFeatureResourceCacheServiceImpl.java | 6 +++--- .../service/impl/SaasFeatureResourceServiceImpl.java | 6 +++--- .../tyr/server/service/impl/TyrSaasAuthServiceImpl.java | 7 ++----- .../server/service/impl/WorkspaceProductServiceImpl.java | 6 +++--- 7 files changed, 20 insertions(+), 23 deletions(-) diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductPermissionCacheServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductPermissionCacheServiceImpl.java index ba3d97bb..8a24245d 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductPermissionCacheServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductPermissionCacheServiceImpl.java @@ -51,8 +51,8 @@ public class ProductPermissionCacheServiceImpl implements ProductPermissionCache private CacheProductPermissionHandler cacheProductPermissionHandler; /** 产品权限缓存过期时间 **/ - @Value("${product.permission.expire:180}") - private Long expireInDays; + @Value("${product.permission.expire.minutes:14}") + private Long expireInMinutes; @Override public Map> list(ListProductPermissionParam param) { @@ -136,7 +136,7 @@ public class ProductPermissionCacheServiceImpl implements ProductPermissionCache // 存在hash中部分key移除，为了处理快，直接把redisKey删除掉，修改不频繁 redisTemplate.delete(redisKey); RedisClient.HashOps.hPutAll(redisKey, redisValues); - redisTemplate.expire(redisKey, expireInDays, TimeUnit.DAYS); + redisTemplate.expire(redisKey, expireInMinutes, TimeUnit.MINUTES); log.info("succeed to store product permission: redisKey:{} value:{}", redisKey, redisValues); } return null; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductSaasFeatureResourceCacheServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductSaasFeatureResourceCacheServiceImpl.java index 9bad1442..e5275a53 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductSaasFeatureResourceCacheServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/ProductSaasFeatureResourceCacheServiceImpl.java @@ -47,8 +47,8 @@ public class ProductSaasFeatureResourceCacheServiceImpl implements ProductSaasFe @Autowired private CacheProductSaasFeatureResourceHandler cacheProductSaasFeatureResourceHandler; - @Value("${product.feature.resouce.expire:180}") - private Long expireInDays; + @Value("${product.feature.resouce.expire.minutes:14}") + private Long expireInMinutes; @Override public Map> list(ListProductFeatureResourceParam param) { @@ -82,7 +82,7 @@ public class ProductSaasFeatureResourceCacheServiceImpl implements ProductSaasFe // 存在hash中部分key移除，为了处理快，直接把redisKey删除掉，修改不频繁 redisTemplate.delete(redisKey); RedisClient.HashOps.hPutAll(redisKey, redisValues); - redisTemplate.expire(redisKey, expireInDays, TimeUnit.DAYS); + redisTemplate.expire(redisKey, expireInMinutes, TimeUnit.MINUTES); log.info("succeed to store product featureResource: redisKey:{} value:{}", redisKey, redisValues); } return null; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RolePermissionCacheServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RolePermissionCacheServiceImpl.java index a237d7f9..4fa6f5d6 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RolePermissionCacheServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RolePermissionCacheServiceImpl.java @@ -48,8 +48,8 @@ public class RolePermissionCacheServiceImpl implements RolePermissionCacheServic /** 角色权限缓存过期时间 **/ - @Value("${role.permission.expire:180}") - private Long expireInDays; + @Value("${role.permission.expire.minutes:14}") + private Long expireInMinutes; @Override public Map> list(ListRolePermissionParam param) { @@ -131,7 +131,7 @@ public class RolePermissionCacheServiceImpl implements RolePermissionCacheServic // 存在hash中部分key移除，为了处理快，直接把redisKey删除掉，修改不频繁 redisTemplate.delete(redisKey); RedisClient.HashOps.hPutAll(redisKey, redisValues); - redisTemplate.expire(redisKey, expireInDays, TimeUnit.DAYS); + redisTemplate.expire(redisKey, expireInMinutes, TimeUnit.MINUTES); log.info("succeed to store role permission: redisKey:{} value:{}", redisKey, redisValues); } return null; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleSaasFeatureResourceCacheServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleSaasFeatureResourceCacheServiceImpl.java index 3d150979..0044c0e2 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleSaasFeatureResourceCacheServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/RoleSaasFeatureResourceCacheServiceImpl.java @@ -49,8 +49,8 @@ public class RoleSaasFeatureResourceCacheServiceImpl implements RoleSaasFeatureR /** 角色菜单缓存过期时间 **/ - @Value("${role.feature.resource.expire:180}") - private Long expireInDays; + @Value("${role.feature.resource.expire.minutes:14}") + private Long expireInMinutes; @Override public Map> list(ListRoleSaasFeatureResourceParam param) { @@ -84,7 +84,7 @@ public class RoleSaasFeatureResourceCacheServiceImpl implements RoleSaasFeatureR // 存在hash中部分key移除，为了处理快，直接把redisKey删除掉，修改不频繁 redisTemplate.delete(redisKey); RedisClient.HashOps.hPutAll(redisKey, redisValues); - redisTemplate.expire(redisKey, expireInDays, TimeUnit.DAYS); + redisTemplate.expire(redisKey, expireInMinutes, TimeUnit.MINUTES); log.info("succeed to store role featureResource: redisKey:{} value:{}", redisKey, redisValues); } return null; diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java index c1d23595..ce3e6555 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/SaasFeatureResourceServiceImpl.java @@ -121,8 +121,8 @@ public class SaasFeatureResourceServiceImpl extends ServiceImpl redisTemplate; /** 菜单树过期时间 **/ - @Value("${saas.feature.resource.expire:180}") - private Long expireInDays; + @Value("${saas.feature.resource.expire.minutes:14}") + private Long expireInMinutes; private static final String SAAS_FEATURE_RESOURCE_KEY = "saas:feature:resource:%s"; @@ -785,7 +785,7 @@ public class SaasFeatureResourceServiceImpl extends ServiceImpl pairs = BeanMapper.copyList(req.getWorkspaceAndOU(), IdentityAuthReq.WorkspaceOuPair.class); request.setWorkspaceOusPairs(pairs); + request.setFeatureCode(Sets.newHashSet(req.getCodes())); IdentityAuthRes authRes = this.findIdentityAuthMix(request); - HashSet codeSet = new HashSet<>(req.getCodes()); - //比较code return authRes.getPermissions().stream() - .anyMatch(e -> e.getPermissionPoint() - .stream() - .anyMatch(p -> codeSet.contains(p.getFeatureCode()))); + .anyMatch(e -> CollectionUtil.isNotEmpty(e.getPermissionPoint())); } @Data diff --git a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/WorkspaceProductServiceImpl.java b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/WorkspaceProductServiceImpl.java index 3ce49afd..23a5f76d 100644 --- a/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/WorkspaceProductServiceImpl.java +++ b/tyr-server/src/main/java/cn/axzo/tyr/server/service/impl/WorkspaceProductServiceImpl.java @@ -62,8 +62,8 @@ public class WorkspaceProductServiceImpl implements WorkspaceProductService { /** 授权缓存过期时间 **/ - @Value("${workspace.product.expire:90}") - private Long expireInDays; + @Value("${workspace.product.expire.minutes:14}") + private Long expireInMinutes; private static final String WORKSPACE_PRODUCT_KEY = "workspace:product:%s"; @@ -190,7 +190,7 @@ public class WorkspaceProductServiceImpl implements WorkspaceProductService { for (WorkspaceProductDTO workspaceProduct : param.getWorkspaceProducts()) { String redisKey = getKey(workspaceProduct.getWorkspaceId()); RedisUtil.StringValueOps.setEx(redisKey, JSON.toJSONString(workspaceProduct.getProductIds()), - expireInDays, TimeUnit.DAYS); + expireInMinutes, TimeUnit.MINUTES); } return null;