diff --git a/api-boot-project/api-boot-autoconfigure/pom.xml b/api-boot-project/api-boot-autoconfigure/pom.xml
index 8ada6ebe..f99fb88b 100644
--- a/api-boot-project/api-boot-autoconfigure/pom.xml
+++ b/api-boot-project/api-boot-autoconfigure/pom.xml
@@ -149,13 +149,6 @@
             <optional>true</optional>
         </dependency>
 
-        <!--ApiBoot Plugin Message Push-->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>api-boot-plugin-message-push</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <!--ApiBoot Mybatis Pageable-->
         <dependency>
             <groupId>com.gitee.hengboy</groupId>
@@ -258,7 +251,11 @@
             <artifactId>minbox-mongo-client-settings</artifactId>
             <optional>true</optional>
         </dependency>
-
+        <dependency>
+            <groupId>cn.jpush.api</groupId>
+            <artifactId>jpush-client</artifactId>
+            <optional>true</optional>
+        </dependency>
         <!--apiboot tools-->
         <dependency>
             <groupId>org.minbox.framework</groupId>
diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/push/ApiBootMessagePushAutoConfiguration.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/push/ApiBootMessagePushAutoConfiguration.java
index a0db95ce..4bdfb4cf 100644
--- a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/push/ApiBootMessagePushAutoConfiguration.java
+++ b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/push/ApiBootMessagePushAutoConfiguration.java
@@ -18,11 +18,11 @@
 package org.minbox.framework.api.boot.autoconfigure.push;
 
 import cn.jpush.api.JPushClient;
-import org.minbox.framework.api.boot.plugin.message.push.ApiBootMessagePushService;
-import org.minbox.framework.api.boot.plugin.message.push.aop.advistor.ApiBootMessagePushClientSwitchAdvisor;
-import org.minbox.framework.api.boot.plugin.message.push.aop.interceptor.ApiBootMessagePushSwitchAnnotationInterceptor;
-import org.minbox.framework.api.boot.plugin.message.push.model.PushClientConfig;
-import org.minbox.framework.api.boot.plugin.message.push.support.ApiBootMessagePushJiGuangServiceImpl;
+import org.minbox.framework.api.boot.push.ApiBootMessagePushService;
+import org.minbox.framework.api.boot.push.aop.advistor.ApiBootMessagePushClientSwitchAdvisor;
+import org.minbox.framework.api.boot.push.aop.interceptor.ApiBootMessagePushSwitchAnnotationInterceptor;
+import org.minbox.framework.api.boot.push.model.PushClientConfig;
+import org.minbox.framework.api.boot.push.support.ApiBootMessagePushJiGuangServiceImpl;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
diff --git a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/push/ApiBootMessagePushProperties.java b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/push/ApiBootMessagePushProperties.java
index 50517f94..92933a3a 100644
--- a/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/push/ApiBootMessagePushProperties.java
+++ b/api-boot-project/api-boot-autoconfigure/src/main/java/org/minbox/framework/api/boot/autoconfigure/push/ApiBootMessagePushProperties.java
@@ -18,7 +18,7 @@
 package org.minbox.framework.api.boot.autoconfigure.push;
 
 import lombok.Data;
-import org.minbox.framework.api.boot.plugin.message.push.model.PushClientConfig;
+import org.minbox.framework.api.boot.push.model.PushClientConfig;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Configuration;
 
