Merge pull request #25 from hengboy/2.3.x

Move "api-boot-plugin-message-push" to "api-boot"

Author: hengboy

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>

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;

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;
 

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>

api-boot-project/api-boot-plugins/api-boot-plugin-message-push/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>

api-boot-project/api-boot-plugins/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>

api-boot-project/api-boot-starters/api-boot-starter-message-push/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>

api-boot-project/api-boot/pom.xml

@@ -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

api-boot-project/api-boot-plugins/api-boot-plugin-message-push/src/main/java/org/minbox/framework/api/boot/plugin/message/push/ApiBootMessagePushService.java renamed to api-boot-project/api-boot/src/main/java/org/minbox/framework/api/boot/push/ApiBootMessagePushService.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.*;