version 0.45 -> 0.46

(cherry picked from commit a8d076a9ac7faa1a556caeaad239bb393824bd8b)

broker/config/wildfirechat.conf

@@ -69,13 +69,15 @@ message.max_queue 1024
 ##是否禁止陌生人聊天
 message.disable_stranger_chat false
 
-##黑名单处理策略，0 发送失败，返回被拉黑的错误码；1 发送成功但消息被服务器直接丢弃；2 敏感词替换为***；3 不处理。
-##所有命中敏感词的消息都会被记录在敏感词消息表中
+##黑名单策略，0 发送失败，返回被拉黑的错误码；1 发送成功但消息被服务器直接丢弃
 message.blacklist.strategy 0
 
 ##是否禁止服务器端消息搜索，该功能暂未实现。目前的影响是如果打开，则存储消息时不单独保存_searchable_content字段
 message.disable_remote_search  false
 
+##允许客户端撤回消息时限，单位是秒。群组管理员或群主撤回群成员消息、server api不受此限制，可以撤回任意时限内的消息
+message.recall_time_limit 120
+
 ##禁止搜索用户
 friend.disable_search false
 
@@ -114,7 +116,8 @@ hazelcast.configuration config/hazelcast.xml
 #*********************************************************************
 # Media server configuration
 #*********************************************************************
-##是否使用七牛云存储。1使用七牛；0使用内存文件服务器。
+##是否使用七牛云存储。1使用七牛；0使用内存文件服务器。默认的七牛账户信息不可用，请在七牛官网申请账户并配置
+## https://docs.wildfirechat.cn/server/media_server.html
 media.server.use_qiniu 0
 
 ##媒体类型分类

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.43</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/AdminAction.java

@@ -44,9 +44,20 @@ abstract public class AdminAction extends Action {
         if (!mLimitCounter.isGranted("admin")) {
             return ErrorCode.ERROR_CODE_OVER_FREQUENCY;
         }
+        
         String nonce = request.getHeader("nonce");
+        if (StringUtil.isNullOrEmpty(nonce)) {
+            nonce = request.getHeader("Nonce");
+        }
         String timestamp = request.getHeader("timestamp");
+        if (StringUtil.isNullOrEmpty(timestamp)) {
+            timestamp = request.getHeader("Timestamp");
+        }
         String sign = request.getHeader("sign");
+        if (StringUtil.isNullOrEmpty(sign)) {
+            sign = request.getHeader("Sign");
+        }
+        
         if (StringUtil.isNullOrEmpty(nonce) || StringUtil.isNullOrEmpty(timestamp) || StringUtil.isNullOrEmpty(sign)) {
             return ErrorCode.INVALID_PARAMETER;
         }

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);
                         }

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/admin/GetGroupMembersAction.java

