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开源许可进行编写。
## 开源支持
-
- * 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:恒宇少年 - 于起宇
- *
- * 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 @@
\ No newline at end of file
+
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 @@
- * 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:恒宇少年 - 于起宇 - *
- * 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 @@
-
-
- * 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:恒宇少年 - 于起宇
- *
- * 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:恒宇少年 - 于起宇
- *
- * 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:恒宇少年 - 于起宇
- *
- * 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:恒宇少年 - 于起宇
- *
- * 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:恒宇少年 - 于起宇
- *
- * 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:恒宇少年 - 于起宇
- *
- * 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:恒宇少年 - 于起宇
- *
- * 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:恒宇少年 - 于起宇
- *
- * 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:恒宇少年 - 于起宇
- *
- * 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:恒宇少年 - 于起宇
- *
- * 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:恒宇少年 - 于起宇
- *
- * 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:恒宇少年 - 于起宇
- *
- * 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:恒宇少年 - 于起宇
- *
- * 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 @@