Skip to content

Commit 2820b30

Browse files
author
Javen
committed
Refactoring: adjust packages.
1 parent 7cb6f1a commit 2820b30

32 files changed

+394
-420
lines changed

‎pom.xml‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
4+
<licenses>
5+
<license>
6+
<name>The Apache Software License, Version 2.0</name>
7+
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
8+
<distribution>repo</distribution>
9+
</license>
10+
</licenses>
11+
<parent>
12+
<groupId>org.sonatype.oss</groupId>
13+
<artifactId>oss-parent</artifactId>
14+
<version>7</version>
15+
</parent>
316
<groupId>cn.jpush.api</groupId>
4-
<artifactId>jpush-client</artifactId>
5-
<packaging>jar</packaging>
6-
<name>Jpush Client</name>
7-
<description>jpush client</description>
8-
<url>https://github.com/jpush/jpush-api-java-client</url>
9-
<licenses>
10-
<license>
11-
<name>The Apache Software License, Version 2.0</name>
12-
<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
13-
<distribution>repo</distribution>
14-
</license>
15-
</licenses>
16-
17+
<artifactId>jpush-client</artifactId>
18+
<version>2.2-SNAPSHOT</version>
19+
<packaging>jar</packaging>
20+
<name>JPush API Java Client</name>
21+
<description>JPush's officially supported Java client library for accessing JPush APIs.</description>
22+
<url>https://github.com/jpush/jpush-api-java-client</url>
23+
1724
<dependencies>
1825
<dependency>
1926
<groupId>com.google.code.gson</groupId>
@@ -40,16 +47,16 @@
4047
</configuration>
4148
</plugin>
4249
<plugin>
43-
<groupId>org.apache.maven.plugins</groupId>
44-
<artifactId>maven-release-plugin</artifactId>
45-
<version>2.2.2</version>
46-
<dependencies>
47-
<dependency>
48-
<groupId>org.apache.maven.plugins</groupId>
49-
<artifactId>maven-scm-plugin</artifactId>
50-
<version>1.8.1</version>
51-
</dependency>
52-
</dependencies>
50+
<groupId>org.apache.maven.plugins</groupId>
51+
<artifactId>maven-release-plugin</artifactId>
52+
<version>2.2.2</version>
53+
<dependencies>
54+
<dependency>
55+
<groupId>org.apache.maven.plugins</groupId>
56+
<artifactId>maven-scm-plugin</artifactId>
57+
<version>1.8.1</version>
58+
</dependency>
59+
</dependencies>
5360
<configuration>
5461
<goals>deploy</goals>
5562
<pushChanges>false</pushChanges>
@@ -64,18 +71,12 @@
6471
<developerConnection>scm:git:git@github.com:jpush/jpush-api-java-client.git</developerConnection>
6572
<url>scm:git:git@github.com:jpush/jpush-api-java-client.git</url>
6673
</scm>
67-
<developers>
68-
<developer>
69-
<id>xinxin</id>
70-
<name>xinxin</name>
71-
<email>xinxin@jpush.cn</email>
72-
</developer>
73-
</developers>
74-
75-
<parent>
76-
<groupId>org.sonatype.oss</groupId>
77-
<artifactId>oss-parent</artifactId>
78-
<version>7</version>
79-
</parent>
80-
<version>2.2-SNAPSHOT</version>
81-
</project>
74+
<developers>
75+
<developer>
76+
<id>xinxin</id>
77+
<name>xinxin</name>
78+
<email>xinxin@jpush.cn</email>
79+
</developer>
80+
</developers>
81+
82+
</project>

‎src/cn/jpush/api/BaseResult.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
import com.google.gson.Gson;
44

