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

Merge remote-tracking branch 'origin/4.0.x' into 4.0.x

Browse Source 
# Conflicts:
#	hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/annotation/DataAccess.java
This commit is contained in:
zhou-hao
2019-11-18 09:42:25 +08:00
parent 1a1b38bea0 10ae5fa528
commit 0cdfc2bbef
21 changed files with 374 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/annotation/DataAccess.java
View File

@@ -29,6 +29,7 @@ import java.lang.annotation.*;
*
* @author zhouhao
* @see DataAccessController
* @see ResourceAction#dataAccess()
* @since 3.0
*/
@Target({ElementType.ANNOTATION_TYPE,ElementType.METHOD})

23
hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/define/AuthorizingContext.java
View File

@@ -21,27 +21,4 @@ public class AuthorizingContext {
private MethodInterceptorContext paramContext;
public AuthorizeDefinition getDefinition() {
return definition;
}
public void setDefinition(AuthorizeDefinition definition) {
this.definition = definition;
}
public Authentication getAuthentication() {
return authentication;
}
public void setAuthentication(Authentication authentication) {
this.authentication = authentication;
}
public MethodInterceptorContext getParamContext() {
return paramContext;
}
public void setParamContext(MethodInterceptorContext paramContext) {
this.paramContext = paramContext;
}
}