lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-06-03 03:12:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 优化权限解析

Browse Source
This commit is contained in:
zhouhao
2025-06-20 19:09:57 +08:00
parent de7a816fb2
commit 41c17c858b
3 changed files with 46 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/define/AopAuthorizeDefinitionParser.java
View File

@@ -73,6 +73,14 @@ public class AopAuthorizeDefinitionParser {
if (annotation instanceof Dimension) {
definition.putAnnotation(((Dimension) annotation));
}
if (annotation instanceof ResourceAction) {
getAnnotationByType(Resource.class)
.map(res -> definition.getResources().getResource(res.id()).orElse(null))
.filter(Objects::nonNull)
.forEach(res -> {
definition.putAnnotation(res, (ResourceAction) annotation);
});
}
}
}
@@ -89,10 +97,11 @@ public class AopAuthorizeDefinitionParser {
private <T extends Annotation> Stream<T> getAnnotationByType(Class<T> type) {
return Optional.ofNullable(methodAnnotationGroup.getOrDefault(type, classAnnotationGroup.get(type)))
.map(Collection::stream)
.orElseGet(Stream::empty)
.map(type::cast);
return Optional
.ofNullable(methodAnnotationGroup.getOrDefault(type, classAnnotationGroup.get(type)))
.stream()
.flatMap(Collection::stream)
.map(type::cast);
}
}