55
public class BaseResult {
6+
protected static Gson _gson = new Gson();
67

78
public BaseResult() {
8-
// TODO Auto-generated constructor stub
99
}
10-
public BaseResult(String error,Integer responseStatus){
11-
this.errmsg = error;
10+
11+
public BaseResult(String error, Integer responseStatus) {
12+
this.errmsg = error;
1213
this.response_status = responseStatus;
1314
}
14-
protected Long msg_id;
1515

16+
protected Long msg_id;
1617
protected Integer response_status = 200;
17-
1818
protected String errmsg;
1919

2020
public Long getMsg_id() {
@@ -43,7 +43,7 @@ public void setErrmsg(String errmsg) {
4343

4444
@Override
4545
public String toString() {
46-
return new Gson().toJson(this);
46+
return _gson.toJson(this);
4747
}
4848

4949
}

‎src/cn/jpush/api/DeviceEnum.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
package cn.jpush.api;
22

33
public enum DeviceEnum {
4+
45
Android("android"),
56

67
IOS("ios");
78

89
private final String value;
10+
911
private DeviceEnum(final String value) {
1012
this.value = value;
1113
}
14+
1215
public String value() {
1316
return this.value;
1417
}
15-
}
18+
19+
}

‎src/cn/jpush/http/HttpClient.java‎ renamed to ‎src/cn/jpush/api/HttpClient.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.jpush.http;
1+
package cn.jpush.api;
22

33
import java.io.DataOutputStream;
44
import java.io.IOException;
@@ -18,16 +18,16 @@
1818
import javax.net.ssl.HttpsURLConnection;
1919
import javax.net.ssl.TrustManager;
2020

21-
import cn.jpush.api.BaseResult;
22-
import cn.jpush.api.CustomMessageParams;
23-
import cn.jpush.api.ErrorCodeEnum;
24-
import cn.jpush.api.MessageParams;
25-
import cn.jpush.api.MessageResult;
26-
import cn.jpush.api.MsgTypeEnum;
27-
import cn.jpush.api.NotifyMessageParams;
28-
import cn.jpush.api.SimpleHostnameVerifier;
29-
import cn.jpush.api.SimpleTrustManager;
30-
import cn.jpush.api.ValidateRequestParams;
21+
import cn.jpush.api.http.BaseURL;
22+
import cn.jpush.api.http.RequestTypeEnum;
23+
import cn.jpush.api.push.CustomMessageParams;
24+
import cn.jpush.api.push.MessageParams;
25+
import cn.jpush.api.push.MessageResult;
26+
import cn.jpush.api.push.MsgTypeEnum;
27+
import cn.jpush.api.push.NotificationParams;
28+
import cn.jpush.api.utils.SimpleHostnameVerifier;
29+
import cn.jpush.api.utils.SimpleTrustManager;
30+
import cn.jpush.api.utils.StringUtils;
3131

3232
import com.google.gson.Gson;
3333

@@ -37,6 +37,7 @@ public class HttpClient {
3737

3838
//设置连接超时时间
3939
private final int DEFAULT_CONNECTION_TIMEOUT = (20 * 1000); // milliseconds
40+
4041
//设置读取超时时间
4142
private final int DEFAULT_SOCKET_TIMEOUT = (30 * 1000); // milliseconds
4243

@@ -177,7 +178,7 @@ protected void initSSL() {
177178
protected String parse(MessageParams message) {
178179
String input = String.valueOf(message.getSendNo()) + message.getReceiverType().value() + message.getReceiverValue() + message.getMasterSecret();
179180
int msgType = 0;
180-
if (message instanceof NotifyMessageParams) {
181+
if (message instanceof NotificationParams) {
181182
msgType = MsgTypeEnum.NOTIFY.value();
182183
} else if (message instanceof CustomMessageParams) {
183184
msgType = MsgTypeEnum.CUSTOM.value();

‎src/cn/jpush/api/ValidateRequestParams.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package cn.jpush.api;
22
import java.util.regex.Pattern;
33

4+
import cn.jpush.api.push.MessageParams;
5+
import cn.jpush.api.push.MessageResult;
6+
import cn.jpush.api.push.ReceiverTypeEnum;
7+
48
public class ValidateRequestParams {
59
private final static int sendNo = -1;
610
private final static Pattern pattern = Pattern.compile("[^a-zA-Z0-9]");

‎src/cn/jpush/example/JPushClientExample.java‎ renamed to ‎src/cn/jpush/api/example/JPushClientExample.java‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
package cn.jpush.example;
1+
package cn.jpush.api.example;
2+
23
import java.util.HashMap;
34
import java.util.Map;
45

56
import cn.jpush.api.ErrorCodeEnum;
6-
import cn.jpush.api.IOSExtra;
7-
import cn.jpush.api.JPushClient;
8-
import cn.jpush.api.MessageResult;
7+
import cn.jpush.api.push.IOSExtra;
8+
import cn.jpush.api.push.JPushSendClient;
9+
import cn.jpush.api.push.MessageResult;
910

1011
public class JPushClientExample {
1112

1213
private static final String appKey ="3af172b794896c3e1de43fe7"; //必填，例如466f7032ac604e02fb7bda89
13-
1414
private static final String masterSecret = "57c45646c772983eb0e7c455";//"13ac09b17715bd117163d8a1";//必填，每个应用都对应一个masterSecret
1515

16-
private static JPushClient jpush = null;
16+
private static JPushSendClient _client = null;
1717

1818
/**
1919
* 保存离线的时长。秒为单位。最多支持10天（864000秒）。
@@ -44,7 +44,7 @@ public static void main(String[] args) {
4444
*/
4545

4646

47-
jpush = new JPushClient(masterSecret, appKey, timeToLive);
47+
_client = new JPushSendClient(masterSecret, appKey, timeToLive);
4848

4949
/*
5050
* 是否启用ssl安全连接, 可选
@@ -59,7 +59,6 @@ public static void main(String[] args) {
5959

6060
private static void testSend() {
6161
// 在实际业务中，建议 sendNo 是一个你自己的业务可以处理的一个自增数字。
62-
// 除非需要覆盖，请确保不要重复使用。详情请参考 API 文档相关说明。
6362
int sendNo = getRandomSendNo();
6463
String msgTitle = "+;//jpush\"\"";
6564
String msgContent = "\\&;w\"\"a--【\npush】";
@@ -68,7 +67,6 @@ private static void testSend() {
6867
* IOS设备扩展参数,
6968
* 设置badge，设置声音
7069
*/
71-
7270
Map<String, Object> extra = new HashMap<String, Object>();
7371
IOSExtra iosExtra = new IOSExtra(10, "WindowsLogonSound.wav");
7472
extra.put("ios", iosExtra);
@@ -79,7 +77,7 @@ private static void testSend() {
7977

8078

8179
//对所有用户发送通知。
82-
MessageResult msgResult = jpush.sendNotificationWithAppKey(sendNo, msgTitle, msgContent);
80+
MessageResult msgResult = _client.sendNotificationWithAppKey(sendNo, msgTitle, msgContent);
8381

8482
//对所有用户发送消息。
8583
//MessageResult msgResult = jpush.sendCustomMessageWithAppKey(sendNo,msgTitle, msgContent);

‎src/cn/jpush/api/example/ReceiveClientExample.java‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
package cn.jpush.api.example;
2+
import java.util.List;
3+
4+
import cn.jpush.api.report.JPushReportClient;
5+
import cn.jpush.api.report.ReportReceivedResult;
6+
7+
public class ReceiveClientExample {
8+
private static final String appKey ="3af172b794896c3e1de43fe7"; //必填，例如466f7032ac604e02fb7bda89
9+
private static final String masterSecret = "57c45646c772983eb0e7c455";//"13ac09b17715bd117163d8a1";//必填
10+
11+
public static void main(String[] args) {
12+
JPushReportClient JPushClient = new JPushReportClient(appKey, masterSecret);
13+
14+
String msgId = "1236722141";
15+
String[] msgIds = {"1236722141","910981248","911034889"};
16+
17+
//获取一条
18+
ReportReceivedResult receiveResult = JPushClient.getReceived(msgId);
19+
if (receiveResult == null) {
20+
System.out.println("获取 Received 数据失败！");
21+
}else{
22+
//gson toJson 之后，NULL 值的字段会被过滤掉
23+
System.out.println("Received result: " + receiveResult.toString());
24+
}
25+
26+
// 获取多条
27+
List<ReportReceivedResult> receiveResults = JPushClient.getReceiveds(msgIds);
28+
if (receiveResults == null) {
29+
System.out.println("获取receive 数据失败！");
30+
}else{
31+
System.out.println("成功获取了：" + receiveResults);
32+
}
33+
34+
}
35+
}

‎src/cn/jpush/http/BaseClient.java‎ renamed to ‎src/cn/jpush/api/http/BaseClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.jpush.http;
1+
package cn.jpush.api.http;
22

33
import java.util.HashSet;
44
import java.util.Set;
@@ -8,7 +8,7 @@
88
public class BaseClient {
99
public String masterSecret = "";
1010
public String appKey = "";
11-
public String sendDescription = ""; //发送的描述
11+
public String sendDescription = ""; //发送的描述
1212
public long timeToLive = -1; //保存离线的时长。秒为单位。默认为保存1天的离线消息
1313
public boolean enableSSL = false;
1414
public Set<DeviceEnum> devices = new HashSet<DeviceEnum>(); //默认发送android和ios

‎src/cn/jpush/http/BaseURL.java‎ renamed to ‎src/cn/jpush/api/http/BaseURL.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.jpush.http;
1+
package cn.jpush.api.http;
22

33

44

‎src/cn/jpush/http/RequestTypeEnum.java‎ renamed to ‎src/cn/jpush/api/http/RequestTypeEnum.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package cn.jpush.http;
1+
package cn.jpush.api.http;
22

33
public enum RequestTypeEnum {
44
PUSH(0),

0 commit comments

Comments
 (0)