From e6ca9f5c78c2d8a05b03feada89ffa64c3f0e4c5 Mon Sep 17 00:00:00 2001 From: "heavyrain.lee" Date: Mon, 6 Jan 2020 12:00:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0channel=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E8=AE=A2=E9=98=85/=E5=8F=96=E6=B6=88=E8=AE=A2?= =?UTF-8?q?=E9=98=85=E5=8F=AA=E8=83=BD=E9=80=90=E4=B8=AA=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/wildfirechat/common/APIPath.java | 1 - .../wildfirechat/pojos/InputChannelSubscribe.java | 10 +++++----- .../cn/wildfirechat/sdk/ChannelServiceApi.java | 10 +++++----- sdk/src/main/java/cn/wildfirechat/sdk/Main.java | 14 +++++++++++--- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/cn/wildfirechat/common/APIPath.java b/common/src/main/java/cn/wildfirechat/common/APIPath.java index 80795d66..6f8ee82f 100644 --- a/common/src/main/java/cn/wildfirechat/common/APIPath.java +++ b/common/src/main/java/cn/wildfirechat/common/APIPath.java @@ -52,7 +52,6 @@ public interface APIPath { String Channel_Update_Profile = "/channel/update_profile"; String Channel_Message_Send = "/channel/message/send"; String Channel_Subscribe = "/channel/subscribe"; - String Channel_Unsubscribe = "/channel/unsubscribe"; String Channel_Subscriber_List = "/channel/subscriber_list"; String Robot_User_Info = "/robot/user_info"; diff --git a/common/src/main/java/cn/wildfirechat/pojos/InputChannelSubscribe.java b/common/src/main/java/cn/wildfirechat/pojos/InputChannelSubscribe.java index 40d4c9bf..7c4178da 100644 --- a/common/src/main/java/cn/wildfirechat/pojos/InputChannelSubscribe.java +++ b/common/src/main/java/cn/wildfirechat/pojos/InputChannelSubscribe.java @@ -15,15 +15,15 @@ import java.util.ArrayList; import java.util.List; public class InputChannelSubscribe { - private List targets; + private String target; private int subscribe; //1，订阅；0，取消订阅 - public List getTargets() { - return targets; + public String getTarget() { + return target; } - public void setTargets(List targets) { - this.targets = targets; + public void setTarget(String target) { + this.target = target; } public int getSubscribe() { diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/ChannelServiceApi.java b/sdk/src/main/java/cn/wildfirechat/sdk/ChannelServiceApi.java index af27e6c8..1f6270df 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/ChannelServiceApi.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/ChannelServiceApi.java @@ -41,18 +41,18 @@ public class ChannelServiceApi { return httpUtils.httpJsonPost(path, messageData, SendMessageResult.class); } - public IMResult subscribe(List targets) throws Exception { + public IMResult subscribe(String target) throws Exception { String path = APIPath.Channel_Subscribe; InputChannelSubscribe input = new InputChannelSubscribe(); - input.setTargets(targets); + input.setTarget(target); input.setSubscribe(1); return httpUtils.httpJsonPost(path, input, Void.class); } - public IMResult unsubscribe(List targets) throws Exception { - String path = APIPath.Channel_Unsubscribe; + public IMResult unsubscribe(String target) throws Exception { + String path = APIPath.Channel_Subscribe; InputChannelSubscribe input = new InputChannelSubscribe(); - input.setTargets(targets); + input.setTarget(target); input.setSubscribe(0); return httpUtils.httpJsonPost(path, input, Void.class); } diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/Main.java b/sdk/src/main/java/cn/wildfirechat/sdk/Main.java index 2dce8a79..ad609016 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/Main.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/Main.java @@ -510,7 +510,15 @@ public class Main { ChannelServiceApi channelServiceApi = new ChannelServiceApi("http://localhost", inputCreateChannel.getTargetId(), inputCreateChannel.getSecret()); //3. 测试channel api功能 - resultVoid = channelServiceApi.subscribe(Arrays.asList("user2","user3")); + resultVoid = channelServiceApi.subscribe("user2"); + if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { + System.out.println("block user done"); + } else { + System.out.println("block user failure"); + System.exit(-1); + } + + resultVoid = channelServiceApi.subscribe("user3"); if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { System.out.println("block user done"); } else { @@ -526,7 +534,7 @@ public class Main { System.exit(-1); } - resultVoid = channelServiceApi.unsubscribe(Arrays.asList("user2")); + resultVoid = channelServiceApi.unsubscribe("user2"); if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { System.out.println("block user done"); } else { @@ -535,7 +543,7 @@ public class Main { } resultStringList = channelServiceApi.getSubscriberList(); - if (resultStringList != null && resultStringList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && resultStringList.getResult().getList().contains("user2") && !resultStringList.getResult().getList().contains("user3")) { + if (resultStringList != null && resultStringList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && resultStringList.getResult().getList().contains("user3") && !resultStringList.getResult().getList().contains("user2")) { System.out.println("block user done"); } else { System.out.println("block user failure");