From 580e9f80fba9128b60bb017fede545a7e1c60245 Mon Sep 17 00:00:00 2001
From: imhao183 <wildfirechat86@gmail.com>
Date: Tue, 15 Sep 2020 07:53:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8Dserver=20api?=
 =?UTF-8?q?=E5=A5=BD=E5=8F=8B=E7=8A=B6=E6=80=81model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../loServer/action/admin/FriendRelationAction.java    |  4 ++--
 ...equest.java => InputUpdateFriendStatusRequest.java} |  2 +-
 .../main/java/cn/wildfirechat/sdk/RelationAdmin.java   | 10 +++++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)
 rename common/src/main/java/cn/wildfirechat/pojos/{InputFriendRequest.java => InputUpdateFriendStatusRequest.java} (95%)

diff --git a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationAction.java b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationAction.java
index 8b0399e1..7ede42b6 100755
--- a/broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationAction.java
+++ b/broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationAction.java
@@ -16,7 +16,7 @@ import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
 import com.xiaoleilu.loServer.handler.Response;
-import cn.wildfirechat.pojos.InputFriendRequest;
+import cn.wildfirechat.pojos.InputUpdateFriendStatusRequest;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.persistence.TargetEntry;
 import io.netty.buffer.ByteBuf;
@@ -41,7 +41,7 @@ public class FriendRelationAction extends AdminAction {
     @Override
     public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
-            InputFriendRequest friendAdd = getRequestBody(request.getNettyRequest(), InputFriendRequest.class);
+            InputUpdateFriendStatusRequest friendAdd = getRequestBody(request.getNettyRequest(), InputUpdateFriendStatusRequest.class);
             if (friendAdd != null
                 && !StringUtil.isNullOrEmpty(friendAdd.getUserId())
                 && !StringUtil.isNullOrEmpty(friendAdd.getFriendUid())
diff --git a/common/src/main/java/cn/wildfirechat/pojos/InputFriendRequest.java b/common/src/main/java/cn/wildfirechat/pojos/InputUpdateFriendStatusRequest.java
similarity index 95%
rename from common/src/main/java/cn/wildfirechat/pojos/InputFriendRequest.java
rename to common/src/main/java/cn/wildfirechat/pojos/InputUpdateFriendStatusRequest.java
index f2cc2dfd..899a000d 100755
--- a/common/src/main/java/cn/wildfirechat/pojos/InputFriendRequest.java
+++ b/common/src/main/java/cn/wildfirechat/pojos/InputUpdateFriendStatusRequest.java
@@ -9,7 +9,7 @@
 package cn.wildfirechat.pojos;
 
 
-public class InputFriendRequest {
+public class InputUpdateFriendStatusRequest {
     private String userId;
     private String friendUid;
     private int status;
diff --git a/sdk/src/main/java/cn/wildfirechat/sdk/RelationAdmin.java b/sdk/src/main/java/cn/wildfirechat/sdk/RelationAdmin.java
index efebe59f..73425938 100644
--- a/sdk/src/main/java/cn/wildfirechat/sdk/RelationAdmin.java
+++ b/sdk/src/main/java/cn/wildfirechat/sdk/RelationAdmin.java
@@ -8,7 +8,7 @@ import cn.wildfirechat.sdk.utilities.AdminHttpUtils;
 public class RelationAdmin {
     public static IMResult<Void> setUserFriend(String userId, String targetId, boolean isFriend, String extra) throws Exception {
         String path = APIPath.Friend_Update_Status;
-        InputFriendRequest input = new InputFriendRequest();
+        InputUpdateFriendStatusRequest input = new InputUpdateFriendStatusRequest();
         input.setUserId(userId);
         input.setFriendUid(targetId);
         input.setStatus(isFriend ? 0 : 1); //历史遗留问题，在IM数据库中0是好友，1是好友被删除。
@@ -55,4 +55,12 @@ public class RelationAdmin {
         input.setTargetId(targetId);
         return AdminHttpUtils.httpJsonPost(path, input, OutputGetAlias.class);
     }
+
+    public static IMResult<OutputGetAlias> sendFrienRequest(String operator, String targetId, String reason, String extra) throws Exception {
+        String path = APIPath.Friend_Send_Request;
+        InputGetAlias input = new InputGetAlias();
+        input.setOperator(operator);
+        input.setTargetId(targetId);
+        return AdminHttpUtils.httpJsonPost(path, input, OutputGetAlias.class);
+    }
 }