From 679e76a5f67c13c22f577a28beb2e5a8b60c03d6 Mon Sep 17 00:00:00 2001 From: "heavyrain.lee" Date: Thu, 23 May 2019 08:21:48 +0800 Subject: [PATCH] update --- .../java/cn/wildfirechat/common/APIPath.java | 8 +++--- .../java/cn/wildfirechat/sdk/ChatConfig.java | 4 +-- .../java/cn/wildfirechat/sdk/GroupAdmin.java | 1 + .../cn/wildfirechat/sdk/MessageAdmin.java | 25 +++++++++++++++++++ .../java/cn/wildfirechat/sdk/UserAdmin.java | 3 +-- .../sdk/{ => utilities}/HttpUtils.java | 6 ++--- 6 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 sdk/src/main/java/cn/wildfirechat/sdk/MessageAdmin.java rename sdk/src/main/java/cn/wildfirechat/sdk/{ => utilities}/HttpUtils.java (94%) diff --git a/common/src/main/java/cn/wildfirechat/common/APIPath.java b/common/src/main/java/cn/wildfirechat/common/APIPath.java index a16f6084..e6bcceb6 100644 --- a/common/src/main/java/cn/wildfirechat/common/APIPath.java +++ b/common/src/main/java/cn/wildfirechat/common/APIPath.java @@ -2,10 +2,6 @@ package cn.wildfirechat.common; public interface APIPath { String Create_Chatroom = "/admin/chatroom/create"; - String Create_Group = "/admin/group/create"; - String Create_Robot = "/admin/robot/create"; - String Create_User = "/admin/user/create"; - String Chatroom_Destroy = "/admin/chatroom/del"; String Chatroom_Info = "/admin/chatroom/info"; @@ -14,6 +10,7 @@ public interface APIPath { String Sensitive_Del = "/admin/sensitive/del"; String Sensitive_Query = "/admin/sensitive/query"; + String Create_User = "/admin/user/create"; String User_Get_Token = "/admin/user/get_token"; String User_Update_Block_Status = "/admin/user/update_block_status"; String User_Get_Info = "/admin/user/get_info"; @@ -28,12 +25,15 @@ public interface APIPath { String Msg_Send = "/admin/message/send"; String Msg_Recall = "/admin/message/recall"; + String Create_Group = "/admin/group/create"; String Group_Dismiss = "/admin/group/del"; String Group_Transfer = "/admin/group/transfer"; String Group_Member_Add = "/admin/group/member/add"; String Group_Member_Kickoff = "/admin/group/member/del"; + String Create_Robot = "/admin/robot/create"; + String Channel_Message_Send = "/channel/message/send"; String Robot_User_Info = "/robot/user_info"; diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/ChatConfig.java b/sdk/src/main/java/cn/wildfirechat/sdk/ChatConfig.java index 1b83b60d..3f099a44 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/ChatConfig.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/ChatConfig.java @@ -1,8 +1,6 @@ package cn.wildfirechat.sdk; -import cn.wildfirechat.common.APIPath; -import cn.wildfirechat.pojos.*; -import cn.wildfirechat.sdk.model.*; +import cn.wildfirechat.sdk.utilities.HttpUtils; public class ChatConfig { public static void init(String url, String secret) { diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/GroupAdmin.java b/sdk/src/main/java/cn/wildfirechat/sdk/GroupAdmin.java index 9f5ef749..1d902bb8 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/GroupAdmin.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/GroupAdmin.java @@ -3,6 +3,7 @@ package cn.wildfirechat.sdk; import cn.wildfirechat.common.APIPath; import cn.wildfirechat.pojos.*; import cn.wildfirechat.sdk.model.IMResult; +import cn.wildfirechat.sdk.utilities.HttpUtils; import java.util.ArrayList; import java.util.List; diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/MessageAdmin.java b/sdk/src/main/java/cn/wildfirechat/sdk/MessageAdmin.java new file mode 100644 index 00000000..bcaac0ef --- /dev/null +++ b/sdk/src/main/java/cn/wildfirechat/sdk/MessageAdmin.java @@ -0,0 +1,25 @@ +package cn.wildfirechat.sdk; + +import cn.wildfirechat.common.APIPath; +import cn.wildfirechat.pojos.*; +import cn.wildfirechat.sdk.model.IMResult; +import cn.wildfirechat.sdk.utilities.HttpUtils; + +public class MessageAdmin { + public static IMResult sendMessage(String sender, Conversation conversation, MessagePayload payload) throws Exception { + String path = APIPath.Msg_Send; + SendMessageData messageData = new SendMessageData(); + messageData.setSender(sender); + messageData.setConv(conversation); + messageData.setPayload(payload); + return HttpUtils.httpJsonPost(path, messageData, SendMessageResult.class); + } + + public static IMResult recallMessage(String operator, long messageUid) throws Exception { + String path = APIPath.Msg_Recall; + RecallMessageData messageData = new RecallMessageData(); + messageData.setOperator(operator); + messageData.setMessageUid(messageUid); + return HttpUtils.httpJsonPost(path, messageData, Void.class); + } +} diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/UserAdmin.java b/sdk/src/main/java/cn/wildfirechat/sdk/UserAdmin.java index b27fa288..c4df2cfd 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/UserAdmin.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/UserAdmin.java @@ -3,8 +3,7 @@ package cn.wildfirechat.sdk; import cn.wildfirechat.common.APIPath; import cn.wildfirechat.pojos.*; import cn.wildfirechat.sdk.model.IMResult; - -import java.util.List; +import cn.wildfirechat.sdk.utilities.HttpUtils; public class UserAdmin { public static IMResult getUserByName(String mobile) throws Exception { diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/HttpUtils.java b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/HttpUtils.java similarity index 94% rename from sdk/src/main/java/cn/wildfirechat/sdk/HttpUtils.java rename to sdk/src/main/java/cn/wildfirechat/sdk/utilities/HttpUtils.java index a37fabb1..7c7a0679 100644 --- a/sdk/src/main/java/cn/wildfirechat/sdk/HttpUtils.java +++ b/sdk/src/main/java/cn/wildfirechat/sdk/utilities/HttpUtils.java @@ -1,4 +1,4 @@ -package cn.wildfirechat.sdk; +package cn.wildfirechat.sdk.utilities; import cn.wildfirechat.sdk.model.IMResult; import com.google.gson.Gson; @@ -25,12 +25,12 @@ public class HttpUtils { private static String adminUrl; private static String adminSecret; - static void init(String url, String secret) { + public static void init(String url, String secret) { adminUrl = url; adminSecret = secret; } - static IMResult httpJsonPost(String path, Object object, Class clazz) throws Exception{ + public static IMResult httpJsonPost(String path, Object object, Class clazz) throws Exception{ if (isNullOrEmpty(adminUrl) || isNullOrEmpty(path)) { LOG.error("Not init IM SDK correctly. Do you forget init it?"); throw new Exception("SDK url or secret lack!");