Skip to content

Commit

Permalink
update version to 5.1.12, sync params.
Browse files Browse the repository at this point in the history
  • Loading branch information
wicked-tc130 committed Dec 26, 2024
1 parent b503ed6 commit c980917
Show file tree
Hide file tree
Showing 10 changed files with 438 additions and 73 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
## 1. 集成
引入sdk包
```xml
<!--以5.1.11版本为例-->
<!--以5.1.12版本为例-->
<dependencies>
<!-- jiguang-sdk -->
<dependency>
<groupId>io.github.jpush</groupId>
<artifactId>jiguang-sdk</artifactId>
<version>5.1.11</version>
<version>5.1.12</version>
</dependency>
</dependencies>
```
Expand Down
4 changes: 2 additions & 2 deletions example-for-spring/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

<groupId>io.github.jpush</groupId>
<artifactId>example-for-spring</artifactId>
<version>5.1.11</version>
<version>5.1.12</version>

<properties>
<maven.compiler.source>8</maven.compiler.source>
Expand All @@ -26,7 +26,7 @@
<dependency>
<groupId>io.github.jpush</groupId>
<artifactId>jiguang-sdk</artifactId>
<version>5.1.11</version>
<version>5.1.12</version>
</dependency>
<!-- lombok -->
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions jiguang-sdk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
<parent>
<groupId>io.github.jpush</groupId>
<artifactId>jiguang-sdk-java</artifactId>
<version>5.1.11</version>
<version>5.1.12</version>
<relativePath>../pom.xml</relativePath>
</parent>

<groupId>io.github.jpush</groupId>
<artifactId>jiguang-sdk</artifactId>
<version>5.1.11</version>
<version>5.1.12</version>
<packaging>jar</packaging>

<properties>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

@Data
public class PushSendParam {

@JsonProperty("cid")
@JsonInclude(JsonInclude.Include.NON_NULL)
private String cid;
Expand All @@ -37,36 +36,64 @@ public class PushSendParam {
@JsonProperty("platform")
private Object platform;

/**
* 推送参数
*/
@JsonProperty("options")
@JsonInclude(JsonInclude.Include.NON_NULL)
private Options options;

/**
* 通知内容体,是被推送到客户端的内容。
* 与 message 一起二者必须有其一,可以二者并存。
*/
@JsonProperty("notification")
@JsonInclude(JsonInclude.Include.NON_NULL)
private NotificationMessage notification;

/**
* 消息内容体,是被推送到客户端的内容。
* 与 notification 一起二者必须有其一,可以二者并存。
*/
@JsonProperty("message")
@JsonInclude(JsonInclude.Include.NON_NULL)
private CustomMessage custom;

/**
* 实时活动内容体。
* 不可与 notification 或 message 等并存。
*/
@JsonProperty("live_activity")
@JsonInclude(JsonInclude.Include.NON_NULL)
private LiveActivityMessage liveActivity;

/**
* 面向于通知栏消息类型,需搭配notification参数一起使用,对于通知权限关闭的用户可设置启用此功能。
* 不可与 message 同时并存。
*/
@JsonProperty("inapp_message")
@JsonInclude(JsonInclude.Include.NON_NULL)
private InAppMessage inApp;

/**
* 自定义消息转厂商通知内容体。
* 与 message 一起使用。
*/
@JsonProperty("notification_3rd")
@JsonInclude(JsonInclude.Include.NON_NULL)
private ThirdNotificationMessage thirdNotificationMessage;

/**
* 短信渠道补充送达内容体
*/
@JsonProperty("sms_message")
@JsonInclude(JsonInclude.Include.NON_NULL)
private SmsMessage smsMessage;

/**
* 回调参数
*/
@JsonProperty("callback")
@JsonInclude(JsonInclude.Include.NON_NULL)
private Callback callback;

}
Original file line number Diff line number Diff line change
Expand Up @@ -10,32 +10,32 @@
@Data
@JsonIgnoreProperties(ignoreUnknown = true)
public class CustomMessage {

@JsonProperty("title")
@JsonInclude(JsonInclude.Include.NON_NULL)
public String title;

/**
* 消息内容本身。
*/
@JsonProperty("msg_content")
@JsonInclude(JsonInclude.Include.NON_NULL)
public String content;

@JsonProperty("alternate_title")
@JsonInclude(JsonInclude.Include.NON_NULL)
public String alternateTitle;

@JsonProperty("alternate_content")
/**
* 消息标题。
*/
@JsonProperty("title")
@JsonInclude(JsonInclude.Include.NON_NULL)
public String alternateContent;
public String title;

/**
* 消息内容类型,开发者可根据自身业务定义具体类型。
*/
@JsonProperty("content_type")
@JsonInclude(JsonInclude.Include.NON_NULL)
public String contentType;

/**
* 这里的Object,可以是基础数据类型
* JSON 格式的可选参数
*/
@JsonProperty("extras")
@JsonInclude(JsonInclude.Include.NON_NULL)
public Map<String, Object> extras;

}
Loading

0 comments on commit c980917

Please sign in to comment.