support harmonyos, update version to 5.1.0.

jpush · May 21, 2024 · c362186 · c362186
1 parent d62a178
commit c362186
Show file tree

Hide file tree

Showing 12 changed files with 68 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -3,24 +3,24 @@
 这是 Jiguang REST API 的 Java 版本封装开发包，是由极光推送官方提供的，一般支持最新的 API 功能。
 
 对应的 REST API 文档：
-* [REST API - Push](https://docs.jiguang.cn/jpush/server/push/rest_api_v3_push/)
-* [REST API - Device](https://docs.jiguang.cn/jpush/server/push/rest_api_v3_device/)
-* [REST API - Report](https://docs.jiguang.cn/jpush/server/push/rest_api_v3_report/)
-* [REST API - Admin](https://docs.jiguang.cn/jpush/server/push/rest_api_admin_api_v1/)
+* [REST API - Push](https://docs.jiguang.cn/jpush/server/push/rest_api_v3_push)
+* [REST API - Device](https://docs.jiguang.cn/jpush/server/push/rest_api_v3_device)
+* [REST API - Report](https://docs.jiguang.cn/jpush/server/push/rest_api_v3_report)
+* [REST API - Admin](https://docs.jiguang.cn/jpush/server/push/rest_api_admin_api_v1)
 
 支持 Java JDK 1.8 及其以上版本。
 > 支持 Java JDK 1.6 版本：[jpush-api-java-client](https://github.com/jpush/jpush-api-java-client)，但不再更新。
 
 ## 1. 集成
 引入sdk包
 ```xml
-<!--以5.0.9版本为例-->
+<!--以5.1.0版本为例-->
 <dependencies>
  <!-- jiguang-sdk -->
  <dependency>
  <groupId>io.github.jpush</groupId>
  <artifactId>jiguang-sdk</artifactId>
- <version>5.0.9</version>
+ <version>5.1.0</version>
  </dependency>
 </dependencies>
 ```

diff --git a/example-for-spring/pom.xml b/example-for-spring/pom.xml
@@ -13,7 +13,7 @@
 
  <groupId>io.github.jpush</groupId>
  <artifactId>example-for-spring</artifactId>
- <version>5.0.9</version>
+ <version>5.1.0</version>
 
  <properties>
  <maven.compiler.source>8</maven.compiler.source>
@@ -26,7 +26,7 @@
  <dependency>
  <groupId>io.github.jpush</groupId>
  <artifactId>jiguang-sdk</artifactId>
- <version>5.0.9</version>
+ <version>5.1.0</version>
  </dependency>
  <!-- lombok -->
  <dependency>

diff --git a/jiguang-sdk/pom.xml b/jiguang-sdk/pom.xml
@@ -7,13 +7,13 @@
  <parent>
  <groupId>io.github.jpush</groupId>
  <artifactId>jiguang-sdk-java</artifactId>
- <version>5.0.9</version>
+ <version>5.1.0</version>
  <relativePath>../pom.xml</relativePath>
  </parent>
 
  <groupId>io.github.jpush</groupId>
  <artifactId>jiguang-sdk</artifactId>
- <version>5.0.9</version>
+ <version>5.1.0</version>
  <packaging>jar</packaging>
 
  <properties>

diff --git a/jiguang-sdk/src/main/java/cn/jiguang/sdk/bean/push/PushSendParam.java b/jiguang-sdk/src/main/java/cn/jiguang/sdk/bean/push/PushSendParam.java
@@ -32,7 +32,7 @@ public class PushSendParam {
  /**
  * 两种格式
  * 字符串："all"
- * {@link Platform}数组：["android","ios","quickapp"]
+ * {@link Platform}数组：["android","ios","hmos","quickapp"]
  */
  @JsonProperty("platform")
  private Object platform;

diff --git a/...-sdk/src/main/java/cn/jiguang/sdk/bean/push/message/notification/NotificationMessage.java b/...-sdk/src/main/java/cn/jiguang/sdk/bean/push/message/notification/NotificationMessage.java
@@ -32,6 +32,10 @@ public class NotificationMessage {
  @JsonInclude(JsonInclude.Include.NON_NULL)
  private IOS ios;
 
+ @JsonProperty("hmos")
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private HMOS hmos;
+
  @JsonProperty("quickapp")
  @JsonInclude(JsonInclude.Include.NON_NULL)
  private QuickApp quickApp;
@@ -187,6 +191,52 @@ public static class IOS {
  private String interruptionLevel;
  }
 
+ @Data
+ public static class HMOS {
+ @JsonProperty("alert")
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String alert;
+
+ @JsonProperty("title")
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String title;
+
+ @JsonProperty("category")
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String category;
+
+ @JsonProperty("large_icon")
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String largeIcon;
+
+ @JsonProperty("intent")
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private Android.Intent intent;
+
+ @JsonProperty("badge_add_num")
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private Integer badgeAddNumber;
+
+ @JsonProperty("extras")
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private Map<String, Object> extras;
+
+ @JsonProperty("test_message")
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private Boolean isTest;
+
+ @JsonProperty("receipt_id")
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String receiptId;
+
+ @Data
+ public static class Intent {
+ @JsonProperty("url")
+ @JsonInclude(JsonInclude.Include.NON_NULL)
+ private String url;
+ }
+ }
+
  @Data
  public static class QuickApp {
  @JsonProperty("title")

diff --git a/jiguang-sdk/src/main/java/cn/jiguang/sdk/client/AdminClient.java b/jiguang-sdk/src/main/java/cn/jiguang/sdk/client/AdminClient.java
@@ -6,7 +6,7 @@
 import feign.RequestLine;
 
 /**
- * (<a href="https://docs.jiguang.cn/jpush/server/push/rest_api_admin_api_v1/">REST API - Admin</a>)
+ * (<a href="https://docs.jiguang.cn/jpush/server/push/rest_api_admin_api_v1">REST API - Admin</a>)
  */
 public interface AdminClient {
 

diff --git a/jiguang-sdk/src/main/java/cn/jiguang/sdk/client/DeviceClient.java b/jiguang-sdk/src/main/java/cn/jiguang/sdk/client/DeviceClient.java
@@ -7,7 +7,7 @@
 import feign.RequestLine;
 
 /**
- * (<a href="https://docs.jiguang.cn/jpush/server/push/rest_api_v3_device/">REST API - Device</a>)
+ * (<a href="https://docs.jiguang.cn/jpush/server/push/rest_api_v3_device">REST API - Device</a>)
  */
 public interface DeviceClient {
 

diff --git a/jiguang-sdk/src/main/java/cn/jiguang/sdk/client/PushClient.java b/jiguang-sdk/src/main/java/cn/jiguang/sdk/client/PushClient.java
@@ -16,7 +16,7 @@
 import feign.RequestLine;
 
 /**
- * (<a href="https://docs.jiguang.cn/jpush/server/push/rest_api_v3_report/">REST API - Push</a>)
+ * (<a href="https://docs.jiguang.cn/jpush/server/push/rest_api_v3_push">REST API - Push</a>)
  */
 public interface PushClient {
 

diff --git a/jiguang-sdk/src/main/java/cn/jiguang/sdk/client/ReportClient.java b/jiguang-sdk/src/main/java/cn/jiguang/sdk/client/ReportClient.java
@@ -10,7 +10,7 @@
 import java.util.Map;
 
 /**
- * (<a href="https://docs.jiguang.cn/jpush/server/push/rest_api_admin_api_v1/">REST API - Report</a>)
+ * (<a href="https://docs.jiguang.cn/jpush/server/push/rest_api_v3_report">REST API - Report</a>)
  */
 public interface ReportClient {
 

diff --git a/jiguang-sdk/src/main/java/cn/jiguang/sdk/constants/ApiConstants.java b/jiguang-sdk/src/main/java/cn/jiguang/sdk/constants/ApiConstants.java
@@ -10,6 +10,7 @@ interface Platform {
  String ALL = "all";
  String ANDROID = "android";
  String IOS = "ios";
+ String HMOS = "hmos";
  String QUICK_APP = "quickapp";
  }
 

diff --git a/jiguang-sdk/src/main/java/cn/jiguang/sdk/enums/platform/Platform.java b/jiguang-sdk/src/main/java/cn/jiguang/sdk/enums/platform/Platform.java
@@ -6,6 +6,7 @@ public enum Platform {
 
  android(ApiConstants.Platform.ANDROID, "Android平台"),
  ios(ApiConstants.Platform.IOS, "iOS平台"),
+ hmos(ApiConstants.Platform.HMOS, "鸿蒙平台"),
  quickapp(ApiConstants.Platform.QUICK_APP, "快应用平台");
 
  private String value;

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
  <groupId>io.github.jpush</groupId>
  <artifactId>jiguang-sdk-java</artifactId>
- <version>5.0.9</version>
+ <version>5.1.0</version>
  <packaging>pom</packaging>
 
  <name>Jiguang SDK For Rest Api</name>