From c8661b193a3f05172b8bc4728b04fac7540c1d4f Mon Sep 17 00:00:00 2001
From: hengboy <jnyuqy@gmail.com>
Date: Mon, 20 Jul 2020 22:24:38 +0800
Subject: [PATCH] Move "api-boot-plugin-resource-load" to "api-boot"

---
 README.zh-CN.md                               |  5 +-
 .../api-boot-autoconfigure/pom.xml            |  5 --
 .../ApiBootResourceLoadAutoConfiguration.java | 18 ++----
 ...ootResourceRedisLoadAutoConfiguration.java | 14 ++---
 .../api-boot-dependencies/pom.xml             | 12 ----
 api-boot-project/api-boot-plugins/README.md   | 17 -----
 .../api-boot-plugin-resource-load/pom.xml     | 38 -----------
 .../load/annotation/ResourceFields.java       | 26 --------
 .../load/enums/ResourceStoreEvent.java        | 34 ----------
 .../api-boot-plugins/api-boot-plugin/pom.xml  | 40 ------------
 .../api/boot/plugin/tools/AopTools.java       | 46 --------------
 .../api/boot/plugin/tools/JsonTools.java      | 63 -------------------
 api-boot-project/api-boot-plugins/pom.xml     | 24 -------
 .../api-boot-starter-resource-load/pom.xml    |  5 --
 .../ApiBootResourceStoreDelegate.java         | 10 +--
 .../resource}/annotation/ResourceField.java   | 10 +--
 .../resource/annotation/ResourceFields.java   | 20 ++++++
 .../resource}/annotation/ResourceLoad.java    | 12 +---
 .../advistor/ApiBootResourceLoadAdvisor.java  | 14 ++---
 .../ApiBootResourceLoadMethodInterceptor.java | 17 ++---
 .../context/ApiBootResourceContext.java       | 12 +---
 .../resource/enums/ResourceStoreEvent.java    | 28 +++++++++
 .../expression/ResourceSourceExpression.java  | 16 ++---
 .../resource}/loader/ResourceFieldLoader.java | 14 ++---
 .../pusher/ApiBootResourcePusher.java         | 16 ++---
 .../ApiBootAbstractResourcePusher.java        | 16 ++---
 .../support/ApiBootJdbcResourcePusher.java    | 12 +---
 .../support/ApiBootMemoryResourcePusher.java  | 14 ++---
 .../support/ApiBootRedisResourcePusher.java   | 14 ++---
 .../resource}/tools/ResourceFieldTools.java   | 18 ++----
 api-boot-project/pom.xml                      |  1 -
 .../api-boot-sample-resource-load/pom.xml     |  2 +-
 .../sample/ResourceLoadSampleService.java     |  8 +--
 .../api/boot/sample/ResourceLoadService.java  |  2 +-
 34 files changed, 124 insertions(+), 479 deletions(-)
 delete mode 100644 api-boot-project/api-boot-plugins/README.md
 delete mode 100644 api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/pom.xml
 delete mode 100644 api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/annotation/ResourceFields.java
 delete mode 100644 api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/enums/ResourceStoreEvent.java
 delete mode 100644 api-boot-project/api-boot-plugins/api-boot-plugin/pom.xml
 delete mode 100644 api-boot-project/api-boot-plugins/api-boot-plugin/src/main/java/org/minbox/framework/api/boot/plugin/tools/AopTools.java
 delete mode 100644 api-boot-project/api-boot-plugins/api-boot-plugin/src/main/java/org/minbox/framework/api/boot/plugin/tools/JsonTools.java
 delete mode 100644 api-boot-project/api-boot-plugins/pom.xml
 rename api-boot-project/{api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load => api-boot/src/main/java/org/minbox/framework/api/boot/resource}/ApiBootResourceStoreDelegate.java (88%)
 rename api-boot-project/{api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load => api-boot/src/main/java/org/minbox/framework/api/boot/resource}/annotation/ResourceField.java (74%)
 create mode 100644 api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/annotation/ResourceFields.java
 rename api-boot-project/{api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load => api-boot/src/main/java/org/minbox/framework/api/boot/resource}/annotation/ResourceLoad.java (50%)
 rename api-boot-project/{api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load => api-boot/src/main/java/org/minbox/framework/api/boot/resource}/aop/advistor/ApiBootResourceLoadAdvisor.java (83%)
 rename api-boot-project/{api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load => api-boot/src/main/java/org/minbox/framework/api/boot/resource}/aop/interceptor/ApiBootResourceLoadMethodInterceptor.java (86%)
 rename api-boot-project/{api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load => api-boot/src/main/java/org/minbox/framework/api/boot/resource}/context/ApiBootResourceContext.java (92%)
 create mode 100644 api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/enums/ResourceStoreEvent.java
 rename api-boot-project/{api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load => api-boot/src/main/java/org/minbox/framework/api/boot/resource}/expression/ResourceSourceExpression.java (84%)
 rename api-boot-project/{api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load => api-boot/src/main/java/org/minbox/framework/api/boot/resource}/loader/ResourceFieldLoader.java (79%)
 rename api-boot-project/{api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load => api-boot/src/main/java/org/minbox/framework/api/boot/resource}/pusher/ApiBootResourcePusher.java (80%)
 rename api-boot-project/{api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load => api-boot/src/main/java/org/minbox/framework/api/boot/resource}/pusher/support/ApiBootAbstractResourcePusher.java (94%)
 rename api-boot-project/{api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load => api-boot/src/main/java/org/minbox/framework/api/boot/resource}/pusher/support/ApiBootJdbcResourcePusher.java (89%)
 rename api-boot-project/{api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load => api-boot/src/main/java/org/minbox/framework/api/boot/resource}/pusher/support/ApiBootMemoryResourcePusher.java (91%)
 rename api-boot-project/{api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load => api-boot/src/main/java/org/minbox/framework/api/boot/resource}/pusher/support/ApiBootRedisResourcePusher.java (92%)
 rename api-boot-project/{api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load => api-boot/src/main/java/org/minbox/framework/api/boot/resource}/tools/ResourceFieldTools.java (89%)

