From d89e641470060d749bdd189d42299d2fe6a908e5 Mon Sep 17 00:00:00 2001 From: imhao183 Date: Mon, 24 Aug 2020 09:50:29 +0800 Subject: [PATCH] =?UTF-8?q?sdk=20=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=B8=AD=E5=8C=BA=E5=88=86=E7=A4=BE=E5=8C=BA=E7=89=88=E5=92=8C?= =?UTF-8?q?=E4=B8=93=E4=B8=9A=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../action/admin/CreateChannelAction.java | 4 +- .../pojos/OutputCreateChannel.java | 12 +- .../main/java/cn/wildfirechat/sdk/Main.java | 187 ++++++++++-------- 3 files changed, 106 insertions(+), 97 deletions(-) diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateChannelAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateChannelAction.java index 364e6ea8..d902d40e 100755 --- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateChannelAction.java +++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/CreateChannelAction.java @@ -61,8 +61,8 @@ public class CreateChannelAction extends AdminAction { if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) { byte[] data = new byte[byteBuf.readableBytes()]; byteBuf.readBytes(data); - String secret = new String(data); - sendResponse(response, null, new OutputCreateChannel(inputCreateChannel.getTargetId(), secret)); + String channelId = new String(data); + sendResponse(response, null, new OutputCreateChannel(channelId)); } else { sendResponse(response, errorCode, null); } diff --git a/common/src/main/java/cn/wildfirechat/pojos/OutputCreateChannel.java b/common/src/main/java/cn/wildfirechat/pojos/OutputCreateChannel.java index 598788a9..00dd6b29 100755 --- a/common/src/main/java/cn/wildfirechat/pojos/OutputCreateChannel.java +++ b/common/src/main/java/cn/wildfirechat/pojos/OutputCreateChannel.java @@ -13,11 +13,9 @@ import cn.wildfirechat.proto.WFCMessage; public class OutputCreateChannel { private String targetId; - private String secret; - public OutputCreateChannel(String targetId, String secret) { + public OutputCreateChannel(String targetId) { this.targetId = targetId; - this.secret = secret; } public String getTargetId() { @@ -27,12 +25,4 @@ public class OutputCreateChannel { public void setTargetId(String targetId) { this.targetId = targetId; } - - public String getSecret() { - return secret; - } - - public void setSecret(String secret) { - this.secret = secret; - } } diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/Main.java b/sdk/src/main/java/cn/wildfirechat/sdk/Main.java index 09d3f8f4..1f65f6dc 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/Main.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/Main.java @@ -17,13 +17,15 @@ import java.util.List; import static cn.wildfirechat.proto.ProtoConstants.SystemSettingType.Group_Max_Member_Count; public class Main { + private static boolean commercialServer = false; + public static void main(String[] args) throws Exception { //admin使用的是18080端口，超级管理接口，理论上不能对外开放端口，也不能让非内部服务知悉密钥。 testAdmin(); //Robot和Channel都是使用的80端口，第三方可以创建或者为第三方创建，第三方可以使用robot或者channel与IM系统进行对接。 testRobot(); - //testChannel(); + testChannel(); } @@ -37,7 +39,10 @@ public class Main { testChatroom(); testMessage(); testGeneralApi(); - testDevice(); + if (commercialServer) { + testDevice(); + } + System.out.println("Congratulation, all admin test case passed!!!!!!!"); } @@ -418,21 +423,24 @@ public class Main { System.exit(-1); } - voidIMResult = GroupAdmin.muteGroupMemeber("user1", groupInfo.getTarget_id(), Arrays.asList("user4", "user5"), true, null, null); - if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { - System.out.println("mute group member success"); - } else { - System.out.println("mute group member failure"); - System.exit(-1); + if (commercialServer) { + voidIMResult = GroupAdmin.muteGroupMemeber("user1", groupInfo.getTarget_id(), Arrays.asList("user4", "user5"), true, null, null); + if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { + System.out.println("mute group member success"); + } else { + System.out.println("mute group member failure"); + System.exit(-1); + } + + voidIMResult = GroupAdmin.muteGroupMemeber("user1", groupInfo.getTarget_id(), Arrays.asList("user4", "user5"), false, null, null); + if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { + System.out.println("unmute group member success"); + } else { + System.out.println("unmute group member failure"); + System.exit(-1); + } } - voidIMResult = GroupAdmin.muteGroupMemeber("user1", groupInfo.getTarget_id(), Arrays.asList("user4", "user5"), false, null, null); - if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { - System.out.println("unmute group member success"); - } else { - System.out.println("unmute group member failure"); - System.exit(-1); - } @@ -487,20 +495,22 @@ public class Main { System.exit(-1); } - voidIMResult = MessageAdmin.deleteMessage(resultSendMessage.getResult().getMessageUid()); - if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { - System.out.println("delete message success"); - } else { - System.out.println("delete message failure"); - System.exit(-1); - } + if (commercialServer) { + voidIMResult = MessageAdmin.deleteMessage(resultSendMessage.getResult().getMessageUid()); + if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { + System.out.println("delete message success"); + } else { + System.out.println("delete message failure"); + System.exit(-1); + } - IMResult resultBroadcastMessage = MessageAdmin.broadcastMessage("user1", 0, payload); - if (resultBroadcastMessage != null && resultBroadcastMessage.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { - System.out.println("broad message success, send message to " + resultBroadcastMessage.getResult().getCount() + " users"); - } else { - System.out.println("broad message failure"); - System.exit(-1); + IMResult resultBroadcastMessage = MessageAdmin.broadcastMessage("user1", 0, payload); + if (resultBroadcastMessage != null && resultBroadcastMessage.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { + System.out.println("broad message success, send message to " + resultBroadcastMessage.getResult().getCount() + " users"); + } else { + System.out.println("broad message failure"); + System.exit(-1); + } } List multicastReceivers = Arrays.asList("user2", "user3", "user4"); @@ -790,6 +800,8 @@ public class Main { InputCreateChannel inputCreateChannel = new InputCreateChannel(); inputCreateChannel.setName("testChannel"); inputCreateChannel.setOwner("userId1"); + String secret = "channelsecret"; + inputCreateChannel.setSecret(secret); IMResult resultCreateChannel = GeneralAdmin.createChannel(inputCreateChannel); if (resultCreateChannel != null && resultCreateChannel.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { System.out.println("create channel success"); @@ -798,56 +810,61 @@ public class Main { System.exit(-1); } + //2. 初始化api - ChannelServiceApi channelServiceApi = new ChannelServiceApi("http://localhost", resultCreateChannel.getResult().getTargetId(), resultCreateChannel.getResult().getSecret()); + ChannelServiceApi channelServiceApi = new ChannelServiceApi("http://localhost", resultCreateChannel.getResult().getTargetId(), secret); - //3. 测试channel api功能 - IMResult resultVoid = channelServiceApi.subscribe("userId2"); - if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { - System.out.println("subscribe success"); - } else { - System.out.println("subscribe failure"); - System.exit(-1); - } - resultVoid = channelServiceApi.subscribe("userId3"); - if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { - System.out.println("subscribe done"); - } else { - System.out.println("subscribe failure"); - System.exit(-1); - } - IMResult resultStringList = channelServiceApi.getSubscriberList(); - if (resultStringList != null && resultStringList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && resultStringList.getResult().getList().contains("userId2") && resultStringList.getResult().getList().contains("userId3")) { - System.out.println("get subscriber done"); - } else { - System.out.println("get subscriber failure"); - System.exit(-1); - } + if (commercialServer) { + //3. 测试channel api功能 + IMResult resultVoid = channelServiceApi.subscribe("userId2"); + if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { + System.out.println("subscribe success"); + } else { + System.out.println("subscribe failure"); + System.exit(-1); + } - resultVoid = channelServiceApi.unsubscribe("userId2"); - if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { - System.out.println("unsubscriber done"); - } else { - System.out.println("unsubscriber failure"); - System.exit(-1); - } + resultVoid = channelServiceApi.subscribe("userId3"); + if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { + System.out.println("subscribe done"); + } else { + System.out.println("subscribe failure"); + System.exit(-1); + } - resultStringList = channelServiceApi.getSubscriberList(); - if (resultStringList != null && resultStringList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && resultStringList.getResult().getList().contains("userId3") && !resultStringList.getResult().getList().contains("userId2")) { - System.out.println("get subscriber done"); - } else { - System.out.println("get subscriber failure"); - System.exit(-1); - } + IMResult resultStringList = channelServiceApi.getSubscriberList(); + if (resultStringList != null && resultStringList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && resultStringList.getResult().getList().contains("userId2") && resultStringList.getResult().getList().contains("userId3")) { + System.out.println("get subscriber done"); + } else { + System.out.println("get subscriber failure"); + System.exit(-1); + } - IMResult resultGetUserInfo1 = channelServiceApi.getUserInfo("userId3"); - if (resultGetUserInfo1 != null && resultGetUserInfo1.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { - System.out.println("get user info success"); - } else { - System.out.println("get user info failure"); - System.exit(-1); + resultVoid = channelServiceApi.unsubscribe("userId2"); + if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { + System.out.println("unsubscriber done"); + } else { + System.out.println("unsubscriber failure"); + System.exit(-1); + } + + resultStringList = channelServiceApi.getSubscriberList(); + if (resultStringList != null && resultStringList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && resultStringList.getResult().getList().contains("userId3") && !resultStringList.getResult().getList().contains("userId2")) { + System.out.println("get subscriber done"); + } else { + System.out.println("get subscriber failure"); + System.exit(-1); + } + + IMResult resultGetUserInfo1 = channelServiceApi.getUserInfo("userId3"); + if (resultGetUserInfo1 != null && resultGetUserInfo1.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { + System.out.println("get user info success"); + } else { + System.out.println("get user info failure"); + System.exit(-1); + } } @@ -873,20 +890,22 @@ public class Main { System.exit(-1); } - IMResult voidIMResult = channelServiceApi.modifyChannelInfo(ProtoConstants.ModifyChannelInfoType.Modify_Channel_Desc, "this is a test channel, update at:" + new Date().toString()); - if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { - System.out.println("modify channel profile success"); - } else { - System.out.println("modify channel profile failure"); - System.exit(-1); - } + if (commercialServer) { + IMResult voidIMResult = channelServiceApi.modifyChannelInfo(ProtoConstants.ModifyChannelInfoType.Modify_Channel_Desc, "this is a test channel, update at:" + new Date().toString()); + if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { + System.out.println("modify channel profile success"); + } else { + System.out.println("modify channel profile failure"); + System.exit(-1); + } - IMResult outputGetChannelInfoIMResult = channelServiceApi.getChannelInfo(); - if (outputGetChannelInfoIMResult != null && outputGetChannelInfoIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { - System.out.println("destroy user success"); - } else { - System.out.println("destroy user failure"); - System.exit(-1); + IMResult outputGetChannelInfoIMResult = channelServiceApi.getChannelInfo(); + if (outputGetChannelInfoIMResult != null && outputGetChannelInfoIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) { + System.out.println("destroy user success"); + } else { + System.out.println("destroy user failure"); + System.exit(-1); + } } }