version 0.45 -> 0.46

broker/migrate/h2/V35__create_file_transfer_user.sql

@@ -0,0 +1,3 @@
+
+insert into t_user (`_uid`,`_name`,`_display_name`,`_portrait`,`_type`,`_dt`) values ('wfc_file_transfer','wfc_file_transfer','文件传输助手','https://static.wildfirechat.cn/wfc_file_transfer.png',1,1);
+insert into t_robot (`_uid`,`_owner`,`_secret`,`_callback`,`_state`,`_dt`) values ('wfc_file_transfer', 'wfc_file_transfer', '', '', 0, 1);

broker/migrate/mysql/V40__create_file_transfer_user.sql

@@ -0,0 +1,3 @@
+
+insert into t_user (`_uid`,`_name`,`_display_name`,`_portrait`,`_type`,`_dt`) values ('wfc_file_transfer','wfc_file_transfer','文件传输助手','https://static.wildfirechat.cn/wfc_file_transfer.png',1,1);
+insert into t_robot (`_uid`,`_owner`,`_secret`,`_callback`,`_state`,`_dt`) values ('wfc_file_transfer', 'wfc_file_transfer', '', '', 0, 1);

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.45</version>
+        <version>0.46</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>

broker/src/main/java/com/xiaoleilu/loServer/action/admin/AddFriendRequestAction.java

@@ -0,0 +1,87 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputAddFriendRequest;
+import cn.wildfirechat.pojos.InputUpdateAlias;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.hazelcast.util.StringUtil;
+import com.xiaoleilu.loServer.RestResult;
+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 io.moquette.persistence.RPCCenter;
+import io.moquette.persistence.TargetEntry;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Friend_Send_Request)
+@HttpMethod("POST")
+public class AddFriendRequestAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputAddFriendRequest input = getRequestBody(request.getNettyRequest(), InputAddFriendRequest.class);
+
+            if (StringUtil.isNullOrEmpty(input.getUserId()) || StringUtil.isNullOrEmpty(input.getFriendUid())) {
+                sendResponse(response, ErrorCode.INVALID_PARAMETER, null);
+                return true;
+            }
+
+            WFCMessage.AddFriendRequest addFriendRequest = WFCMessage.AddFriendRequest.newBuilder().setReason(input.getReason()).setTargetUid(input.getFriendUid()).build();
+            RPCCenter.getInstance().sendRequest(input.getUserId(), null, IMTopic.AddFriendRequestTopic, addFriendRequest.toByteArray(), input.getUserId(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                @Override
+                public void onSuccess(byte[] result) {
+                    ByteBuf byteBuf = Unpooled.buffer();
+                    byteBuf.writeBytes(result);
+                    ErrorCode errorCode = ErrorCode.fromCode(byteBuf.readByte());
+                    if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
+                        sendResponse(response, null, null);
+                    } else {
+                        sendResponse(response, errorCode, null);
+                    }
+                }
+
+                @Override
+                public void onError(ErrorCode errorCode) {
+                    sendResponse(response, errorCode, null);
+                }
+
+                @Override
+                public void onTimeout() {
+                    sendResponse(response, ErrorCode.ERROR_CODE_TIMEOUT, null);
+                }
+
+                @Override
+                public Executor getResponseExecutor() {
+                    return command -> {
+                        ctx.executor().execute(command);
+                    };
+                }
+            }, input.isForce());
+            return false;
+        }
+        return true;
+    }
+}

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())

broker/src/main/java/com/xiaoleilu/loServer/action/admin/FriendRelationGetAction.java

@@ -23,6 +23,7 @@ import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpResponseStatus;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
 @Route(APIPath.Friend_Get_List)