diff --git a/README.zh-CN.md b/README.zh-CN.md
index a3e02112..0f595f25 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -129,9 +129,6 @@ ApiBoot正式版本都会发布到Maven Center，如果你想使用源码最新
 
 该模块继承自`api-boot-dependencies`，可直接使用固化版本后的依赖，是构建其他模块的统一父依赖。
 
-### api-boot-plugins
-
-该模块提供了集成第三方依赖的插件列表，每当新增集成一个第三方组件都会在该模块下对应创建一个子模块、
 
 ### api-boot-starters
 
@@ -163,4 +160,4 @@ ApiBoot采用Apache2开源许可进行编写。
 
 ## 开源支持
 
-<a href="https://www.jetbrains.com/?from=api-boot"><img src="https://apiboot.minbox.org/img/jetbrains.png" width="100" heith="100"/></a>
\ No newline at end of file
+<a href="https://www.jetbrains.com/?from=api-boot"><img src="https://apiboot.minbox.org/img/jetbrains.png" width="100" heith="100"/></a>
diff --git a/api-boot-project/api-boot-autoconfigure/pom.xml b/api-boot-project/api-boot-autoconfigure/pom.xml
index a000ab58..7c7983fd 100644
--- a/api-boot-project/api-boot-autoconfigure/pom.xml
+++ b/api-boot-project/api-boot-autoconfigure/pom.xml
@@ -80,11 +80,6 @@
             <artifactId>api-boot-common</artifactId>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.minbox.framework</groupId>
-            <artifactId>api-boot-plugin-resource-load</artifactId>
-            <optional>true</optional>
-        </dependency>
         <dependency>
             <groupId>org.minbox.framework</groupId>
             <artifactId>api-boot-tools</artifactId>
diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/resource/ApiBootResourceLoadAutoConfiguration.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/resource/ApiBootResourceLoadAutoConfiguration.java
index 0c64e156..c814ba06 100644
--- a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/resource/ApiBootResourceLoadAutoConfiguration.java
+++ b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/resource/ApiBootResourceLoadAutoConfiguration.java
@@ -16,11 +16,11 @@
  */
 package org.minbox.framework.api.boot.autoconfigure.resource;
 
-import org.minbox.framework.api.boot.plugin.resource.load.ApiBootResourceStoreDelegate;
-import org.minbox.framework.api.boot.plugin.resource.load.aop.advistor.ApiBootResourceLoadAdvisor;
-import org.minbox.framework.api.boot.plugin.resource.load.aop.interceptor.ApiBootResourceLoadMethodInterceptor;
-import org.minbox.framework.api.boot.plugin.resource.load.pusher.ApiBootResourcePusher;
-import org.minbox.framework.api.boot.plugin.resource.load.pusher.support.ApiBootMemoryResourcePusher;
+import org.minbox.framework.api.boot.resource.ApiBootResourceStoreDelegate;
+import org.minbox.framework.api.boot.resource.aop.advistor.ApiBootResourceLoadAdvisor;
+import org.minbox.framework.api.boot.resource.aop.interceptor.ApiBootResourceLoadMethodInterceptor;
+import org.minbox.framework.api.boot.resource.pusher.ApiBootResourcePusher;
+import org.minbox.framework.api.boot.resource.pusher.support.ApiBootMemoryResourcePusher;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -32,13 +32,7 @@
 /**
  * ApiBoot Resource Load Auto Config
  *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-12 13:30
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
+ * @author 恒宇少年
  */
 @Configuration
 @ConditionalOnClass(ApiBootResourceStoreDelegate.class)
diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/resource/ApiBootResourceRedisLoadAutoConfiguration.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/resource/ApiBootResourceRedisLoadAutoConfiguration.java
index 0595cf45..7294f56e 100644
--- a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/resource/ApiBootResourceRedisLoadAutoConfiguration.java
+++ b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/resource/ApiBootResourceRedisLoadAutoConfiguration.java
@@ -17,8 +17,8 @@
 
 package org.minbox.framework.api.boot.autoconfigure.resource;
 
-import org.minbox.framework.api.boot.plugin.resource.load.ApiBootResourceStoreDelegate;
-import org.minbox.framework.api.boot.plugin.resource.load.pusher.support.ApiBootRedisResourcePusher;
+import org.minbox.framework.api.boot.resource.ApiBootResourceStoreDelegate;
+import org.minbox.framework.api.boot.resource.pusher.support.ApiBootRedisResourcePusher;
 import org.springframework.beans.factory.ObjectProvider;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -29,13 +29,9 @@
 import org.springframework.data.redis.core.RedisTemplate;
 
 /**
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-19 10:46
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
+ * Automatic configuration implemented by Redis
+ *
+ * @author 恒宇少年
  */
 @Configuration
 @ConditionalOnClass(RedisTemplate.class)
