lywsvip/hsweb-framework
1
0
Fork 0
mirror of https://github.com/hs-web/hsweb-framework.git synced 2026-05-17 11:47:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化权限控制逻辑

Browse Source
This commit is contained in:
zhouhao
2018-02-23 11:15:50 +08:00
parent 11d3e907f2
commit 07f4eb4a88
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/aop/AopAuthorizingController.java
View File

@@ -51,8 +51,8 @@ public class AopAuthorizingController extends StaticMethodMatcherPointcutAdvisor
MethodInterceptorContext paramContext = holder.createParamContext();
AuthorizeDefinition definition = aopMethodAuthorizeDefinitionParser.parse(methodInvocation.getThis().getClass(), methodInvocation.getMethod());
Object result = true;
AuthorizeDefinition definition = aopMethodAuthorizeDefinitionParser.parse(methodInvocation.getThis().getClass(), methodInvocation.getMethod(), paramContext);
Object result = null;
boolean isControl = false;
if (null != definition) {
Authentication authentication = Authentication.current().orElseThrow(UnAuthorizedException::new);

7
hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/aop/DefaultAopMethodAuthorizeDefinitionParser.java
View File

@@ -52,7 +52,7 @@ public class DefaultAopMethodAuthorizeDefinitionParser implements AopMethodAutho
CacheKey key = buildCacheKey(target, method);
AuthorizeDefinition definition = cache.get(key);
if ((definition instanceof EmptyAuthorizeDefinition)) {
if (definition instanceof EmptyAuthorizeDefinition) {
return null;
}
if (null != definition) {
@@ -64,10 +64,9 @@ public class DefaultAopMethodAuthorizeDefinitionParser implements AopMethodAutho
.map(customer -> customer.parse(target, method, context))
.filter(Objects::nonNull)
.findAny().orElse(null);
if (definition == null || definition instanceof EmptyAuthorizeDefinition) {
return null;
if (definition != null && !(definition instanceof EmptyAuthorizeDefinition)) {
return definition;
}
}
Authorize classAuth = AopUtils.findAnnotation(target, Authorize.class);
Authorize methodAuth = AopUtils.findMethodAnnotation(target, method, Authorize.class);