Skip to content

Commit 04204ee

Browse files
wicked-tc130wicked-tc130
committed
update version to 5.0.7.
1 parent bd4896a commit 04204ee

File tree

13 files changed

+236
-7
lines changed

13 files changed

+236
-7
lines changed

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@
1414
## 1. 集成
1515
引入sdk包
1616
```xml
17-
<!--以5.0.6版本为例-->
17+
<!--以5.0.7版本为例-->
1818
<dependencies>
1919
<!-- jiguang-sdk -->
2020
<dependency>
2121
<groupId>io.github.jpush</groupId>
2222
<artifactId>jiguang-sdk</artifactId>
23-
<version>5.0.6</version>
23+
<version>5.0.7</version>
2424
</dependency>
2525
</dependencies>
2626
```

‎example-for-spring/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<groupId>io.github.jpush</groupId>
1515
<artifactId>example-for-spring</artifactId>
16-
<version>5.0.6</version>
16+
<version>5.0.7</version>
1717

1818
<properties>
1919
<maven.compiler.source>8</maven.compiler.source>
@@ -26,7 +26,7 @@
2626
<dependency>
2727
<groupId>io.github.jpush</groupId>
2828
<artifactId>jiguang-sdk</artifactId>
29-
<version>5.0.6</version>
29+
<version>5.0.7</version>
3030
</dependency>
3131
<!-- lombok -->
3232
<dependency>

‎example-for-spring/src/test/java/cn/jiguang/app/api/PushApiTest.java

