发布2.0.5.RELEASE版本.

hengboy · Apr 22, 2019 · 26cd81e · 26cd81e
1 parent 81eca63
commit 26cd81e
Show file tree

Hide file tree

Showing 46 changed files with 172 additions and 78 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@
     <dependency>
       <groupId>org.minbox.framework</groupId>
       <artifactId>api-boot-dependencies</artifactId>
-      <version>2.0.5.RC1</version>
+      <version>2.0.5.RELEASE</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -76,6 +76,7 @@ Demo列表：
 - [ApiBoot Quartz](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-quartz)
 - [ApiBoot DataSource Switch](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-datasource-switch)
 - [ApiBoot Resource Load](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-resource-load)
+- [ApiBoot Message Push](https://github.com/hengboy/api-boot/tree/master/api-boot-samples/api-boot-sample-message-push)
 
 ## 更新日志
 

diff --git a/api-boot-project/api-boot-autoconfigure/pom.xml b/api-boot-project/api-boot-autoconfigure/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-parent</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.5.RC1</version>
+        <version>2.0.5.RELEASE</version>
         <relativePath>../api-boot-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -153,5 +153,13 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
             <optional>true</optional>
         </dependency>
+
+        <!--ApiBoot Plugin Message Push-->
+        <dependency>
+            <groupId>org.minbox.framework</groupId>
+            <artifactId>api-boot-plugin-message-push</artifactId>
+            <optional>true</optional>
+        </dependency>
+
     </dependencies>
 </project>
diff --git a/.../src/main/java/org/minbox/framework/api/boot/autoconfigure/swagger/SwaggerProperties.java b/.../src/main/java/org/minbox/framework/api/boot/autoconfigure/swagger/SwaggerProperties.java
@@ -45,7 +45,7 @@ public class SwaggerProperties {
     /**
      * 文档版本号
      */
-    private String version = "2.0.5.RC1";
+    private String version = "2.0.5.RELEASE";
     /**
      * 文档版权
      */

diff --git a/api-boot-project/api-boot-common/pom.xml b/api-boot-project/api-boot-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-parent</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.5.RC1</version>
+        <version>2.0.5.RELEASE</version>
         <relativePath>../api-boot-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/api-boot-project/api-boot-dependencies/pom.xml b/api-boot-project/api-boot-dependencies/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.5.RC1</version>
+        <version>2.0.5.RELEASE</version>
         <relativePath>../..</relativePath>
     </parent>
     <packaging>pom</packaging>
@@ -15,6 +15,7 @@
     <properties>
         <main.basedir>${basedir}/../..</main.basedir>
         <spring.boot.version>2.1.4.RELEASE</spring.boot.version>
+        <api.boot.version>2.0.5.RELEASE</api.boot.version>
         <mybatis.enhance.version>1.1.0.RELEASE</mybatis.enhance.version>
         <mybatis.pageable.version>1.0.6.RELEASE</mybatis.pageable.version>
         <druid.version>1.1.14</druid.version>
@@ -30,6 +31,7 @@
         <aliyun.sdk.dysmsapi.version>1.1.0</aliyun.sdk.dysmsapi.version>
         <quartz.version>2.3.0</quartz.version>
         <spring.tx.version>5.1.5.RELEASE</spring.tx.version>
+        <jpush-client.version>3.3.11</jpush-client.version>
 
         <!--Plugin Versions-->
         <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
@@ -51,33 +53,33 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-starter</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
             <!--ApiBoot AutoConfigure-->
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-autoconfigure</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
 
             <!--ApiBoot Converter-->
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-plugin-http-converter</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
                 <optional>true</optional>
             </dependency>
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-starter-http-converter</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
 
             <!--ApiBoot Common-->
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-common</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
             <!--fastJson-->
             <dependency>
@@ -148,14 +150,14 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-starter-swagger</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
 
             <!--ApiBoot Plugin-->
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-plugin</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
 
             <!--ApiBoot Security-->
@@ -172,17 +174,17 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-plugin-security</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-plugin-oauth</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-starter-security-oauth-jwt</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
 
             <!--ApiBoot & Aliyun Oss-->
@@ -194,12 +196,12 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-plugin-alibaba-oss</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-starter-alibaba-oss</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
 
             <!--ApiBoot & Aliyun Sms-->
@@ -216,12 +218,12 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-plugin-alibaba-sms</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-starter-alibaba-sms</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
 
             <!--ApiBoot & Quartz-->
@@ -233,36 +235,53 @@
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-plugin-quartz</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-starter-quartz</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
 
             <!--ApiBoot DataSource Switch-->
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-plugin-datasource-switch</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-starter-datasource-switch</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
 
             <!--ApiBoot Resource Load-->
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-plugin-resource-load</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.minbox.framework</groupId>
                 <artifactId>api-boot-starter-resource-load</artifactId>
-                <version>${project.version}</version>
+                <version>${api.boot.version}</version>
+            </dependency>
+
+            <!--ApiBoot Message Push-->
+            <dependency>
+                <groupId>cn.jpush.api</groupId>
+                <artifactId>jpush-client</artifactId>
+                <version>${jpush-client.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.minbox.framework</groupId>
+                <artifactId>api-boot-plugin-message-push</artifactId>
+                <version>${api.boot.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.minbox.framework</groupId>
+                <artifactId>api-boot-starter-message-push</artifactId>
+                <version>${api.boot.version}</version>
             </dependency>
 
         </dependencies>

diff --git a/api-boot-project/api-boot-parent/pom.xml b/api-boot-project/api-boot-parent/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-dependencies</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.5.RC1</version>
+        <version>2.0.5.RELEASE</version>
         <relativePath>../api-boot-dependencies</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-alibaba-oss/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin-alibaba-oss/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-plugins</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.5.RC1</version>
+        <version>2.0.5.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>ApiBoot Plugin 阿里云 对象存储oss</description>

diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-alibaba-sms/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin-alibaba-sms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-plugins</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.5.RC1</version>
+        <version>2.0.5.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>ApiBoot集成阿里云国际短信服务</description>

diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-datasource-switch/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin-datasource-switch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-plugins</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.5.RC1</version>
+        <version>2.0.5.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-http-converter/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin-http-converter/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>api-boot-plugins</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.5.RC1</version>
+        <version>2.0.5.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

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
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>api-boot-plugins</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.5.RC1</version>
+        <version>2.0.5.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>

diff --git a/...rc/main/java/org/minbox/framework/api/boot/plugin/message/push/model/MessagePushBody.java b/...rc/main/java/org/minbox/framework/api/boot/plugin/message/push/model/MessagePushBody.java
@@ -76,10 +76,6 @@ public class MessagePushBody {
      * message content
      */
     private String message;
-    /**
-     * if push production message
-     */
-    private boolean production = true;
 
     /**
      * get message push sound

diff --git a/...framework/api/boot/plugin/message/push/support/ApiBootAbstractMessagePushServiceImpl.java b/...framework/api/boot/plugin/message/push/support/ApiBootAbstractMessagePushServiceImpl.java
@@ -52,9 +52,14 @@ public abstract class ApiBootAbstractMessagePushServiceImpl implements ApiBootMe
      * config push clients
      */
     private Map<String, PushClientConfig> pushClientConfigs;
+    /**
+     * is production
+     */
+    private boolean production;
 
-    public ApiBootAbstractMessagePushServiceImpl(Map<String, PushClientConfig> pushClientConfigs) {
+    public ApiBootAbstractMessagePushServiceImpl(Map<String, PushClientConfig> pushClientConfigs, boolean production) {
         this.pushClientConfigs = pushClientConfigs;
+        this.production = production;
     }
 
     /**
@@ -83,4 +88,13 @@ public PushClientConfig getCurrentPushClient() throws ApiBootException {
         String currentClientName = getCurrentPushClientName();
         return pushClientConfigs.get(currentClientName);
     }
+
+    /**
+     * is production
+     *
+     * @return true：production
+     */
+    public boolean isProduction() {
+        return production;
+    }
 }
diff --git a/.../framework/api/boot/plugin/message/push/support/ApiBootMessagePushJiGuangServiceImpl.java b/.../framework/api/boot/plugin/message/push/support/ApiBootMessagePushJiGuangServiceImpl.java
@@ -51,8 +51,8 @@ public class ApiBootMessagePushJiGuangServiceImpl extends ApiBootAbstractMessage
      */
     static Logger logger = LoggerFactory.getLogger(ApiBootMessagePushJiGuangServiceImpl.class);
 
-    public ApiBootMessagePushJiGuangServiceImpl(Map<String, PushClientConfig> pushClientConfigs) {
-        super(pushClientConfigs);
+    public ApiBootMessagePushJiGuangServiceImpl(Map<String, PushClientConfig> pushClientConfigs, boolean production) {
+        super(pushClientConfigs, production);
     }
 
     /**
@@ -105,7 +105,7 @@ private void addPlatformMeta(MessagePushBody messagePushBody, PushPayload.Builde
             case IOS:
                 builder.setPlatform(Platform.ios());
                 // set is production
-                builder.setOptions(Options.newBuilder().setApnsProduction(messagePushBody.isProduction()).build());
+                builder.setOptions(Options.newBuilder().setApnsProduction(isProduction()).build());
                 break;
             case ANDROID:
                 builder.setPlatform(Platform.android());

diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin-oauth/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-plugins</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.5.RC1</version>
+        <version>2.0.5.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>ApiBoot集成SpringSecurity</description>

diff --git a/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/pom.xml b/api-boot-project/api-boot-plugins/api-boot-plugin-quartz/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-plugins</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.5.RC1</version>
+        <version>2.0.5.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>ApiBoot集成Quartz</description>

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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>api-boot-plugins</artifactId>
         <groupId>org.minbox.framework</groupId>
-        <version>2.0.5.RC1</version>
+        <version>2.0.5.RELEASE</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <properties>