From aeae03cd38bca4bd34361cfa1706a022db087150 Mon Sep 17 00:00:00 2001 From: zhou-hao Date: Wed, 27 Nov 2019 21:16:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E6=9D=83?= =?UTF-8?q?=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../define/DefaultBasicAuthorizeDefinition.java | 17 +++++++++++++++++ ...ReactiveAuthenticationInitializeService.java | 6 +++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/define/DefaultBasicAuthorizeDefinition.java b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/define/DefaultBasicAuthorizeDefinition.java index fda119eb8..3564361de 100644 --- a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/define/DefaultBasicAuthorizeDefinition.java +++ b/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/define/DefaultBasicAuthorizeDefinition.java @@ -129,6 +129,23 @@ public class DefaultBasicAuthorizeDefinition implements AopAuthorizeDefinition { } + + for (Annotation annotation : classAnnotation) { + if (annotation instanceof DataAccessType|| + annotation instanceof DataAccess) { + for (ResourceDefinition resource : definition.getResources().getResources()) { + for (ResourceActionDefinition action : resource.getActions()) { + if(annotation instanceof DataAccessType) { + definition.putAnnotation(action, (DataAccessType) annotation); + }else{ + definition.putAnnotation(action, (DataAccess) annotation); + } + } + } + } + } + + return definition; } diff --git a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/DefaultReactiveAuthenticationInitializeService.java b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/DefaultReactiveAuthenticationInitializeService.java index 6c017b89a..01a9248db 100644 --- a/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/DefaultReactiveAuthenticationInitializeService.java +++ b/hsweb-system/hsweb-system-authorization/hsweb-system-authorization-default/src/main/java/org/hswebframework/web/system/authorization/defaults/service/DefaultReactiveAuthenticationInitializeService.java @@ -65,7 +65,11 @@ public class DefaultReactiveAuthenticationInitializeService .userType(user.getType()) .build()); return initPermission(authentication) - .switchIfEmpty(Mono.just(authentication)); + .switchIfEmpty(Mono.just(authentication)) + .onErrorResume(err -> { + log.warn(err.getMessage(), err); + return Mono.just(authentication); + }); }); }