+9
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,15 @@ public void send() {
6363
// 或者发送所有平台
6464
// param.setPlatform(ApiConstants.Platform.ALL);
6565

66+
// Android厂商
67+
// param.setThirdNotificationMessage();
68+
69+
// 短信补充
70+
// param.setSmsMessage();
71+
72+
// 回调
73+
// param.setCallback();
74+
6675
// 发送
6776
PushSendResult result = pushApi.send(param);
6877
log.info("result:{}", result);

‎example-for-spring/target/classes/application.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
spring:
2+
application:
3+
name: jiguang-sdk
4+
5+
server:
6+
port: 9876
7+
8+
logging:
9+
level:
10+
root: debug
11+
12+
jiguang:
13+
api:
14+
# 此为演示数据，请替换成真实数据
15+
app-key: a266cd5c8544ba09b23733e1
16+
master-secret: bcf3b3327000abce4764f862
17+
dev-key: c2dc75e97486529205528b23
18+
dev-secret: d219e2f001df2fe4f08b6754
19+
20+

‎jiguang-sdk/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<parent>
88
<groupId>io.github.jpush</groupId>
99
<artifactId>jiguang-sdk-java</artifactId>
10-
<version>5.0.6</version>
10+
<version>5.0.7</version>
1111
<relativePath>../pom.xml</relativePath>
1212
</parent>
1313

1414
<groupId>io.github.jpush</groupId>
1515
<artifactId>jiguang-sdk</artifactId>
16-
<version>5.0.6</version>
16+
<version>5.0.7</version>
1717
<packaging>jar</packaging>
1818

1919
<properties>

‎jiguang-sdk/src/main/java/cn/jiguang/sdk/api/PushApi.java

+18
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,24 @@ public ImageFileUpdateResult updateImageFile(@NonNull String mediaId, @NonNull I
100100
return pushClient.updateImageFile(mediaId, param);
101101
}
102102

103+
// ********************* 如果遇到此api没有及时补充字段的情况，可以自行构建json，调用下面的接口 *********************
104+
105+
public PushSendResult send(Object param) {
106+
return pushClient.send(param);
107+
}
108+
109+
public SchedulePushSendResult scheduleSend(Object param) {
110+
return pushClient.scheduleSend(param);
111+
}
112+
113+
public PushSendResult validateSend(Object param) {
114+
return pushClient.validateSend(param);
115+
}
116+
117+
public PushSendResult sendByFile(Object param) {
118+
return pushClient.sendByFile(param);
119+
}
120+
103121
public static class Builder {
104122

105123
private String host = "https://api.jpush.cn";

‎jiguang-sdk/src/main/java/cn/jiguang/sdk/bean/push/PushSendParam.java

+15
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
package cn.jiguang.sdk.bean.push;
22

33
import cn.jiguang.sdk.bean.push.audience.Audience;
4+
import cn.jiguang.sdk.bean.push.callback.Callback;
45
import cn.jiguang.sdk.bean.push.message.custom.CustomMessage;
56
import cn.jiguang.sdk.bean.push.message.inapp.InAppMessage;
67
import cn.jiguang.sdk.bean.push.message.liveactivity.LiveActivityMessage;
78
import cn.jiguang.sdk.bean.push.message.notification.NotificationMessage;
9+
import cn.jiguang.sdk.bean.push.message.notification.ThirdNotificationMessage;
10+
import cn.jiguang.sdk.bean.push.message.sms.SmsMessage;
811
import cn.jiguang.sdk.bean.push.options.Options;
912
import cn.jiguang.sdk.enums.platform.Platform;
1013
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -54,4 +57,16 @@ public class PushSendParam {
5457
@JsonInclude(JsonInclude.Include.NON_NULL)
5558
private InAppMessage inApp;
5659

60+
@JsonProperty("notification_3rd")
61+
@JsonInclude(JsonInclude.Include.NON_NULL)
62+
private ThirdNotificationMessage thirdNotificationMessage;
63+
64+
@JsonProperty("sms_message")
65+
@JsonInclude(JsonInclude.Include.NON_NULL)
66+
private SmsMessage smsMessage;
67+
68+
@JsonProperty("callback")
69+
@JsonInclude(JsonInclude.Include.NON_NULL)
70+
private Callback callback;
71+
5772
}

‎jiguang-sdk/src/main/java/cn/jiguang/sdk/bean/push/callback/Callback.java

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package cn.jiguang.sdk.bean.push.callback;
2+
3+
import cn.jiguang.sdk.enums.callback.CallbackType;
4+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
5+
import com.fasterxml.jackson.annotation.JsonInclude;
6+
import com.fasterxml.jackson.annotation.JsonProperty;
7+
import lombok.Data;
8+
9+
import java.util.Map;
10+
11+
@Data
12+
@JsonIgnoreProperties(ignoreUnknown = true)
13+
public class Callback {
14+
15+
@JsonProperty("url")
16+
private String url;
17+
18+
/**
19+
* 取值参考：{@link CallbackType}
20+
*/
21+
@JsonProperty("type")
22+
@JsonInclude(JsonInclude.Include.NON_NULL)
23+
private Integer type;
24+
25+
@JsonProperty("params")
26+
@JsonInclude(JsonInclude.Include.NON_NULL)
27+
private Map<String, Object> params;
28+
29+
}

‎jiguang-sdk/src/main/java/cn/jiguang/sdk/bean/push/message/notification/ThirdNotificationMessage.java

+64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
package cn.jiguang.sdk.bean.push.message.notification;
2+
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
5+
import com.fasterxml.jackson.annotation.JsonProperty;
6+
import lombok.Data;
7+
8+
import java.util.Map;
9+
10+
@Data
11+
@JsonIgnoreProperties(ignoreUnknown = true)
12+
public class ThirdNotificationMessage {
13+
14+
@JsonProperty("title")
15+
@JsonInclude(JsonInclude.Include.NON_NULL)
16+
private String title;
17+
18+
@JsonProperty("content")
19+
private String content;
20+
21+
@JsonProperty("intent")
22+
@JsonInclude(JsonInclude.Include.NON_NULL)
23+
private Intent intent;
24+
25+
@JsonProperty("uri_activity")
26+
@JsonInclude(JsonInclude.Include.NON_NULL)
27+
private String uriActivity;
28+
29+
@JsonProperty("uri_action")
30+
@JsonInclude(JsonInclude.Include.NON_NULL)
31+
private String uriAction;
32+
33+
@JsonProperty("badge_class")
34+
@JsonInclude(JsonInclude.Include.NON_NULL)
35+
private String badgeClass;
36+
37+
@JsonProperty("badge_add_num")
38+
@JsonInclude(JsonInclude.Include.NON_NULL)
39+
private Integer badgeAddNumber;
40+
41+
@JsonProperty("badge_set_num")
42+
@JsonInclude(JsonInclude.Include.NON_NULL)
43+
private Integer badgeSetNumber;
44+
45+
@JsonProperty("sound")
46+
@JsonInclude(JsonInclude.Include.NON_NULL)
47+
private String sound;
48+
49+
@JsonProperty("channel_id")
50+
@JsonInclude(JsonInclude.Include.NON_NULL)
51+
private String channelId;
52+
53+
@JsonProperty("extras")
54+
@JsonInclude(JsonInclude.Include.NON_NULL)
55+
private Map<String, Object> extras;
56+
57+
@Data
58+
public static class Intent {
59+
@JsonProperty("url")
60+
@JsonInclude(JsonInclude.Include.NON_NULL)
61+
private String url;
62+
}
63+
64+
}

‎jiguang-sdk/src/main/java/cn/jiguang/sdk/bean/push/message/sms/SmsMessage.java

+34
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package cn.jiguang.sdk.bean.push.message.sms;
2+
3+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
4+
import com.fasterxml.jackson.annotation.JsonInclude;
5+
import com.fasterxml.jackson.annotation.JsonProperty;
6+
import lombok.Data;
7+
8+
import java.util.Map;
9+
10+
@Data
11+
@JsonIgnoreProperties(ignoreUnknown = true)
12+
public class SmsMessage {
13+
14+
@JsonProperty("temp_id")
15+
@JsonInclude(JsonInclude.Include.NON_NULL)
16+
private Integer tempId;
17+
18+
@JsonProperty("signid")
19+
@JsonInclude(JsonInclude.Include.NON_NULL)
20+
private Integer signId;
21+
22+
@JsonProperty("delay_time")
23+
@JsonInclude(JsonInclude.Include.NON_NULL)
24+
private Integer delayTime;
25+
26+
@JsonProperty("active_filter")
27+
@JsonInclude(JsonInclude.Include.NON_NULL)
28+
private Boolean activeFilter;
29+
30+
@JsonProperty("temp_para")
31+
@JsonInclude(JsonInclude.Include.NON_NULL)
32+
private Map<String, Object> tempParams;
33+
34+
}

‎jiguang-sdk/src/main/java/cn/jiguang/sdk/client/PushClient.java

+18
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,22 @@ public interface PushClient {
8888
@Headers("Content-Type: multipart/form-data")
8989
ImageFileUpdateResult updateImageFile(@Param("media_id") String mediaId, ImageFileUpdateParam param);
9090

91+
// ********************* 如果遇到此api没有及时补充字段的情况，可以自行构建json，调用下面的接口 *********************
92+
93+
@RequestLine("POST /v3/push")
94+
@Headers("Content-Type: application/json; charset=utf-8")
95+
PushSendResult send(Object param);
96+
97+
@RequestLine("POST /v3/schedules")
98+
@Headers("Content-Type: application/json; charset=utf-8")
99+
SchedulePushSendResult scheduleSend(Object param);
100+
101+
@RequestLine("POST /v3/push/validate")
102+
@Headers("Content-Type: application/json; charset=utf-8")
103+
PushSendResult validateSend(Object param);
104+
105+
@RequestLine("POST /v3/push/file")
106+
@Headers("Content-Type: application/json; charset=utf-8")
107+
PushSendResult sendByFile(Object param);
108+
91109
}

‎jiguang-sdk/src/main/java/cn/jiguang/sdk/enums/callback/CallbackType.java

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package cn.jiguang.sdk.enums.callback;
2+
3+
public enum CallbackType {
4+
5+
RECEIVED(0b1, "送达回执，值为1"),
6+
CLICKED(0b10, "点击回执，值为2"),
7+
RECEIVED_AND_CLICKED(0b11, "送达和点击回执，值为3"),
8+
PUSH(0b1000, "推送成功回执，值为8"),
9+
PUSH_AND_RECEIVED(0b1001, "推送成功和送达回执，值为9"),
10+
PUSH_AND_CLICKED(0b1010, "推送成功和点击回执，值为10"),
11+
PUSH_AND_RECEIVED_AND_CLICKED(0b1011, "推送成功和送达和点击回执，值为11"),
12+
;
13+
14+
private int value;
15+
private String description;
16+
17+
CallbackType(int value, String description) {
18+
this.value = value;
19+
this.description = description;
20+
}
21+
22+
}

‎pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.github.jpush</groupId>
88
<artifactId>jiguang-sdk-java</artifactId>
9-
<version>5.0.6</version>
9+
<version>5.0.7</version>
1010
<packaging>pom</packaging>
1111

1212
<name>Jiguang SDK For Rest Api</name>

0 commit comments

Comments
 (0)