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

优化

Browse Source
This commit is contained in:
zhouhao
2022-01-25 15:39:29 +08:00
parent 8b21574e23
commit e5158ed3b2
12 changed files with 146 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,7 @@ import org.hswebframework.web.aop.MethodInterceptorContext;
import org.hswebframework.web.authorization.annotation.Authorize;
import org.hswebframework.web.authorization.annotation.DataAccess;
import org.hswebframework.web.authorization.annotation.Dimension;
import org.hswebframework.web.authorization.annotation.ResourceAction;
import org.hswebframework.web.authorization.basic.define.DefaultBasicAuthorizeDefinition;
import org.hswebframework.web.authorization.basic.define.EmptyAuthorizeDefinition;
import org.hswebframework.web.authorization.define.AuthorizeDefinition;
@@ -15,8 +16,10 @@ import org.springframework.core.annotation.AnnotatedElementUtils;
import org.springframework.core.type.AnnotationMetadata;
import org.springframework.util.ClassUtils;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RequestMapping;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@@ -63,7 +66,8 @@ public class DefaultAopMethodAuthorizeDefinitionParser implements AopMethodAutho
}
//使用自定义
if (!CollectionUtils.isEmpty(parserCustomizers)) {
definition = parserCustomizers.stream()
definition = parserCustomizers
.stream()
.map(customizer -> customizer.parse(target, method, context))
.filter(Objects::nonNull)
.findAny().orElse(null);
@@ -77,7 +81,7 @@ public class DefaultAopMethodAuthorizeDefinitionParser implements AopMethodAutho
Authorize annotation = AnnotationUtils.findAnnotation(target, method, Authorize.class);
if (annotation != null && annotation.ignore()) {
if (isIgnoreMethod(method) || (annotation != null && annotation.ignore())) {
cache.put(key, EmptyAuthorizeDefinition.instance);
return null;
}
@@ -107,4 +111,14 @@ public class DefaultAopMethodAuthorizeDefinitionParser implements AopMethodAutho
cache.clear();
}
static boolean isIgnoreMethod(Method method) {
//不是public的方法
if(!Modifier.isPublic(method.getModifiers())){
return true;
}
//没有以下注解
return null == AnnotatedElementUtils.findMergedAnnotation(method, RequestMapping.class)
&& null == AnnotatedElementUtils.findMergedAnnotation(method, ResourceAction.class);
}
}