优化命名

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/CustomDataAccess.java

@@ -4,9 +4,9 @@ package org.hswebframework.web.authorization.access;
  * 自定义控制器的数据级权限控制器
  *
  * @author zhouhao
- * @see DataAccess.Type#CUSTOM
+ * @see DefaultType#CUSTOM
  */
-public interface CustomDataAccess extends DataAccess {
+public interface CustomDataAccess extends DataAccessConfig {
 
     /**
      * @return 自定义的控制器
@@ -14,6 +14,6 @@ public interface CustomDataAccess extends DataAccess {
     DataAccessController getController();
 
     default String getType() {
-        return Type.CUSTOM.name();
+        return DefaultType.CUSTOM;
     }
 }

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/DataAccess.java

@@ -29,10 +29,10 @@ import java.io.Serializable;
  *
  * @author zhouhao
  * @see org.hswebframework.web.authorization.access.CustomDataAccess
- * @see org.hswebframework.web.authorization.access.OwnCreatedDataAccess
- * @see org.hswebframework.web.authorization.access.ScriptDataAccess
+ * @see OwnCreatedDataAccessConfig
+ * @see ScriptDataAccessConfig
  */
-public interface DataAccess extends Serializable {
+public interface DataAccessConfig extends Serializable {
 
     /**
      * 对数据的操作事件
@@ -50,22 +50,19 @@ public interface DataAccess extends Serializable {
      * 控制方式标识
      *
      * @return 控制方式
-     * @see Type#name()
+     * @see DefaultType
      */
     String getType();
 
     /**
      * 内置3中控制方式
      */
-    enum Type {
-        OWN_CREATED("自己创建的数据"),
-        SCRIPT("脚本"),
-        CUSTOM("自定义控制器");
-
-        public final String text;
-
-        Type(String text) {
-            this.text = text;
-        }
+    interface DefaultType {
+        //自己创建的数据
+        String OWN_CREATED = "OWN_CREATED";
+        //脚本
+        String SCRIPT      = "SCRIPT";
+        //自定义控制器
+        String CUSTOM      = "CUSTOM";
     }
 }

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/DataAccessController.java

@@ -1,5 +1,7 @@
 package org.hswebframework.web.authorization.access;
 
+import org.hswebframework.web.boost.aop.context.MethodInterceptorParamContext;
+
 /**
  * 数据级别权限控制器,通过此控制器对当前登录用户进行的操作进行数据级别的权限控制。
  * 如：A用户只能查询自己创建的B数据,A用户只能修改自己创建的B数据
@@ -14,5 +16,5 @@ public interface DataAccessController {
      * @param params 当前操作的方法的参数上下文
      * @return 授权是否通过
      */
-    boolean doAccess(DataAccess access, ParamContext params);
+    boolean doAccess(DataAccessConfig access, MethodInterceptorParamContext params);
 }

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/DataAccessHandler.java

@@ -1,5 +1,7 @@
 package org.hswebframework.web.authorization.access;
 
+import org.hswebframework.web.boost.aop.context.MethodInterceptorParamContext;
+
 /**
  * 数据级别权限控制处理器接口,负责处理支持的权限控制配置
  *
@@ -13,7 +15,7 @@ public interface DataAccessHandler {
      * @param access 控制配置
      * @return 是否支持
      */
-    boolean isSupport(DataAccess access);
+    boolean isSupport(DataAccessConfig access);
 
     /**
      * 执行处理,返回处理结果
@@ -22,5 +24,5 @@ public interface DataAccessHandler {
      * @param context 参数上下文
      * @return 处理结果
      */
-    boolean handle(DataAccess access, ParamContext context);
+    boolean handle(DataAccessConfig access, MethodInterceptorParamContext context);
 }

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/FieldAccess.java

@@ -9,7 +9,7 @@ import java.util.Set;
  * @author zhouhao
  * @see FieldAccessController
  */
-public interface FieldAccess extends Serializable {
+public interface FieldAccessConfig extends Serializable {
     /**
      * 获取字段名称,字段名称支持嵌套如: user.info.name
      * 此值为不能操作的字段

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/FieldAccessController.java

@@ -1,6 +1,7 @@
 package org.hswebframework.web.authorization.access;
 
 import org.hswebframework.web.authorization.Permission;
+import org.hswebframework.web.boost.aop.context.MethodInterceptorParamContext;
 
 import java.util.Set;
 
@@ -19,5 +20,5 @@ public interface FieldAccessController {
      * @param params   参数上下文
      * @return 验证是否通过
      */
-    boolean doAccess(String action, Set<FieldAccess> accesses, ParamContext params);
+    boolean doAccess(String action, Set<FieldAccessConfig> accesses, MethodInterceptorParamContext params);
 }

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/OwnCreatedDataAccess.java

@@ -5,8 +5,8 @@ package org.hswebframework.web.authorization.access;
  *
  * @author zhouhao
  */
-public interface OwnCreatedDataAccess extends DataAccess {
+public interface OwnCreatedDataAccessConfig extends DataAccessConfig {
     default String getType() {
-        return Type.OWN_CREATED.name();
+        return DefaultType.OWN_CREATED;
     }
 }

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/ScriptDataAccess.java

@@ -5,9 +5,9 @@ package org.hswebframework.web.authorization.access;
  *
  * @author zhouhao
  */
-public interface ScriptDataAccess extends DataAccess {
+public interface ScriptDataAccessConfig extends DataAccessConfig {
     default String getType() {
-        return Type.CUSTOM.name();
+        return DefaultType.SCRIPT;
     }
 
     /**

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/ParamContext.java

@@ -1,4 +1,22 @@
-package org.hswebframework.web.authorization.access;
+/*
+ *  Copyright 2016 http://www.hswebframework.org
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ *
+ *
+ */
+
+package org.hswebframework.web.boost.aop.context;
 
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
@@ -7,12 +25,12 @@ import java.util.Map;
 import java.util.Optional;
 
 /**
- * 参数上下文，用于获取当前进行操作的方法的各种参数信息，如:当前所在类实例，参数集合，注解
+ * AOP拦截到方法的参数上下文，用于获取当前进行操作的方法的各种参数信息，如:当前所在类实例，参数集合，注解
  *
  * @author zhouhao
  * @see 3.0
  */
-public interface ParamContext extends Serializable {
+public interface MethodInterceptorParamContext extends Serializable {
 
     /**
      * 获取当前类实例

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/DuplicateValidator.java

@@ -16,7 +16,9 @@
  *
  */
 
-package org.hswebframework.web.authorization.access;
+package org.hswebframework.web.boost.validator;
+
+import org.hswebframework.web.boost.aop.context.MethodInterceptorParamContext;
 
 /**
  * 重复数据验证器,验证数据是否重复
@@ -24,7 +26,7 @@ package org.hswebframework.web.authorization.access;
  * @author zhouhao
  */
 public interface DuplicateValidator {
-    Result doValidate(DuplicateValidatorConfig validator, ParamContext context);
+    Result doValidate(DuplicateValidatorConfig validator, MethodInterceptorParamContext context);
 
     /**
      * 验证结果

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/DuplicateValidatorConfig.java

@@ -16,9 +16,8 @@
  *
  */
 
-package org.hswebframework.web.authorization.access;
+package org.hswebframework.web.boost.validator;
 
-import org.hswebframework.web.authorization.Permission;
 
 import java.io.Serializable;
 
@@ -31,9 +30,9 @@ public interface DuplicateValidatorConfig extends Serializable {
     /**
      * 对数据的操作事件
      *
-     * @return 操作时间
-     * @see Permission#ACTION_UPDATE
-     * @see Permission#ACTION_ADD
+     * @return 操作事件
+     * @see org.hswebframework.web.authorization.Permission#ACTION_UPDATE
+     * @see org.hswebframework.web.authorization.Permission#ACTION_ADD
      */
     String getAction();
 

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/FiledDuplicateValidatorConfig.java

@@ -16,7 +16,7 @@
  *
  */
 
-package org.hswebframework.web.authorization.access;
+package org.hswebframework.web.boost.validator;
 
 import java.util.List;
 

hsweb-authorization/hsweb-authorization-api/src/main/java/org/hswebframework/web/authorization/access/ScriptDuplicateValidatorConfig.java

@@ -16,7 +16,7 @@
  *
  */
 
-package org.hswebframework.web.authorization.access;
+package org.hswebframework.web.boost.validator;
 
 /**
  * 通过脚本来控制数据重复