update version to 0.39

.gitignore

@@ -59,3 +59,4 @@ sdk/target
 moments/target
 monitor
 wildfire_jmeter
+git.properties

broker/config/hazelcast.xml

@@ -61,6 +61,15 @@
         </map-store>
     </map>
 
+    <map name="user_friends_empty">
+        <time-to-live-seconds>86400</time-to-live-seconds>
+        <eviction-policy>LRU</eviction-policy>
+        <max-size policy="PER_NODE">1000000</max-size>
+        <eviction-percentage>10</eviction-percentage>
+    </map>
+
+
+
     <set name="node_ids"/>
 
     <multimap name="user_setting">

broker/config/i18n/messages.properties

@@ -0,0 +1,3 @@
+#native2ascii -encoding UTF-8 messages.properties temp_messages.properties
+Above_Greeting_Message=\u4ee5\u4e0a\u662f\u6253\u62db\u547c\u4fe1\u606f
+Friend_Can_Start_Chat=\u4f60\u4eec\u5df2\u7ecf\u6210\u4e3a\u597d\u53cb\u4e86\uff0c\u73b0\u5728\u53ef\u4ee5\u5f00\u59cb\u804a\u5929\u4e86

broker/config/i18n/messages_en.properties

@@ -0,0 +1,2 @@
+Above_Greeting_Message=This's the greeting
+Friend_Can_Start_Chat=You're already friend, start chat now.

broker/config/i18n/messages_en_US.properties

@@ -0,0 +1,2 @@
+Above_Greeting_Message=This's the greeting
+Friend_Can_Start_Chat=You're already friend, start chat now.

broker/config/i18n/messages_zh.properties

@@ -0,0 +1,2 @@
+Above_Greeting_Message=\u4ee5\u4e0a\u662f\u6253\u62db\u547c\u4fe1\u606f
+Friend_Can_Start_Chat=\u4f60\u4eec\u5df2\u7ecf\u6210\u4e3a\u597d\u53cb\u4e86\uff0c\u73b0\u5728\u53ef\u4ee5\u5f00\u59cb\u804a\u5929\u4e86

broker/config/i18n/messages_zh_CN.properties

@@ -0,0 +1,2 @@
+Above_Greeting_Message=\u4ee5\u4e0a\u662f\u6253\u62db\u547c\u4fe1\u606f
+Friend_Can_Start_Chat=\u4f60\u4eec\u5df2\u7ecf\u6210\u4e3a\u597d\u53cb\u4e86\uff0c\u73b0\u5728\u53ef\u4ee5\u5f00\u59cb\u804a\u5929\u4e86

broker/config/wildfirechat.conf

@@ -52,6 +52,9 @@ client.proto.secret_key 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x78,0x79,0x7A,0
 ##用来生产im token的私钥，只在服务器使用，客户端不用。正式使用时为了安全一定要修改这个值，切记切记
 token.key testim
 
+##token的过期时间，单位为毫秒，默认为无限期。如果需要设置无限期，客户端上一定需要加上token过期的处理。token过期的处理请参考文档的常见问题
+##token.expire_time 2592000000
+
 ##首次登录，是否接收之前的历史消息。0 不接收；1接收。
 message.roaming 0
 

broker/migrate/h2/V22__refactor_channel_status.sql

@@ -0,0 +1 @@
+update t_channel set `_status` = 64 where `_status` = 3;

broker/migrate/h2/V23__alter_message_add_to_column.sql

@@ -0,0 +1,2 @@
+alter table t_messages add column `_to` varchar(64) DEFAULT NULL;
+

broker/migrate/h2/V24__add_friend_extra.sql

@@ -0,0 +1 @@
+alter table t_friend add column `_extra` TEXT DEFAULT NULL;

broker/migrate/mysql/V27__refactor_channel_status.sql

@@ -0,0 +1 @@
+update t_channel set `_status` = 64 where `_status` = 3;

broker/migrate/mysql/V28__alter_message_add_to_column.sql

@@ -0,0 +1,38 @@
+alter table t_messages add column `_to` varchar(64) DEFAULT NULL;
+
+alter table t_messages_0 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_1 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_2 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_3 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_4 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_5 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_6 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_7 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_8 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_9 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_10 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_11 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_12 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_13 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_14 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_15 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_16 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_17 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_18 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_19 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_20 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_21 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_22 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_23 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_24 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_25 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_26 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_27 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_28 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_29 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_30 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_31 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_32 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_33 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_34 add column `_to` varchar(64) DEFAULT NULL;
+alter table t_messages_35 add column `_to` varchar(64) DEFAULT NULL;

broker/migrate/mysql/V29__add_friend_extra.sql

@@ -0,0 +1 @@
+alter table t_friend add column `_extra` TEXT DEFAULT NULL;

broker/pom.xml

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

broker/src/main/java/cn/wildfirechat/push/PushMessage.java

@@ -46,4 +46,13 @@ public class PushMessage {
         this.isHiddenDetail = isHiddenDetail;
         this.language = language;
     }
+    public PushMessage(String sender, String target, long serverTime, String senderName, int unReceivedMsg, String language, int pushMessageType) {
+        this.sender = sender;
+        this.target = target;
+        this.senderName = senderName;
+        this.serverTime = serverTime;
+        this.unReceivedMsg = unReceivedMsg;
+        this.pushMessageType = pushMessageType;
+        this.language = language;
+    }
 }

broker/src/main/java/cn/wildfirechat/push/PushServer.java

@@ -34,6 +34,7 @@ public class PushServer {
         int PUSH_MESSAGE_TYPE_NORMAL = 0;
         int PUSH_MESSAGE_TYPE_VOIP_INVITE = 1;
         int PUSH_MESSAGE_TYPE_VOIP_BYE = 2;
+        int PUSH_MESSAGE_TYPE_FRIEND_REQUEST = 3;
     }
 
     private static PushServer INSTANCE = new PushServer();