diff --git a/api-boot-project/api-boot-dependencies/pom.xml b/api-boot-project/api-boot-dependencies/pom.xml
index d0426ec1..074c4510 100644
--- a/api-boot-project/api-boot-dependencies/pom.xml
+++ b/api-boot-project/api-boot-dependencies/pom.xml
@@ -182,11 +182,6 @@
                 <artifactId>api-boot-common</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.minbox.framework</groupId>
-                <artifactId>api-boot-plugin</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-tools</artifactId>
@@ -378,13 +373,6 @@
                 <artifactId>mongodb-driver-sync</artifactId>
                 <version>${mongo-driver-sync.version}</version>
             </dependency>
-
-            <!--wait remove-->
-            <dependency>
-                <groupId>org.minbox.framework</groupId>
-                <artifactId>api-boot-plugin-resource-load</artifactId>
-                <version>${project.version}</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 
diff --git a/api-boot-project/api-boot-plugins/README.md b/api-boot-project/api-boot-plugins/README.md
deleted file mode 100644
index ffa9f902..00000000
--- a/api-boot-project/api-boot-plugins/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-### ApiBoot Plugins
-
-`ApiBoot`所继承的插件的实现都在对应的`api-boot-plugin-xxx`内。
-
-| 依赖名称                                                     | 介绍                          |
-| ------------------------------------------------------------ | ----------------------------- |
-| Api-boot-plugin                                              | 所有Plugin的基础依赖          |
-| [api-boot-plugin-oauth](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-security-oauth-jwt) | 集成Oauth2                    |
-| [api-boot-plugin-security](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-security-oauth-jwt) | 集成SpringSecurity            |
-| [api-boot-plugin-alibaba-oss](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-alibaba-oss) | 集成阿里云Oss对象存储接口服务 |
-| [api-boot-plugin-alibaba-sms](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-alibaba-sms) | 集成阿里云国际短信服务        |
-| [api-boot-plugin-quartz](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-quartz) | 集成分布式定时任务框架Quartz  |
-
-
-
-**点击依赖名称跳转示例~~~**
-
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/pom.xml
deleted file mode 100644
index 845830a7..00000000
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>api-boot-plugins</artifactId>
-        <groupId>org.minbox.framework</groupId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <properties>
-        <main.basedir>${basedir}/../../..</main.basedir>
-    </properties>
-    <artifactId>api-boot-plugin-resource-load</artifactId>
-    <description>
-        ApiBoot Resource Load
-        自动化资源加载
-    </description>
-    <dependencies>
-        <!--ApiBoot Plugin-->
-        <dependency>
-            <groupId>org.minbox.framework</groupId>
-            <artifactId>api-boot-plugin</artifactId>
-        </dependency>
-        <!--Spring Boot Aop-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <!--Spring Boot Redis-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-data-redis</artifactId>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/annotation/ResourceFields.java b/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/annotation/ResourceFields.java
deleted file mode 100644
index a54946df..00000000
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/annotation/ResourceFields.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package org.minbox.framework.api.boot.plugin.resource.load.annotation;
-
-import java.lang.annotation.*;
-
-/**
- * 资源业务字段集合
- *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-11 22:12
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
- */
-@Target({ElementType.METHOD})
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface ResourceFields {
-    /**
-     * 资源业务字段的集合
-     *
-     * @return
-     */
-    ResourceField[] value();
-}
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/enums/ResourceStoreEvent.java b/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/enums/ResourceStoreEvent.java
deleted file mode 100644
index 5ad86c29..00000000
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/enums/ResourceStoreEvent.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.minbox.framework.api.boot.plugin.resource.load.enums;
-
-import lombok.Getter;
-
-/**
- * 资源存储事件
- *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-12 09:33
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
- */
-@Getter
-public enum ResourceStoreEvent {
-    /**
-     * 查询资源
-     */
-    SELECT,
-    /**
-     * 添加资源
-     */
-    INSERT,
-    /**
-     * 更新资源
-     */
-    UPDATE,
-    /**
-     * 删除资源
-     */
-    DELETE
-}
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin/pom.xml
deleted file mode 100644
index ae82441b..00000000
--- a/api-boot-project/api-boot-plugins/api-boot-plugin/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>api-boot-plugins</artifactId>
-        <groupId>org.minbox.framework</groupId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>api-boot-plugin</artifactId>
-    <description>
-        ApiBoot Plugin 基础依赖
-    </description>
-    <properties>
-        <main.basedir>${basedir}/../../..</main.basedir>
-    </properties>
-    <dependencies>
-        <!--ApiBoot Common-->
-        <dependency>
-            <groupId>org.minbox.framework</groupId>
-            <artifactId>api-boot-common</artifactId>
-        </dependency>
-        <!--FastJson-->
-        <dependency>
-            <groupId>com.alibaba</groupId>
-            <artifactId>fastjson</artifactId>
-        </dependency>
-        <!--Spring Core-->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-        </dependency>
-        <!--lombok-->
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin/src/main/java/org/minbox/framework/api/boot/plugin/tools/AopTools.java b/api-boot-project/api-boot-plugins/api-boot-plugin/src/main/java/org/minbox/framework/api/boot/plugin/tools/AopTools.java
deleted file mode 100644
index 1926444f..00000000
--- a/api-boot-project/api-boot-plugins/api-boot-plugin/src/main/java/org/minbox/framework/api/boot/plugin/tools/AopTools.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright [2019] [恒宇少年 - 于起宇]
- *
- *      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.minbox.framework.api.boot.plugin.tools;
-
-import org.springframework.core.BridgeMethodResolver;
-import org.springframework.util.ClassUtils;
-
-import java.lang.reflect.Method;
-
-/**
- * Aop Tools
- *
- * @author 恒宇少年
- */
-public class AopTools {
-    /**
-     * get method declared annotation
-     *
-     * @param targetClass     class instance
-     * @param method          method instance
-     * @param annotationClass annotation class
-     * @param <T>             annotation type
-     * @return annotation instance
-     */
-    public static <T> T getMethodAnnotation(Class targetClass, Method method, Class annotationClass) {
-        Method specificMethod = ClassUtils.getMostSpecificMethod(method, targetClass);
-        // declared method object instance
-        Method declaredMethod = BridgeMethodResolver.findBridgedMethod(specificMethod);
-        return (T) declaredMethod.getDeclaredAnnotation(annotationClass);
-    }
-}
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin/src/main/java/org/minbox/framework/api/boot/plugin/tools/JsonTools.java b/api-boot-project/api-boot-plugins/api-boot-plugin/src/main/java/org/minbox/framework/api/boot/plugin/tools/JsonTools.java
deleted file mode 100644
index e88b7fc1..00000000
--- a/api-boot-project/api-boot-plugins/api-boot-plugin/src/main/java/org/minbox/framework/api/boot/plugin/tools/JsonTools.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright [2019] [恒宇少年 - 于起宇]
- *
- *      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.minbox.framework.api.boot.plugin.tools;
-
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.serializer.SerializerFeature;
-import org.springframework.util.ObjectUtils;
-
-/**
- * json tools
- *
- * @author 恒宇少年
- */
-public class JsonTools {
-    /**
-     * beautify object to json
-     *
-     * @param object object
-     * @return object json string
-     */
-    public static String beautifyJson(Object object) {
-        if (ObjectUtils.isEmpty(object)) {
-            return null;
-        }
-        return JSON.toJSONString(object,
-            SerializerFeature.PrettyFormat,
-            SerializerFeature.SortField,
-            SerializerFeature.MapSortField
-        );
-    }
-
-    /**
-     * beautify string to json
-     *
-     * @param json json string
-     * @return after beautify json
-     */
-    public static String beautifyJson(String json) {
-        if (ObjectUtils.isEmpty(json)) {
-            return json;
-        }
-        return JSON.toJSONString(
-            JSONObject.parse(json),
-            SerializerFeature.PrettyFormat
-        );
-    }
-}
diff --git a/api-boot-project/api-boot-plugins/pom.xml b/api-boot-project/api-boot-plugins/pom.xml
deleted file mode 100644
index 9c47fb17..00000000
--- a/api-boot-project/api-boot-plugins/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>api-boot-parent</artifactId>
-        <groupId>org.minbox.framework</groupId>
-        <version>${revision}</version>
-        <relativePath>../api-boot-parent</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>api-boot-plugins</artifactId>
-    <packaging>pom</packaging>
-    <description>
-        ApiBoot集成第三方插件集成实现
-    </description>
-    <properties>
-        <main.basedir>${basedir}/../..</main.basedir>
-    </properties>
-    <modules>
-        <module>api-boot-plugin</module>
-        <module>api-boot-plugin-resource-load</module>
-    </modules>
-</project>
diff --git a/api-boot-project/api-boot-starters/api-boot-starter-resource-load/pom.xml b/api-boot-project/api-boot-starters/api-boot-starter-resource-load/pom.xml
index 47a880bf..6024a22b 100644
--- a/api-boot-project/api-boot-starters/api-boot-starter-resource-load/pom.xml
+++ b/api-boot-project/api-boot-starters/api-boot-starter-resource-load/pom.xml
@@ -50,11 +50,6 @@
             <groupId>org.minbox.framework</groupId>
             <artifactId>api-boot-starter</artifactId>
         </dependency>