@@ -46,7 +46,7 @@ public class GetGroupMembersAction extends AdminAction {
                 && (!StringUtil.isNullOrEmpty(inputGetGroup.getGroupId()))) {
 
                 List<WFCMessage.GroupMember> members = new ArrayList<>();
-                ErrorCode errorCode = messagesStore.getGroupMembers(inputGetGroup.getGroupId(), 0, members);
+                ErrorCode errorCode = messagesStore.getGroupMembers(null, inputGetGroup.getGroupId(), 0, members);
 
 
                 response.setStatus(HttpResponseStatus.OK);

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

@@ -34,9 +34,21 @@ abstract public class ChannelAction extends Action {
     @Override
     public ErrorCode preAction(Request request, Response response) {
         String nonce = request.getHeader("nonce");
+        if (StringUtil.isNullOrEmpty(nonce)) {
+            nonce = request.getHeader("Nonce");
+        }
         String timestamp = request.getHeader("timestamp");
+        if (StringUtil.isNullOrEmpty(timestamp)) {
+            timestamp = request.getHeader("Timestamp");
+        }
         String sign = request.getHeader("sign");
+        if (StringUtil.isNullOrEmpty(sign)) {
+            sign = request.getHeader("Sign");
+        }
         String cid = request.getHeader("cid");
+        if (StringUtil.isNullOrEmpty(cid)) {
+            cid = request.getHeader("Cid");
+        }
 
         if (StringUtil.isNullOrEmpty(nonce) || StringUtil.isNullOrEmpty(timestamp) || StringUtil.isNullOrEmpty(sign) || StringUtil.isNullOrEmpty(cid)) {
             return ErrorCode.INVALID_PARAMETER;
@@ -63,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

@@ -38,9 +38,22 @@ abstract public class RobotAction extends Action {
     @Override
     public ErrorCode preAction(Request request, Response response) {
         String nonce = request.getHeader("nonce");
+        if (StringUtil.isNullOrEmpty(nonce)) {
+            nonce = request.getHeader("Nonce");
+        }
         String timestamp = request.getHeader("timestamp");
+        if (StringUtil.isNullOrEmpty(timestamp)) {
+            timestamp = request.getHeader("Timestamp");
+        }
         String sign = request.getHeader("sign");
+        if (StringUtil.isNullOrEmpty(sign)) {
+            sign = request.getHeader("Sign");
+        }
         String rid = request.getHeader("rid");
+        if (StringUtil.isNullOrEmpty(rid)) {
+            rid = request.getHeader("Rid");
+        }
+
         if (StringUtil.isNullOrEmpty(nonce) || StringUtil.isNullOrEmpty(timestamp) || StringUtil.isNullOrEmpty(sign) || StringUtil.isNullOrEmpty(rid)) {
             return ErrorCode.INVALID_PARAMETER;
         }
@@ -67,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/BrokerConstants.java

@@ -142,6 +142,8 @@ public final class BrokerConstants {
 
     public static final String MESSAGES_DISABLE_REMOTE_SEARCH = "message.disable_remote_search";
 
+    public static final String MESSAGES_RECALL_TIME_LIMIT = "message.recall_time_limit";
+
     private BrokerConstants() {
     }
 }

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/BroadcastMessageHandler.java

@@ -33,7 +33,13 @@ public class BroadcastMessageHandler extends IMHandler<WFCMessage.Message> {
             }
 
             long timestamp = System.currentTimeMillis();
-            long messageId = MessageShardingUtil.generateId();
+            long messageId = 0;
+            try {
+                messageId = MessageShardingUtil.generateId();
+            } catch (Exception e) {
+                e.printStackTrace();
+                return ErrorCode.ERROR_CODE_SERVER_ERROR;
+            }
             message = message.toBuilder().setFromUser(fromUser).setMessageId(messageId).setServerTimestamp(timestamp).setConversation(WFCMessage.Conversation.newBuilder().setTarget(fromUser).setLine(message.getConversation().getLine()).setType(ProtoConstants.ConversationType.ConversationType_Private).build()).build();
 
             long count = saveAndBroadcast(fromUser, clientID, message);

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

@@ -27,7 +27,7 @@ public class CreateGroupHandler extends GroupHandler<WFCMessage.CreateGroupReque
                 return ErrorCode.ERROR_CODE_GROUP_ALREADY_EXIST;
             }
         }
-        WFCMessage.GroupInfo groupInfo = m_messagesStore.createGroup(fromUser, request.getGroup().getGroupInfo(), request.getGroup().getMembersList());
+        WFCMessage.GroupInfo groupInfo = m_messagesStore.createGroup(fromUser, request.getGroup().getGroupInfo(), request.getGroup().getMembersList(), isAdmin);
         if (groupInfo != null) {
             if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());

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

@@ -24,7 +24,7 @@ public class GetGroupMemberHandler extends IMHandler<WFCMessage.PullGroupMemberR
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.PullGroupMemberRequest request, Qos1PublishHandler.IMCallback callback) {
         List<WFCMessage.GroupMember> members = new ArrayList<>();
-        ErrorCode errorCode = m_messagesStore.getGroupMembers(request.getTarget(), request.getHead(), members);
+        ErrorCode errorCode = m_messagesStore.getGroupMembers(fromUser, request.getTarget(), request.getHead(), members);
 
         if (errorCode == ERROR_CODE_SUCCESS) {
             WFCMessage.PullGroupMemberResult result = WFCMessage.PullGroupMemberResult.newBuilder().addAllMember(members).build();

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

@@ -32,9 +32,13 @@ abstract public class GroupHandler<T> extends IMHandler<T> {
             WFCMessage.Message.Builder builder = WFCMessage.Message.newBuilder().setContent(content).setServerTimestamp(timestamp);
             builder.setConversation(builder.getConversationBuilder().setType(ProtoConstants.ConversationType.ConversationType_Group).setTarget(targetId).setLine(line));
             builder.setFromUser(fromUser);
-            long messageId = MessageShardingUtil.generateId();
-            builder.setMessageId(messageId);
-            saveAndPublish(fromUser, null, builder.build(), false);
+            try {
+                long messageId = MessageShardingUtil.generateId();
+                builder.setMessageId(messageId);
+                saveAndPublish(fromUser, null, builder.build(), false);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
     }
 

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

@@ -32,48 +32,54 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
 
             if (errorCode == ERROR_CODE_SUCCESS) {
                 if (!isAdmin && builder.getConversation() != null && request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted) {
-                    long messageId = MessageShardingUtil.generateId();
-                    long timestamp = System.currentTimeMillis();
-                    builder.setMessageId(messageId);
-                    builder.setServerTimestamp(timestamp);
-                    saveAndPublish(request.getTargetUid(), null, builder.build(), false);
+                    try {
+                        long messageId = MessageShardingUtil.generateId();
+                        long timestamp = System.currentTimeMillis();
+                        builder.setMessageId(messageId);
+                        builder.setServerTimestamp(timestamp);
+                        saveAndPublish(request.getTargetUid(), null, builder.build(), false);
 
-                    MemorySessionStore.Session session = m_sessionsStore.getSession(clientID);
-                    String language = "zh_CN";
-                    if (session != null && !StringUtil.isNullOrEmpty(session.getLanguage())) {
-                        language = session.getLanguage();
+                        MemorySessionStore.Session session = m_sessionsStore.getSession(clientID);
+                        String language = "zh_CN";
+                        if (session != null && !StringUtil.isNullOrEmpty(session.getLanguage())) {
+                            language = session.getLanguage();
+                        }
+                        WFCMessage.MessageContent.Builder contentBuilder = WFCMessage.MessageContent.newBuilder();
+                        if (m_messagesStore.isNewFriendWelcomeMessage()) {
+                            contentBuilder.setType(92);
+                        } else {
+                            contentBuilder.setType(90).setContent(I18n.getString(language, "Above_Greeting_Message"));
+                        }
+
+                        builder = WFCMessage.Message.newBuilder();
+                        builder.setFromUser(request.getTargetUid());
+                        builder.setConversation(WFCMessage.Conversation.newBuilder().setTarget(fromUser).setLine(0).setType(ProtoConstants.ConversationType.ConversationType_Private).build());
+                        builder.setContent(contentBuilder);
+                        timestamp = System.currentTimeMillis();
+                        builder.setServerTimestamp(timestamp);
+
+                        messageId = MessageShardingUtil.generateId();
+                        builder.setMessageId(messageId);
+                        saveAndPublish(request.getTargetUid(), null, builder.build(), false);
+
+                        if (m_messagesStore.isNewFriendWelcomeMessage()) {
+                            contentBuilder.setType(93);
+                        } else {
+                            contentBuilder.setContent(I18n.getString(language, "Friend_Can_Start_Chat"));
+                        }
+
+                        builder.setContent(contentBuilder);
+                        messageId = MessageShardingUtil.generateId();
+                        builder.setMessageId(messageId);
+                        timestamp = System.currentTimeMillis();
+                        builder.setServerTimestamp(timestamp);
+                        saveAndPublish(request.getTargetUid(), null, builder.build(), false);
+
+                    } catch (Exception e) {
+                        e.printStackTrace();
                     }
-                    WFCMessage.MessageContent.Builder contentBuilder = WFCMessage.MessageContent.newBuilder();
-                    if (m_messagesStore.isNewFriendWelcomeMessage()) {
-                        contentBuilder.setType(92);
-                    } else {
-                        contentBuilder.setType(90).setContent(I18n.getString(language, "Above_Greeting_Message"));
-                    }
-
-                    builder = WFCMessage.Message.newBuilder();
-                    builder.setFromUser(request.getTargetUid());
-                    builder.setConversation(WFCMessage.Conversation.newBuilder().setTarget(fromUser).setLine(0).setType(ProtoConstants.ConversationType.ConversationType_Private).build());
-                    builder.setContent(contentBuilder);
-                    timestamp = System.currentTimeMillis();
-                    builder.setServerTimestamp(timestamp);
-
-                    messageId = MessageShardingUtil.generateId();
-                    builder.setMessageId(messageId);
-                    saveAndPublish(request.getTargetUid(), null, builder.build(), false);
-
-                    if (m_messagesStore.isNewFriendWelcomeMessage()) {
-                        contentBuilder.setType(93);
-                    } else {
-                        contentBuilder.setContent(I18n.getString(language, "Friend_Can_Start_Chat"));
-                    }
-
-                    builder.setContent(contentBuilder);
-                    messageId = MessageShardingUtil.generateId();
-                    builder.setMessageId(messageId);
-                    timestamp = System.currentTimeMillis();
-                    builder.setServerTimestamp(timestamp);
-                    saveAndPublish(request.getTargetUid(), null, builder.build(), false);
-
+                }
+                if (request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted || isAdmin) {
                     publisher.publishNotification(IMTopic.NotifyFriendTopic, request.getTargetUid(), heads[0]);
                     publisher.publishNotification(IMTopic.NotifyFriendTopic, fromUser, heads[1]);
                 }

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/imhandler/MultiCastMessageHandler.java

@@ -36,7 +36,13 @@ public class MultiCastMessageHandler extends IMHandler<WFCMessage.MultiCastMessa
         }
 
         long timestamp = System.currentTimeMillis();
-        long messageId = MessageShardingUtil.generateId();
+        long messageId = 0;
+        try {
+            messageId = MessageShardingUtil.generateId();
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ErrorCode.ERROR_CODE_SERVER_ERROR;
+        }
         WFCMessage.Message message = WFCMessage.Message.newBuilder()
             .setContent(multiCastMessage.getContent())
             .setConversation(WFCMessage.Conversation.newBuilder().setTarget(fromUser).setType(ConversationType_Private).setLine(multiCastMessage.getLine()).build())

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

@@ -100,7 +100,13 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
             }
 
             long timestamp = System.currentTimeMillis();
-            long messageId = MessageShardingUtil.generateId();
+            long messageId = 0;
+            try {
+                messageId = MessageShardingUtil.generateId();
+            } catch (Exception e) {
+                e.printStackTrace();
+                return ErrorCode.ERROR_CODE_SERVER_ERROR;
+            }
             message = message.toBuilder().setFromUser(fromUser).setMessageId(messageId).setServerTimestamp(timestamp).build();
 
             if (mForwardUrl != null) {

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
@@ -2186,6 +2190,33 @@ public class DatabaseStore {
             }
         });
     }
+    
+    boolean isUidAndNameConflict(String uid, String name) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSet rs = null;
+        long start = System.currentTimeMillis();
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "select _uid from t_user where _name = ? and _uid <> ? limit 1";
+            statement = connection.prepareStatement(sql);
+            statement.setString(1, name);
+            statement.setString(2, uid);
+            rs = statement.executeQuery();
+            if (rs.next()) {
+                String conflictId = rs.getString(1);
+                LOG.error("user {} already have name {} !!!", conflictId, name);
+                return true;
+            }
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement, rs);
+        }
+        return false;
+    }
 
     void updateUser(final WFCMessage.User user) throws Exception {
         LOG.info("Database update user info {} {}", user.getUid(), user.getUpdateDt());

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

@@ -136,6 +136,8 @@ public class MemoryMessagesStore implements IMessagesStore {
     private long mChatroomParticipantIdleTime = 900000;
     private boolean mChatroomRejoinWhenActive = true;
 
+    private long mRecallTimeLimit = 300;
+
     MemoryMessagesStore(Server server, DatabaseStore databaseStore) {
         m_Server = server;
         this.databaseStore = databaseStore;
@@ -236,6 +238,11 @@ public class MemoryMessagesStore implements IMessagesStore {
             databaseStore.setDisableRemoteMessageSearch(disableRemoteMessageSearch);
         } catch (Exception e) {
         }
+
+        try {
+            mRecallTimeLimit = Long.parseLong(m_Server.getConfig().getProperty(BrokerConstants.MESSAGES_RECALL_TIME_LIMIT));
+        } catch (Exception e) {
+        }
     }
 
     private void printMissConfigLog(String config, String defaultValue) {
@@ -769,7 +776,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public WFCMessage.GroupInfo createGroup(String fromUser, WFCMessage.GroupInfo groupInfo, List<WFCMessage.GroupMember> memberList) {
+    public WFCMessage.GroupInfo createGroup(String fromUser, WFCMessage.GroupInfo groupInfo, List<WFCMessage.GroupMember> memberList, boolean isAdmin) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);
 
@@ -780,6 +787,26 @@ public class MemoryMessagesStore implements IMessagesStore {
         } else {
             groupId = groupInfo.getTargetId();
         }
+
+        MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
+
+        String owner = fromUser;
+        if (isAdmin && !StringUtil.isNullOrEmpty(groupInfo.getOwner())) {
+            owner = groupInfo.getOwner();
+        }
+
+        List<WFCMessage.GroupMember> updatedMemberList = new ArrayList<>();
+        for (WFCMessage.GroupMember member : memberList) {
+            if (member.getMemberId().equals(owner)) {
+                member = member.toBuilder().setUpdateDt(dt).setCreateDt(dt).setType(ProtoConstants.GroupMemberType.GroupMemberType_Owner).build();
+            } else {
+                member = member.toBuilder().setUpdateDt(dt).setCreateDt(dt).build();
+            }
+            groupMembers.put(groupId, member);
+            updatedMemberList.add(member);
+            dt++;
+        }
+
         groupInfo = groupInfo.toBuilder()
             .setTargetId(groupId)
             .setName(groupInfo.getName())
@@ -789,23 +816,10 @@ public class MemoryMessagesStore implements IMessagesStore {
             .setUpdateDt(dt)
             .setMemberUpdateDt(dt)
             .setMemberCount(memberList.size())
-            .setOwner(StringUtil.isNullOrEmpty(groupInfo.getOwner()) ? fromUser : groupInfo.getOwner())
+            .setOwner(owner)
             .build();
 
-        mIMap.put(groupId, groupInfo);
-        MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
-
-        List<WFCMessage.GroupMember> updatedMemberList = new ArrayList<>();
-        for (WFCMessage.GroupMember member : memberList) {
-            if (member.getMemberId().equals(groupInfo.getOwner())) {
-                member = member.toBuilder().setUpdateDt(dt).setCreateDt(dt).setType(ProtoConstants.GroupMemberType.GroupMemberType_Owner).build();
-            } else {
-                member = member.toBuilder().setUpdateDt(dt).setCreateDt(dt).build();
-            }
-            groupMembers.put(groupId, member);
-            updatedMemberList.add(member);
-        }
-
+        mIMap.set(groupId, groupInfo);
         databaseStore.persistGroupMember(groupId, updatedMemberList);
 
         return groupInfo;
@@ -871,12 +885,20 @@ public class MemoryMessagesStore implements IMessagesStore {
         ArrayList<String> newInviteUsers = new ArrayList<>();
         for (WFCMessage.GroupMember member : memberList) {
             if (member.getMemberId().equals(groupInfo.getOwner())) {
-                member = member.toBuilder().setType(GroupMemberType_Owner).setUpdateDt(updateDt).setCreateDt(updateDt).setAlias("").build();
+                member = member.toBuilder().setType(GroupMemberType_Owner).setUpdateDt(updateDt).setCreateDt(updateDt).build();
             } else {
-                member = member.toBuilder().setType(GroupMemberType_Normal).setUpdateDt(updateDt).setCreateDt(updateDt).setAlias("").build();
+                if (isAdmin) {
+                    if (member.getType() != GroupMemberType_Owner)
+                        member = member.toBuilder().setUpdateDt(updateDt).setCreateDt(updateDt).build();
+                    else
+                        return ErrorCode.INVALID_PARAMETER;
+                } else {
+                    member = member.toBuilder().setType(GroupMemberType_Normal).setUpdateDt(updateDt).setCreateDt(updateDt).build();
+                }
             }
             tmp.add(member);
             newInviteUsers.add(member.getMemberId());
+            updateDt++;
         }
         memberList = tmp;
 
@@ -1150,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);
@@ -1164,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;
     }
 
@@ -1223,7 +1292,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public ErrorCode getGroupMembers(String groupId, long maxDt, List<WFCMessage.GroupMember> members) {
+    public ErrorCode getGroupMembers(String fromUser, String groupId, long maxDt, List<WFCMessage.GroupMember> members) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);
 
@@ -1239,10 +1308,30 @@ public class MemoryMessagesStore implements IMessagesStore {
         if (memberCollection == null || memberCollection.size() == 0) {
             memberCollection = loadGroupMemberFromDB(hzInstance, groupId);
         }
+        boolean notInGroup = true;
+        WFCMessage.GroupMember self = null;
         for (WFCMessage.GroupMember member:memberCollection) {
             if (member.getUpdateDt() > maxDt) {
                 members.add(member);
             }
+            if (fromUser != null && notInGroup) {
+                if (member.getMemberId().equals(fromUser)) {
+                    if (member.getType() != GroupMemberType_Removed) {
+                        notInGroup = false;
+                    } else {
+                        self = member;
+                        break;
+                    }
+                }
+            }
+        }
+
+        //server api fromUser is null
+        if (fromUser != null && notInGroup) {
+            members.clear();
+            if (self != null) {
+                members.add(self.toBuilder().setUpdateDt(0).setType(GroupMemberType_Removed).build());
+            }
         }
 
         return ErrorCode.ERROR_CODE_SUCCESS;
@@ -1429,6 +1518,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         IMap<Long, MessageBundle> mIMap = hzInstance.getMap(MESSAGES_MAP);
 
         MessageBundle messageBundle = mIMap.get(messageUid);
+        long now = System.currentTimeMillis();
         if (messageBundle != null) {
             WFCMessage.Message message = messageBundle.getMessage();
             boolean canRecall = false;
@@ -1436,7 +1526,11 @@ public class MemoryMessagesStore implements IMessagesStore {
                 canRecall = true;
             }
             if (!isAdmin && message.getFromUser().equals(operatorId)) {
-                canRecall = true;
+                if (now - message.getServerTimestamp() > mRecallTimeLimit * 1000) {
+                    return ErrorCode.ERROR_CODE_RECALL_TIME_EXPIRED;
+                } else {
+                    canRecall = true;
+                }
             }
 
             if (!canRecall && message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group) {
@@ -1444,7 +1538,7 @@ public class MemoryMessagesStore implements IMessagesStore {
 
                 WFCMessage.GroupInfo groupInfo = groupMap.get(message.getConversation().getTarget());
                 if (groupInfo == null) {
-                    return ErrorCode.ERROR_CODE_NOT_EXIST;
+                    return ErrorCode.ERROR_CODE_RECALL_TIME_EXPIRED;
                 }
                 if (operatorId.equals(groupInfo.getOwner())) {
                     canRecall = true;
@@ -1475,9 +1569,6 @@ public class MemoryMessagesStore implements IMessagesStore {
                 return ErrorCode.ERROR_CODE_NOT_RIGHT;
             }
 
-            String searchContent = message.getContent().getSearchableContent() == null ? "" : message.getContent().getSearchableContent();
-            String cont = message.getContent().getContent() == null ? "" : message.getContent().getContent().replace("\"", "\\\"");
-            String extra = message.getContent().getExtra() == null ? "" : message.getContent().getExtra().replace("\"", "\\\"");
             JSONObject json = new JSONObject();
             json.put("s", message.getFromUser());
             json.put("ts", message.getServerTimestamp());
@@ -1485,9 +1576,19 @@ public class MemoryMessagesStore implements IMessagesStore {
             json.put("sc", message.getContent().getSearchableContent());
             json.put("c", message.getContent().getContent());
             json.put("e", message.getContent().getExtra());
+            if (message.getContent().getData() != null && message.getContent().getData().size() > 0) {
+                json.put("b", Base64.getEncoder().encode(message.getContent().getData().toByteArray()));
+            }
+            if (message.getContent().getMediaType() > 0) {
+                json.put("mt", message.getContent().getMediaType());
+            }
+            if (!StringUtil.isNullOrEmpty(message.getContent().getRemoteMediaUrl())) {
+                json.put("mu", message.getContent().getRemoteMediaUrl());
+            }
+
             String recalledContent = json.toJSONString();
 
-            message = message.toBuilder().setContent(message.getContent().toBuilder().setContent(operatorId).setType(80).clearSearchableContent().setData(ByteString.copyFrom(String.valueOf(messageUid).getBytes())).setExtra(recalledContent).build()).build();
+            message = message.toBuilder().setContent(WFCMessage.MessageContent.newBuilder().setContent(operatorId).setType(80).setData(ByteString.copyFrom(String.valueOf(messageUid).getBytes())).setExtra(recalledContent)).build();
             messageBundle.setMessage(message);
             messageBundle.setFromClientId(clientId);
 
@@ -1729,6 +1830,9 @@ public class MemoryMessagesStore implements IMessagesStore {
     public void addUserInfo(WFCMessage.User user, String password) throws Exception {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
+        if (databaseStore.isUidAndNameConflict(user.getUid(), user.getName())) {
+            throw new Exception("用户名不能重复，必须唯一！！！");
+        }
         databaseStore.updateUser(user);
         mUserMap.put(user.getUid(), user);
         databaseStore.updateUserPassword(user.getUid(), password);
@@ -2063,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;
         }
@@ -2084,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) {
@@ -2108,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;
         }
 
@@ -2148,7 +2252,8 @@ public class MemoryMessagesStore implements IMessagesStore {
     public ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads, boolean isAdmin) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
 
-        if(request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted) {
+
+        if(!isAdmin && request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted) {
             MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
 
             Collection<FriendData> friends = friendsMap.get(userId);
@@ -2244,6 +2349,27 @@ public class MemoryMessagesStore implements IMessagesStore {
             } else {
                 existRequest = existRequest.toBuilder().setStatus(request.getStatus()).setUpdateDt(System.currentTimeMillis()).build();
                 databaseStore.persistOrUpdateFriendRequest(existRequest);
+
+                if (request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted) {
+                    Collection<WFCMessage.FriendRequest> targetRequests = requestMap.get(request.getTargetUid());
+                    if (targetRequests == null || targetRequests.size() == 0) {
+                        targetRequests = loadFriendRequest(requestMap, request.getTargetUid());
+                    }
+
+                    WFCMessage.FriendRequest existTargetRequest = null;
+                    for (WFCMessage.FriendRequest tmpRequest : targetRequests) {
+                        if (tmpRequest.getFromUid().equals(userId)) {
+                            existTargetRequest = tmpRequest;
+                            break;
+                        }
+                    }
+
+                    if (existTargetRequest != null && existTargetRequest.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Sent) {
+                        existTargetRequest = existTargetRequest.toBuilder().setStatus(request.getStatus()).setUpdateDt(existRequest.getUpdateDt()).build();
+                        databaseStore.persistOrUpdateFriendRequest(existTargetRequest);
+                    }
+                }
+
                 if(request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted){
                     MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
                     FriendData friendData1 = new FriendData(userId, request.getTargetUid(), "", request.getExtra(), 0, 0, System.currentTimeMillis());
@@ -2664,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

@@ -104,18 +104,18 @@ public interface IMessagesStore {
     WFCMessage.PullMessageResult fetchMessage(String user, String exceptClientId, long fromMessageId, int pullType);
     WFCMessage.PullMessageResult loadRemoteMessages(String user, WFCMessage.Conversation conversation, long beforeUid, int count);
     long insertUserMessages(String sender, int conversationType, String target, int line, int messageContentType, String userId, long messageId);
-    WFCMessage.GroupInfo createGroup(String operator, WFCMessage.GroupInfo groupInfo, List<WFCMessage.GroupMember> memberList);
+    WFCMessage.GroupInfo createGroup(String operator, WFCMessage.GroupInfo groupInfo, List<WFCMessage.GroupMember> memberList, boolean isAdmin);
     ErrorCode addGroupMembers(String operator, boolean isAdmin, String groupId, List<WFCMessage.GroupMember> memberList);
     ErrorCode kickoffGroupMembers(String operator, boolean isAdmin, String groupId, List<String> memberList);
     ErrorCode quitGroup(String operator, String groupId);
     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);
-    ErrorCode getGroupMembers(String groupId, long maxDt, List<WFCMessage.GroupMember> members);
+    ErrorCode getGroupMembers(String fromUser, String groupId, long maxDt, List<WFCMessage.GroupMember> members);
     WFCMessage.GroupMember getGroupMember(String groupId, String memberId);
     ErrorCode transferGroup(String operator, String groupId, String newOwner, boolean isAdmin);
     ErrorCode setGroupManager(String operator, String groupId, int type, List<String> userList, boolean isAdmin);
@@ -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/io/moquette/spi/impl/ProtocolProcessor.java

@@ -243,18 +243,16 @@ public class ProtocolProcessor {
         MemorySessionStore.Session session = m_sessionsStore.getSession(clientId);
         if(session != null) {
             session.refreshLastActiveTime();
-            forwardOnlineStatusEvent(payload.userName(), clientId, session.getPlatform(), UserOnlineStatus.ONLINE);
+            forwardOnlineStatusEvent(payload.userName(), clientId, session.getPlatform(), UserOnlineStatus.ONLINE, session.getAppName());
             m_messagesStore.updateUserOnlineSetting(session, true);
-        } else {
-            forwardOnlineStatusEvent(payload.userName(), clientId, ProtoConstants.Platform.Platform_UNSET, UserOnlineStatus.ONLINE);
         }
 
         LOG.info("The CONNECT message has been processed. CId={}, username={}", clientId, payload.userName());
     }
 
-    public void forwardOnlineStatusEvent(String userId, String clientId, int platform, int status) {
+    public void forwardOnlineStatusEvent(String userId, String clientId, int platform, int status, String packageName) {
         if (!StringUtil.isNullOrEmpty(mUserOnlineStatusCallback)) {
-            executorCallback.execute(() -> HttpUtils.httpJsonPost(mUserOnlineStatusCallback, new Gson().toJson(new UserOnlineStatus(userId, clientId, platform, status))));
+            executorCallback.execute(() -> HttpUtils.httpJsonPost(mUserOnlineStatusCallback, new Gson().toJson(new UserOnlineStatus(userId, clientId, platform, status, packageName))));
         }
     }
 
@@ -562,9 +560,7 @@ public class ProtocolProcessor {
         MemorySessionStore.Session session = m_sessionsStore.getSession(clientID);
         if(session != null) {
             m_messagesStore.updateUserOnlineSetting(session, false);
-        }
-        if(session != null) {
-            forwardOnlineStatusEvent(username, clientID, session.getPlatform(), UserOnlineStatus.LOGOUT);
+            forwardOnlineStatusEvent(username, clientID, session.getPlatform(), UserOnlineStatus.LOGOUT, session.getAppName());
         }
 
         channel.closeFuture();
@@ -608,7 +604,7 @@ public class ProtocolProcessor {
         MemorySessionStore.Session session = m_sessionsStore.getSession(clientID);
         if(session != null) {
             session.refreshLastActiveTime();
-            forwardOnlineStatusEvent(username, clientID, session.getPlatform(), clearSession ? UserOnlineStatus.LOGOUT : UserOnlineStatus.OFFLINE);
+            forwardOnlineStatusEvent(username, clientID, session.getPlatform(), clearSession ? UserOnlineStatus.LOGOUT : UserOnlineStatus.OFFLINE, session.getAppName());
             m_messagesStore.updateUserOnlineSetting(session, false);
         }
 

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/MessageShardingUtil.java

@@ -14,6 +14,7 @@ import java.util.Date;
 public class MessageShardingUtil {
     private static SpinLock mLock = new SpinLock();
     private static volatile int rotateId = 0;
+    private static volatile long timeId = 0;
     private static int nodeId = 0;
 
     private static int rotateIdWidth = 15;
@@ -33,13 +34,41 @@ public class MessageShardingUtil {
      * 所以时间限制是到2157/5/15（2的42次幂代表的时间 + (2018-1970)）。节点数限制是小于64，每台服务器每毫秒最多发送32768条消息
      * @return
      */
-    public static long generateId() {
+    public static long generateId() throws Exception {
         mLock.lock();
         rotateId = (rotateId + 1)&rotateIdMask;
         mLock.unLock();
 
         long id = System.currentTimeMillis() - T201801010000;
 
+        if (id > timeId) {
+            timeId = id;
+            rotateId = 1;
+        } else if(id == timeId) {
+            if (rotateId == (rotateIdMask - 1)) { //当前空间已经用完，等待下一个空间打开
+                while (id <= timeId) {
+                    id = System.currentTimeMillis() - T201801010000;
+                }
+                mLock.unLock();
+                return generateId();
+            }
+        } else { //id < timeId;
+            if (rotateId > (rotateIdMask -1)*9/10) { //空间已经接近用完
+                if (timeId - id < 3000) { //时间回拨小于3秒，等待时间赶上回拨之前记录
+                    while (id < timeId) {
+                        id = System.currentTimeMillis() - T201801010000;
+                    }
+                    mLock.unLock();
+                    return generateId();
+                } else { //时间回拨大于3秒，抛出异常，这段时间消息将不可用。
+                    mLock.unLock();
+                    throw new Exception("Time turn back " + (timeId - id) + " ms, it too long!!!");
+                }
+            } else {
+                id = timeId;
+            }
+
+        }
 
         id <<= nodeIdWidth;
         id += (nodeId & nodeIdMask);

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.43</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";
@@ -54,6 +56,7 @@ public interface APIPath {
     String Group_Member_Quit = "/admin/group/member/quit";
     String Group_Set_Manager = "/admin/group/manager/set";
     String Group_Mute_Member = "/admin/group/manager/mute";
+    String Group_Allow_Member = "/admin/group/manager/allow";
     String Get_User_Groups = "/admin/group/of_user";
 
 

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

@@ -40,6 +40,8 @@ public enum ErrorCode {
 
     ERROR_CODE_ALREADY_FRIENDS(23, "already friends"),
 
+    ERROR_CODE_RECALL_TIME_EXPIRED(24, "time expired"),
+
     ERROR_CODE_GROUP_EXCEED_MAX_MEMBER_COUNT(240, "group exceed max member count"),
     ERROR_CODE_GROUP_MUTED(241, "group is muted"),
     ERROR_CODE_SENSITIVE_MATCHED(242, "sensitive matched"),

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

@@ -149,4 +149,7 @@ public class GroupNotificationBinaryContent {
         return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_MUTE_MEMBER);
     }
 
+    public WFCMessage.MessageContent getAllowGroupMemberNotifyContent() {
+        return getGroupNotifyContent(ProtoConstants.MESSAGE_CONTENT_TYPE_ALLOW_MEMBER);
+    }
 }

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

@@ -0,0 +1,50 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * 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/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;
-    }
 }

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

@@ -10,12 +10,14 @@ public class UserOnlineStatus {
     public int platform;
     public int status;
     public long timestamp;
+    public String packageName;
 
-    public UserOnlineStatus(String userId, String clientId, int platform, int status) {
+    public UserOnlineStatus(String userId, String clientId, int platform, int status, String packageName) {
         this.userId = userId;
         this.clientId = clientId;
         this.platform = platform;
         this.status = status;
+        this.packageName = packageName;
         this.timestamp = System.currentTimeMillis();
     }
 }

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

@@ -28,6 +28,7 @@ public class ProtoConstants {
         int GroupMemberType_Owner = 2;
         int GroupMemberType_Silent = 3;
         int GroupMemberType_Removed = 4;
+        int GroupMemberType_Allowed = 5;
     }
 
     //message FriendRequest -> status
@@ -182,5 +183,6 @@ public class ProtoConstants {
 
     public static final int MESSAGE_CONTENT_TYPE_SET_MANAGER = 117;
     public static final int MESSAGE_CONTENT_TYPE_MUTE_MEMBER = 118;
+    public static final int MESSAGE_CONTENT_TYPE_ALLOW_MEMBER = 119;
 }
 

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.43</version>
+        <version>0.46</version>
     </parent>
 
     <artifactId>distribution</artifactId>

distribution/src/main/resources/wildfirechat.conf

@@ -37,7 +37,7 @@ http.admin.secret_key 123456
 ##nonce = "76616", timestamp = "1558350862502", sign = "b98f9b0717f59febccf1440067a7f50d9b31bdde"
 http.admin.no_check_time false
 
-##客户端协议栈密钥，需要与客户端协议栈文件libemqq.cc文件中的aes_key值保持一致，16进制byte用逗号分割。这个密钥对安全性帮助不大，客户不要修改
+##客户端协议栈密钥，需要与客户端协议栈文件libemqq.cc文件中的aes_key值保持一致，16进制byte用逗号分割。这个密钥不能修改！！！
 client.proto.secret_key 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F
 
 ##用来生产im token的私钥，只在服务器使用，客户端不用。正式使用时为了安全一定要修改这个值，切记切记
@@ -60,13 +60,15 @@ message.max_queue 1024
 ##是否禁止陌生人聊天
 message.disable_stranger_chat false
 
-##黑名单处理策略，0 发送失败，返回被拉黑的错误码；1 发送成功但消息被服务器直接丢弃；2 敏感词替换为***；3 不处理。
-##所有命中敏感词的消息都会被记录在敏感词消息表中
+##黑名单策略，0 发送失败，返回被拉黑的错误码；1 发送成功但消息被服务器直接丢弃
 message.blacklist.strategy 0
 
 ##是否禁止服务器端消息搜索，该功能暂未实现。目前的影响是如果打开，则存储消息时不单独保存_searchable_content字段
 message.disable_remote_search  false
 
+##允许客户端撤回消息时限，单位是秒。群组管理员或群主撤回群成员消息、server api不受此限制，可以撤回任意时限内的消息
+message.recall_time_limit 120
+
 ##禁止搜索用户
 friend.disable_search false
 
@@ -105,7 +107,8 @@ hazelcast.configuration config/hazelcast.xml
 #*********************************************************************
 # Media server configuration
 #*********************************************************************
-##是否使用七牛云存储。1使用七牛；0使用内存文件服务器。
+##是否使用七牛云存储。1使用七牛；0使用内存文件服务器。默认的七牛账户信息不可用，请在七牛官网申请账户并配置
+## https://docs.wildfirechat.cn/server/media_server.html
 media.server.use_qiniu 0
 
 ##媒体类型分类

pom.xml

@@ -12,7 +12,7 @@
     <artifactId>wildfirechat-parent</artifactId>
 
     <packaging>pom</packaging>
-    <version>0.43</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.43</version>
+        <version>0.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -72,17 +72,11 @@ public class GroupAdmin {
         return AdminHttpUtils.httpJsonPost(path, input, OutputGroupMemberList.class);
     }
 
-    public static IMResult<Void> addGroupMembers(String operator, String groupId, List<String> groupMemberIds, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+    public static IMResult<Void> addGroupMembers(String operator, String groupId, List<PojoGroupMember> groupMembers, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
         String path = APIPath.Group_Member_Add;
         InputAddGroupMember addGroupMember = new InputAddGroupMember();
         addGroupMember.setGroup_id(groupId);
-        List<PojoGroupMember> members = new ArrayList<>();
-        for (String mid : groupMemberIds) {
-            PojoGroupMember m = new PojoGroupMember();
-            m.setMember_id(mid);
-            members.add(m);
-        }
-        addGroupMember.setMembers(members);
+        addGroupMember.setMembers(groupMembers);
         addGroupMember.setOperator(operator);
         addGroupMember.setTo_lines(to_lines);
         addGroupMember.setNotify_message(notify_message);
@@ -101,12 +95,24 @@ public class GroupAdmin {
         return AdminHttpUtils.httpJsonPost(path, addGroupMember, Void.class);
     }
 
-    public static IMResult<Void> muteGroupMemeber(String operator, String groupId, List<String> groupMemberIds, boolean isManager, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+    public static IMResult<Void> muteGroupMemeber(String operator, String groupId, List<String> groupMemberIds, boolean isMute, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
         String path = APIPath.Group_Mute_Member;
         InputMuteGroupMember addGroupMember = new InputMuteGroupMember();
         addGroupMember.setGroup_id(groupId);
         addGroupMember.setMembers(groupMemberIds);
-        addGroupMember.setIs_manager(isManager);
+        addGroupMember.setIs_manager(isMute);
+        addGroupMember.setOperator(operator);
+        addGroupMember.setTo_lines(to_lines);
+        addGroupMember.setNotify_message(notify_message);
+        return AdminHttpUtils.httpJsonPost(path, addGroupMember, Void.class);
+    }
+
+    public static IMResult<Void> allowGroupMemeber(String operator, String groupId, List<String> groupMemberIds, boolean isAllow, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
+        String path = APIPath.Group_Allow_Member;
+        InputMuteGroupMember addGroupMember = new InputMuteGroupMember();
+        addGroupMember.setGroup_id(groupId);
+        addGroupMember.setMembers(groupMemberIds);
+        addGroupMember.setIs_manager(isAllow);
         addGroupMember.setOperator(operator);
         addGroupMember.setTo_lines(to_lines);
         addGroupMember.setNotify_message(notify_message);

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,11 @@ public class Main {
         testChatroom();
         testMessage();
         testGeneralApi();
-        testDevice();
+        testSensitiveApi();
+        if (commercialServer) {
+            testDevice();
+        }
+
 
         System.out.println("Congratulation, all admin test case passed!!!!!!!");
     }
@@ -47,7 +53,9 @@ public class Main {
     //***********************************************
     static void testUser() throws Exception {
         InputOutputUserInfo userInfo = new InputOutputUserInfo();
+        //用户ID，必须保证唯一性
         userInfo.setUserId("userId1");
+        //用户名，一般是用户登录帐号，也必须保证唯一性。也就是说所有用户的userId必须不能重复，所有用户的name必须不能重复，但可以同一个用户的userId和name是同一个，一般建议userId使用一个uuid，name是"微信号"且可以修改，
         userInfo.setName("user1");
         userInfo.setMobile("13900000000");
         userInfo.setDisplayName("user 1");
@@ -246,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");
@@ -262,6 +294,23 @@ public class Main {
             System.exit(-1);
         }
 
+        updateFriendStatusResult = RelationAdmin.setUserFriend("ff1", "ff2", false, null);
+        if (updateFriendStatusResult != null && updateFriendStatusResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("update friend status success");
+        } else {
+            System.out.println("update friend status failure");
+            System.exit(-1);
+        }
+
+        resultGetFriendList = RelationAdmin.getFriendList("ff1");
+        if (resultGetFriendList != null && resultGetFriendList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && !resultGetFriendList.getResult().getList().contains("ff2")) {
+            System.out.println("get friend status success");
+        } else {
+            System.out.println("get friend status failure");
+            System.exit(-1);
+        }
+
+
         IMResult<Void> updateBlacklistStatusResult = RelationAdmin.setUserBlacklist("ff1", "ff2", true);
         if (updateBlacklistStatusResult != null && updateBlacklistStatusResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("update blacklist status success");
@@ -382,7 +431,11 @@ public class Main {
             System.exit(-1);
         }
 
-        voidIMResult = GroupAdmin.addGroupMembers("user1", groupInfo.getTarget_id(), Arrays.asList("use4", "user5"), null, null);
+        PojoGroupMember m = new PojoGroupMember();
+        m.setMember_id("user1");
+        m.setAlias("hello user1");
+        
+        voidIMResult = GroupAdmin.addGroupMembers("user1", groupInfo.getTarget_id(), Arrays.asList(m), null, null);
         if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("add group member success");
         } else {
@@ -414,23 +467,6 @@ 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);
-        }
-
-        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.quitGroup("user4", groupInfo.getTarget_id(), null, null);
         if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
@@ -453,6 +489,44 @@ public class Main {
             System.exit(-1);
         }
 
+
+        //仅专业版支持
+        if (commercialServer) {
+            //开启群成员禁言
+            voidIMResult = GroupAdmin.muteGroupMemeber("user1", groupInfo.getTarget_id(), Arrays.asList("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("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.allowGroupMemeber("user1", groupInfo.getTarget_id(), Arrays.asList("user5"), true, null, null);
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("allow group member success");
+            } else {
+                System.out.println("allow group member failure");
+                System.exit(-1);
+            }
+
+            //关闭群成员白名单
+            voidIMResult = GroupAdmin.allowGroupMemeber("user1", groupInfo.getTarget_id(), Arrays.asList("user5"), false, null, null);
+            if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("unallow group member success");
+            } else {
+                System.out.println("unallow group member failure");
+                System.exit(-1);
+            }
+        }
     }
 
     //***********************************************
@@ -483,20 +557,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<BroadMessageResult> 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<BroadMessageResult> 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<String> multicastReceivers = Arrays.asList("user2", "user3", "user4");
@@ -786,6 +862,8 @@ public class Main {
         InputCreateChannel inputCreateChannel = new InputCreateChannel();
         inputCreateChannel.setName("testChannel");
         inputCreateChannel.setOwner("userId1");
+        String secret = "channelsecret";
+        inputCreateChannel.setSecret(secret);
         IMResult<OutputCreateChannel> resultCreateChannel = GeneralAdmin.createChannel(inputCreateChannel);
         if (resultCreateChannel != null && resultCreateChannel.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("create channel success");
@@ -794,56 +872,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<Void> 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<OutputStringList> 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<Void> 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<OutputStringList> 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<InputOutputUserInfo> 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<InputOutputUserInfo> 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);
+            }
         }
 
 
@@ -869,19 +952,55 @@ public class Main {
             System.exit(-1);
         }
 
-        IMResult<Void> 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");
+        if (commercialServer) {
+            IMResult<Void> 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<OutputGetChannelInfo> 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);
+            }
+        }
+    }
+    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("modify channel profile failure");
+            System.out.println("Add sensitive word response error");
             System.exit(-1);
         }
 
-        IMResult<OutputGetChannelInfo> outputGetChannelInfoIMResult = channelServiceApi.getChannelInfo();
-        if (outputGetChannelInfoIMResult != null && outputGetChannelInfoIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("destroy user success");
+        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("destroy user failure");
+            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);
         }
     }

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);
     }