@@ -57,7 +58,7 @@ public class PushServer {
     }
 
     public void pushMessage(PushMessage pushMessage, String deviceId, String pushContent) {
-        LOG.info("try to delivery push diviceId = {}, pushContent = {}", deviceId, pushContent);
+        LOG.info("try to delivery push diviceId = {}, conversationType = {}, pushContent = {}", deviceId, pushMessage.convType, pushContent);
         executorService.execute(() ->{
                 try {
                     pushMessageInternel(pushMessage, deviceId, pushContent);

broker/src/main/java/com/xiaoleilu/loServer/action/FileAction.java

@@ -35,6 +35,7 @@ public class FileAction extends Action {
 
     @Override
     public boolean action(Request request, Response response) {
+        response.setHeader("Access-Control-Allow-Origin", "*");
         if (false == Request.METHOD_GET.equalsIgnoreCase(request.getMethod())) {
             response.sendError(HttpResponseStatus.METHOD_NOT_ALLOWED, "Please use GET method to request file!");
             return true;

broker/src/main/java/com/xiaoleilu/loServer/action/UploadFileAction.java

@@ -254,7 +254,7 @@ public class UploadFileAction extends Action {
                 }
 
 
-                String filePath = dir + "/" + requestId;
+                String filePath = dir + "/" + (StringUtil.isNullOrEmpty(remoteFileName) ? requestId : remoteFileName);
                 logger.info("the file path is " + filePath);
 
                 File tmpFile = new File(filePath);
@@ -279,7 +279,7 @@ public class UploadFileAction extends Action {
                             fileUpload.release();
 
                             response.setStatus(HttpResponseStatus.OK);
-                            String relativePath = datePath + "/" +  requestId;
+                            String relativePath = datePath + "/" +  (StringUtil.isNullOrEmpty(remoteFileName) ? requestId : remoteFileName);
                             response.setContent("{\"key\":\"" + relativePath + "\"}");
                             break;
                         }

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

@@ -0,0 +1,88 @@
+/*
+ * 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.InputBlacklistRequest;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+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 io.netty.util.internal.StringUtil;
+import win.liyufan.im.IMTopic;
+
+import java.util.concurrent.Executor;
+
+@Route(APIPath.Blacklist_Update_Status)
+@HttpMethod("POST")
+public class BlacklistAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputBlacklistRequest inputData = getRequestBody(request.getNettyRequest(), InputBlacklistRequest.class);
+            if (inputData != null
+                && !StringUtil.isNullOrEmpty(inputData.getUserId())
+                && !StringUtil.isNullOrEmpty(inputData.getTargetUid())
+            ) {
+                WFCMessage.BlackUserRequest friendRequest = WFCMessage.BlackUserRequest.newBuilder().setUid(inputData.getTargetUid()).setStatus(inputData.getStatus()).build();
+                RPCCenter.getInstance().sendRequest(inputData.getUserId(), null, IMTopic.BlackListUserTopic, friendRequest.toByteArray(), inputData.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);
+                    }
+                }, true);
+                return false;
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,54 @@
+/*
+ * 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.pojos.InputGetFriendList;
+import cn.wildfirechat.pojos.InputUserId;
+import cn.wildfirechat.pojos.OutputStringList;
+import com.google.gson.Gson;
+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 com.xiaoleilu.loServer.model.FriendData;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.Blacklist_Get_List)
+@HttpMethod("POST")
+public class BlacklistGetAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputUserId inputGetFriendList = getRequestBody(request.getNettyRequest(), InputUserId.class);
+            List<FriendData> dataList = messagesStore.getFriendList(inputGetFriendList.getUserId(), null, 0);
+            List<String> list = new ArrayList<>();
+            for (FriendData data : dataList) {
+                if (data.getBlacked() > 0) {
+                    list.add(data.getFriendUid());
+                }
+            }
+            response.setStatus(HttpResponseStatus.OK);
+            RestResult result = RestResult.ok(new OutputStringList(list));
+            response.setContent(new Gson().toJson(result));
+        }
+        return true;
+    }
+}

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

@@ -9,6 +9,10 @@
 package com.xiaoleilu.loServer.action.admin;
 
 import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.pojos.BroadMessageResult;
+import cn.wildfirechat.pojos.OutputCheckUserOnline;
+import com.google.gson.Gson;
+import com.xiaoleilu.loServer.RestResult;
 import com.xiaoleilu.loServer.annotation.HttpMethod;
 import com.xiaoleilu.loServer.annotation.Route;
 import com.xiaoleilu.loServer.handler.Request;
@@ -16,10 +20,15 @@ import com.xiaoleilu.loServer.handler.Response;
 import cn.wildfirechat.pojos.InputGetUserInfo;
 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 io.netty.util.internal.StringUtil;
 import cn.wildfirechat.common.ErrorCode;
 
+import java.util.concurrent.Executor;
+
 @Route(APIPath.User_Get_Online_Status)
 @HttpMethod("POST")
 public class CheckUserOnlineAction extends AdminAction {
@@ -34,12 +43,34 @@ public class CheckUserOnlineAction extends AdminAction {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputGetUserInfo inputUserId = getRequestBody(request.getNettyRequest(), InputGetUserInfo.class);
             if (inputUserId == null || !StringUtil.isNullOrEmpty(inputUserId.getUserId())) {
-                RPCCenter.getInstance().sendRequest(null, null, RPCCenter.CHECK_USER_ONLINE_REQUEST, inputUserId.getUserId().getBytes(), inputUserId.getUserId(), TargetEntry.Type.TARGET_TYPE_USER, null, true);
-                return true;
+                RPCCenter.getInstance().sendRequest(null, null, RPCCenter.CHECK_USER_ONLINE_REQUEST, inputUserId.getUserId().getBytes(), inputUserId.getUserId(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                    @Override
+                    public void onSuccess(byte[] res) {
+                        OutputCheckUserOnline out = new Gson().fromJson(new String(res), OutputCheckUserOnline.class);
+                        sendResponse(response, null, out);
+                    }
+
+                    @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);
+                        };
+                    }
+                }, true);
+                return false;
             } else {
                 sendResponse(response, ErrorCode.INVALID_PARAMETER, null);
             }
-
         }
         return true;
     }

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

@@ -46,8 +46,11 @@ public class FriendRelationAction extends AdminAction {
                 && !StringUtil.isNullOrEmpty(friendAdd.getUserId())
                 && !StringUtil.isNullOrEmpty(friendAdd.getFriendUid())
             ) {
-                WFCMessage.HandleFriendRequest friendRequest = WFCMessage.HandleFriendRequest.newBuilder().setTargetUid(friendAdd.getFriendUid()).setStatus(friendAdd.getStatus()).build();
-                RPCCenter.getInstance().sendRequest(friendAdd.getUserId(), null, IMTopic.HandleFriendRequestTopic, friendRequest.toByteArray(), friendAdd.getFriendUid(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                WFCMessage.HandleFriendRequest.Builder friendRequestBuilder = WFCMessage.HandleFriendRequest.newBuilder().setTargetUid(friendAdd.getFriendUid()).setStatus(friendAdd.getStatus());
+                if (!StringUtil.isNullOrEmpty(friendAdd.getExtra())) {
+                    friendRequestBuilder = friendRequestBuilder.setExtra(friendAdd.getExtra());
+                }
+                RPCCenter.getInstance().sendRequest(friendAdd.getUserId(), null, IMTopic.HandleFriendRequestTopic, friendRequestBuilder.build().toByteArray(), friendAdd.getFriendUid(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
                     @Override
                     public void onSuccess(byte[] result) {
                         ByteBuf byteBuf = Unpooled.buffer();

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

@@ -9,6 +9,7 @@
 package com.xiaoleilu.loServer.action.admin;
 
 import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.pojos.InputUserId;
 import cn.wildfirechat.pojos.OutputStringList;
 import com.google.gson.Gson;
 import com.xiaoleilu.loServer.RestResult;
@@ -36,11 +37,11 @@ public class FriendRelationGetAction extends AdminAction {
     @Override
     public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
-            InputGetFriendList inputGetFriendList = getRequestBody(request.getNettyRequest(), InputGetFriendList.class);
+            InputUserId inputGetFriendList = getRequestBody(request.getNettyRequest(), InputUserId.class);
             List<FriendData> dataList = messagesStore.getFriendList(inputGetFriendList.getUserId(), null, 0);
             List<String> list = new ArrayList<>();
             for (FriendData data : dataList) {
-                if (data.getState() == inputGetFriendList.getStatus()) {
+                if (data.getState() == 0) {
                     list.add(data.getFriendUid());
                 }
             }

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

@@ -0,0 +1,74 @@
+/*
+ * 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.InputGetChatroomInfo;
+import cn.wildfirechat.pojos.OutputGetChatroomInfo;
+import cn.wildfirechat.pojos.OutputStringList;
+import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+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.UserClientEntry;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+import io.netty.util.internal.StringUtil;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+@Route(APIPath.Chatroom_GetMembers)
+@HttpMethod("POST")
+public class GetChatroomMembersAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetChatroomInfo getChatroomInfo = getRequestBody(request.getNettyRequest(), InputGetChatroomInfo.class);
+            String chatroomid = getChatroomInfo.getChatroomId();
+            if (!StringUtil.isNullOrEmpty(chatroomid)) {
+
+                Collection<UserClientEntry> members = messagesStore.getChatroomMembers(chatroomid);
+
+                List<String> list = new ArrayList<>();
+                for (UserClientEntry entry : members) {
+                    list.add(entry.userId);
+                }
+
+                RestResult result;
+                if (!list.isEmpty()) {
+                    result = RestResult.ok(new OutputStringList(list));
+                } else {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+                }
+                response.setStatus(HttpResponseStatus.OK);
+
+                response.setContent(new Gson().toJson(result));
+
+            } else {
+                response.setStatus(HttpResponseStatus.OK);
+                RestResult result = RestResult.resultOf(ErrorCode.INVALID_PARAMETER);
+                response.setContent(new Gson().toJson(result));
+            }
+
+        }
+        return true;
+    }
+}

broker/src/main/java/com/xiaoleilu/loServer/handler/ActionHandler.java

@@ -113,7 +113,8 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
 	 * @param response 响应对象
 	 */
 	private void doAction(ChannelHandlerContext ctx, Request request, Response response){
-	    if( "/route".equalsIgnoreCase(request.getPath()) && "OPTIONS".equalsIgnoreCase(request.getMethod())){
+	    if(("/route".equalsIgnoreCase(request.getPath()) || request.getPath().startsWith("/fs/"))
+            && "OPTIONS".equalsIgnoreCase(request.getMethod())){
 	        handleOptions(ctx, request, response);
 	        return;
         }

broker/src/main/java/com/xiaoleilu/loServer/model/FriendData.java

@@ -14,15 +14,17 @@ public class FriendData implements Serializable {
     private String userId;
     private String friendUid;
     private String alias;
+    private String extra;
     private int state;
     private int blacked;
     private long timestamp;
 
 
-    public FriendData(String userId, String friendUid, String alias, int state, int blacked, long timestamp) {
+    public FriendData(String userId, String friendUid, String alias, String extra, int state, int blacked, long timestamp) {
         this.userId = userId;
         this.friendUid = friendUid;
         this.alias = alias;
+        this.extra = extra;
         this.state = state;
         this.blacked = blacked;
         this.timestamp = timestamp;
@@ -55,6 +57,14 @@ public class FriendData implements Serializable {
         this.alias = alias;
     }
 
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
+
     public int getState() {
         return state;
     }

broker/src/main/java/io/moquette/BrokerConstants.java

@@ -99,6 +99,7 @@ public final class BrokerConstants {
 
     public static final String CLIENT_PROTO_SECRET_KEY = "client.proto.secret_key";
     public static final String TOKEN_SECRET_KEY = "token.key";
+    public static final String TOKEN_EXPIRE_TIME = "token.expire_time";
 
     public static final String EMBED_DB_PROPERTY_NAME = "embed.db";
 

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

@@ -27,7 +27,7 @@ public class AddFriendHandler extends GroupHandler<WFCMessage.AddFriendRequest>
             if (errorCode == ERROR_CODE_SUCCESS) {
                 WFCMessage.User user = m_messagesStore.getUserInfo(request.getTargetUid());
                 if (user != null && user.getType() == ProtoConstants.UserType.UserType_Normal) {
-                    publisher.publishNotification(IMTopic.NotifyFriendRequestTopic, request.getTargetUid(), head[0]);
+                    publisher.publishNotification(IMTopic.NotifyFriendRequestTopic, request.getTargetUid(), head[0], fromUser, request.getReason());
                 } else if(user != null && user.getType() == ProtoConstants.UserType.UserType_Robot) {
                     WFCMessage.HandleFriendRequest handleFriendRequest = WFCMessage.HandleFriendRequest.newBuilder().setTargetUid(fromUser).setStatus(ProtoConstants.FriendRequestStatus.RequestStatus_Accepted).build();
                     mServer.internalRpcMsg(request.getTargetUid(), null, handleFriendRequest.toByteArray(), 0, fromUser, HandleFriendRequestTopic, false);

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

@@ -30,6 +30,9 @@ public class FriendPullHandler extends IMHandler<WFCMessage.Version> {
             if (!StringUtil.isNullOrEmpty(data.getAlias())) {
                 builder1.setAlias(data.getAlias());
             }
+            if (!StringUtil.isNullOrEmpty(data.getExtra())) {
+                builder1.setExtra(data.getExtra());
+            }
             builder.addEntry(builder1.build());
         }
         byte[] data = builder.build().toByteArray();

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

@@ -10,9 +10,12 @@ package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
+import io.moquette.persistence.MemorySessionStore;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
 import cn.wildfirechat.common.ErrorCode;
+import io.netty.util.internal.StringUtil;
+import win.liyufan.im.I18n;
 import win.liyufan.im.IMTopic;
 import win.liyufan.im.MessageShardingUtil;
 
@@ -27,33 +30,41 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
             long[] heads = new long[2];
             ErrorCode errorCode = m_messagesStore.handleFriendRequest(fromUser, request, builder, heads, isAdmin);
 
-            if (errorCode == ERROR_CODE_SUCCESS && !isAdmin) {
-                long messageId = MessageShardingUtil.generateId();
-                long timestamp = System.currentTimeMillis();
-                builder.setMessageId(messageId);
-                builder.setServerTimestamp(timestamp);
-                saveAndPublish(request.getTargetUid(), null, builder.build(), false);
+            if (errorCode == ERROR_CODE_SUCCESS) {
+                if (!isAdmin && builder.getConversation() != null) {
+                    long messageId = MessageShardingUtil.generateId();
+                    long timestamp = System.currentTimeMillis();
+                    builder.setMessageId(messageId);
+                    builder.setServerTimestamp(timestamp);
+                    saveAndPublish(request.getTargetUid(), null, builder.build(), false);
 
-                WFCMessage.MessageContent.Builder contentBuilder = WFCMessage.MessageContent.newBuilder().setType(90).setContent("以上是打招呼信息");
-                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);
+                    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().setType(90).setContent(I18n.getString(language, "Above_Greeting_Message"));
 
-                messageId = MessageShardingUtil.generateId();
-                builder.setMessageId(messageId);
-                saveAndPublish(request.getTargetUid(), null, builder.build(), false);
+                    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);
 
-                contentBuilder.setContent("你们已经成为好友了，现在可以开始聊天了");
-                builder.setContent(contentBuilder);
-                messageId = MessageShardingUtil.generateId();
-                builder.setMessageId(messageId);
-                timestamp = System.currentTimeMillis();
-                builder.setServerTimestamp(timestamp);
-                saveAndPublish(request.getTargetUid(), null, builder.build(), false);
+                    messageId = MessageShardingUtil.generateId();
+                    builder.setMessageId(messageId);
+                    saveAndPublish(request.getTargetUid(), null, builder.build(), false);
 
+                    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);
+
+                }
                 publisher.publishNotification(IMTopic.NotifyFriendTopic, request.getTargetUid(), heads[0]);
                 publisher.publishNotification(IMTopic.NotifyFriendTopic, fromUser, heads[1]);
             }

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

@@ -32,6 +32,8 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
@@ -83,15 +85,11 @@ abstract public class IMHandler<T> {
                 }
             }
 
-            for (Method method : getClass().getDeclaredMethods()
-                 ) {
-
-                if (method.getName() == actionName && method.getParameterCount() == 6 && !method.getParameterTypes()[4].equals(Object.class)) {
-                    dataCls = method.getParameterTypes()[4];
-                    break;
-                }
-            }
-
+            Type t = getClass().getGenericSuperclass();
+            ParameterizedType p = (ParameterizedType) t ;
+            Class<T> c = (Class<T>) p.getActualTypeArguments()[0];
+            dataCls = c;
+            
             if (dataCls.getSuperclass().equals(GeneratedMessage.class)) {
                 parseDataMethod = dataCls.getMethod("parseFrom", byte[].class);
             } else if (dataCls.isPrimitive()) {

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

@@ -32,6 +32,12 @@ public class LoadRemoteMessagesHandler extends IMHandler<WFCMessage.LoadRemoteMe
             }
         }
 
+        if (request.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel) {
+            if (!m_messagesStore.checkUserInChannel(fromUser, request.getConversation().getTarget())) {
+                return ErrorCode.ERROR_CODE_NOT_IN_CHANNEL;
+            }
+        }
+
         WFCMessage.PullMessageResult result = m_messagesStore.loadRemoteMessages(fromUser, request.getConversation(), beforeUid, request.getCount());
         byte[] data = result.toByteArray();
         LOG.info("User {} load message with count({}), payload size({})", fromUser, result.getMessageCount(), data.length);

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

@@ -108,7 +108,7 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
             }
 
 
-            if (!isAdmin && message.getContent().getType() == Text) {
+            if (!isAdmin) {
                 Set<String> matched = m_messagesStore.handleSensitiveWord(message.getContent().getSearchableContent());
                 if (matched != null && !matched.isEmpty()) {
                     m_messagesStore.storeSensitiveMessage(message);

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

@@ -380,7 +380,7 @@ public class DatabaseStore {
 
         try {
             connection = DBUtil.getConnection();
-            String sql = "select `_uid`, `_friend_uid`, `_alias`, `_state`, `_blacked`, `_dt` from t_friend";
+            String sql = "select `_uid`, `_friend_uid`, `_alias`, `_state`, `_blacked`, `_dt`, `_extra` from t_friend";
             statement = connection.prepareStatement(sql);
 
             int index;
@@ -411,6 +411,8 @@ public class DatabaseStore {
                 long longvalue = rs.getLong(index++);
                 builder.setTimestamp(longvalue);
 
+                builder.setExtra(rs.getString(index++));
+
                 friendsMap.put(builder.getUserId(), builder);
             }
         } catch (SQLException e) {
@@ -493,7 +495,7 @@ public class DatabaseStore {
             try {
                 connection = DBUtil.getConnection();
                 String sql = "insert into " + MessageShardingUtil.getMessageTable(message.getMessageId()) +
-                    " (`_mid`, `_from`, `_type`, `_target`, `_line`, `_data`, `_searchable_key`, `_dt`, `_content_type`) values(?, ?, ?, ?, ?, ?, ?, ?, ?)" +
+                    " (`_mid`, `_from`, `_type`, `_target`, `_line`, `_data`, `_searchable_key`, `_dt`, `_content_type`, `_to`) values(?, ?, ?, ?, ?, ?, ?, ?, ?, ?)" +
                     " ON DUPLICATE KEY UPDATE " +
                     "`_data` = ?," +
                     "`_searchable_key` = ?," +
@@ -515,6 +517,13 @@ public class DatabaseStore {
                 statement.setString(index++, searchableContent);
                 statement.setTimestamp(index++, new Timestamp(message.getServerTimestamp()));
                 statement.setInt(index++, message.getContent().getType());
+                String to = message.getToUser();
+                if (StringUtil.isNullOrEmpty(message.getToUser())) {
+                    if (message.getToList()!= null && message.getToList().size() == 1) {
+                        to = message.getToList().get(0);
+                    }
+                }
+                statement.setString(index++, to);
 
                 statement.setBlob(index++, blob);
                 statement.setString(index++, searchableContent);
@@ -721,21 +730,27 @@ public class DatabaseStore {
     }
 
     List<WFCMessage.Message> loadRemoteMessages(String user, WFCMessage.Conversation conversation, long beforeUid, int count) {
-        List<WFCMessage.Message> messages = loadRemoteMessagesFromTable(user, conversation, beforeUid, count, MessageShardingUtil.getMessageTable(beforeUid));
-        if (messages != null && messages.size() < count) {
-            String nexTable = MessageShardingUtil.getPreviousMessageTable(beforeUid);
-            if (!StringUtil.isNullOrEmpty(nexTable)) {
-                List<WFCMessage.Message> nextMessages = loadRemoteMessagesFromTable(user, conversation, beforeUid, count - messages.size(), nexTable);
-                if (nextMessages != null) {
-                    messages.addAll(nextMessages);
+        List<WFCMessage.Message> messages = new ArrayList<>();
+        long[] before = new long[1];
+        before[0] = beforeUid;
+        boolean hasMore = loadRemoteMessagesFromTable(user, conversation, before, count, MessageShardingUtil.getMessageTable(beforeUid), messages);
+        if (messages.size() < count) {
+            if (hasMore) {
+                loadRemoteMessagesFromTable(user, conversation, before, count - messages.size(), MessageShardingUtil.getMessageTable(beforeUid), messages);
+            } else {
+                String nexTable = MessageShardingUtil.getPreviousMessageTable(before[0]);
+                if (!StringUtil.isNullOrEmpty(nexTable)) {
+                    loadRemoteMessagesFromTable(user, conversation, before, count - messages.size(), nexTable, messages);
                 }
             }
         }
+
         return messages;
     }
 
-    List<WFCMessage.Message> loadRemoteMessagesFromTable(String user, WFCMessage.Conversation conversation, long beforeUid, int count, String table) {
-        String sql = "select `_mid`, `_from`, `_type`, `_target`, `_line`, `_data`, `_dt` from " + table +" where";
+    boolean loadRemoteMessagesFromTable(String user, WFCMessage.Conversation conversation, long[] before, int count, String table, List<WFCMessage.Message> messages) {
+        long beforeUid = before[0];
+        String sql = "select `_mid`, `_from`, `_type`, `_target`, `_line`, `_data`, `_dt`, `_to` from " + table +" where";
         if (conversation.getType() == ProtoConstants.ConversationType.ConversationType_Private) {
             sql += " _type = ? and _line = ? and _mid < ? and ((_target = ?  and _from = ?) or (_target = ?  and _from = ?))";
         } else {
@@ -747,7 +762,6 @@ public class DatabaseStore {
         Connection connection = null;
         PreparedStatement statement = null;
         ResultSet resultSet = null;
-        List<WFCMessage.Message> out = new ArrayList<>();
         try {
             connection = DBUtil.getConnection();
             statement = connection.prepareStatement(sql);
@@ -764,9 +778,12 @@ public class DatabaseStore {
             statement.setInt(index++, count);
             resultSet = statement.executeQuery();
             while (resultSet.next()) {
+                count--;
                 WFCMessage.Message.Builder builder = WFCMessage.Message.newBuilder();
                 index = 1;
                 builder.setMessageId(resultSet.getLong(index++));
+                before[0] = builder.getMessageId();
+
                 builder.setFromUser(resultSet.getString(index++));
                 WFCMessage.Conversation.Builder cb = WFCMessage.Conversation.newBuilder();
                 cb.setType(resultSet.getInt(index++));
@@ -777,9 +794,22 @@ public class DatabaseStore {
 
                 WFCMessage.MessageContent messageContent = WFCMessage.MessageContent.parseFrom(blob.getBinaryStream());
                 builder.setContent(messageContent);
+
                 builder.setServerTimestamp(resultSet.getTimestamp(index++).getTime());
+                String to = resultSet.getString(index++);
+                if (!StringUtil.isNullOrEmpty(to)) {
+                    if (to.equals(user) || builder.getFromUser().equals(user)) {
+                        builder.setToUser(to);
+                    } else {
+                        continue;
+                    }
+                }
                 WFCMessage.Message message = builder.build();
-                out.add(message);
+                messages.add(message);
+            }
+
+            if (count == 0) {
+                return true;
             }
         } catch (SQLException | IOException e) {
             e.printStackTrace();
@@ -787,7 +817,7 @@ public class DatabaseStore {
         } finally {
             DBUtil.closeDB(connection, statement, resultSet);
         }
-        return out;
+        return false;
     }
 
     void persistUserMessage(final String userId, final long messageId, final long messageSeq) {
@@ -1446,8 +1476,9 @@ public class DatabaseStore {
         try {
             connection = DBUtil.getConnection();
             String sql;
-            if (platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_OSX
-                    || platform == ProtoConstants.Platform.Platform_iOS || platform == ProtoConstants.Platform.Platform_Android) {
+            if (platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_Linux) {
+                sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and (`_platform` = ? or `_platform` = ? or `_platform` = ?)  and `_cid` <> ? and `_deleted` = 0";
+            } else if(platform == ProtoConstants.Platform.Platform_iOS || platform == ProtoConstants.Platform.Platform_Android) {
                 sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and (`_platform` = ? or `_platform` = ?)  and `_cid` <> ? and `_deleted` = 0";
             } else {
                 sql = "update t_user_session set `_deleted` = ?, `_token` = ?, `_voip_token` = ?, `_dt` = ?  where `_uid`=? and `_platform` = ? and `_cid` <> ? and `_deleted` = 0";
@@ -1463,9 +1494,10 @@ public class DatabaseStore {
 
             statement.setString(index++, uid);
 
-            if (platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_OSX) {
+            if (platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_Linux) {
                 statement.setInt(index++, ProtoConstants.Platform.Platform_Windows);
                 statement.setInt(index++, ProtoConstants.Platform.Platform_OSX);
+                statement.setInt(index++, ProtoConstants.Platform.Platform_Linux);
             } else if(platform == ProtoConstants.Platform.Platform_iOS || platform == ProtoConstants.Platform.Platform_Android) {
                 statement.setInt(index++, ProtoConstants.Platform.Platform_iOS);
                 statement.setInt(index++, ProtoConstants.Platform.Platform_Android);
@@ -2473,7 +2505,7 @@ public class DatabaseStore {
         ResultSet rs = null;
         try {
             connection = DBUtil.getConnection();
-            String sql = "select `_friend_uid`, `_alias`, `_state`, `_blacked`, `_dt` from t_friend where `_uid` = ?";
+            String sql = "select `_friend_uid`, `_alias`, `_state`, `_blacked`, `_dt`, `_extra` from t_friend where `_uid` = ?";
             statement = connection.prepareStatement(sql);
 
 
@@ -2489,8 +2521,9 @@ public class DatabaseStore {
                 int state = rs.getInt(3);
                 int blacked = rs.getInt(4);
                 long timestamp = rs.getLong(5);
+                String extra = rs.getString(6);
 
-                FriendData data = new FriendData(userId, uid, alias, state, blacked, timestamp);
+                FriendData data = new FriendData(userId, uid, alias, extra, state, blacked, timestamp);
                 out.add(data);
             }
             return out;
@@ -2510,7 +2543,7 @@ public class DatabaseStore {
         PreparedStatement statement = null;
         try {
             connection = DBUtil.getConnection();
-            String sql = "update t_friend  set `_alias` = '', `_state` = 1, `_blacked` = 0, `_dt` = ? where `_uid` = ? or `_friend_uid` = ?";
+            String sql = "update t_friend  set `_alias` = '', `_state` = 1, `_blacked` = 0, `_dt` = ?, `_extra` = 0 where `_uid` = ? or `_friend_uid` = ?";
 
             statement = connection.prepareStatement(sql);
             int index = 1;
@@ -2693,12 +2726,13 @@ public class DatabaseStore {
             PreparedStatement statement = null;
             try {
                 connection = DBUtil.getConnection();
-                String sql = "insert into t_friend (`_uid`, `_friend_uid`, `_alias`, `_state`, `_blacked`, `_dt`) values(?, ?, ?, ?, ?, ?)" +
+                String sql = "insert into t_friend (`_uid`, `_friend_uid`, `_alias`, `_state`, `_blacked`, `_dt`, `_extra`) values(?, ?, ?, ?, ?, ?, ?)" +
                     " ON DUPLICATE KEY UPDATE " +
                     "`_alias` = ?," +
                     "`_state` = ?," +
                     "`_blacked` = ?," +
-                    "`_dt` = ?";
+                    "`_dt` = ?," +
+                    "`_extra` = ?";
 
 
                 statement = connection.prepareStatement(sql);
@@ -2709,10 +2743,12 @@ public class DatabaseStore {
                 statement.setInt(index++, request.getState());
                 statement.setInt(index++, request.getBlacked());
                 statement.setLong(index++, request.getTimestamp());
+                statement.setString(index++, request.getExtra());
                 statement.setString(index++, request.getAlias());
                 statement.setInt(index++, request.getState());
                 statement.setInt(index++, request.getBlacked());
                 statement.setLong(index++, request.getTimestamp());
+                statement.setString(index++, request.getExtra());
                 int count = statement.executeUpdate();
                 LOG.info("Update rows {}", count);
             } catch (SQLException e) {
@@ -3001,7 +3037,7 @@ public class DatabaseStore {
             rs = statement.executeQuery();
             while (rs.next()) {
 
-                String value = rs.getString(index++);
+                String value = rs.getString(1);
                 if (!StringUtil.isNullOrEmpty(value)) {
                     out.add(value);
                 }

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

@@ -50,8 +50,7 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.function.Consumer;
 
-
-import static cn.wildfirechat.proto.ProtoConstants.ChannelStatus.Channel_Status_Destoryed;
+import static cn.wildfirechat.proto.ProtoConstants.ChannelState.Channel_State_Mask_Deleted;
 import static cn.wildfirechat.proto.ProtoConstants.GroupMemberType.*;
 import static cn.wildfirechat.proto.ProtoConstants.ModifyChannelInfoType.*;
 import static cn.wildfirechat.proto.ProtoConstants.ModifyGroupInfoType.*;
@@ -305,20 +304,19 @@ public class MemoryMessagesStore implements IMessagesStore {
             if (channelInfo != null) {
                 notifyReceivers.add(fromUser);
                 if (channelInfo.getOwner().equals(fromUser)) {
-                    MultiMap<String, String> listeners = hzInstance.getMultiMap(CHANNEL_LISTENERS);
+                    Collection<String> listeners = getChannelListener(message.getConversation().getTarget());
                     if (!StringUtil.isNullOrEmpty(message.getToUser())) {
-                        if (listeners.values().contains(message.getToUser())) {
+                        if (listeners.contains(message.getToUser())) {
                             notifyReceivers.add(message.getToUser());
                         }
                     } else if(message.getToList() != null && !message.getToList().isEmpty()) {
-                        Collection<String> ls = listeners.get(message.getConversation().getTarget());
                         for (String to:message.getToList()) {
-                            if (ls.contains(to)) {
+                            if (listeners.contains(to)) {
                                 notifyReceivers.add(to);
                             }
                         }
                     } else {
-                        notifyReceivers.addAll(listeners.get(message.getConversation().getTarget()));
+                        notifyReceivers.addAll(listeners);
                     }
                 } else {
                     if (StringUtil.isNullOrEmpty(channelInfo.getCallback()) || channelInfo.getAutomatic() == 0) {
@@ -1295,7 +1293,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         if (members == null || members.size() == 0) {
             members = loadGroupMemberFromDB(hzInstance, groupId);
         }
-        
+
         boolean isInGroup = false;
         for (WFCMessage.GroupMember member : members) {
             if (member.getMemberId().equals(memberId)) {
@@ -1502,7 +1500,8 @@ public class MemoryMessagesStore implements IMessagesStore {
                     modified = true;
                     break;
                 case Modify_Social:
-
+                    builder.setSocial(entry.getValue());
+                    modified = true;
                     break;
                 case Modify_Extra:
                     builder.setExtra(entry.getValue());
@@ -2041,9 +2040,10 @@ public class MemoryMessagesStore implements IMessagesStore {
                 }
             }
             if (friendData1 == null) {
-                friendData1 = new FriendData(userId, request.getTargetUid(), "", request.getStatus(), 0, System.currentTimeMillis());
+                friendData1 = new FriendData(userId, request.getTargetUid(), "", request.getExtra(), request.getStatus(), 0, System.currentTimeMillis());
             } else {
                 friendData1.setState(request.getStatus());
+                friendData1.setExtra(request.getExtra());
                 friendData1.setTimestamp(System.currentTimeMillis());
             }
 
@@ -2063,7 +2063,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                     }
                 }
                 if (friendData2 == null) {
-                    friendData2 = new FriendData(request.getTargetUid(), userId, "", request.getStatus(), 0, friendData1.getTimestamp());
+                    friendData2 = new FriendData(request.getTargetUid(), userId, "", request.getExtra(), request.getStatus(), 0, friendData1.getTimestamp());
                 } else {
                     friendsMap.remove(request.getTargetUid(), friendData2);
                     friendData2.setState(request.getStatus());
@@ -2100,26 +2100,27 @@ public class MemoryMessagesStore implements IMessagesStore {
             if (mFriendRequestExpiration > 0 && System.currentTimeMillis() - existRequest.getUpdateDt() > mFriendRequestExpiration) {
                 return ErrorCode.ERROR_CODE_FRIEND_REQUEST_EXPIRED;
             } else {
-                existRequest = existRequest.toBuilder().setStatus(ProtoConstants.FriendRequestStatus.RequestStatus_Accepted).setUpdateDt(System.currentTimeMillis()).build();
+                existRequest = existRequest.toBuilder().setStatus(request.getStatus()).setUpdateDt(System.currentTimeMillis()).build();
                 databaseStore.persistOrUpdateFriendRequest(existRequest);
-                MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
+                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());
+                    databaseStore.persistOrUpdateFriendData(friendData1);
 
-                FriendData friendData1 = new FriendData(userId, request.getTargetUid(), "", 0, 0, System.currentTimeMillis());
-                databaseStore.persistOrUpdateFriendData(friendData1);
+                    FriendData friendData2 = new FriendData(request.getTargetUid(), userId, "", request.getExtra(), 0, 0, friendData1.getTimestamp());
+                    databaseStore.persistOrUpdateFriendData(friendData2);
 
-                FriendData friendData2 = new FriendData(request.getTargetUid(), userId, "", 0, 0, friendData1.getTimestamp());
-                databaseStore.persistOrUpdateFriendData(friendData2);
+                    requestMap.remove(userId);
+                    requestMap.remove(request.getTargetUid());
+                    friendsMap.remove(userId);
+                    friendsMap.remove(request.getTargetUid());
 
-                requestMap.remove(userId);
-                requestMap.remove(request.getTargetUid());
-                friendsMap.remove(userId);
-                friendsMap.remove(request.getTargetUid());
+                    heads[0] = friendData2.getTimestamp();
+                    heads[1] = friendData1.getTimestamp();
 
-                heads[0] = friendData2.getTimestamp();
-                heads[1] = friendData1.getTimestamp();
-
-                msgBuilder.setConversation(WFCMessage.Conversation.newBuilder().setTarget(userId).setLine(0).setType(ProtoConstants.ConversationType.ConversationType_Private).build());
-                msgBuilder.setContent(WFCMessage.MessageContent.newBuilder().setType(1).setSearchableContent(existRequest.getReason()).build());
+                    msgBuilder.setConversation(WFCMessage.Conversation.newBuilder().setTarget(userId).setLine(0).setType(ProtoConstants.ConversationType.ConversationType_Private).build());
+                    msgBuilder.setContent(WFCMessage.MessageContent.newBuilder().setType(1).setSearchableContent(existRequest.getReason()).build());
+                }
                 return ErrorCode.ERROR_CODE_SUCCESS;
             }
         } else {
@@ -2152,7 +2153,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         if (friendData == null) {
-            friendData = new FriendData(fromUser, targetUserId, "", 1, state, System.currentTimeMillis());
+            friendData = new FriendData(fromUser, targetUserId, "", "", 1, state, System.currentTimeMillis());
         }
         friendData.setBlacked(state);
         friendData.setTimestamp(System.currentTimeMillis());
@@ -2166,6 +2167,25 @@ public class MemoryMessagesStore implements IMessagesStore {
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
+    @Override
+    public FriendData getFriendData(String fromUser, String targetUserId) {
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+        MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
+
+        Collection<FriendData> friends = friendsMap.get(fromUser);
+        if (friends == null || friends.size() == 0) {
+            friends = loadFriend(friendsMap, fromUser);
+        }
+
+        for (FriendData fd:friends) {
+            if (fd.getFriendUid().equals(targetUserId)) {
+                return fd;
+            }
+        }
+
+        return null;
+    }
+
     @Override
     public ErrorCode setFriendAliasRequest(String fromUser, String targetUserId, String alias, long[] heads){
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -2598,7 +2618,7 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         WFCMessage.ChannelInfo.Builder newInfoBuilder = oldInfo.toBuilder();
 
-        newInfoBuilder.setStatus(Channel_Status_Destoryed);
+        newInfoBuilder.setStatus(oldInfo.getStatus() | Channel_State_Mask_Deleted);
         newInfoBuilder.setUpdateDt(System.currentTimeMillis());
         mIMap.put(channelId, newInfoBuilder.build());
         return ErrorCode.ERROR_CODE_SUCCESS;
@@ -2614,6 +2634,8 @@ public class MemoryMessagesStore implements IMessagesStore {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         MultiMap<String, String> listeners = hzInstance.getMultiMap(CHANNEL_LISTENERS);
 
+        getChannelListener(channelId);
+
         if (listen) {
             listeners.put(channelId, operator);
         } else {
@@ -2624,6 +2646,19 @@ public class MemoryMessagesStore implements IMessagesStore {
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
+    private Collection<String> getChannelListener(String channelId) {
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+        MultiMap<String, String> listeners = hzInstance.getMultiMap(CHANNEL_LISTENERS);
+        Collection<String> result = listeners.get(channelId);
+        if (result.isEmpty()) {
+            result = databaseStore.getChannelListener(channelId);
+            for (String userId : result) {
+                listeners.put(channelId, userId);
+            }
+        }
+        return result;
+    }
+
     @Override
     public WFCMessage.ChannelInfo getChannelInfo(String channelId) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -2633,12 +2668,12 @@ public class MemoryMessagesStore implements IMessagesStore {
 
     @Override
     public boolean checkUserInChannel(String user, String channelId) {
-        MultiMap<String, String> chatroomMembers = m_Server.getHazelcastInstance().getMultiMap(CHANNEL_LISTENERS);
+        Collection<String> chatroomMembers = getChannelListener(channelId);
         if (chatroomMembers == null) {
             return false;
         }
 
-        if(!chatroomMembers.containsEntry(channelId, user)) {
+        if(!chatroomMembers.contains(user)) {
             IMap<String, WFCMessage.ChannelInfo> mIMap = m_Server.getHazelcastInstance().getMap(CHANNELS);
             WFCMessage.ChannelInfo info = mIMap.get(channelId);
             if (info == null || !info.getOwner().equals(user)) {
@@ -2648,6 +2683,16 @@ public class MemoryMessagesStore implements IMessagesStore {
         return true;
     }
 
+    @Override
+    public Collection<String> getChannelSubscriber(String channelId) {
+        MultiMap<String, String> channelMembers = m_Server.getHazelcastInstance().getMultiMap(CHANNEL_LISTENERS);
+        if (channelMembers == null) {
+            return new ArrayList<>();
+        }
+
+        return channelMembers.get(channelId);
+    }
+
     @Override
     public Set<String> handleSensitiveWord(String message) {
         updateSensitiveWord();

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

@@ -279,6 +279,9 @@ public class MemorySessionStore implements ISessionsStore {
 
     @Override
     public Session getSession(String clientID) {
+        if (StringUtil.isNullOrEmpty(clientID)) {
+            return null;
+        }
         Session session = sessions.get(clientID);
         if (session == null) {
             LOG.error("Can't find the session for client <{}>", clientID);
@@ -378,8 +381,8 @@ public class MemorySessionStore implements ISessionsStore {
                             if (s.getPlatform() == ProtoConstants.Platform.Platform_Android || s.getPlatform() == ProtoConstants.Platform.Platform_iOS) {
                                 remove = true;
                             }
-                        } else if(platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_Windows) {
-                            if (s.getPlatform() == ProtoConstants.Platform.Platform_OSX || s.getPlatform() == ProtoConstants.Platform.Platform_Windows) {
+                        } else if(platform == ProtoConstants.Platform.Platform_OSX || platform == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_Linux) {
+                            if (s.getPlatform() == ProtoConstants.Platform.Platform_OSX || s.getPlatform() == ProtoConstants.Platform.Platform_Windows || platform == ProtoConstants.Platform.Platform_Linux) {
                                 remove = true;
                             }
                         } else {

broker/src/main/java/io/moquette/server/Server.java

@@ -35,11 +35,13 @@ import io.moquette.spi.IStore;
 import io.moquette.spi.impl.ProtocolProcessor;
 import io.moquette.spi.impl.ProtocolProcessorBootstrapper;
 import io.moquette.spi.impl.security.AES;
+import io.moquette.spi.impl.subscriptions.Token;
 import io.moquette.spi.security.IAuthenticator;
 import io.moquette.spi.security.IAuthorizator;
 import io.moquette.spi.security.ISslContextCreator;
 import io.moquette.spi.security.Tokenor;
 import io.netty.util.ResourceLeakDetector;
+import io.netty.util.internal.StringUtil;
 import win.liyufan.im.DBUtil;
 
 import org.slf4j.Logger;
@@ -387,6 +389,14 @@ public class Server {
         hazelcastInstance.getCluster().getLocalMember().setIntAttribute(HZ_Cluster_Node_ID, nodeId);
         hazelcastInstance.getCluster().getLocalMember().setStringAttribute(HZ_Cluster_Node_External_IP, serverIp);
         Tokenor.setKey(config.getProperty(BrokerConstants.TOKEN_SECRET_KEY));
+        String expirTimeStr = config.getProperty(TOKEN_EXPIRE_TIME);
+        if (!StringUtil.isNullOrEmpty(expirTimeStr)) {
+            try {
+                Tokenor.setExpiredTime(Long.parseLong(expirTimeStr));
+            } catch (NumberFormatException e) {
+                e.printStackTrace();
+            }
+        }
         RPCCenter.getInstance().init(this);
         return true;
     }

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

@@ -167,6 +167,7 @@ public interface IMessagesStore {
     ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads, boolean isAdmin);
     ErrorCode deleteFriend(String userId, String friendUid, long[] head);
     ErrorCode blackUserRequest(String fromUser, String targetUserId, int status, long[] head);
+    FriendData getFriendData(String fromUser, String targetUserId);
     ErrorCode SyncFriendRequestUnread(String userId, long unreadDt, long[] head);
     ErrorCode isAllowUserMessage(String fromUser, String userId);
     ErrorCode setFriendAliasRequest(String fromUser, String targetUserId, String alias, long[] head);
@@ -195,6 +196,7 @@ public interface IMessagesStore {
     ErrorCode listenChannel(String operator, String channelId, boolean listen);
     WFCMessage.ChannelInfo getChannelInfo(String channelId);
     boolean checkUserInChannel(String user, String channelId);
+    Collection<String> getChannelSubscriber(String channelId);
 
     Set<String> handleSensitiveWord(String message);
     boolean addSensitiveWords(List<String> words);

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

@@ -18,11 +18,14 @@ package io.moquette.spi.impl;
 
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
+import cn.wildfirechat.push.PushServer;
 import com.google.gson.Gson;
 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;
 import io.moquette.server.ConnectionDescriptorStore;
@@ -316,11 +319,19 @@ public class MessagesPublisher {
                     boolean isHiddenDetail = m_messagesStore.getUserPushHiddenDetail(user);
 
                     if(!nameLoaded) {
-                        senderName = getUserDisplayName(sender);
+                        senderName = getUserDisplayName(sender, conversationType == ProtoConstants.ConversationType.ConversationType_Group ? target : null);
                         targetName = getTargetName(target, conversationType);
                         nameLoaded = true;
                     }
-                    this.messageSender.sendPush(sender, conversationType, target, line, messageHead, targetSession.getClientID(), pushContent, messageContentType, serverTime, senderName, targetName, targetSession.getUnReceivedMsgs(), curMentionType, isHiddenDetail, targetSession.getLanguage());
+
+                    String name = senderName;
+                    if (!sender.equals(user)) {
+                        FriendData fd = m_messagesStore.getFriendData(user, sender);
+                        if (fd != null && !StringUtil.isNullOrEmpty(fd.getAlias())) {
+                            name = fd.getAlias();
+                        }
+                    }
+                    this.messageSender.sendPush(sender, conversationType, target, line, messageHead, targetSession.getClientID(), pushContent, messageContentType, serverTime, name, targetName, targetSession.getUnReceivedMsgs(), curMentionType, isHiddenDetail, targetSession.getLanguage());
                 }
 
             }
@@ -335,6 +346,10 @@ public class MessagesPublisher {
                 Collection<Session> sessions = m_sessionsStore.sessionForUser(user);
 
                 for (Session targetSession : sessions) {
+                    if(System.currentTimeMillis() - targetSession.getLastActiveTime() > 60 * 60 * 1000) {
+                        continue;
+                    }
+
                     if (targetSession.getClientID() == null) {
                         continue;
                     }
@@ -356,33 +371,51 @@ public class MessagesPublisher {
         }
     }
 
-    String getUserDisplayName(String userId) {
+    String getUserDisplayName(String userId, String groupId) {
         WFCMessage.User user = m_messagesStore.getUserInfo(userId);
+        String userName = null;
         if(user != null) {
-            return user.getDisplayName();
+            userName = user.getDisplayName();
         }
-        return null;
+        if (!StringUtil.isNullOrEmpty(groupId)) {
+            WFCMessage.GroupMember member = m_messagesStore.getGroupMember(groupId, userId);
+            if (member != null && !StringUtil.isNullOrEmpty(member.getAlias())) {
+                userName = member.getAlias();
+            }
+        }
+        return userName;
     }
 
     String getTargetName(String targetId, int cnvType) {
         if (cnvType == ProtoConstants.ConversationType.ConversationType_Private) {
-            return getUserDisplayName(targetId);
+            return getUserDisplayName(targetId, null);
         } else if(cnvType == ProtoConstants.ConversationType.ConversationType_Group) {
             WFCMessage.GroupInfo group = m_messagesStore.getGroupInfo(targetId);
             if(group != null) {
                 return group.getName();
             }
+        } else if(cnvType == ProtoConstants.ConversationType.ConversationType_Channel) {
+            WFCMessage.ChannelInfo channelInfo = m_messagesStore.getChannelInfo(targetId);
+            if (channelInfo != null) {
+                return channelInfo.getName();
+            }
         }
         return null;
     }
 
     public void publishNotification(String topic, String receiver, long head) {
-        publishNotificationLocal(topic, receiver, head);
+        publishNotification(topic, receiver, head, null, null);
     }
 
-    void publishNotificationLocal(String topic, String receiver, long head) {
+    public void publishNotification(String topic, String receiver, long head, String fromUser, String pushContent) {
+        publishNotificationLocal(topic, receiver, head, fromUser, pushContent);
+    }
+
+    void publishNotificationLocal(String topic, String receiver, long head, String fromUser, String pushContent) {
         Collection<Session> sessions = m_sessionsStore.sessionForUser(receiver);
+        String fromUserName = null;
         for (Session targetSession : sessions) {
+            boolean needPush = !StringUtil.isNullOrEmpty(pushContent);
             boolean targetIsActive = this.connectionDescriptors.isConnected(targetSession.getClientSession().clientID);
             if (targetIsActive) {
                 ByteBuf payload = Unpooled.buffer();
@@ -393,9 +426,24 @@ public class MessagesPublisher {
                 boolean result = this.messageSender.sendPublish(targetSession.getClientSession(), publishMsg);
                 if (!result) {
                     LOG.warn("Publish friend request failure");
+                } else {
+                    needPush = false;
                 }
             }
+            if (needPush) {
+                if (fromUserName == null) {
+                    WFCMessage.User userInfo = m_messagesStore.getUserInfo(fromUser);
+                    if (userInfo == null) {
+                        fromUserName = "";
+                    } else {
+                        fromUserName = userInfo.getDisplayName();
+                    }
+                }
 
+                if (IMTopic.NotifyFriendRequestTopic.equals(topic)) {
+                    messageSender.sendPush(fromUser, receiver, targetSession.getClientID(), pushContent, PushServer.PushMessageType.PUSH_MESSAGE_TYPE_FRIEND_REQUEST, System.currentTimeMillis(), fromUserName, targetSession.getUnReceivedMsgs() + 1, targetSession.getLanguage());
+                }
+            }
         }
     }
 

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

@@ -40,6 +40,14 @@ class PersistentQueueMessageSender {
     void sendPush(String sender, int conversationType, String target, int line, long messageHead, String deviceId, String pushContent, int messageContentType, long serverTime, String senderName, String targetName, int unReceivedMsg, int mentionType, boolean isHiddenDetail, String language) {
         LOG.info("Send push to {}, message from {}", deviceId, sender);
         PushMessage pushMessage = new PushMessage(sender, conversationType, target, line, messageContentType, serverTime, senderName, targetName, unReceivedMsg, mentionType, isHiddenDetail, language);
+        pushMessage.pushContent = pushContent;
+        PushServer.getServer().pushMessage(pushMessage, deviceId, pushContent);
+    }
+
+    void sendPush(String sender, String target, String deviceId, String pushContent, int pushContentType, long serverTime, String senderName, int unReceivedMsg, String language) {
+        LOG.info("Send push to {}, message from {}", deviceId, sender);
+        PushMessage pushMessage = new PushMessage(sender, target, serverTime, senderName, unReceivedMsg, language, pushContentType);
+        pushMessage.pushContent = pushContent;
         PushServer.getServer().pushMessage(pushMessage, deviceId, pushContent);
     }
 

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

@@ -109,8 +109,6 @@ public class ProtocolProcessor {
 
     protected ConnectionDescriptorStore connectionDescriptors;
 
-    private boolean allowAnonymous;
-    private boolean allowZeroByteClientId;
     private IAuthorizator m_authorizator;
 
     private IMessagesStore m_messagesStore;
@@ -147,8 +145,6 @@ public class ProtocolProcessor {
         LOG.info("Initializing MQTT protocol processor...");
         this.connectionDescriptors = connectionDescriptors;
         this.m_interceptor = interceptor;
-        this.allowAnonymous = false;
-        this.allowZeroByteClientId = false;
         m_authorizator = authorizator;
         m_authenticator = authenticator;
         m_messagesStore = storageService;
@@ -199,9 +195,7 @@ public class ProtocolProcessor {
 
         MqttVersion mqttVersion = MqttVersion.fromProtocolLevel(msg.variableHeader().version());
         if (!login(channel, msg, clientId, mqttVersion)) {
-            MqttConnAckMessage badId = connAck(CONNECTION_REFUSED_BAD_USER_NAME_OR_PASSWORD);
-
-            channel.writeAndFlush(badId);
+            channel.flush();
             channel.close();
             LOG.error("The MQTT login failure. Username={}", payload.userName());
             return;
@@ -303,6 +297,7 @@ public class ProtocolProcessor {
                 if (session == null) {
                     ErrorCode errorCode = m_sessionsStore.loadActiveSession(msg.payload().userName(), clientId);
                     if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                        failedNoSession(channel);
                         return false;
                     }
                     session = m_sessionsStore.getSession(clientId);
@@ -310,6 +305,7 @@ public class ProtocolProcessor {
 
                 if (session.getDeleted() != 0) {
                     LOG.error("user {} session {} is deleted. login failure", msg.payload().userName(), clientId);
+                    failedNoSession(channel);
                     return false;
                 }
                 
@@ -327,7 +323,7 @@ public class ProtocolProcessor {
                     return false;
                 }
                 session.setMqttVersion(mqttVersion);
-            } else if (!this.allowAnonymous) {
+            } else {
                 LOG.error("Client didn't supply any password and MQTT anonymous mode is disabled CId={}", clientId);
                 failedCredentials(channel);
                 return false;
@@ -339,12 +335,12 @@ public class ProtocolProcessor {
                 return false;
             }
             NettyUtils.userName(channel, msg.payload().userName());
-        } else if (!this.allowAnonymous) {
+            return true;
+        } else {
             LOG.error("Client didn't supply any credentials and MQTT anonymous mode is disabled. CId={}", clientId);
             failedCredentials(channel);
             return false;
         }
-        return true;
     }
 
     private boolean sendAck(ConnectionDescriptor descriptor, MqttConnectMessage msg, final String clientId) {

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

@@ -128,23 +128,25 @@ public class Qos1PublishHandler extends QosPublishHandler {
             String userId = new String(payloadContent);
 
             int status;
-            ClientSession clientSession = m_sessionStore.sessionForClient(userId);
-            if (clientSession == null) {
-                status = 2;
-            } else {
-                ConnectionDescriptor descriptor = connectionDescriptors.getConnection(clientSession.clientID);
+            Collection<MemorySessionStore.Session> useSessions = m_sessionStore.sessionForUser(userId);
+            OutputCheckUserOnline out = new OutputCheckUserOnline();
+
+            for (MemorySessionStore.Session session : useSessions) {
+                if (session.getDeleted() > 0) {
+                    continue;
+                }
+
+                ConnectionDescriptor descriptor = connectionDescriptors.getConnection(session.getClientID());
                 if (descriptor == null) {
                     status = 1;
                 } else {
                     status = 0;
                 }
+
+                out.addSession(userId, session.getClientID(), session.getPlatform(), status, session.getLastActiveTime());
             }
 
-            OutputCheckUserOnline out = new OutputCheckUserOnline();
-            out.setStatus(status);
-            RestResult result = RestResult.ok(out);
-
-            callback.onRouteHandled(new Gson().toJson(result).getBytes());
+            callback.onRouteHandled(new Gson().toJson(out).getBytes());
         });
     }
 

broker/src/main/java/io/moquette/spi/security/Tokenor.java

@@ -6,6 +6,7 @@ import io.moquette.spi.impl.security.AES;
 
 public class Tokenor {
 	private static String KEY = "testim";
+	private static long expiredTime = Long.MAX_VALUE;
 
 	public static void setKey(String key) {
 	    if (!StringUtil.isNullOrEmpty(key)) {
@@ -13,6 +14,10 @@ public class Tokenor {
         }
     }
 
+    public static void setExpiredTime(long expiredTime) {
+        Tokenor.expiredTime = expiredTime;
+    }
+
     public static String getUserId(byte[] password) {
         try {
             String signKey =
@@ -21,8 +26,8 @@ public class Tokenor {
             if (signKey.startsWith(KEY + "|")) {
                 signKey = signKey.substring(KEY.length() + 1);
                 long timestamp = Long.parseLong(signKey.substring(0, signKey.indexOf('|')));
-                if (System.currentTimeMillis() - timestamp > 7 * 24 * 60 *60 *1000) {
-                    //return false;
+                if (expiredTime > 0 && System.currentTimeMillis() - timestamp > expiredTime) {
+                    return null;
                 }
                 String id = signKey.substring(signKey.indexOf('|') + 1);
                 return id;

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

@@ -0,0 +1,68 @@
+package win.liyufan.im;
+
+import io.netty.util.internal.StringUtil;
+
+import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class I18n {
+    private static ClassLoader Loader = null;
+    static {
+        String configPath = System.getProperty("wildfirechat.path", null);
+        String resBundlePaht = "config/i18n";
+
+        File file = new File(configPath, resBundlePaht);
+        URL[] urls = new URL[0];
+        try {
+            urls = new URL[]{file.toURI().toURL()};
+            Loader = new URLClassLoader(urls);
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static Map<String, ResourceBundle> bundleMap = new ConcurrentHashMap<>();
+
+    public static String getString(String language, String key) {
+        ResourceBundle bundle = bundleMap.get(language);
+
+        if (StringUtil.isNullOrEmpty(language)) language = "zh_CN";
+
+        if (bundle == null) {
+            bundle = ResourceBundle.getBundle("messages", new Locale(language), Loader);
+            bundleMap.put(language, bundle);
+        }
+
+        try {
+            return bundle.getString(key);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return "糟糕，字符串 " + key + " 没有找到";
+    }
+
+    public static void test() throws MalformedURLException {
+
+        // 设置定制的语言国家代码
+        Locale locale1 = new Locale("zh");
+        Locale locale2 = new Locale("en");
+        ResourceBundle rb = ResourceBundle.getBundle("messages", locale1, Loader);
+
+
+
+        // 获得相应的key值
+        String greeting = rb.getString("Above_Greeting_Message");
+        String userInfo = rb.getString("Friend_Can_Start_Chat");
+
+        System.out.println(greeting);
+        System.out.println(userInfo);
+    }
+
+    public static void main(String[] args) throws Exception {
+        test();
+    }
+}

common/pom.xml

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

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

@@ -4,6 +4,7 @@ public interface APIPath {
     String Create_Chatroom = "/admin/chatroom/create";
     String Chatroom_Destroy = "/admin/chatroom/del";
     String Chatroom_Info = "/admin/chatroom/info";
+    String Chatroom_GetMembers = "/admin/chatroom/members";
 
 
     String Sensitive_Add = "/admin/sensitive/add";
@@ -23,6 +24,8 @@ public interface APIPath {
 
     String Friend_Update_Status = "/admin/friend/status";
     String Friend_Get_List = "/admin/friend/list";
+    String Blacklist_Update_Status = "/admin/blacklist/status";
+    String Blacklist_Get_List = "/admin/blacklist/list";
     String Friend_Get_Alias = "/admin/friend/get_alias";
     String Friend_Set_Alias = "/admin/friend/set_alias";
 

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

@@ -0,0 +1,41 @@
+/*
+ * 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 InputBlacklistRequest {
+    private String userId;
+    private String targetUid;
+    private int status;
+
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getTargetUid() {
+        return targetUid;
+    }
+
+    public void setTargetUid(String targetUid) {
+        this.targetUid = targetUid;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+}

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

@@ -9,7 +9,6 @@
 package cn.wildfirechat.pojos;
 
 
-import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
 import io.netty.util.internal.StringUtil;
 
@@ -22,7 +21,7 @@ public class InputCreateChannel {
     private int auto;
     private String secret;
     private String desc;
-    private int status;
+    private int state;
     private String extra;
     private long updateDt;
 
@@ -41,7 +40,7 @@ public class InputCreateChannel {
             builder = builder.setSecret(secret);
         if (!StringUtil.isNullOrEmpty(desc))
             builder = builder.setDesc(desc);
-        builder = builder.setStatus(status);
+        builder = builder.setStatus(state);
         if (!StringUtil.isNullOrEmpty(extra))
             builder = builder.setExtra(extra);
         if (!StringUtil.isNullOrEmpty(name))
@@ -116,12 +115,12 @@ public class InputCreateChannel {
         this.desc = desc;
     }
 
-    public int getStatus() {
-        return status;
+    public int getState() {
+        return state;
     }
 
-    public void setStatus(int status) {
-        this.status = status;
+    public void setState(int state) {
+        this.state = state;
     }
 
     public String getExtra() {

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

@@ -13,6 +13,7 @@ public class InputFriendRequest {
     private String userId;
     private String friendUid;
     private int status;
+    private String extra;
 
 
     public String getUserId() {
@@ -38,4 +39,12 @@ public class InputFriendRequest {
     public void setStatus(int status) {
         this.status = status;
     }
+
+    public String getExtra() {
+        return extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
 }

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

@@ -8,14 +8,39 @@
 
 package cn.wildfirechat.pojos;
 
-public class OutputCheckUserOnline {
-    private int status; //0 online, 1 have session offline, 2 no session
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 
-    public int getStatus() {
-        return status;
+public class OutputCheckUserOnline {
+    public static class Session {
+        public String clientId;
+        public String userId;
+        public int platform;
+        public int status; //0 online, 1 have session offline
+        public long lastSeen;
+
+        public Session(String clientId, String userId, int platform, int status, long lastSeen) {
+            this.clientId = clientId;
+            this.userId = userId;
+            this.platform = platform;
+            this.status = status;
+            this.lastSeen = lastSeen;
+        }
     }
 
-    public void setStatus(int status) {
-        this.status = status;
+    public void addSession(String userId, String clientId, int platform, int status, long lastSeen) {
+        Session session = new Session(clientId, userId, platform, status, lastSeen);
+        sessions.add(session);
+    }
+
+    private List<Session> sessions = new ArrayList<>();
+
+    public List<Session> getSessions() {
+        return sessions;
+    }
+
+    public void setSessions(List<Session> sessions) {
+        this.sessions = sessions;
     }
 }

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

@@ -45,6 +45,8 @@ public class ProtoConstants {
         int Platform_Windows = 3;
         int Platform_OSX = 4;
         int Platform_WEB = 5;
+        int Platform_WX = 6;
+        int Platform_Linux = 7;
     }
 
     //message NotifyMessage & PullMessageRequest -> type
@@ -114,10 +116,19 @@ public class ProtoConstants {
     }
 
     //Channel -> status
-    public interface ChannelStatus {
-        int Channel_Status_Public = 0;
-        int Channel_Status_Private = 1;
-        int Channel_Status_Destoryed = 2;
+    //第0位表示是否允许查看用户所有信息，还是只允许看用户id，用户名称，用户昵称和用户头像
+    //第1位表示是否允许查看非订阅用户信息
+    //第2位表示是否允许主动添加用户订阅关系
+    //第3位表示是否允许给非订阅用户发送消息
+    //第4位表示是否私有
+    //第6位表示是否删除
+    public interface ChannelState {
+        int Channel_State_Mask_FullInfo = 0x01;
+        int Channel_State_Mask_Unsubscribed_User_Access = 0x02;
+        int Channel_State_Mask_Active_Subscribe = 0x04;
+        int Channel_State_Mask_Message_Unsubscribed = 0x08;
+        int Channel_State_Mask_Private = 0x10;
+        int Channel_State_Mask_Deleted = 0x40;
     }
 
 

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

@@ -19039,6 +19039,21 @@ public final class WFCMessage {
      * <code>required int32 status = 2;</code>
      */
     int getStatus();
+
+    // optional string extra = 3;
+    /**
+     * <code>optional string extra = 3;</code>
+     */
+    boolean hasExtra();
+    /**
+     * <code>optional string extra = 3;</code>
+     */
+    java.lang.String getExtra();
+    /**
+     * <code>optional string extra = 3;</code>
+     */
+    com.google.protobuf.ByteString
+        getExtraBytes();
   }
   /**
    * Protobuf type {@code HandleFriendRequest}
@@ -19101,6 +19116,11 @@ public final class WFCMessage {
               status_ = input.readInt32();
               break;
             }
+            case 26: {
+              bitField0_ |= 0x00000004;
+              extra_ = input.readBytes();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -19200,9 +19220,53 @@ public final class WFCMessage {
       return status_;
     }
 
+    // optional string extra = 3;
+    public static final int EXTRA_FIELD_NUMBER = 3;
+    private java.lang.Object extra_;
+    /**
+     * <code>optional string extra = 3;</code>
+     */
+    public boolean hasExtra() {
+      return ((bitField0_ & 0x00000004) == 0x00000004);
+    }
+    /**
+     * <code>optional string extra = 3;</code>
+     */
+    public java.lang.String getExtra() {
+      java.lang.Object ref = extra_;
+      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()) {
+          extra_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string extra = 3;</code>
+     */
+    public com.google.protobuf.ByteString
+        getExtraBytes() {
+      java.lang.Object ref = extra_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        extra_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
     private void initFields() {
       targetUid_ = "";
       status_ = 0;
+      extra_ = "";
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -19230,6 +19294,9 @@ public final class WFCMessage {
       if (((bitField0_ & 0x00000002) == 0x00000002)) {
         output.writeInt32(2, status_);
       }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        output.writeBytes(3, getExtraBytes());
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -19247,6 +19314,10 @@ public final class WFCMessage {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(2, status_);
       }
+      if (((bitField0_ & 0x00000004) == 0x00000004)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(3, getExtraBytes());
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -19367,6 +19438,8 @@ public final class WFCMessage {
         bitField0_ = (bitField0_ & ~0x00000001);
         status_ = 0;
         bitField0_ = (bitField0_ & ~0x00000002);
+        extra_ = "";
+        bitField0_ = (bitField0_ & ~0x00000004);
         return this;
       }
 
@@ -19403,6 +19476,10 @@ public final class WFCMessage {
           to_bitField0_ |= 0x00000002;
         }
         result.status_ = status_;
+        if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+          to_bitField0_ |= 0x00000004;
+        }
+        result.extra_ = extra_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -19427,6 +19504,11 @@ public final class WFCMessage {
         if (other.hasStatus()) {
           setStatus(other.getStatus());
         }
+        if (other.hasExtra()) {
+          bitField0_ |= 0x00000004;
+          extra_ = other.extra_;
+          onChanged();
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -19569,6 +19651,80 @@ public final class WFCMessage {
         return this;
       }
 
+      // optional string extra = 3;
+      private java.lang.Object extra_ = "";
+      /**
+       * <code>optional string extra = 3;</code>
+       */
+      public boolean hasExtra() {
+        return ((bitField0_ & 0x00000004) == 0x00000004);
+      }
+      /**
+       * <code>optional string extra = 3;</code>
+       */
+      public java.lang.String getExtra() {
+        java.lang.Object ref = extra_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          extra_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string extra = 3;</code>
+       */
+      public com.google.protobuf.ByteString
+          getExtraBytes() {
+        java.lang.Object ref = extra_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          extra_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string extra = 3;</code>
+       */
+      public Builder setExtra(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000004;
+        extra_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string extra = 3;</code>
+       */
+      public Builder clearExtra() {
+        bitField0_ = (bitField0_ & ~0x00000004);
+        extra_ = getDefaultInstance().getExtra();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string extra = 3;</code>
+       */
+      public Builder setExtraBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000004;
+        extra_ = value;
+        onChanged();
+        return this;
+      }
+
       // @@protoc_insertion_point(builder_scope:HandleFriendRequest)
     }
 
@@ -45347,6 +45503,21 @@ public final class WFCMessage {
      * <code>optional int32 blacked = 5;</code>
      */
     int getBlacked();
+
+    // optional string extra = 6;
+    /**
+     * <code>optional string extra = 6;</code>
+     */
+    boolean hasExtra();
+    /**
+     * <code>optional string extra = 6;</code>
+     */
+    java.lang.String getExtra();
+    /**
+     * <code>optional string extra = 6;</code>
+     */
+    com.google.protobuf.ByteString
+        getExtraBytes();
   }
   /**
    * Protobuf type {@code Friend}
@@ -45424,6 +45595,11 @@ public final class WFCMessage {
               blacked_ = input.readInt32();
               break;
             }
+            case 50: {
+              bitField0_ |= 0x00000020;
+              extra_ = input.readBytes();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -45598,12 +45774,56 @@ public final class WFCMessage {
       return blacked_;
     }
 
+    // optional string extra = 6;
+    public static final int EXTRA_FIELD_NUMBER = 6;
+    private java.lang.Object extra_;
+    /**
+     * <code>optional string extra = 6;</code>
+     */
+    public boolean hasExtra() {
+      return ((bitField0_ & 0x00000020) == 0x00000020);
+    }
+    /**
+     * <code>optional string extra = 6;</code>
+     */
+    public java.lang.String getExtra() {
+      java.lang.Object ref = extra_;
+      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()) {
+          extra_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string extra = 6;</code>
+     */
+    public com.google.protobuf.ByteString
+        getExtraBytes() {
+      java.lang.Object ref = extra_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        extra_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
     private void initFields() {
       uid_ = "";
       state_ = 0;
       updateDt_ = 0L;
       alias_ = "";
       blacked_ = 0;
+      extra_ = "";
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -45644,6 +45864,9 @@ public final class WFCMessage {
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
         output.writeInt32(5, blacked_);
       }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        output.writeBytes(6, getExtraBytes());
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -45673,6 +45896,10 @@ public final class WFCMessage {
         size += com.google.protobuf.CodedOutputStream
           .computeInt32Size(5, blacked_);
       }
+      if (((bitField0_ & 0x00000020) == 0x00000020)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(6, getExtraBytes());
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -45799,6 +46026,8 @@ public final class WFCMessage {
         bitField0_ = (bitField0_ & ~0x00000008);
         blacked_ = 0;
         bitField0_ = (bitField0_ & ~0x00000010);
+        extra_ = "";
+        bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
 
@@ -45847,6 +46076,10 @@ public final class WFCMessage {
           to_bitField0_ |= 0x00000010;
         }
         result.blacked_ = blacked_;
+        if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
+          to_bitField0_ |= 0x00000020;
+        }
+        result.extra_ = extra_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -45882,6 +46115,11 @@ public final class WFCMessage {
         if (other.hasBlacked()) {
           setBlacked(other.getBlacked());
         }
+        if (other.hasExtra()) {
+          bitField0_ |= 0x00000020;
+          extra_ = other.extra_;
+          onChanged();
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -46168,6 +46406,80 @@ public final class WFCMessage {
         return this;
       }
 
+      // optional string extra = 6;
+      private java.lang.Object extra_ = "";
+      /**
+       * <code>optional string extra = 6;</code>
+       */
+      public boolean hasExtra() {
+        return ((bitField0_ & 0x00000020) == 0x00000020);
+      }
+      /**
+       * <code>optional string extra = 6;</code>
+       */
+      public java.lang.String getExtra() {
+        java.lang.Object ref = extra_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          extra_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string extra = 6;</code>
+       */
+      public com.google.protobuf.ByteString
+          getExtraBytes() {
+        java.lang.Object ref = extra_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          extra_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string extra = 6;</code>
+       */
+      public Builder setExtra(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000020;
+        extra_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string extra = 6;</code>
+       */
+      public Builder clearExtra() {
+        bitField0_ = (bitField0_ & ~0x00000020);
+        extra_ = getDefaultInstance().getExtra();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string extra = 6;</code>
+       */
+      public Builder setExtraBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00000020;
+        extra_ = value;
+        onChanged();
+        return this;
+      }
+
       // @@protoc_insertion_point(builder_scope:Friend)
     }
 
@@ -60429,109 +60741,110 @@ public final class WFCMessage {
       "edia_type\030\001 \002(\005\022\022\n\nmedia_path\030\002 \002(\t\"S\n\024G" +
       "etUploadTokenResult\022\016\n\006domain\030\001 \002(\t\022\r\n\005t" +
       "oken\030\002 \002(\t\022\016\n\006server\030\003 \002(\t\022\014\n\004port\030\004 \001(\005" +
-      "\"9\n\023HandleFriendRequest\022\022\n\ntarget_uid\030\001 " +
-      "\002(\t\022\016\n\006status\030\002 \002(\005\"\023\n\005IDBuf\022\n\n\002id\030\001 \002(\t" +
-      "\"\027\n\tIDListBuf\022\n\n\002id\030\001 \003(\t\"\256\001\n\007Message\022#\n" +
-      "\014conversation\030\001 \002(\0132\r.Conversation\022\021\n\tfr" +
-      "om_user\030\002 \002(\t\022 \n\007content\030\003 \002(\0132\017.Message" +
-      "Content\022\022\n\nmessage_id\030\004 \001(\003\022\030\n\020server_ti",
-      "mestamp\030\005 \001(\003\022\017\n\007to_user\030\006 \001(\t\022\n\n\002to\030\007 \003" +
-      "(\t\"\353\001\n\004User\022\013\n\003uid\030\001 \002(\t\022\014\n\004name\030\002 \001(\t\022\024" +
-      "\n\014display_name\030\003 \001(\t\022\020\n\010portrait\030\004 \001(\t\022\016" +
-      "\n\006mobile\030\005 \001(\t\022\r\n\005email\030\006 \001(\t\022\017\n\007address" +
-      "\030\007 \001(\t\022\017\n\007company\030\010 \001(\t\022\r\n\005extra\030\t \001(\t\022\021" +
-      "\n\tupdate_dt\030\n \001(\003\022\016\n\006gender\030\013 \001(\005\022\016\n\006soc" +
-      "ial\030\014 \001(\t\022\014\n\004type\030\r \001(\005\022\017\n\007deleted\030\016 \001(\005" +
-      "\"c\n\005Robot\022\013\n\003uid\030\001 \002(\t\022\r\n\005state\030\002 \002(\005\022\r\n" +
-      "\005owner\030\003 \001(\t\022\016\n\006secret\030\004 \001(\t\022\020\n\010callback" +
-      "\030\005 \001(\t\022\r\n\005extra\030\006 \001(\t\"(\n\017GetRobotsResult",
-      "\022\025\n\005entry\030\001 \003(\0132\006.Robot\"P\n\005Thing\022\013\n\003uid\030" +
-      "\001 \002(\t\022\r\n\005state\030\002 \002(\005\022\r\n\005token\030\003 \002(\t\022\r\n\005o" +
-      "wner\030\004 \001(\t\022\r\n\005extra\030\005 \001(\t\"(\n\017GetThingsRe" +
-      "sult\022\025\n\005entry\030\001 \003(\0132\006.Thing\"g\n\030UploadDev" +
-      "iceTokenRequest\022\020\n\010platform\030\001 \002(\005\022\020\n\010app" +
-      "_name\030\002 \002(\t\022\024\n\014device_token\030\003 \002(\t\022\021\n\tpus" +
-      "h_type\030\004 \002(\005\"\201\001\n\026ModifyGroupInfoRequest\022" +
-      "\020\n\010group_id\030\001 \002(\t\022\014\n\004type\030\002 \002(\005\022\r\n\005value" +
-      "\030\003 \002(\t\022\017\n\007to_line\030\004 \003(\005\022\'\n\016notify_conten" +
-      "t\030\005 \001(\0132\017.MessageContent\"\203\001\n\026SetGroupMan",
-      "agerRequest\022\020\n\010group_id\030\001 \002(\t\022\014\n\004type\030\002 " +
-      "\002(\005\022\017\n\007user_id\030\003 \003(\t\022\017\n\007to_line\030\004 \003(\005\022\'\n" +
-      "\016notify_content\030\005 \001(\0132\017.MessageContent\"(" +
-      "\n\tInfoEntry\022\014\n\004type\030\001 \002(\005\022\r\n\005value\030\002 \002(\t" +
-      "\"0\n\023ModifyMyInfoRequest\022\031\n\005entry\030\001 \003(\0132\n" +
-      ".InfoEntry\";\n\rNotifyMessage\022\014\n\004type\030\001 \002(" +
-      "\005\022\014\n\004head\030\002 \002(\003\022\016\n\006target\030\003 \001(\t\"=\n\022PullM" +
-      "essageRequest\022\n\n\002id\030\001 \002(\003\022\014\n\004type\030\002 \002(\005\022" +
-      "\r\n\005delay\030\003 \001(\003\"M\n\021PullMessageResult\022\031\n\007m" +
-      "essage\030\001 \003(\0132\010.Message\022\017\n\007current\030\002 \002(\003\022",
-      "\014\n\004head\030\003 \002(\003\"/\n\023PullGroupInfoResult\022\030\n\004" +
-      "info\030\001 \003(\0132\n.GroupInfo\"6\n\026PullGroupMembe" +
-      "rRequest\022\016\n\006target\030\001 \002(\t\022\014\n\004head\030\002 \002(\003\"5" +
-      "\n\025PullGroupMemberResult\022\034\n\006member\030\001 \003(\0132" +
-      "\014.GroupMember\"-\n\013UserRequest\022\013\n\003uid\030\001 \002(" +
-      "\t\022\021\n\tupdate_dt\030\002 \001(\003\"0\n\017PullUserRequest\022" +
-      "\035\n\007request\030\001 \003(\0132\014.UserRequest\"/\n\nUserRe" +
-      "sult\022\023\n\004user\030\001 \002(\0132\005.User\022\014\n\004code\030\002 \002(\005\"" +
-      "-\n\016PullUserResult\022\033\n\006result\030\001 \003(\0132\013.User" +
-      "Result\"^\n\020QuitGroupRequest\022\020\n\010group_id\030\001",
-      " \002(\t\022\017\n\007to_line\030\002 \003(\005\022\'\n\016notify_content\030" +
-      "\003 \001(\0132\017.MessageContent\"~\n\030RemoveGroupMem" +
-      "berRequest\022\020\n\010group_id\030\001 \002(\t\022\026\n\016removed_" +
-      "member\030\002 \003(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016notify_" +
-      "content\030\004 \001(\0132\017.MessageContent\"u\n\024Transf" +
-      "erGroupRequest\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_c" +
-      "ontent\030\004 \001(\0132\017.MessageContent\"s\n\026ModifyG" +
-      "roupMemberAlias\022\020\n\010group_id\030\001 \002(\t\022\r\n\005ali" +
-      "as\030\002 \002(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016notify_cont",
-      "ent\030\004 \001(\0132\017.MessageContent\"P\n\020UserSettin" +
-      "gEntry\022\r\n\005scope\030\001 \002(\005\022\013\n\003key\030\002 \002(\t\022\r\n\005va" +
-      "lue\030\003 \002(\t\022\021\n\tupdate_dt\030\004 \002(\003\"A\n\024ModifyUs" +
-      "erSettingReq\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\024GetUserSettingResult\022 \n\005entry\030\001 \003" +
-      "(\0132\021.UserSettingEntry\"W\n\006Friend\022\013\n\003uid\030\001" +
-      " \002(\t\022\r\n\005state\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\"*\n\020GetFri" +
-      "endsResult\022\026\n\005entry\030\001 \003(\0132\007.Friend\"7\n\026Ge",
-      "tFriendRequestResult\022\035\n\005entry\030\001 \003(\0132\016.Fr" +
-      "iendRequest\"\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\016frie" +
-      "nd_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\013" +
-      "server_time\030\007 \001(\003\"P\n\rIMHttpWrapper\022\r\n\005to" +
-      "ken\030\001 \002(\t\022\021\n\tclient_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\020SearchUserResult\022\024\n\005entry\030\001 \003(",
-      "\0132\005.User\"@\n\026GetChatroomInfoRequest\022\023\n\013ch" +
-      "atroom_id\030\001 \002(\t\022\021\n\tupdate_dt\030\002 \001(\003\"\227\001\n\014C" +
-      "hatroomInfo\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\034GetChatr" +
-      "oomMemberInfoRequest\022\023\n\013chatroom_id\030\001 \002(" +
-      "\t\022\021\n\tmax_count\030\002 \001(\005\";\n\022ChatroomMemberIn" +
-      "fo\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\023NotifyRecal",
-      "lMessage\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\006stat" +
-      "us\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\013d" +
-      "evice_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\nshor" +
-      "t_port\030\003 \002(\005\"G\n\017GetTokenRequest\022\017\n\007user_",
-      "id\030\001 \002(\t\022\021\n\tclient_id\030\002 \002(\t\022\020\n\010platform\030" +
-      "\003 \001(\005\"\\\n\022LoadRemoteMessages\022#\n\014conversat" +
-      "ion\030\001 \002(\0132\r.Conversation\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.Me" +
-      "ssageContent\022\n\n\002to\030\003 \003(\t\022\014\n\004line\030\004 \002(\005B#" +
-      "\n\025cn.wildfirechat.protoB\nWFCMessage"
+      "\"H\n\023HandleFriendRequest\022\022\n\ntarget_uid\030\001 " +
+      "\002(\t\022\016\n\006status\030\002 \002(\005\022\r\n\005extra\030\003 \001(\t\"\023\n\005ID" +
+      "Buf\022\n\n\002id\030\001 \002(\t\"\027\n\tIDListBuf\022\n\n\002id\030\001 \003(\t" +
+      "\"\256\001\n\007Message\022#\n\014conversation\030\001 \002(\0132\r.Con" +
+      "versation\022\021\n\tfrom_user\030\002 \002(\t\022 \n\007content\030" +
+      "\003 \002(\0132\017.MessageContent\022\022\n\nmessage_id\030\004 \001",
+      "(\003\022\030\n\020server_timestamp\030\005 \001(\003\022\017\n\007to_user\030" +
+      "\006 \001(\t\022\n\n\002to\030\007 \003(\t\"\353\001\n\004User\022\013\n\003uid\030\001 \002(\t\022" +
+      "\014\n\004name\030\002 \001(\t\022\024\n\014display_name\030\003 \001(\t\022\020\n\010p" +
+      "ortrait\030\004 \001(\t\022\016\n\006mobile\030\005 \001(\t\022\r\n\005email\030\006" +
+      " \001(\t\022\017\n\007address\030\007 \001(\t\022\017\n\007company\030\010 \001(\t\022\r" +
+      "\n\005extra\030\t \001(\t\022\021\n\tupdate_dt\030\n \001(\003\022\016\n\006gend" +
+      "er\030\013 \001(\005\022\016\n\006social\030\014 \001(\t\022\014\n\004type\030\r \001(\005\022\017" +
+      "\n\007deleted\030\016 \001(\005\"c\n\005Robot\022\013\n\003uid\030\001 \002(\t\022\r\n" +
+      "\005state\030\002 \002(\005\022\r\n\005owner\030\003 \001(\t\022\016\n\006secret\030\004 " +
+      "\001(\t\022\020\n\010callback\030\005 \001(\t\022\r\n\005extra\030\006 \001(\t\"(\n\017",
+      "GetRobotsResult\022\025\n\005entry\030\001 \003(\0132\006.Robot\"P" +
+      "\n\005Thing\022\013\n\003uid\030\001 \002(\t\022\r\n\005state\030\002 \002(\005\022\r\n\005t" +
+      "oken\030\003 \002(\t\022\r\n\005owner\030\004 \001(\t\022\r\n\005extra\030\005 \001(\t" +
+      "\"(\n\017GetThingsResult\022\025\n\005entry\030\001 \003(\0132\006.Thi" +
+      "ng\"g\n\030UploadDeviceTokenRequest\022\020\n\010platfo" +
+      "rm\030\001 \002(\005\022\020\n\010app_name\030\002 \002(\t\022\024\n\014device_tok" +
+      "en\030\003 \002(\t\022\021\n\tpush_type\030\004 \002(\005\"\201\001\n\026ModifyGr" +
+      "oupInfoRequest\022\020\n\010group_id\030\001 \002(\t\022\014\n\004type" +
+      "\030\002 \002(\005\022\r\n\005value\030\003 \002(\t\022\017\n\007to_line\030\004 \003(\005\022\'" +
+      "\n\016notify_content\030\005 \001(\0132\017.MessageContent\"",
+      "\203\001\n\026SetGroupManagerRequest\022\020\n\010group_id\030\001" +
+      " \002(\t\022\014\n\004type\030\002 \002(\005\022\017\n\007user_id\030\003 \003(\t\022\017\n\007t" +
+      "o_line\030\004 \003(\005\022\'\n\016notify_content\030\005 \001(\0132\017.M" +
+      "essageContent\"(\n\tInfoEntry\022\014\n\004type\030\001 \002(\005" +
+      "\022\r\n\005value\030\002 \002(\t\"0\n\023ModifyMyInfoRequest\022\031" +
+      "\n\005entry\030\001 \003(\0132\n.InfoEntry\";\n\rNotifyMessa" +
+      "ge\022\014\n\004type\030\001 \002(\005\022\014\n\004head\030\002 \002(\003\022\016\n\006target" +
+      "\030\003 \001(\t\"=\n\022PullMessageRequest\022\n\n\002id\030\001 \002(\003" +
+      "\022\014\n\004type\030\002 \002(\005\022\r\n\005delay\030\003 \001(\003\"M\n\021PullMes" +
+      "sageResult\022\031\n\007message\030\001 \003(\0132\010.Message\022\017\n",
+      "\007current\030\002 \002(\003\022\014\n\004head\030\003 \002(\003\"/\n\023PullGrou" +
+      "pInfoResult\022\030\n\004info\030\001 \003(\0132\n.GroupInfo\"6\n" +
+      "\026PullGroupMemberRequest\022\016\n\006target\030\001 \002(\t\022" +
+      "\014\n\004head\030\002 \002(\003\"5\n\025PullGroupMemberResult\022\034" +
+      "\n\006member\030\001 \003(\0132\014.GroupMember\"-\n\013UserRequ" +
+      "est\022\013\n\003uid\030\001 \002(\t\022\021\n\tupdate_dt\030\002 \001(\003\"0\n\017P" +
+      "ullUserRequest\022\035\n\007request\030\001 \003(\0132\014.UserRe" +
+      "quest\"/\n\nUserResult\022\023\n\004user\030\001 \002(\0132\005.User" +
+      "\022\014\n\004code\030\002 \002(\005\"-\n\016PullUserResult\022\033\n\006resu" +
+      "lt\030\001 \003(\0132\013.UserResult\"^\n\020QuitGroupReques",
+      "t\022\020\n\010group_id\030\001 \002(\t\022\017\n\007to_line\030\002 \003(\005\022\'\n\016" +
+      "notify_content\030\003 \001(\0132\017.MessageContent\"~\n" +
+      "\030RemoveGroupMemberRequest\022\020\n\010group_id\030\001 " +
+      "\002(\t\022\026\n\016removed_member\030\002 \003(\t\022\017\n\007to_line\030\003" +
+      " \003(\005\022\'\n\016notify_content\030\004 \001(\0132\017.MessageCo" +
+      "ntent\"u\n\024TransferGroupRequest\022\020\n\010group_i" +
+      "d\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.MessageCon" +
+      "tent\"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\016notify_content\030\004 \001(\0132\017.MessageConten" +
+      "t\"P\n\020UserSettingEntry\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\022\021\n\tupdate_dt\030\004 " +
+      "\002(\003\"A\n\024ModifyUserSettingReq\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\007Versio" +
+      "n\022\017\n\007version\030\001 \002(\003\"8\n\024GetUserSettingResu" +
+      "lt\022 \n\005entry\030\001 \003(\0132\021.UserSettingEntry\"f\n\006" +
+      "Friend\022\013\n\003uid\030\001 \002(\t\022\r\n\005state\030\002 \002(\005\022\021\n\tup" +
+      "date_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\020GetFriendsResult",
+      "\022\026\n\005entry\030\001 \003(\0132\007.Friend\"7\n\026GetFriendReq" +
+      "uestResult\022\035\n\005entry\030\001 \003(\0132\016.FriendReques" +
+      "t\"\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\016friend_rq_head" +
+      "\030\003 \001(\003\022\024\n\014setting_head\030\004 \001(\003\022\021\n\tnode_add" +
+      "r\030\005 \001(\t\022\021\n\tnode_port\030\006 \001(\005\022\023\n\013server_tim" +
+      "e\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\007request\030\003 \002(\t\022\014\n\004d" +
+      "ata\030\004 \001(\014\"A\n\021SearchUserRequest\022\017\n\007keywor" +
+      "d\030\001 \002(\t\022\r\n\005fuzzy\030\002 \001(\005\022\014\n\004page\030\003 \001(\005\"(\n\020",
+      "SearchUserResult\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\014ChatroomInf" +
+      "o\022\r\n\005title\030\001 \002(\t\022\014\n\004desc\030\002 \001(\t\022\020\n\010portra" +
+      "it\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\034GetChatroomMemberI" +
+      "nfoRequest\022\023\n\013chatroom_id\030\001 \002(\t\022\021\n\tmax_c" +
+      "ount\030\002 \001(\005\";\n\022ChatroomMemberInfo\022\024\n\014memb" +
+      "er_count\030\001 \001(\005\022\017\n\007members\030\002 \003(\t\"\026\n\010INT64",
+      "Buf\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\020BlackUs" +
+      "erRequest\022\013\n\003uid\030\001 \002(\t\022\016\n\006status\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_v" +
+      "ersion\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\017GetTokenRequest\022\017\n\007user_id\030\001 \002(\t\022\021" +
+      "\n\tclient_id\030\002 \002(\t\022\020\n\010platform\030\003 \001(\005\"\\\n\022L" +
+      "oadRemoteMessages\022#\n\014conversation\030\001 \002(\0132" +
+      "\r.Conversation\022\022\n\nbefore_uid\030\002 \002(\003\022\r\n\005co" +
+      "unt\030\003 \002(\005\"a\n\020MultiCastMessage\022\021\n\tfrom_us" +
+      "er\030\001 \002(\t\022 \n\007content\030\002 \002(\0132\017.MessageConte" +
+      "nt\022\n\n\002to\030\003 \003(\t\022\014\n\004line\030\004 \002(\005B#\n\025cn.wildf" +
+      "irechat.protoB\nWFCMessage"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -60669,7 +60982,7 @@ public final class WFCMessage {
           internal_static_HandleFriendRequest_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_HandleFriendRequest_descriptor,
-              new java.lang.String[] { "TargetUid", "Status", });
+              new java.lang.String[] { "TargetUid", "Status", "Extra", });
           internal_static_IDBuf_descriptor =
             getDescriptor().getMessageTypes().get(22);
           internal_static_IDBuf_fieldAccessorTable = new
@@ -60861,7 +61174,7 @@ public final class WFCMessage {
           internal_static_Friend_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_Friend_descriptor,
-              new java.lang.String[] { "Uid", "State", "UpdateDt", "Alias", "Blacked", });
+              new java.lang.String[] { "Uid", "State", "UpdateDt", "Alias", "Blacked", "Extra", });
           internal_static_GetFriendsResult_descriptor =
             getDescriptor().getMessageTypes().get(54);
           internal_static_GetFriendsResult_fieldAccessorTable = new

distribution/pom.xml

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

distribution/src/main/assembly/assembly.xml

@@ -19,6 +19,11 @@
             <directory>../broker/migrate/h2/</directory>
             <outputDirectory>/migrate/h2</outputDirectory>
         </fileSet>
+
+        <fileSet>
+            <directory>../broker/config/i18n/</directory>
+            <outputDirectory>/config/i18n</outputDirectory>
+        </fileSet>
     </fileSets>
 
     <files>

distribution/src/main/resources/hazelcast.xml

@@ -57,6 +57,13 @@
         </map-store>
     </map>
 
+    <map name="user_friends_empty">
+        <time-to-live-seconds>86400</time-to-live-seconds>
+        <eviction-policy>LRU</eviction-policy>
+        <max-size policy="PER_NODE">1000000</max-size>
+        <eviction-percentage>10</eviction-percentage>
+    </map>
+
     <set name="node_ids"/>
 
     <multimap name="user_setting">

distribution/src/main/resources/wildfirechat.conf

@@ -35,7 +35,7 @@ http.admin.secret_key 123456
 
 ##服务器API接口参数是否检查时间。当设置为false时，所有的请求会检查时间的有效性；当设置为true时，可以在http.admin.secret_key保持不变的情况下，使用固定的服务API签名
 ##nonce = "76616", timestamp = "1558350862502", sign = "b98f9b0717f59febccf1440067a7f50d9b31bdde"
-http.admin.no_check_time true
+http.admin.no_check_time false
 
 ##客户端协议栈密钥，需要与客户端协议栈文件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
@@ -43,6 +43,9 @@ client.proto.secret_key 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x78,0x79,0x7A,0
 ##用来生产im token的私钥，只在服务器使用，客户端不用。正式使用时为了安全一定要修改这个值，切记切记
 token.key testim
 
+##token的过期时间，单位为毫秒，默认为无限期。如果需要设置无限期，客户端上一定需要加上token过期的处理。token过期的处理请参考文档的常见问题
+##token.expire_time 2592000000
+
 ##首次登录，是否接收之前的历史消息。0 不接收；1接收。
 message.roaming 0
 

pom.xml

@@ -12,7 +12,7 @@
     <artifactId>wildfirechat-parent</artifactId>
 
     <packaging>pom</packaging>
-    <version>0.38</version>
+    <version>0.39</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.38</version>
+        <version>0.39</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -24,6 +24,18 @@ public class ChannelServiceApi {
         return httpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
     }
 
+    public IMResult<InputOutputUserInfo> getUserInfoByName(String userName) throws Exception {
+        String path = APIPath.Channel_User_Info;
+        InputGetUserInfo getUserInfo = new InputGetUserInfo(null, userName, null);
+        return httpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
+    }
+
+    public IMResult<InputOutputUserInfo> getUserInfoByMobile(String mobile) throws Exception {
+        String path = APIPath.Channel_User_Info;
+        InputGetUserInfo getUserInfo = new InputGetUserInfo(null, null, mobile);
+        return httpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
+    }
+
     public IMResult<Void> modifyChannelInfo(/*ProtoConstants.ModifyChannelInfoType*/int type, String value) throws Exception {
         String path = APIPath.Channel_Update_Profile;
         InputModifyChannelInfo modifyChannelInfo = new InputModifyChannelInfo();

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

@@ -30,5 +30,13 @@ public class ChatroomAdmin {
         InputGetChatroomInfo input = new InputGetChatroomInfo(chatroomId);
         return AdminHttpUtils.httpJsonPost(path, input, OutputGetChatroomInfo.class);
     }
+
+    public static IMResult<OutputStringList> getChatroomMembers(String chatroomId) throws Exception {
+        String path = APIPath.Chatroom_GetMembers;
+        InputGetChatroomInfo input = new InputGetChatroomInfo(chatroomId);
+        return AdminHttpUtils.httpJsonPost(path, input, OutputStringList.class);
+    }
+
+
     
 }

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

@@ -17,18 +17,33 @@ import static cn.wildfirechat.proto.ProtoConstants.SystemSettingType.Group_Max_M
 
 public class Main {
     public static void main(String[] args) throws Exception {
+        //admin使用的是18080端口，超级管理接口，理论上不能对外开放端口，也不能让非内部服务知悉密钥。
         testAdmin();
+
+        //Robot和Channel都是使用的80端口，第三方可以创建或者为第三方创建，第三方可以使用robot或者channel与IM系统进行对接。
         testRobot();
-//        testChannel();
+        //testChannel();
     }
 
+
     static void testAdmin() throws Exception {
         //初始化服务API
         AdminHttpUtils.init("http://localhost:18080", "123456");
 
-        //***********************************************
-        //****  用户相关的API
-        //***********************************************
+        testUser();
+        testUserRelation();
+        testGroup();
+        testChatroom();
+        testMessage();
+        testGeneralApi();
+
+        System.out.println("Congratulation, all admin test case passed!!!!!!!");
+    }
+
+    //***********************************************
+    //****  用户相关的API
+    //***********************************************
+    static void testUser() throws Exception {
         InputOutputUserInfo userInfo = new InputOutputUserInfo();
         userInfo.setUserId("userId1");
         userInfo.setName("user1");
@@ -175,9 +190,112 @@ public class Main {
             System.exit(-1);
         }
 
-        //***********************************************
-        //****  群组相关功能
-        //***********************************************
+        IMResult<OutputCheckUserOnline> outputCheckUserOnline = UserAdmin.checkUserOnlineStatus(userInfo.getUserId());
+        if (outputCheckUserOnline != null && outputCheckUserOnline.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("check user online status success:" + outputCheckUserOnline.getResult().getSessions().size());
+        } else {
+            System.out.println("block user online failure");
+            System.exit(-1);
+        }
+
+        //慎用，这个方法可能功能不完全，如果用户不在需要，建议使用block功能屏蔽用户
+        IMResult<Void> voidIMResult = UserAdmin.destroyUser("user11");
+        if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("destroy user success");
+        } else {
+            System.out.println("destroy user failure");
+            System.exit(-1);
+        }
+    }
+
+    //***********************************************
+    //****  用户关系相关的API
+    //***********************************************
+    static void testUserRelation() throws Exception {
+
+        //先创建2个用户
+        InputOutputUserInfo userInfo = new InputOutputUserInfo();
+        userInfo.setUserId("ff1");
+        userInfo.setName("ff1");
+        userInfo.setMobile("13800000000");
+        userInfo.setDisplayName("ff1");
+
+        IMResult<OutputCreateUser> resultCreateUser = UserAdmin.createUser(userInfo);
+        if (resultCreateUser != null && resultCreateUser.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("Create user " + resultCreateUser.getResult().getName() + " success");
+        } else {
+            System.out.println("Create user failure");
+            System.exit(-1);
+        }
+
+        userInfo = new InputOutputUserInfo();
+        userInfo.setUserId("ff2");
+        userInfo.setName("ff2");
+        userInfo.setMobile("13800000001");
+        userInfo.setDisplayName("ff2");
+
+        resultCreateUser = UserAdmin.createUser(userInfo);
+        if (resultCreateUser != null && resultCreateUser.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("Create user " + resultCreateUser.getResult().getName() + " success");
+        } else {
+            System.out.println("Create user failure");
+            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");
+        } else {
+            System.out.println("update friend status failure");
+            System.exit(-1);
+        }
+
+        IMResult<OutputStringList> 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);
+        }
+
+        updateFriendStatusResult = RelationAdmin.setUserBlacklist("ff1", "ff2", true);
+        if (updateFriendStatusResult != null && updateFriendStatusResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("update blacklist status success");
+        } else {
+            System.out.println("update blacklist status failure");
+            System.exit(-1);
+        }
+
+        resultGetFriendList = RelationAdmin.getUserBlacklist("ff1");
+        if (resultGetFriendList != null && resultGetFriendList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && resultGetFriendList.getResult().getList().contains("ff2")) {
+            System.out.println("get blacklist status success");
+        } else {
+            System.out.println("get blacklist status failure");
+            System.exit(-1);
+        }
+
+        String alias = "hello" + System.currentTimeMillis();
+        IMResult<Void> updateFriendAlias = RelationAdmin.updateFriendAlias("ff1", "ff2", alias);
+        if (updateFriendAlias != null && updateFriendAlias.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("update friend status success");
+        } else {
+            System.out.println("update friend status failure");
+            System.exit(-1);
+        }
+
+        IMResult<OutputGetAlias> getFriendAlias = RelationAdmin.getFriendAlias("ff1", "ff2");
+        if (getFriendAlias != null && getFriendAlias.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && getFriendAlias.getResult().getAlias().equals(alias)) {
+            System.out.println("update friend status success");
+        } else {
+            System.out.println("update friend status failure");
+            System.exit(-1);
+        }
+    }
+    //***********************************************
+    //****  群组相关功能
+    //***********************************************
+    static void testGroup() throws Exception {
+
         IMResult<Void> voidIMResult1 = GroupAdmin.dismissGroup("user1", "groupId1", null, null);
 
         PojoGroupInfo groupInfo = new PojoGroupInfo();
@@ -314,10 +432,12 @@ public class Main {
             System.exit(-1);
         }
 
+    }
 
-        //***********************************************
-        //****  消息相关功能
-        //***********************************************
+    //***********************************************
+    //****  消息相关功能
+    //***********************************************
+    static void testMessage() throws Exception {
         Conversation conversation = new Conversation();
         conversation.setTarget("user2");
         conversation.setType(ProtoConstants.ConversationType.ConversationType_Private);
@@ -334,7 +454,7 @@ public class Main {
         }
 
 
-        voidIMResult = MessageAdmin.recallMessage("user1", resultSendMessage.getResult().getMessageUid());
+        IMResult<Void> voidIMResult = MessageAdmin.recallMessage("user1", resultSendMessage.getResult().getMessageUid());
         if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("recall message success");
         } else {
@@ -359,7 +479,12 @@ public class Main {
             System.out.println("multi message failure");
             System.exit(-1);
         }
+    }
 
+    //***********************************************
+    //****  一些其它的功能，比如创建频道，更新用户设置等
+    //***********************************************
+    static void testGeneralApi() throws Exception {
         IMResult<SystemSettingPojo> resultGetSystemSetting  =  GeneralAdmin.getSystemSetting(Group_Max_Member_Count);
         if (resultGetSystemSetting != null && resultGetSystemSetting.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("success");
@@ -394,81 +519,8 @@ public class Main {
             System.out.println("create channel failure");
             System.exit(-1);
         }
-
-
-        //***********************************************
-        //****  好友相关功能
-        //***********************************************
-        //先创建2个用户
-        userInfo = new InputOutputUserInfo();
-        userInfo.setUserId("ff1");
-        userInfo.setName("ff1");
-        userInfo.setMobile("13800000000");
-        userInfo.setDisplayName("ff1");
-
-        resultCreateUser = UserAdmin.createUser(userInfo);
-        if (resultCreateUser != null && resultCreateUser.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("Create user " + resultCreateUser.getResult().getName() + " success");
-        } else {
-            System.out.println("Create user failure");
-            System.exit(-1);
-        }
-
-        userInfo = new InputOutputUserInfo();
-        userInfo.setUserId("ff2");
-        userInfo.setName("ff2");
-        userInfo.setMobile("13800000001");
-        userInfo.setDisplayName("ff2");
-
-        resultCreateUser = UserAdmin.createUser(userInfo);
-        if (resultCreateUser != null && resultCreateUser.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("Create user " + resultCreateUser.getResult().getName() + " success");
-        } else {
-            System.out.println("Create user failure");
-            System.exit(-1);
-        }
-
-        IMResult<Void> updateFriendStatusResult = FriendAdmin.updateFriendStatus("ff1", "ff2", 1);
-        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);
-        }
-
-        IMResult<OutputStringList> resultGetFriendList = FriendAdmin.getFriendStatusList("ff1", 1);
-        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);
-        }
-
-        String alias = "hello" + System.currentTimeMillis();
-        IMResult<Void> updateFriendAlias = FriendAdmin.updateFriendAlias("ff1", "ff2", alias);
-        if (updateFriendAlias != null && updateFriendAlias.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("update friend status success");
-        } else {
-            System.out.println("update friend status failure");
-            System.exit(-1);
-        }
-
-        IMResult<OutputGetAlias> getFriendAlias = FriendAdmin.getFriendAlias("ff1", "ff2");
-        if (getFriendAlias != null && getFriendAlias.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && getFriendAlias.getResult().getAlias().equals(alias)) {
-            System.out.println("update friend status success");
-        } else {
-            System.out.println("update friend status failure");
-            System.exit(-1);
-        }
-
-
-        voidIMResult = UserAdmin.destroyUser("user11");
-        if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            System.out.println("destroy user success");
-        } else {
-            System.out.println("destroy user failure");
-            System.exit(-1);
-        }
+    }
+    static void testChatroom() throws Exception {
 
         String chatroomId = "chatroomId1";
         String chatroomTitle = "TESTCHATROM";
@@ -501,7 +553,14 @@ public class Main {
             System.exit(-1);
         }
 
-        voidIMResult = ChatroomAdmin.destroyChatroom(chatroomId);
+        IMResult<OutputStringList> memberList = ChatroomAdmin.getChatroomMembers(chatroomId);
+        if (memberList != null && memberList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("get chatroom member success");
+        } else {
+            System.out.println("get chatroom member failure: " + memberList.getErrorCode().msg);
+        }
+
+        IMResult<Void> voidIMResult = ChatroomAdmin.destroyChatroom(chatroomId);
         if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("destroy chatroom done!");
         } else {
@@ -516,8 +575,6 @@ public class Main {
             System.out.println("chatroom not destroyed!");
             System.exit(-1);
         }
-
-        System.out.println("Congratulation, all admin test case passed!!!!!!!");
     }
 
     static void testRobot() throws Exception {

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

@@ -5,21 +5,37 @@ import cn.wildfirechat.pojos.*;
 import cn.wildfirechat.sdk.model.IMResult;
 import cn.wildfirechat.sdk.utilities.AdminHttpUtils;
 
-public class FriendAdmin {
-    public static IMResult<Void> updateFriendStatus(String operator, String targetId, int status) throws Exception {
+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();
-        input.setUserId(operator);
+        input.setUserId(userId);
         input.setFriendUid(targetId);
-        input.setStatus(status);
+        input.setStatus(isFriend ? 0 : 1); //历史遗留问题，在IM数据库中0是好友，1是好友被删除。
+        input.setExtra(extra);
         return AdminHttpUtils.httpJsonPost(path, input, Void.class);
     }
 
-    public static IMResult<OutputStringList> getFriendStatusList(String operator, int status) throws Exception {
+    public static IMResult<OutputStringList> getFriendList(String userId) throws Exception {
         String path = APIPath.Friend_Get_List;
-        InputGetFriendList input = new InputGetFriendList();
-        input.setUserId(operator);
-        input.setStatus(status);
+        InputUserId input = new InputUserId();
+        input.setUserId(userId);
+        return AdminHttpUtils.httpJsonPost(path, input, OutputStringList.class);
+    }
+
+    public static IMResult<Void> setUserBlacklist(String userId, String targetId, boolean isBlacklist) throws Exception {
+        String path = APIPath.Blacklist_Update_Status;
+        InputBlacklistRequest input = new InputBlacklistRequest();
+        input.setUserId(userId);
+        input.setTargetUid(targetId);
+        input.setStatus(isBlacklist ? 1 : 0);
+        return AdminHttpUtils.httpJsonPost(path, input, Void.class);
+    }
+
+    public static IMResult<OutputStringList> getUserBlacklist(String userId) throws Exception {
+        String path = APIPath.Blacklist_Get_List;
+        InputUserId input = new InputUserId();
+        input.setUserId(userId);
         return AdminHttpUtils.httpJsonPost(path, input, OutputStringList.class);
     }
 

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

@@ -21,4 +21,16 @@ public class RobotService {
         InputGetUserInfo getUserInfo = new InputGetUserInfo(userId, null, null);
         return RobotHttpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
     }
+
+    public static IMResult<InputOutputUserInfo> getUserInfoByMobile(String phone) throws Exception {
+        String path = APIPath.Robot_User_Info;
+        InputGetUserInfo getUserInfo = new InputGetUserInfo(null, null, phone);
+        return RobotHttpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
+    }
+
+    public static IMResult<InputOutputUserInfo> getUserInfoByName(String userName) throws Exception {
+        String path = APIPath.Robot_User_Info;
+        InputGetUserInfo getUserInfo = new InputGetUserInfo(null, userName, null);
+        return RobotHttpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
+    }
 }

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

@@ -58,6 +58,12 @@ public class UserAdmin {
         return AdminHttpUtils.httpJsonPost(path, null, OutputUserBlockStatusList.class);
     }
 
+    public static IMResult<OutputCheckUserOnline> checkUserOnlineStatus(String userId) throws Exception {
+        String path = APIPath.User_Get_Online_Status;
+        InputGetUserInfo getUserInfo = new InputGetUserInfo(userId, null, null);
+        return AdminHttpUtils.httpJsonPost(path, getUserInfo, OutputCheckUserOnline.class);
+    }
+
     public static IMResult<Void> destroyUser(String userId) throws Exception {
         String path = APIPath.Destroy_User;
         InputDestroyUser inputDestroyUser = new InputDestroyUser();