diff --git a/api-boot-project/api-boot-dependencies/pom.xml b/api-boot-project/api-boot-dependencies/pom.xml
index d2fc054c..22d8cbd2 100644
--- a/api-boot-project/api-boot-dependencies/pom.xml
+++ b/api-boot-project/api-boot-dependencies/pom.xml
@@ -281,11 +281,6 @@
                 <artifactId>jpush-client</artifactId>
                 <version>${jpush-client.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.minbox.framework</groupId>
-                <artifactId>api-boot-plugin-message-push</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-starter-message-push</artifactId>
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/pom.xml
deleted file mode 100644
index 019d64b3..00000000
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ 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.
-  ~
-  -->
-
-<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>
-    <description>
-        ApiBoot 消息推送组件集成，目前集成：
-        1. 极光推送
-    </description>
-    <artifactId>api-boot-plugin-message-push</artifactId>
-    <dependencies>
-        <!--ApiBoot Plugin-->
-        <dependency>
-            <groupId>org.minbox.framework</groupId>
-            <artifactId>api-boot-plugin</artifactId>
-        </dependency>
-        <!--JPush Client-->
-        <dependency>
-            <groupId>cn.jpush.api</groupId>
-            <artifactId>jpush-client</artifactId>
-        </dependency>
-        <!--SpringBoot Aop-->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/api-boot-project/api-boot-plugins/pom.xml b/api-boot-project/api-boot-plugins/pom.xml
index 250917ab..d2f0fea4 100644
--- a/api-boot-project/api-boot-plugins/pom.xml
+++ b/api-boot-project/api-boot-plugins/pom.xml
@@ -23,7 +23,6 @@
         <module>api-boot-plugin-oauth</module>
         <module>api-boot-plugin-quartz</module>
         <module>api-boot-plugin-resource-load</module>
-        <module>api-boot-plugin-message-push</module>
         <module>api-boot-plugin-rate-limiter</module>
         <module>api-boot-plugin-sequence</module>
     </modules>
diff --git a/api-boot-project/api-boot-starters/api-boot-starter-message-push/pom.xml b/api-boot-project/api-boot-starters/api-boot-starter-message-push/pom.xml
index 15c9fa3e..533e0fcd 100644
--- a/api-boot-project/api-boot-starters/api-boot-starter-message-push/pom.xml
+++ b/api-boot-project/api-boot-starters/api-boot-starter-message-push/pom.xml
@@ -47,10 +47,13 @@
             <groupId>org.minbox.framework</groupId>
             <artifactId>api-boot-starter</artifactId>
         </dependency>
-        <!--ApiBoot Plugin Message Push-->
         <dependency>
-            <groupId>org.minbox.framework</groupId>
-            <artifactId>api-boot-plugin-message-push</artifactId>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>cn.jpush.api</groupId>
+            <artifactId>jpush-client</artifactId>
         </dependency>
     </dependencies>
 </project>
diff --git a/api-boot-project/api-boot/pom.xml b/api-boot-project/api-boot/pom.xml
index 33725e7a..343ac205 100644
--- a/api-boot-project/api-boot/pom.xml
+++ b/api-boot-project/api-boot/pom.xml
@@ -35,6 +35,11 @@
             <artifactId>spring-boot-starter-jdbc</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-aop</artifactId>
+            <optional>true</optional>
+        </dependency>
 
         <!--Others-->
         <dependency>
@@ -78,6 +83,10 @@
             <artifactId>fastjson</artifactId>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>cn.jpush.api</groupId>
+            <artifactId>jpush-client</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/ApiBootMessagePushService.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/ApiBootMessagePushService.java
similarity index 87%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/ApiBootMessagePushService.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/ApiBootMessagePushService.java
index 0454341b..98be6196 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/ApiBootMessagePushService.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/ApiBootMessagePushService.java
@@ -15,11 +15,11 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.message.push;
+package org.minbox.framework.api.boot.push;
 
 import org.minbox.framework.api.boot.common.exception.ApiBootException;
-import org.minbox.framework.api.boot.plugin.message.push.model.MessagePushBody;
-import org.minbox.framework.api.boot.plugin.message.push.model.PushClientConfig;
+import org.minbox.framework.api.boot.push.model.MessagePushBody;
+import org.minbox.framework.api.boot.push.model.PushClientConfig;
 
 /**
  * ApiBoot Message Push Service
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/annotation/MessagePushSwitch.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/annotation/MessagePushSwitch.java
similarity index 93%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/annotation/MessagePushSwitch.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/annotation/MessagePushSwitch.java
index 619daba5..8fa8faec 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/annotation/MessagePushSwitch.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/annotation/MessagePushSwitch.java
@@ -15,7 +15,7 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.message.push.annotation;
+package org.minbox.framework.api.boot.push.annotation;
 
 import java.lang.annotation.*;
 
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/aop/advistor/ApiBootMessagePushClientSwitchAdvisor.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/aop/advistor/ApiBootMessagePushClientSwitchAdvisor.java
similarity index 90%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/aop/advistor/ApiBootMessagePushClientSwitchAdvisor.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/aop/advistor/ApiBootMessagePushClientSwitchAdvisor.java
index bdd6d635..c664a75d 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/aop/advistor/ApiBootMessagePushClientSwitchAdvisor.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/aop/advistor/ApiBootMessagePushClientSwitchAdvisor.java
@@ -15,11 +15,11 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.message.push.aop.advistor;
+package org.minbox.framework.api.boot.push.aop.advistor;
 
 import org.aopalliance.aop.Advice;
-import org.minbox.framework.api.boot.plugin.message.push.annotation.MessagePushSwitch;
-import org.minbox.framework.api.boot.plugin.message.push.aop.interceptor.ApiBootMessagePushSwitchAnnotationInterceptor;
+import org.minbox.framework.api.boot.push.annotation.MessagePushSwitch;
+import org.minbox.framework.api.boot.push.aop.interceptor.ApiBootMessagePushSwitchAnnotationInterceptor;
 import org.springframework.aop.Pointcut;
 import org.springframework.aop.support.AbstractPointcutAdvisor;
 import org.springframework.aop.support.annotation.AnnotationMatchingPointcut;
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/aop/holder/MessagePushContextHolder.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/aop/holder/MessagePushContextHolder.java
similarity index 95%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/aop/holder/MessagePushContextHolder.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/aop/holder/MessagePushContextHolder.java
index ced21cfa..428a2956 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/aop/holder/MessagePushContextHolder.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/aop/holder/MessagePushContextHolder.java
@@ -15,7 +15,7 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.message.push.aop.holder;
+package org.minbox.framework.api.boot.push.aop.holder;
 
 import org.springframework.util.Assert;
 
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/aop/interceptor/ApiBootMessagePushSwitchAnnotationInterceptor.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/aop/interceptor/ApiBootMessagePushSwitchAnnotationInterceptor.java
similarity index 89%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/aop/interceptor/ApiBootMessagePushSwitchAnnotationInterceptor.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/aop/interceptor/ApiBootMessagePushSwitchAnnotationInterceptor.java
index 0542fe3a..609cce8f 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/aop/interceptor/ApiBootMessagePushSwitchAnnotationInterceptor.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/aop/interceptor/ApiBootMessagePushSwitchAnnotationInterceptor.java
@@ -15,12 +15,12 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.message.push.aop.interceptor;
+package org.minbox.framework.api.boot.push.aop.interceptor;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
-import org.minbox.framework.api.boot.plugin.message.push.annotation.MessagePushSwitch;
-import org.minbox.framework.api.boot.plugin.message.push.aop.holder.MessagePushContextHolder;
+import org.minbox.framework.api.boot.push.annotation.MessagePushSwitch;
+import org.minbox.framework.api.boot.push.aop.holder.MessagePushContextHolder;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.core.BridgeMethodResolver;
 import org.springframework.util.ClassUtils;
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/model/MessagePushBody.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/model/MessagePushBody.java
similarity index 94%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/model/MessagePushBody.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/model/MessagePushBody.java
index 6420bedc..199e307c 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/model/MessagePushBody.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/model/MessagePushBody.java
@@ -15,13 +15,12 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.message.push.model;
+package org.minbox.framework.api.boot.push.model;
 
 import lombok.Builder;
 import lombok.Data;
 import org.springframework.util.StringUtils;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/model/PushClientConfig.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/model/PushClientConfig.java
similarity index 93%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/model/PushClientConfig.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/model/PushClientConfig.java
index 3011119a..067f477c 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/model/PushClientConfig.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/model/PushClientConfig.java
@@ -15,7 +15,7 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.message.push.model;
+package org.minbox.framework.api.boot.push.model;
 
 import lombok.Data;
 
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/model/PusherPlatform.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/model/PusherPlatform.java
similarity index 93%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/model/PusherPlatform.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/model/PusherPlatform.java
index c6f483ca..ce0147b6 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/model/PusherPlatform.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/model/PusherPlatform.java
@@ -15,7 +15,7 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.message.push.model;
+package org.minbox.framework.api.boot.push.model;
 
 /**
  * Target platform enumeration for message push
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/support/ApiBootAbstractMessagePushServiceImpl.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/support/ApiBootAbstractMessagePushServiceImpl.java
similarity index 89%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/support/ApiBootAbstractMessagePushServiceImpl.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/support/ApiBootAbstractMessagePushServiceImpl.java
index 5df1c140..bb05bfb5 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/support/ApiBootAbstractMessagePushServiceImpl.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/support/ApiBootAbstractMessagePushServiceImpl.java
@@ -15,12 +15,12 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.message.push.support;
+package org.minbox.framework.api.boot.push.support;
 
 import org.minbox.framework.api.boot.common.exception.ApiBootException;
-import org.minbox.framework.api.boot.plugin.message.push.ApiBootMessagePushService;
-import org.minbox.framework.api.boot.plugin.message.push.aop.holder.MessagePushContextHolder;
-import org.minbox.framework.api.boot.plugin.message.push.model.PushClientConfig;
+import org.minbox.framework.api.boot.push.ApiBootMessagePushService;
+import org.minbox.framework.api.boot.push.aop.holder.MessagePushContextHolder;
+import org.minbox.framework.api.boot.push.model.PushClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.StringUtils;
diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/support/ApiBootMessagePushJiGuangServiceImpl.java b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/support/ApiBootMessagePushJiGuangServiceImpl.java
similarity index 96%
rename from api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/support/ApiBootMessagePushJiGuangServiceImpl.java
rename to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/support/ApiBootMessagePushJiGuangServiceImpl.java
index f91e8b5d..76c89a8c 100644
--- a/api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/support/ApiBootMessagePushJiGuangServiceImpl.java
+++ b/api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/support/ApiBootMessagePushJiGuangServiceImpl.java
@@ -15,7 +15,7 @@
  *
  */
 
-package org.minbox.framework.api.boot.plugin.message.push.support;
+package org.minbox.framework.api.boot.push.support;
 
 import cn.jiguang.common.ClientConfig;
 import cn.jpush.api.JPushClient;
@@ -25,8 +25,8 @@
 import cn.jpush.api.push.model.audience.Audience;
 import cn.jpush.api.push.model.notification.*;
 import org.minbox.framework.api.boot.common.exception.ApiBootException;
-import org.minbox.framework.api.boot.plugin.message.push.model.MessagePushBody;
-import org.minbox.framework.api.boot.plugin.message.push.model.PushClientConfig;
+import org.minbox.framework.api.boot.push.model.MessagePushBody;
+import org.minbox.framework.api.boot.push.model.PushClientConfig;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.util.ObjectUtils;
diff --git a/api-boot-samples/api-boot-sample-message-push/pom.xml b/api-boot-samples/api-boot-sample-message-push/pom.xml
index 0e15c0ac..f239c8fc 100644
--- a/api-boot-samples/api-boot-sample-message-push/pom.xml
+++ b/api-boot-samples/api-boot-sample-message-push/pom.xml
@@ -46,7 +46,7 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-dependencies</artifactId>
-                <version>2.2.2.RELEASE</version>
+                <version>${api-boot.version}</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
diff --git a/api-boot-samples/api-boot-sample-message-push/src/main/java/org/minbox/framework/api/boot/sample/message/push/MessagePushSampleService.java b/api-boot-samples/api-boot-sample-message-push/src/main/java/org/minbox/framework/api/boot/sample/message/push/MessagePushSampleService.java
index 8e71a7cd..08176011 100644
--- a/api-boot-samples/api-boot-sample-message-push/src/main/java/org/minbox/framework/api/boot/sample/message/push/MessagePushSampleService.java
+++ b/api-boot-samples/api-boot-sample-message-push/src/main/java/org/minbox/framework/api/boot/sample/message/push/MessagePushSampleService.java
@@ -17,10 +17,10 @@
 
 package org.minbox.framework.api.boot.sample.message.push;
 
-import org.minbox.framework.api.boot.plugin.message.push.ApiBootMessagePushService;
-import org.minbox.framework.api.boot.plugin.message.push.annotation.MessagePushSwitch;
-import org.minbox.framework.api.boot.plugin.message.push.model.MessagePushBody;
-import org.minbox.framework.api.boot.plugin.message.push.model.PusherPlatform;
+import org.minbox.framework.api.boot.push.ApiBootMessagePushService;
+import org.minbox.framework.api.boot.push.annotation.MessagePushSwitch;
+import org.minbox.framework.api.boot.push.model.MessagePushBody;
+import org.minbox.framework.api.boot.push.model.PusherPlatform;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -49,7 +49,7 @@ public class MessagePushSampleService {
      * 注解 @MessagePushSwitch 添加时配置value，则使用配置的value配置
      * 对应api.boot.push.multiple的key
      *
-     * @see org.minbox.framework.api.boot.plugin.message.push.model.PushClientConfig
+     * @see org.minbox.framework.api.boot.push.model.PushClientConfig
      */
     //@MessagePushSwitch
     //@MessagePushSwitch("user")