diff --git a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/DataAccessController.java b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/DataAccessController.java index 34e9c3211..1b66090a7 100644 --- a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/DataAccessController.java +++ b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/DataAccessController.java @@ -1,6 +1,6 @@ package org.hswebframework.web.authorization.access; -import org.hswebframework.web.boost.aop.context.MethodInterceptorParamContext; +import org.hswebframework.web.authorization.define.AuthorizingContext; /** * 数据级别权限控制器,通过此控制器对当前登录用户进行的操作进行数据级别的权限控制。 @@ -13,8 +13,8 @@ public interface DataAccessController { /** * 执行权限控制 * @param access 控制方式以及配置 - * @param params 当前操作的方法的参数上下文 + * @param context 权限验证上下文,用于传递验证过程用到的参数 * @return 授权是否通过 */ - boolean doAccess(DataAccessConfig access, MethodInterceptorParamContext params); + boolean doAccess(DataAccessConfig access, AuthorizingContext context); } diff --git a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/DataAccessHandler.java b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/DataAccessHandler.java index 2c2286171..608163f6b 100644 --- a/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/DataAccessHandler.java +++ b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/DataAccessHandler.java @@ -1,6 +1,6 @@ package org.hswebframework.web.authorization.access; -import org.hswebframework.web.boost.aop.context.MethodInterceptorParamContext; +import org.hswebframework.web.authorization.define.AuthorizingContext; /** * 数据级别权限控制处理器接口,负责处理支持的权限控制配置 @@ -24,5 +24,5 @@ public interface DataAccessHandler { * @param context 参数上下文 * @return 处理结果 */ - boolean handle(DataAccessConfig access, MethodInterceptorParamContext context); + boolean handle(DataAccessConfig access, AuthorizingContext context); } diff --git a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/AuthorizingContext.java b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/define/AuthorizingContext.java similarity index 88% rename from hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/AuthorizingContext.java rename to hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/define/AuthorizingContext.java index 0a59d15c2..9c24dff34 100644 --- a/hsweb-authorization/hsweb-authorization-basic/src/main/java/org/hswebframework/web/authorization/basic/handler/AuthorizingContext.java +++ b/hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/define/AuthorizingContext.java @@ -1,7 +1,6 @@ -package org.hswebframework.web.authorization.basic.handler; +package org.hswebframework.web.authorization.define; import org.hswebframework.web.authorization.Authentication; -import org.hswebframework.web.authorization.define.AuthorizeDefinition; import org.hswebframework.web.boost.aop.context.MethodInterceptorParamContext; /** @@ -14,7 +13,6 @@ public class AuthorizingContext { private MethodInterceptorParamContext paramContext; - public AuthorizeDefinition getDefinition() { return definition; }