Skip to content

支持解绑设备与别名的绑定关系 #166

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
yutaipu merged 4 commits into from
Jul 30, 2020
Merged

支持解绑设备与别名的绑定关系 #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71efc60
支持解绑设备与别名的绑定关系
Jun 2, 2020
87818ca
pom加上SNAPSHOT
Jul 30, 2020
b4d099e
[maven-release-plugin] prepare release v3.4.5
Jul 30, 2020
9674cd1
[maven-release-plugin] prepare for next development iteration
Jul 30, 2020
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
2 changes: 1 addition & 1 deletion 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.4.4</version>
<version>3.4.6-SNAPSHOT</version>
<packaging>jar</packaging>
<url>https://github.com/jpush/jpush-api-java-client</url>
<name>JPush API Java Client</name>
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/cn/jpush/api/JPushClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,6 +900,11 @@ public DefaultResult deleteAlias(String alias, String platform)
return _deviceClient.deleteAlias(alias, platform);
}

public DefaultResult removeDevicesFromAlias(String alias, Set<String> toRemoveDevice)
throws APIConnectionException, APIRequestException {
return _deviceClient.removeDevicesFromAlias(alias, toRemoveDevice);
}

public Map<String, OnlineStatus> getUserOnlineStatus(String... registrationIds)
throws APIConnectionException, APIRequestException
{
Expand Down
21 changes: 21 additions & 0 deletions src/main/java/cn/jpush/api/device/DeviceClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,27 @@ public DefaultResult deleteAlias(String alias, String platform) throws APIConnec
return DefaultResult.fromResponse(response);
}

public DefaultResult removeDevicesFromAlias(String alias, Set<String> toRemoveDevice) throws APIConnectionException, APIRequestException {
String url = hostName + aliasesPath + "/" + alias;

JsonObject top = new JsonObject();
JsonObject registrationIds = new JsonObject();

if (null != toRemoveDevice && toRemoveDevice.size() > 0) {
JsonArray array = new JsonArray();
for (String device : toRemoveDevice) {
array.add(new JsonPrimitive(device));
}
registrationIds.add("remove", array);
}

top.add("registration_ids", registrationIds);

ResponseWrapper response = _httpClient.sendPost(url, top.toString());

return DefaultResult.fromResponse(response);
}

// -------------- devices status

public Map<String, OnlineStatus> getUserOnlineStatus(String... registrationIds)
Expand Down
13 changes: 11 additions & 2 deletions src/test/java/cn/jpush/api/device/DeviceNormalRemoteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ public void testGetDeviceTagAlias_cleard() throws Exception {
assertEquals("tags cleared", 0, result.tags.size());
}



// ------------------ tags

@Test
Expand Down Expand Up @@ -197,4 +197,13 @@ public void testBindMobile_empty() throws APIConnectionException, APIRequestExce
assertTrue(result.isResultOK());
}

@Test
@TestOrder(order = 330)
public void testRemoveDevicesFromAlias() throws APIConnectionException, APIRequestException {
Set<String> toRemoveDevice = new HashSet<>();
toRemoveDevice.add(REGISTRATION_ID1);
DefaultResult result = jpushClient.removeDevicesFromAlias("alias1", toRemoveDevice);
assertTrue(result.isResultOK());
}

}