-        <!--ApiBoot Resource Load Plugin-->
-        <dependency>
-            <groupId>org.minbox.framework</groupId>
-            <artifactId>api-boot-plugin-resource-load</artifactId>
-        </dependency>
         <!--SpringBoot Aop-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/ApiBootResourceStoreDelegate.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/ApiBootResourceStoreDelegate.java
similarity index 88%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/ApiBootResourceStoreDelegate.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/ApiBootResourceStoreDelegate.java
index 367506a7..b35b78b6 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/ApiBootResourceStoreDelegate.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/ApiBootResourceStoreDelegate.java
@@ -14,7 +14,7 @@
  *      limitations under the License.
  *
  */
-package org.minbox.framework.api.boot.plugin.resource.load;
+package org.minbox.framework.api.boot.resource;
 
 import org.minbox.framework.api.boot.common.exception.ApiBootException;
 
@@ -24,13 +24,7 @@
  * ApiBoot Resource Load 数据驱动委托类
  * 该接口实现类用于查询资源信息
  *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-12 11:47
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
+ * @author 恒宇少年
  */
 public interface ApiBootResourceStoreDelegate {
     /**
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/annotation/ResourceField.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/annotation/ResourceField.java
similarity index 74%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/annotation/ResourceField.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/annotation/ResourceField.java
index 6a880392..e48f7843 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/annotation/ResourceField.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/annotation/ResourceField.java
@@ -1,4 +1,4 @@
-package org.minbox.framework.api.boot.plugin.resource.load.annotation;
+package org.minbox.framework.api.boot.resource.annotation;
 
 import java.lang.annotation.*;
 
@@ -6,13 +6,7 @@
  * 资源业务字段
  * 配置方法返回值资源字段的基本信息
  *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-11 21:52
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
+ * @author 恒宇少年
  */
 @Target({ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/annotation/ResourceFields.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/annotation/ResourceFields.java
new file mode 100644
index 00000000..5d5bdd03
--- /dev/null
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/annotation/ResourceFields.java
@@ -0,0 +1,20 @@
+package org.minbox.framework.api.boot.resource.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 资源业务字段集合
+ *
+ * @author 恒宇少年
+ */
+@Target({ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface ResourceFields {
+    /**
+     * 资源业务字段的集合
+     *
+     * @return
+     */
+    ResourceField[] value();
+}
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/annotation/ResourceLoad.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/annotation/ResourceLoad.java
similarity index 50%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/annotation/ResourceLoad.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/annotation/ResourceLoad.java
index 5ded6833..054bdf19 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/annotation/ResourceLoad.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/annotation/ResourceLoad.java
@@ -1,19 +1,13 @@
-package org.minbox.framework.api.boot.plugin.resource.load.annotation;
+package org.minbox.framework.api.boot.resource.annotation;
 
-import org.minbox.framework.api.boot.plugin.resource.load.enums.ResourceStoreEvent;
+import org.minbox.framework.api.boot.resource.enums.ResourceStoreEvent;
 
 import java.lang.annotation.*;
 
 /**
  * 资源加载注解，该注解只能配置在方法上
  *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-11 21:52
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
+ * @author 恒宇少年
  */
 @Target({ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/aop/advistor/ApiBootResourceLoadAdvisor.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/aop/advistor/ApiBootResourceLoadAdvisor.java
similarity index 83%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/aop/advistor/ApiBootResourceLoadAdvisor.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/aop/advistor/ApiBootResourceLoadAdvisor.java
index 97a11ef1..276796d7 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/aop/advistor/ApiBootResourceLoadAdvisor.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/aop/advistor/ApiBootResourceLoadAdvisor.java
@@ -14,11 +14,11 @@
  *      limitations under the License.
  *
  */
-package org.minbox.framework.api.boot.plugin.resource.load.aop.advistor;
+package org.minbox.framework.api.boot.resource.aop.advistor;
 
 import org.aopalliance.aop.Advice;
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceLoad;
-import org.minbox.framework.api.boot.plugin.resource.load.aop.interceptor.ApiBootResourceLoadMethodInterceptor;
+import org.minbox.framework.api.boot.resource.annotation.ResourceLoad;
+import org.minbox.framework.api.boot.resource.aop.interceptor.ApiBootResourceLoadMethodInterceptor;
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.support.AbstractPointcutAdvisor;
 import org.springframework.aop.support.ComposablePointcut;
@@ -31,13 +31,7 @@
 /**
  * ApiBoot Resource Load Pointcut Advisor
  *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-01 16:29
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
+ * @author 恒宇少年
  */
 public class ApiBootResourceLoadAdvisor extends AbstractPointcutAdvisor implements BeanFactoryAware {
 
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/aop/interceptor/ApiBootResourceLoadMethodInterceptor.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/aop/interceptor/ApiBootResourceLoadMethodInterceptor.java
similarity index 86%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/aop/interceptor/ApiBootResourceLoadMethodInterceptor.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/aop/interceptor/ApiBootResourceLoadMethodInterceptor.java
index 7d984150..f3c008e9 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/aop/interceptor/ApiBootResourceLoadMethodInterceptor.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/aop/interceptor/ApiBootResourceLoadMethodInterceptor.java
@@ -14,12 +14,13 @@
  *      limitations under the License.
  *
  */
-package org.minbox.framework.api.boot.plugin.resource.load.aop.interceptor;
+package org.minbox.framework.api.boot.resource.aop.interceptor;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceLoad;
-import org.minbox.framework.api.boot.plugin.resource.load.pusher.ApiBootResourcePusher;
+import org.minbox.framework.api.boot.resource.annotation.ResourceLoad;
+import org.minbox.framework.api.boot.resource.pusher.ApiBootResourcePusher;
+import org.minbox.framework.api.boot.resource.enums.ResourceStoreEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.aop.support.AopUtils;
@@ -33,13 +34,7 @@
  * ApiBoot DataSource Advice
  * use spring aop
  *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-01 16:44
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
+ * @author 恒宇少年
  */
 public class ApiBootResourceLoadMethodInterceptor implements MethodInterceptor {
     /**
@@ -64,7 +59,7 @@ public ApiBootResourceLoadMethodInterceptor(ApiBootResourcePusher apiBootResourc
      * @param invocation MethodInvocation
      * @return Execute Result
      * @throws Throwable method declared exception
-     * @see org.minbox.framework.api.boot.plugin.resource.load.enums.ResourceStoreEvent
+     * @see ResourceStoreEvent
      */
     @Override
     public Object invoke(MethodInvocation invocation) throws Throwable {
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/context/ApiBootResourceContext.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/context/ApiBootResourceContext.java
similarity index 92%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/context/ApiBootResourceContext.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/context/ApiBootResourceContext.java
index 136d7e73..8131af92 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/context/ApiBootResourceContext.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/context/ApiBootResourceContext.java
@@ -15,9 +15,9 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.resource.load.context;
+package org.minbox.framework.api.boot.resource.context;
 
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceField;
+import org.minbox.framework.api.boot.resource.annotation.ResourceField;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -30,13 +30,7 @@
 /**
  * ApiBoot Resource Context
  *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-15 09:57
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
+ * @author 恒宇少年
  */
 public class ApiBootResourceContext {
     /**
diff --git a/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/enums/ResourceStoreEvent.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/enums/ResourceStoreEvent.java
new file mode 100644
index 00000000..6116f9b5
--- /dev/null
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/enums/ResourceStoreEvent.java
@@ -0,0 +1,28 @@
+package org.minbox.framework.api.boot.resource.enums;
+
+import lombok.Getter;
+
+/**
+ * 资源存储事件
+ *
+ * @author 恒宇少年
+ */
+@Getter
+public enum ResourceStoreEvent {
+    /**
+     * 查询资源
+     */
+    SELECT,
+    /**
+     * 添加资源
+     */
+    INSERT,
+    /**
+     * 更新资源
+     */
+    UPDATE,
+    /**
+     * 删除资源
+     */
+    DELETE
+}
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/expression/ResourceSourceExpression.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/expression/ResourceSourceExpression.java
similarity index 84%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/expression/ResourceSourceExpression.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/expression/ResourceSourceExpression.java
index 404116a8..4d2abf91 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/expression/ResourceSourceExpression.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/expression/ResourceSourceExpression.java
@@ -15,7 +15,9 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.resource.load.expression;
+package org.minbox.framework.api.boot.resource.expression;
+
+import org.minbox.framework.api.boot.resource.annotation.ResourceField;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -25,13 +27,7 @@
 /**
  * ApiBoot Resource Source Field Name Expression
  *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-19 14:47
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
+ * @author 恒宇少年
  */
 public class ResourceSourceExpression {
     /**
@@ -48,7 +44,7 @@ public class ResourceSourceExpression {
      *
      * @param sourceFieldName ResourceField annotation source value
      * @return true: match , false: don't match
-     * @see org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceField
+     * @see ResourceField
      */
     public static Matcher getBasicMatch(String sourceFieldName) {
         Matcher matcher = SOURCE_NAME_PATTERN_BASIC.matcher(sourceFieldName);
@@ -60,7 +56,7 @@ public static Matcher getBasicMatch(String sourceFieldName) {
      *
      * @param sourceFieldName ResourceField annotation source value
      * @return true: match , false: don't match
-     * @see org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceField
+     * @see ResourceField
      */
     public static Matcher getOgnlMatch(String sourceFieldName) {
         Matcher matcher = SOURCE_NAME_PATTERN_OGNL.matcher(sourceFieldName);
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/loader/ResourceFieldLoader.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/loader/ResourceFieldLoader.java
similarity index 79%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/loader/ResourceFieldLoader.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/loader/ResourceFieldLoader.java
index ac382f75..a15f6924 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/loader/ResourceFieldLoader.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/loader/ResourceFieldLoader.java
@@ -15,10 +15,10 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.resource.load.loader;
+package org.minbox.framework.api.boot.resource.loader;
 
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceField;
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceFields;
+import org.minbox.framework.api.boot.resource.annotation.ResourceField;
+import org.minbox.framework.api.boot.resource.annotation.ResourceFields;
 import org.springframework.util.ObjectUtils;
 
 import java.lang.reflect.Method;
@@ -29,13 +29,7 @@
 /**
  * ApiBoot Resource Field Annotation Loader
  *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-12 15:44
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
+ * @author 恒宇少年
  */
 public class ResourceFieldLoader {
 
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/pusher/ApiBootResourcePusher.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/pusher/ApiBootResourcePusher.java
similarity index 80%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/pusher/ApiBootResourcePusher.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/pusher/ApiBootResourcePusher.java
index ab940020..d7bc4eea 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/pusher/ApiBootResourcePusher.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/pusher/ApiBootResourcePusher.java
@@ -15,24 +15,20 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.resource.load.pusher;
+package org.minbox.framework.api.boot.resource.pusher;
 
 import org.minbox.framework.api.boot.common.exception.ApiBootException;
+import org.minbox.framework.api.boot.resource.pusher.support.ApiBootJdbcResourcePusher;
+import org.minbox.framework.api.boot.resource.pusher.support.ApiBootRedisResourcePusher;
 
 import java.lang.reflect.Method;
 
 /**
  * ApiBoot Resource Pusher Interface
  *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-19 09:32
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
- * @see org.minbox.framework.api.boot.plugin.resource.load.pusher.support.ApiBootJdbcResourcePusher
- * @see org.minbox.framework.api.boot.plugin.resource.load.pusher.support.ApiBootRedisResourcePusher
+ * @author 恒宇少年
+ * @see ApiBootJdbcResourcePusher
+ * @see ApiBootRedisResourcePusher
  */
 public interface ApiBootResourcePusher {
     /**
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/pusher/support/ApiBootAbstractResourcePusher.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/pusher/support/ApiBootAbstractResourcePusher.java
similarity index 94%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/pusher/support/ApiBootAbstractResourcePusher.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/pusher/support/ApiBootAbstractResourcePusher.java
index e5dafbae..eae84b32 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/pusher/support/ApiBootAbstractResourcePusher.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/pusher/support/ApiBootAbstractResourcePusher.java
@@ -15,13 +15,13 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.resource.load.pusher.support;
+package org.minbox.framework.api.boot.resource.pusher.support;
 
 import org.minbox.framework.api.boot.common.exception.ApiBootException;
 import org.minbox.framework.api.boot.common.tools.ListTools;
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceField;
-import org.minbox.framework.api.boot.plugin.resource.load.pusher.ApiBootResourcePusher;
-import org.minbox.framework.api.boot.plugin.resource.load.tools.ResourceFieldTools;
+import org.minbox.framework.api.boot.resource.annotation.ResourceField;
+import org.minbox.framework.api.boot.resource.pusher.ApiBootResourcePusher;
+import org.minbox.framework.api.boot.resource.tools.ResourceFieldTools;
 import org.springframework.util.ObjectUtils;
 
 import java.lang.reflect.Field;
@@ -33,13 +33,7 @@
  * ApiBoot Resource Pusher Abstract Support
  * Provide access to resource or source field
  *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-19 09:40
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
+ * @author 恒宇少年
  */
 public abstract class ApiBootAbstractResourcePusher implements ApiBootResourcePusher {
 
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/pusher/support/ApiBootJdbcResourcePusher.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/pusher/support/ApiBootJdbcResourcePusher.java
similarity index 89%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/pusher/support/ApiBootJdbcResourcePusher.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/pusher/support/ApiBootJdbcResourcePusher.java
index 5ab1536c..b4f7b7d4 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/pusher/support/ApiBootJdbcResourcePusher.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/pusher/support/ApiBootJdbcResourcePusher.java
@@ -15,10 +15,10 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.resource.load.pusher.support;
+package org.minbox.framework.api.boot.resource.pusher.support;
 
 import org.minbox.framework.api.boot.common.exception.ApiBootException;
-import org.minbox.framework.api.boot.plugin.resource.load.ApiBootResourceStoreDelegate;
+import org.minbox.framework.api.boot.resource.ApiBootResourceStoreDelegate;
 import org.springframework.util.ObjectUtils;
 
 import java.lang.reflect.Method;
@@ -27,13 +27,7 @@
 /**
  * ApiBoot Jdbc Resource Pusher
  *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-19 09:33
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
+ * @author 恒宇少年
  */
 public class ApiBootJdbcResourcePusher extends ApiBootAbstractResourcePusher {
     /**
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/pusher/support/ApiBootMemoryResourcePusher.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/pusher/support/ApiBootMemoryResourcePusher.java
similarity index 91%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/pusher/support/ApiBootMemoryResourcePusher.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/pusher/support/ApiBootMemoryResourcePusher.java
index a79bd7b4..8f45aae8 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/pusher/support/ApiBootMemoryResourcePusher.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/pusher/support/ApiBootMemoryResourcePusher.java
@@ -15,10 +15,10 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.resource.load.pusher.support;
+package org.minbox.framework.api.boot.resource.pusher.support;
 
-import org.minbox.framework.api.boot.plugin.resource.load.ApiBootResourceStoreDelegate;
-import org.minbox.framework.api.boot.plugin.resource.load.context.ApiBootResourceContext;
+import org.minbox.framework.api.boot.resource.ApiBootResourceStoreDelegate;
+import org.minbox.framework.api.boot.resource.context.ApiBootResourceContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.ObjectUtils;
@@ -32,13 +32,7 @@
 /**
  * ApiBoot Resource Memory Pusher
  *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-19 11:16
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
+ * @author 恒宇少年
  */
 public class ApiBootMemoryResourcePusher extends ApiBootJdbcResourcePusher {
     /**
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/pusher/support/ApiBootRedisResourcePusher.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/pusher/support/ApiBootRedisResourcePusher.java
similarity index 92%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/pusher/support/ApiBootRedisResourcePusher.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/pusher/support/ApiBootRedisResourcePusher.java
index 237f1e71..6a13a50f 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/pusher/support/ApiBootRedisResourcePusher.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/pusher/support/ApiBootRedisResourcePusher.java
@@ -15,10 +15,10 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.resource.load.pusher.support;
+package org.minbox.framework.api.boot.resource.pusher.support;
 
-import org.minbox.framework.api.boot.plugin.resource.load.ApiBootResourceStoreDelegate;
-import org.minbox.framework.api.boot.plugin.resource.load.context.ApiBootResourceContext;
+import org.minbox.framework.api.boot.resource.ApiBootResourceStoreDelegate;
+import org.minbox.framework.api.boot.resource.context.ApiBootResourceContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -31,13 +31,7 @@
 /**
  * ApiBoot Redis Resource Pusher
  *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-19 09:34
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
+ * @author 恒宇少年
  */
 public class ApiBootRedisResourcePusher extends ApiBootJdbcResourcePusher {
     /**
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/tools/ResourceFieldTools.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/tools/ResourceFieldTools.java
similarity index 89%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/tools/ResourceFieldTools.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/tools/ResourceFieldTools.java
index bd5ceeb3..c59bbcdd 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-resource-load/src/main/java/org/minbox/framework/api/boot/plugin/resource/load/tools/ResourceFieldTools.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/resource/tools/ResourceFieldTools.java
@@ -15,12 +15,12 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.resource.load.tools;
+package org.minbox.framework.api.boot.resource.tools;
 
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceField;
-import org.minbox.framework.api.boot.plugin.resource.load.context.ApiBootResourceContext;
-import org.minbox.framework.api.boot.plugin.resource.load.expression.ResourceSourceExpression;
-import org.minbox.framework.api.boot.plugin.resource.load.loader.ResourceFieldLoader;
+import org.minbox.framework.api.boot.resource.annotation.ResourceField;
+import org.minbox.framework.api.boot.resource.context.ApiBootResourceContext;
+import org.minbox.framework.api.boot.resource.expression.ResourceSourceExpression;
+import org.minbox.framework.api.boot.resource.loader.ResourceFieldLoader;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;
 
@@ -31,13 +31,7 @@
 /**
  * Resource Tools
  *
- * @author：恒宇少年 - 于起宇
- * <p>
- * DateTime：2019-04-20 11:31
- * Blog：http://blog.yuqiyu.com
- * WebSite：http://www.jianshu.com/u/092df3f77bca
- * Gitee：https://gitee.com/hengboy
- * GitHub：https://github.com/hengboy
+ * @author 恒宇少年
  */
 public class ResourceFieldTools {
     /**
diff --git a/api-boot-project/pom.xml b/api-boot-project/pom.xml
index e8939ae7..9661208f 100644
--- a/api-boot-project/pom.xml
+++ b/api-boot-project/pom.xml
@@ -17,7 +17,6 @@
         <module>api-boot-autoconfigure</module>
         <module>api-boot-starters</module>
         <module>api-boot-common</module>
-        <module>api-boot-plugins</module>
         <module>api-boot-maven-plugins</module>
         <module>api-boot-tools</module>
         <module>api-boot</module>
diff --git a/api-boot-samples/api-boot-sample-resource-load/pom.xml b/api-boot-samples/api-boot-sample-resource-load/pom.xml
index 0f520b06..375e4e79 100644
--- a/api-boot-samples/api-boot-sample-resource-load/pom.xml
+++ b/api-boot-samples/api-boot-sample-resource-load/pom.xml
@@ -53,7 +53,7 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-dependencies</artifactId>
-                <version>2.2.2.RELEASE</version>
+                <version>${api-boot.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/api-boot-samples/api-boot-sample-resource-load/src/main/java/org/minbox/framework/api/boot/sample/ResourceLoadSampleService.java b/api-boot-samples/api-boot-sample-resource-load/src/main/java/org/minbox/framework/api/boot/sample/ResourceLoadSampleService.java
index 5d5fb48c..1f479d7a 100644
--- a/api-boot-samples/api-boot-sample-resource-load/src/main/java/org/minbox/framework/api/boot/sample/ResourceLoadSampleService.java
+++ b/api-boot-samples/api-boot-sample-resource-load/src/main/java/org/minbox/framework/api/boot/sample/ResourceLoadSampleService.java
@@ -18,10 +18,10 @@
 package org.minbox.framework.api.boot.sample;
 
 import lombok.Data;
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceField;
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceFields;
-import org.minbox.framework.api.boot.plugin.resource.load.annotation.ResourceLoad;
-import org.minbox.framework.api.boot.plugin.resource.load.enums.ResourceStoreEvent;
+import org.minbox.framework.api.boot.resource.annotation.ResourceField;
+import org.minbox.framework.api.boot.resource.annotation.ResourceFields;
+import org.minbox.framework.api.boot.resource.annotation.ResourceLoad;
+import org.minbox.framework.api.boot.resource.enums.ResourceStoreEvent;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
diff --git a/api-boot-samples/api-boot-sample-resource-load/src/main/java/org/minbox/framework/api/boot/sample/ResourceLoadService.java b/api-boot-samples/api-boot-sample-resource-load/src/main/java/org/minbox/framework/api/boot/sample/ResourceLoadService.java
index a1d8331b..da6dc468 100644
--- a/api-boot-samples/api-boot-sample-resource-load/src/main/java/org/minbox/framework/api/boot/sample/ResourceLoadService.java
+++ b/api-boot-samples/api-boot-sample-resource-load/src/main/java/org/minbox/framework/api/boot/sample/ResourceLoadService.java
@@ -18,7 +18,7 @@
 package org.minbox.framework.api.boot.sample;
 
 import org.minbox.framework.api.boot.common.exception.ApiBootException;
-import org.minbox.framework.api.boot.plugin.resource.load.ApiBootResourceStoreDelegate;
+import org.minbox.framework.api.boot.resource.ApiBootResourceStoreDelegate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;