Skip to content

Dev #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 12, 2018
Merged

Dev #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31a7e09
prepare release 3.3.4
Jan 29, 2018
909dd57
prepare release v3.3.5
Feb 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<dependency>
<groupId>cn.jpush.api</groupId>
<artifactId>jpush-client</artifactId>
<version>3.3.3</version>
<version>3.3.4</version>
</dependency>
```
### jar 包方式
Expand All @@ -44,7 +44,7 @@
<dependency>
<groupId>cn.jpush.api</groupId>
<artifactId>jiguang-common</artifactId>
<version>1.0.8</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
Expand Down
6 changes: 3 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<groupId>cn.jpush.api</groupId>
<artifactId>jpush-client</artifactId>
<version>3.3.3-SNAPSHOT</version>
<version>3.3.5-SNAPSHOT</version>
<packaging>jar</packaging>
<url>https://github.com/jpush/jpush-api-java-client</url>
<name>JPush API Java Client</name>
Expand Down Expand Up @@ -35,14 +35,14 @@
<url>https://github.com/jpush/jpush-api-java-client</url>
<connection>scm:git:git@github.com:jpush/jpush-api-java-client.git</connection>
<developerConnection>scm:git:git@github.com:jpush/jpush-api-java-client.git</developerConnection>
<tag>v3.3.3</tag>
<tag>v3.3.5</tag>
</scm>

<dependencies>
<dependency>
<groupId>cn.jpush.api</groupId>
<artifactId>jiguang-common</artifactId>
<version>1.0.9</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down
7 changes: 3 additions & 4 deletions src/main/java/cn/jpush/api/push/PushClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
package cn.jpush.api.push;

import cn.jiguang.common.connection.IHttpClient;
import cn.jiguang.common.connection.NativeHttpClient;
import cn.jiguang.common.connection.NettyHttpClient;
import cn.jiguang.common.connection.*;
import com.google.gson.JsonParseException;
import com.google.gson.JsonParser;

import cn.jiguang.common.ClientConfig;
import cn.jiguang.common.ServiceHelper;
import cn.jiguang.common.utils.Preconditions;
import cn.jiguang.common.utils.StringUtils;
import cn.jiguang.common.connection.HttpProxy;
import cn.jiguang.common.resp.APIConnectionException;
import cn.jiguang.common.resp.APIRequestException;
import cn.jiguang.common.resp.BaseResult;
Expand Down Expand Up @@ -239,6 +236,8 @@ public void setHttpClient(IHttpClient client) {
public void close() {
if (_httpClient != null && _httpClient instanceof NettyHttpClient) {
((NettyHttpClient) _httpClient).close();
} else if (_httpClient != null && _httpClient instanceof ApacheHttpClient) {
((ApacheHttpClient) _httpClient).close();
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/cn/jpush/api/push/PushClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import cn.jiguang.common.connection.NettyHttpClient;
import cn.jiguang.common.resp.ResponseWrapper;
import cn.jpush.api.JPushClient;
import cn.jpush.api.push.model.Options;
import cn.jpush.api.push.model.Platform;
import cn.jpush.api.push.model.audience.Audience;
import cn.jpush.api.push.model.notification.*;
Expand Down Expand Up @@ -38,7 +39,6 @@ public void testSendPush() {
PushResult result = jpushClient.sendPush(payload);
int status = result.getResponseCode();
LOG.info("Got result - " + result);

} catch (APIConnectionException e) {
LOG.error("Connection error. Should retry later. ", e);
LOG.error("Sendno: " + payload.getSendno());
Expand Down Expand Up @@ -77,8 +77,9 @@ public void onSucceed(ResponseWrapper responseWrapper) {
public static PushPayload buildPushObject_all_alias_alert() {
return PushPayload.newBuilder()
.setPlatform(Platform.all())
.setAudience(Audience.alias("alias"))
.setAudience(Audience.registrationId(REGISTRATION_ID3))
.setNotification(Notification.alert(ALERT))
.setOptions(Options.newBuilder().setApnsProduction(false).setTimeToLive(86000).build())
.build();
}

Expand Down