@@ -40,6 +41,7 @@ public class FriendRelationGetAction extends AdminAction {
             InputUserId inputGetFriendList = getRequestBody(request.getNettyRequest(), InputUserId.class);
             List<FriendData> dataList = messagesStore.getFriendList(inputGetFriendList.getUserId(), null, 0);
             List<String> list = new ArrayList<>();
+            dataList.sort(Comparator.comparingLong(FriendData::getTimestamp));
             for (FriendData data : dataList) {
                 if (data.getState() == 0) {
                     list.add(data.getFriendUid());

broker/src/main/java/com/xiaoleilu/loServer/action/channel/ChannelAction.java

@@ -75,6 +75,10 @@ abstract public class ChannelAction extends Action {
         if (channelInfo == null) {
             return ErrorCode.INVALID_PARAMETER;
         }
+        
+        if (StringUtil.isNullOrEmpty(channelInfo.getSecret())) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
 
         String str = nonce + "|" + channelInfo.getSecret() + "|" + timestamp;
         String localSign = DigestUtils.sha1Hex(str);

broker/src/main/java/com/xiaoleilu/loServer/action/robot/RobotAction.java

@@ -80,6 +80,10 @@ abstract public class RobotAction extends Action {
             return ErrorCode.ERROR_CODE_NOT_EXIST;
         }
 
+        if (StringUtil.isNullOrEmpty(robot.getSecret())) {
+            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+        }
+
         String str = nonce + "|" + robot.getSecret() + "|" + timestamp;
         String localSign = DigestUtils.sha1Hex(str);
         return localSign.equals(sign) ? ErrorCode.ERROR_CODE_SUCCESS : ErrorCode.ERROR_CODE_AUTH_FAILURE;

broker/src/main/java/io/moquette/imhandler/AddFriendHandler.java

@@ -23,7 +23,7 @@ public class AddFriendHandler extends GroupHandler<WFCMessage.AddFriendRequest>
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.AddFriendRequest request, Qos1PublishHandler.IMCallback callback) {
             long[] head = new long[1];
-            ErrorCode errorCode = m_messagesStore.saveAddFriendRequest(fromUser, request, head);
+            ErrorCode errorCode = m_messagesStore.saveAddFriendRequest(fromUser, request, head, isAdmin);
             if (errorCode == ERROR_CODE_SUCCESS) {
                 WFCMessage.User user = m_messagesStore.getUserInfo(request.getTargetUid());
                 if (user != null && user.getType() == ProtoConstants.UserType.UserType_Normal) {

broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java

@@ -78,11 +78,10 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
-
-                    if (request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted || isAdmin) {
-                        publisher.publishNotification(IMTopic.NotifyFriendTopic, request.getTargetUid(), heads[0]);
-                        publisher.publishNotification(IMTopic.NotifyFriendTopic, fromUser, heads[1]);
-                    }
+                }
+                if (request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted || isAdmin) {
+                    publisher.publishNotification(IMTopic.NotifyFriendTopic, request.getTargetUid(), heads[0]);
+                    publisher.publishNotification(IMTopic.NotifyFriendTopic, fromUser, heads[1]);
                 }
             }
             return errorCode;

broker/src/main/java/io/moquette/imhandler/ModifyGroupAliasHandler.java

@@ -21,7 +21,7 @@ import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
 public class ModifyGroupAliasHandler extends GroupHandler<WFCMessage.ModifyGroupMemberAlias> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyGroupMemberAlias request, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode = m_messagesStore.modifyGroupAlias(fromUser, request.getGroupId(), request.getAlias());
+        ErrorCode errorCode = m_messagesStore.modifyGroupAlias(fromUser, request.getGroupId(), request.getAlias(), null, isAdmin);
         if (errorCode == ERROR_CODE_SUCCESS && request.hasNotifyContent()) {
             if (request.hasNotifyContent()&& request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());

broker/src/main/java/io/moquette/imhandler/ModifyGroupMemberAliasHandler.java

@@ -0,0 +1,35 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package io.moquette.imhandler;
+
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.GroupNotificationBinaryContent;
+import cn.wildfirechat.proto.WFCMessage;
+import io.moquette.spi.impl.Qos1PublishHandler;
+import io.netty.buffer.ByteBuf;
+import win.liyufan.im.IMTopic;
+
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
+
+@Handler(IMTopic.ModifyGroupMemberAliasTopic)
+public class ModifyGroupMemberAliasHandler extends GroupHandler<WFCMessage.ModifyGroupMemberAlias> {
+    @Override
+    public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyGroupMemberAlias request, Qos1PublishHandler.IMCallback callback) {
+        ErrorCode errorCode = m_messagesStore.modifyGroupAlias(fromUser, request.getGroupId(), request.getAlias(), request.getMemberId(), isAdmin);
+        if (errorCode == ERROR_CODE_SUCCESS && request.hasNotifyContent()) {
+            if (request.hasNotifyContent()&& request.getNotifyContent().getType() > 0) {
+                sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
+            } else {
+                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, request.getAlias(), request.getMemberId()).getModifyGroupMemberAliasNotifyContent();
+                sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
+            }
+        }
+        return errorCode;
+    }
+}

broker/src/main/java/io/moquette/persistence/DatabaseStore.java

@@ -1051,6 +1051,10 @@ public class DatabaseStore {
 
                 out.add(builder.build());
             }
+            if (out.isEmpty()) {
+                WFCMessage.UserSettingEntry.Builder builder = WFCMessage.UserSettingEntry.newBuilder().setScope(999).setKey("").setValue("").setUpdateDt(0);
+                out.add(builder.build());
+            }
             return out;
         } catch (SQLException e) {
             // TODO Auto-generated catch block

broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java

@@ -1172,7 +1172,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public ErrorCode modifyGroupAlias(String operator, String groupId, String alias) {
+    public ErrorCode modifyGroupAlias(String operator, String groupId, String alias, String memberId, boolean isAdmin) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
 
         IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);
@@ -1186,25 +1186,72 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
-        long updateDt = System.currentTimeMillis();
         MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
         Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
         if (members == null || members.size() == 0) {
             members = loadGroupMemberFromDB(hzInstance, groupId);
         }
+
+        if (StringUtil.isNullOrEmpty(memberId)) {
+            memberId = operator;
+        } else {
+            if (!isAdmin && !operator.equals(groupInfo.getOwner())) {
+                WFCMessage.GroupMember operatorMember = null;
+                WFCMessage.GroupMember targetMember = null;
+                for (WFCMessage.GroupMember member : members) {
+                    if (member.getMemberId().equals(operator)) {
+                        operatorMember = member;
+                        if (targetMember != null) {
+                            break;
+                        }
+                    }
+                    if ((member.getMemberId().equals(memberId))) {
+                        targetMember = member;
+                        if (operatorMember != null) {
+                            break;
+                        }
+                    }
+                }
+
+                if (operatorMember == null) {
+                    LOG.error("Modify group member alias error, the operator {} is not in group", operator);
+                    return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
+                }
+
+                if (targetMember == null) {
+                    LOG.error("Modify group member alias error, the member {} is not in group", memberId);
+                    return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
+                }
+
+                if (operatorMember.getType() == GroupMemberType_Manager && targetMember.getType() != GroupMemberType_Manager) {
+                    LOG.error("Modify group member alias error, the operator {} type is {} and the member {} type is {}", operator, operatorMember.getType(), memberId, targetMember.getType());
+                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                }
+            }
+        }
+
+        long updateDt = System.currentTimeMillis();
+
+        boolean inGroup = false;
         for (WFCMessage.GroupMember member : members) {
-            if (member.getMemberId().equals(operator)) {
+            if (member.getMemberId().equals(memberId)) {
                 groupMembers.remove(groupId, member);
                 member = member.toBuilder().setAlias(alias).setUpdateDt(updateDt).build();
                 databaseStore.persistGroupMember(groupId, Arrays.asList(member));
                 databaseStore.updateGroupMemberCountDt(groupId, -1, updateDt);
                 groupMembers.put(groupId, member);
 
-                mIMap.put(groupId, groupInfo.toBuilder().setUpdateDt(updateDt).setMemberUpdateDt(updateDt).build());
+                mIMap.set(groupId, groupInfo.toBuilder().setUpdateDt(updateDt).setMemberUpdateDt(updateDt).build());
+                inGroup = true;
                 break;
             }
         }
 
+        if (!inGroup) {
+            LOG.error("Modify group member alias error, the member {} is not in group", memberId);
+            return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
+        }
+
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -2120,7 +2167,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head) {
+    public ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head, boolean isAdmin) {
         if (mDisableFriendRequest) {
             return ErrorCode.ERROR_CODE_NOT_RIGHT;
         }
@@ -2141,7 +2188,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
-        if (existRequest != null && existRequest.getStatus() != ProtoConstants.FriendRequestStatus.RequestStatus_Accepted) {
+        if (existRequest != null && existRequest.getStatus() != ProtoConstants.FriendRequestStatus.RequestStatus_Accepted && !isAdmin) {
             if (mFriendRequestDuration > 0 && System.currentTimeMillis() - existRequest.getUpdateDt() > mFriendRequestDuration) {
                 if (existRequest.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Rejected
                     && System.currentTimeMillis() - existRequest.getUpdateDt() < mFriendRejectDuration) {
@@ -2165,7 +2212,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                 break;
             }
         }
-        if (friendData1 != null && friendData1.getBlacked() > 0) {
+        if (friendData1 != null && friendData1.getBlacked() > 0 && !isAdmin) {
             return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
         }
 
@@ -2743,6 +2790,16 @@ public class MemoryMessagesStore implements IMessagesStore {
         return slient;
     }
 
+    @Override
+    public boolean getSilentWhenPcOnline(String userId) {
+        WFCMessage.UserSettingEntry entry = getUserSetting(userId, UserSettingScope.kUserSettingMuteWhenPCOnline, null);
+        if (entry != null && "1".equals(entry.getValue())) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     @Override
     public ErrorCode createChannel(String operator, WFCMessage.ChannelInfo channelInfo) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();

broker/src/main/java/io/moquette/spi/IMessagesStore.java

@@ -111,7 +111,7 @@ public interface IMessagesStore {
     void clearUserGroups(String userId);
     ErrorCode dismissGroup(String operator, String groupId, boolean isAdmin);
     ErrorCode modifyGroupInfo(String operator, String groupId, int modifyType, String value, boolean isAdmin);
-    ErrorCode modifyGroupAlias(String operator, String groupId, String alias);
+    ErrorCode modifyGroupAlias(String operator, String groupId, String alias, String memberId, boolean isAdmin);
     List<WFCMessage.GroupInfo> getGroupInfos(List<WFCMessage.UserRequest> requests);
     WFCMessage.GroupInfo getGroupInfo(String groupId);
     Set<String> getUserGroupIds(String userId);
@@ -164,7 +164,7 @@ public interface IMessagesStore {
     void clearUserFriend(String userId);
     List<WFCMessage.FriendRequest> getFriendRequestList(String userId, long version);
 
-    ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head);
+    ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head, boolean isAdmin);
     ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads, boolean isAdmin);
     boolean isNewFriendWelcomeMessage();
     ErrorCode deleteFriend(String userId, String friendUid, long[] head);
@@ -188,6 +188,7 @@ public interface IMessagesStore {
     boolean getUserGlobalSlient(String userId);
     boolean getUserPushHiddenDetail(String userId);
     boolean getUserConversationSlient(String userId, WFCMessage.Conversation conversation);
+    boolean getSilentWhenPcOnline(String userId);
 
     ErrorCode createChannel(String operator, WFCMessage.ChannelInfo channelInfo);
     void clearUserChannels(String userId);

broker/src/main/java/io/moquette/spi/impl/MessagesPublisher.java

@@ -25,7 +25,6 @@ import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.util.StringUtil;
 import cn.wildfirechat.pojos.OutputNotifyChannelSubscribeStatus;
 import cn.wildfirechat.pojos.SendMessageData;
-import com.xiaoleilu.hutool.system.UserInfo;
 import com.xiaoleilu.loServer.model.FriendData;
 import io.moquette.persistence.*;
 import io.moquette.persistence.MemorySessionStore.Session;
@@ -198,6 +197,23 @@ public class MessagesPublisher {
             if (pullType == ProtoConstants.PullType.Pull_ChatRoom) {
                 targetClients = m_messagesStore.getChatroomMemberClient(user);
             }
+            boolean isPcOnline = false;
+
+            if (!user.equals(sender)) {
+                for (Session targetSession : sessions) {
+                    if (targetSession.getPlatform() == ProtoConstants.Platform.Platform_WEB
+                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_Windows
+                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_LINUX
+                        || targetSession.getPlatform() == ProtoConstants.Platform.Platform_OSX) {
+                        boolean targetIsActive = this.connectionDescriptors.isConnected(targetSession.getClientSession().clientID);
+                        if (targetIsActive) {
+                            isPcOnline = true;
+                            break;
+                        }
+                    }
+                }
+            }
+
             for (Session targetSession : sessions) {
                 //超过7天不活跃的用户忽略
                 if(System.currentTimeMillis() - targetSession.getLastActiveTime() > 7 * 24 * 60 * 60 * 1000) {
@@ -251,6 +267,11 @@ public class MessagesPublisher {
                             LOG.info("The user {} is global sliented", user);
                             isSlient = true;
                         }
+
+                        if (isPcOnline && m_messagesStore.getSilentWhenPcOnline(user)) {
+                            LOG.info("The user {} pc online and silent when pc online", user);
+                            isSlient = true;
+                        }
                     }
 
                     if (!StringUtil.isNullOrEmpty(pushContent) || messageContentType == 400) {

broker/src/main/java/win/liyufan/im/IMTopic.java

@@ -28,6 +28,7 @@ public interface IMTopic {
 	String DismissGroupTopic = "GD";
 	String ModifyGroupInfoTopic = "GMI";
     String ModifyGroupAliasTopic = "GMA";
+    String ModifyGroupMemberAliasTopic = "GMMA";
     String GetGroupInfoTopic = "GPGI";
     String GetGroupMemberTopic = "GPGM";
     String TransferGroupTopic = "GTG";

broker/src/main/java/win/liyufan/im/UserSettingScope.java

@@ -12,6 +12,7 @@ public interface UserSettingScope {
     int kUserSettingMyChannels = 8;
     int kUserSettingListenedChannels = 9;
     int kUserSettingPCOnline = 10;
+    int kUserSettingMuteWhenPCOnline = 15;
 
     int kUserSettingCustomBegin = 1000;
 }

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.45</version>
+        <version>0.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common/src/main/java/cn/wildfirechat/common/APIPath.java

@@ -36,6 +36,8 @@ public interface APIPath {
     String Blacklist_Get_List = "/admin/blacklist/list";
     String Friend_Get_Alias = "/admin/friend/get_alias";
     String Friend_Set_Alias = "/admin/friend/set_alias";
+    String Friend_Send_Request = "/admin/friend/send_request";
+    String Friend_Get_Requests = "/admin/friend/get_requests";
 
     String Msg_Send = "/admin/message/send";
     String Msg_Recall = "/admin/message/recall";

common/src/main/java/cn/wildfirechat/pojos/InputAddFriendRequest.java

@@ -0,0 +1,50 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+
+public class InputAddFriendRequest {
+    private String userId;
+    private String friendUid;
+    private String reason;
+    private boolean force;
+
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getFriendUid() {
+        return friendUid;
+    }
+
+    public void setFriendUid(String friendUid) {
+        this.friendUid = friendUid;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public boolean isForce() {
+        return force;
+    }
+
+    public void setForce(boolean force) {
+        this.force = force;
+    }
+}

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;

common/src/main/java/cn/wildfirechat/proto/WFCMessage.java

@@ -40329,6 +40329,21 @@ public final class WFCMessage {
      * <code>optional .MessageContent notify_content = 4;</code>
      */
     cn.wildfirechat.proto.WFCMessage.MessageContentOrBuilder getNotifyContentOrBuilder();
+
+    // optional string member_id = 5;
+    /**
+     * <code>optional string member_id = 5;</code>
+     */
+    boolean hasMemberId();
+    /**
+     * <code>optional string member_id = 5;</code>
+     */
+    java.lang.String getMemberId();
+    /**
+     * <code>optional string member_id = 5;</code>
+     */
+    com.google.protobuf.ByteString
+        getMemberIdBytes();
   }
   /**
    * Protobuf type {@code ModifyGroupMemberAlias}
@@ -40425,6 +40440,11 @@ public final class WFCMessage {
               bitField0_ |= 0x00000004;
               break;
             }
+            case 42: {
+              bitField0_ |= 0x00000008;
+              memberId_ = input.readBytes();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -40599,11 +40619,55 @@ public final class WFCMessage {
       return notifyContent_;
     }
 
+    // optional string member_id = 5;
+    public static final int MEMBER_ID_FIELD_NUMBER = 5;
+    private java.lang.Object memberId_;
+    /**
+     * <code>optional string member_id = 5;</code>
+     */
+    public boolean hasMemberId() {
+      return ((bitField0_ & 0x00000008) == 0x00000008);
+    }
+    /**
+     * <code>optional string member_id = 5;</code>
+     */
+    public java.lang.String getMemberId() {
+      java.lang.Object ref = memberId_;
+      if (ref instanceof java.lang.String) {
+        return (java.lang.String) ref;
+      } else {
+        com.google.protobuf.ByteString bs = 
+            (com.google.protobuf.ByteString) ref;
+        java.lang.String s = bs.toStringUtf8();
+        if (bs.isValidUtf8()) {
+          memberId_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string member_id = 5;</code>
+     */
+    public com.google.protobuf.ByteString
+        getMemberIdBytes() {
+      java.lang.Object ref = memberId_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        memberId_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
     private void initFields() {
       groupId_ = "";
       alias_ = "";
       toLine_ = java.util.Collections.emptyList();
       notifyContent_ = cn.wildfirechat.proto.WFCMessage.MessageContent.getDefaultInstance();
+      memberId_ = "";
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -40643,6 +40707,9 @@ public final class WFCMessage {
       if (((bitField0_ & 0x00000004) == 0x00000004)) {
         output.writeMessage(4, notifyContent_);
       }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        output.writeBytes(5, getMemberIdBytes());
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -40673,6 +40740,10 @@ public final class WFCMessage {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(4, notifyContent_);
       }
+      if (((bitField0_ & 0x00000008) == 0x00000008)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(5, getMemberIdBytes());
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -40802,6 +40873,8 @@ public final class WFCMessage {
           notifyContentBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000008);
+        memberId_ = "";
+        bitField0_ = (bitField0_ & ~0x00000010);
         return this;
       }
 
@@ -40851,6 +40924,10 @@ public final class WFCMessage {
         } else {
           result.notifyContent_ = notifyContentBuilder_.build();
         }
+        if (((from_bitField0_ & 0x00000010) == 0x00000010)) {
+          to_bitField0_ |= 0x00000008;
+        }
+        result.memberId_ = memberId_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -40890,6 +40967,11 @@ public final class WFCMessage {
         if (other.hasNotifyContent()) {
           mergeNotifyContent(other.getNotifyContent());
         }
+        if (other.hasMemberId()) {
+          bitField0_ |= 0x00000010;
+          memberId_ = other.memberId_;
+          onChanged();
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -41262,6 +41344,80 @@ public final class WFCMessage {
         return notifyContentBuilder_;
       }
 
+      // optional string member_id = 5;
+      private java.lang.Object memberId_ = "";
+      /**
+       * <code>optional string member_id = 5;</code>
+       */
+      public boolean hasMemberId() {
+        return ((bitField0_ & 0x00000010) == 0x00000010);
+      }
+      /**
+       * <code>optional string member_id = 5;</code>
+       */
+      public java.lang.String getMemberId() {
+        java.lang.Object ref = memberId_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          memberId_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string member_id = 5;</code>
+       */
+      public com.google.protobuf.ByteString
+          getMemberIdBytes() {
+        java.lang.Object ref = memberId_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          memberId_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string member_id = 5;</code>
+       */
+      public Builder setMemberId(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000010;
+        memberId_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string member_id = 5;</code>
+       */
+      public Builder clearMemberId() {
+        bitField0_ = (bitField0_ & ~0x00000010);
+        memberId_ = getDefaultInstance().getMemberId();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string member_id = 5;</code>
+       */
+      public Builder setMemberIdBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000010;
+        memberId_ = value;
+        onChanged();
+        return this;
+      }
+
       // @@protoc_insertion_point(builder_scope:ModifyGroupMemberAlias)
     }
 
@@ -59257,57 +59413,57 @@ public final class WFCMessage {
       "\n\016notify_content\030\004 \001(\0132\017.MessageContent\"" +
       "u\n\024TransferGroupRequest\022\020\n\010group_id\030\001 \002(" +
       "\t\022\021\n\tnew_owner\030\002 \002(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n" +
-      "\016notify_content\030\004 \001(\0132\017.MessageContent\"s" +
-      "\n\026ModifyGroupMemberAlias\022\020\n\010group_id\030\001 \002" +
-      "(\t\022\r\n\005alias\030\002 \002(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016no" +
-      "tify_content\030\004 \001(\0132\017.MessageContent\"P\n\020U" +
-      "serSettingEntry\022\r\n\005scope\030\001 \002(\005\022\013\n\003key\030\002 ",
-      "\002(\t\022\r\n\005value\030\003 \002(\t\022\021\n\tupdate_dt\030\004 \002(\003\"A\n" +
-      "\024ModifyUserSettingReq\022\r\n\005scope\030\001 \002(\005\022\013\n\003" +
-      "key\030\002 \002(\t\022\r\n\005value\030\003 \002(\t\"\032\n\007Version\022\017\n\007v" +
-      "ersion\030\001 \002(\003\"8\n\024GetUserSettingResult\022 \n\005" +
-      "entry\030\001 \003(\0132\021.UserSettingEntry\"f\n\006Friend" +
-      "\022\013\n\003uid\030\001 \002(\t\022\r\n\005state\030\002 \002(\005\022\021\n\tupdate_d" +
-      "t\030\003 \002(\003\022\r\n\005alias\030\004 \001(\t\022\017\n\007blacked\030\005 \001(\005\022" +
-      "\r\n\005extra\030\006 \001(\t\"*\n\020GetFriendsResult\022\026\n\005en" +
-      "try\030\001 \003(\0132\007.Friend\"7\n\026GetFriendRequestRe" +
-      "sult\022\035\n\005entry\030\001 \003(\0132\016.FriendRequest\"\243\001\n\021",
-      "ConnectAckPayload\022\020\n\010msg_head\030\001 \001(\003\022\023\n\013f" +
-      "riend_head\030\002 \001(\003\022\026\n\016friend_rq_head\030\003 \001(\003" +
-      "\022\024\n\014setting_head\030\004 \001(\003\022\021\n\tnode_addr\030\005 \001(" +
-      "\t\022\021\n\tnode_port\030\006 \001(\005\022\023\n\013server_time\030\007 \001(" +
-      "\003\"P\n\rIMHttpWrapper\022\r\n\005token\030\001 \002(\t\022\021\n\tcli" +
-      "ent_id\030\002 \002(\t\022\017\n\007request\030\003 \002(\t\022\014\n\004data\030\004 " +
-      "\001(\014\"A\n\021SearchUserRequest\022\017\n\007keyword\030\001 \002(" +
-      "\t\022\r\n\005fuzzy\030\002 \001(\005\022\014\n\004page\030\003 \001(\005\"(\n\020Search" +
-      "UserResult\022\024\n\005entry\030\001 \003(\0132\005.User\"@\n\026GetC" +
-      "hatroomInfoRequest\022\023\n\013chatroom_id\030\001 \002(\t\022",
-      "\021\n\tupdate_dt\030\002 \001(\003\"\227\001\n\014ChatroomInfo\022\r\n\005t" +
-      "itle\030\001 \002(\t\022\014\n\004desc\030\002 \001(\t\022\020\n\010portrait\030\003 \001" +
-      "(\t\022\024\n\014member_count\030\004 \001(\005\022\021\n\tcreate_dt\030\005 " +
-      "\001(\003\022\021\n\tupdate_dt\030\006 \001(\003\022\r\n\005extra\030\007 \001(\t\022\r\n" +
-      "\005state\030\010 \001(\005\"F\n\034GetChatroomMemberInfoReq" +
-      "uest\022\023\n\013chatroom_id\030\001 \002(\t\022\021\n\tmax_count\030\002" +
-      " \001(\005\";\n\022ChatroomMemberInfo\022\024\n\014member_cou" +
-      "nt\030\001 \001(\005\022\017\n\007members\030\002 \003(\t\"\026\n\010INT64Buf\022\n\n" +
-      "\002id\030\001 \002(\003\"4\n\023NotifyRecallMessage\022\n\n\002id\030\001" +
-      " \002(\003\022\021\n\tfrom_user\030\002 \002(\t\"/\n\020BlackUserRequ",
-      "est\022\013\n\003uid\030\001 \002(\t\022\016\n\006status\030\002 \002(\005\"\323\001\n\014Rou" +
-      "teRequest\022\013\n\003app\030\001 \001(\t\022\020\n\010platform\030\002 \001(\005" +
-      "\022\021\n\tpush_type\030\003 \001(\005\022\023\n\013device_name\030\004 \001(\t" +
-      "\022\026\n\016device_version\030\005 \001(\t\022\022\n\nphone_name\030\006" +
-      " \001(\t\022\020\n\010language\030\007 \001(\t\022\024\n\014carrier_name\030\010" +
-      " \001(\t\022\023\n\013app_version\030\t \001(\t\022\023\n\013sdk_version" +
-      "\030\n \001(\t\"D\n\rRouteResponse\022\014\n\004host\030\001 \002(\t\022\021\n" +
-      "\tlong_port\030\002 \002(\005\022\022\n\nshort_port\030\003 \002(\005\"G\n\017" +
-      "GetTokenRequest\022\017\n\007user_id\030\001 \002(\t\022\021\n\tclie" +
-      "nt_id\030\002 \002(\t\022\020\n\010platform\030\003 \001(\005\"\\\n\022LoadRem",
-      "oteMessages\022#\n\014conversation\030\001 \002(\0132\r.Conv" +
-      "ersation\022\022\n\nbefore_uid\030\002 \002(\003\022\r\n\005count\030\003 " +
-      "\002(\005\"a\n\020MultiCastMessage\022\021\n\tfrom_user\030\001 \002" +
-      "(\t\022 \n\007content\030\002 \002(\0132\017.MessageContent\022\n\n\002" +
-      "to\030\003 \003(\t\022\014\n\004line\030\004 \002(\005B#\n\025cn.wildfirecha" +
-      "t.protoB\nWFCMessage"
+      "\016notify_content\030\004 \001(\0132\017.MessageContent\"\206" +
+      "\001\n\026ModifyGroupMemberAlias\022\020\n\010group_id\030\001 " +
+      "\002(\t\022\r\n\005alias\030\002 \002(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016n" +
+      "otify_content\030\004 \001(\0132\017.MessageContent\022\021\n\t" +
+      "member_id\030\005 \001(\t\"P\n\020UserSettingEntry\022\r\n\005s",
+      "cope\030\001 \002(\005\022\013\n\003key\030\002 \002(\t\022\r\n\005value\030\003 \002(\t\022\021" +
+      "\n\tupdate_dt\030\004 \002(\003\"A\n\024ModifyUserSettingRe" +
+      "q\022\r\n\005scope\030\001 \002(\005\022\013\n\003key\030\002 \002(\t\022\r\n\005value\030\003" +
+      " \002(\t\"\032\n\007Version\022\017\n\007version\030\001 \002(\003\"8\n\024GetU" +
+      "serSettingResult\022 \n\005entry\030\001 \003(\0132\021.UserSe" +
+      "ttingEntry\"f\n\006Friend\022\013\n\003uid\030\001 \002(\t\022\r\n\005sta" +
+      "te\030\002 \002(\005\022\021\n\tupdate_dt\030\003 \002(\003\022\r\n\005alias\030\004 \001" +
+      "(\t\022\017\n\007blacked\030\005 \001(\005\022\r\n\005extra\030\006 \001(\t\"*\n\020Ge" +
+      "tFriendsResult\022\026\n\005entry\030\001 \003(\0132\007.Friend\"7" +
+      "\n\026GetFriendRequestResult\022\035\n\005entry\030\001 \003(\0132",
+      "\016.FriendRequest\"\243\001\n\021ConnectAckPayload\022\020\n" +
+      "\010msg_head\030\001 \001(\003\022\023\n\013friend_head\030\002 \001(\003\022\026\n\016" +
+      "friend_rq_head\030\003 \001(\003\022\024\n\014setting_head\030\004 \001" +
+      "(\003\022\021\n\tnode_addr\030\005 \001(\t\022\021\n\tnode_port\030\006 \001(\005" +
+      "\022\023\n\013server_time\030\007 \001(\003\"P\n\rIMHttpWrapper\022\r" +
+      "\n\005token\030\001 \002(\t\022\021\n\tclient_id\030\002 \002(\t\022\017\n\007requ" +
+      "est\030\003 \002(\t\022\014\n\004data\030\004 \001(\014\"A\n\021SearchUserReq" +
+      "uest\022\017\n\007keyword\030\001 \002(\t\022\r\n\005fuzzy\030\002 \001(\005\022\014\n\004" +
+      "page\030\003 \001(\005\"(\n\020SearchUserResult\022\024\n\005entry\030" +
+      "\001 \003(\0132\005.User\"@\n\026GetChatroomInfoRequest\022\023",
+      "\n\013chatroom_id\030\001 \002(\t\022\021\n\tupdate_dt\030\002 \001(\003\"\227" +
+      "\001\n\014ChatroomInfo\022\r\n\005title\030\001 \002(\t\022\014\n\004desc\030\002" +
+      " \001(\t\022\020\n\010portrait\030\003 \001(\t\022\024\n\014member_count\030\004" +
+      " \001(\005\022\021\n\tcreate_dt\030\005 \001(\003\022\021\n\tupdate_dt\030\006 \001" +
+      "(\003\022\r\n\005extra\030\007 \001(\t\022\r\n\005state\030\010 \001(\005\"F\n\034GetC" +
+      "hatroomMemberInfoRequest\022\023\n\013chatroom_id\030" +
+      "\001 \002(\t\022\021\n\tmax_count\030\002 \001(\005\";\n\022ChatroomMemb" +
+      "erInfo\022\024\n\014member_count\030\001 \001(\005\022\017\n\007members\030" +
+      "\002 \003(\t\"\026\n\010INT64Buf\022\n\n\002id\030\001 \002(\003\"4\n\023NotifyR" +
+      "ecallMessage\022\n\n\002id\030\001 \002(\003\022\021\n\tfrom_user\030\002 ",
+      "\002(\t\"/\n\020BlackUserRequest\022\013\n\003uid\030\001 \002(\t\022\016\n\006" +
+      "status\030\002 \002(\005\"\323\001\n\014RouteRequest\022\013\n\003app\030\001 \001" +
+      "(\t\022\020\n\010platform\030\002 \001(\005\022\021\n\tpush_type\030\003 \001(\005\022" +
+      "\023\n\013device_name\030\004 \001(\t\022\026\n\016device_version\030\005" +
+      " \001(\t\022\022\n\nphone_name\030\006 \001(\t\022\020\n\010language\030\007 \001" +
+      "(\t\022\024\n\014carrier_name\030\010 \001(\t\022\023\n\013app_version\030" +
+      "\t \001(\t\022\023\n\013sdk_version\030\n \001(\t\"D\n\rRouteRespo" +
+      "nse\022\014\n\004host\030\001 \002(\t\022\021\n\tlong_port\030\002 \002(\005\022\022\n\n" +
+      "short_port\030\003 \002(\005\"G\n\017GetTokenRequest\022\017\n\007u" +
+      "ser_id\030\001 \002(\t\022\021\n\tclient_id\030\002 \002(\t\022\020\n\010platf",
+      "orm\030\003 \001(\005\"\\\n\022LoadRemoteMessages\022#\n\014conve" +
+      "rsation\030\001 \002(\0132\r.Conversation\022\022\n\nbefore_u" +
+      "id\030\002 \002(\003\022\r\n\005count\030\003 \002(\005\"a\n\020MultiCastMess" +
+      "age\022\021\n\tfrom_user\030\001 \002(\t\022 \n\007content\030\002 \002(\0132" +
+      "\017.MessageContent\022\n\n\002to\030\003 \003(\t\022\014\n\004line\030\004 \002" +
+      "(\005B#\n\025cn.wildfirechat.protoB\nWFCMessage"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -59595,7 +59751,7 @@ public final class WFCMessage {
           internal_static_ModifyGroupMemberAlias_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_ModifyGroupMemberAlias_descriptor,
-              new java.lang.String[] { "GroupId", "Alias", "ToLine", "NotifyContent", });
+              new java.lang.String[] { "GroupId", "Alias", "ToLine", "NotifyContent", "MemberId", });
           internal_static_UserSettingEntry_descriptor =
             getDescriptor().getMessageTypes().get(47);
           internal_static_UserSettingEntry_fieldAccessorTable = new

distribution/pom.xml

@@ -6,7 +6,7 @@
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.45</version>
+        <version>0.46</version>
     </parent>
 
     <artifactId>distribution</artifactId>

pom.xml

@@ -12,7 +12,7 @@
     <artifactId>wildfirechat-parent</artifactId>
 
     <packaging>pom</packaging>
-    <version>0.45</version>
+    <version>0.46</version>
     <name>Wildfire Chat</name>
     <description>Wildfire Chat Server</description>
     <inceptionYear>2019</inceptionYear>

sdk/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.45</version>
+        <version>0.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sdk/src/main/java/cn/wildfirechat/sdk/Main.java

@@ -39,6 +39,7 @@ public class Main {
         testChatroom();
         testMessage();
         testGeneralApi();
+        testSensitiveApi();
         if (commercialServer) {
             testDevice();
         }
@@ -253,6 +254,30 @@ public class Main {
             System.exit(-1);
         }
 
+        IMResult<Void> result = RelationAdmin.sendFrienRequest("ff1", "ff2", "hello", true);
+        if (result != null && result.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("send friend request success");
+        } else {
+            System.out.println("failure");
+            System.exit(-1);
+        }
+
+        result = RelationAdmin.sendFrienRequest("ff1", "ff2", "hello2", false);
+        if (result != null && result.getErrorCode() != ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("success");
+        } else {
+            System.out.println("failure");
+            System.exit(-1);
+        }
+
+        result = RelationAdmin.sendFrienRequest("ff1", "ff2", "hello3", true);
+        if (result != null && result.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("success");
+        } else {
+            System.out.println("send friend request success");
+            System.exit(-1);
+        }
+
         IMResult<Void> updateFriendStatusResult = RelationAdmin.setUserFriend("ff1", "ff2", true, "{\"from\":1}");
         if (updateFriendStatusResult != null && updateFriendStatusResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("update friend status success");
@@ -945,6 +970,40 @@ public class Main {
             }
         }
     }
+    static void testSensitiveApi() throws Exception {
+        List<String> words = Arrays.asList("a","b","c");
+        IMResult<Void> addResult = SensitiveAdmin.addSensitives(words);
+        if (addResult != null && addResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("Add sensitive word response success");
+        } else {
+            System.out.println("Add sensitive word response error");
+            System.exit(-1);
+        }
+
+        IMResult<InputOutputSensitiveWords> swResult = SensitiveAdmin.getSensitives();
+        if (swResult != null && swResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && swResult.getResult().getWords().containsAll(words)) {
+            System.out.println("Sensitive word added");
+        } else {
+            System.out.println("Sensitive word not added");
+            System.exit(-1);
+        }
+
+        IMResult<Void> removeResult = SensitiveAdmin.removeSensitives(words);
+        if (removeResult != null && removeResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("Remove sensitive word response success");
+        } else {
+            System.out.println("Remove sensitive word response error");
+            System.exit(-1);
+        }
+
+        swResult = SensitiveAdmin.getSensitives();
+        if (swResult != null && swResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && !swResult.getResult().getWords().containsAll(words)) {
+            System.out.println("Sensitive word removed");
+        } else {
+            System.out.println("Sensitive word not removed");
+            System.exit(-1);
+        }
+    }
 
     //***********************************************
     //****  物联网相关的API，仅专业版支持

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,14 @@ public class RelationAdmin {
         input.setTargetId(targetId);
         return AdminHttpUtils.httpJsonPost(path, input, OutputGetAlias.class);
     }
+
+    public static IMResult<Void> sendFrienRequest(String userId, String targetId, String reason, boolean force) throws Exception {
+        String path = APIPath.Friend_Send_Request;
+        InputAddFriendRequest input = new InputAddFriendRequest();
+        input.setUserId(userId);
+        input.setFriendUid(targetId);
+        input.setReason(reason);
+        input.setForce(force);
+        return AdminHttpUtils.httpJsonPost(path, input, Void.class);
+    }
 }

sdk/src/main/java/cn/wildfirechat/sdk/SensitiveAdmin.java

@@ -22,7 +22,7 @@ public class SensitiveAdmin {
         return AdminHttpUtils.httpJsonPost(path, input, Void.class);
     }
 
-    public static IMResult<InputOutputSensitiveWords> getSensitives(List<String> sensitives) throws Exception {
+    public static IMResult<InputOutputSensitiveWords> getSensitives() throws Exception {
         String path = APIPath.Sensitive_Query;
         return AdminHttpUtils.httpJsonPost(path, null, InputOutputSensitiveWords.class);
     }