update version to 0.25

README.md

@@ -65,7 +65,7 @@
 
 | 捐赠者 | 商标 | 金额 | 简介 |
 | ----- | ---- | -------- | --- |
-| [SAMOS](http://samos.io) | ![SAMOS](http://static.wildfirechat.cn/SAMOS.png) | 每月2000¥ | 一站式区块链解决方案服务商(http://samos.io) |
+| [SAMOS](http://samos.io) | ![SAMOS](http://static.wildfirechat.cn/SAMOS.png) | 保密 | 一站式区块链解决方案服务商(http://samos.io) |
 
 ## 特别感谢
 1. [moquette](https://github.com/moquette-io/moquette) 本项目是基于此项目二次开发而来，处理MQTT相关业务。

broker/config/wildfirechat.conf

@@ -42,6 +42,9 @@ client.proto.secret_key 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x78,0x79,0x7A,0
 ##用来生产im token的私钥，只在服务器使用，客户端不用。正式使用时为了安全一定要修改这个值，切记切记
 token.key testim
 
+##首次登录，是否接收之前的历史消息。0 不接收；1接收。
+message.roaming 1
+
 #*********************************************************************
 # hazelcase configuration
 #*********************************************************************

broker/migrate/mysql/V13__create_session_table.sql

@@ -0,0 +1,14 @@
+
+DROP TABLE IF EXISTS `t_session`;
+CREATE TABLE `t_session` (
+  `row_id` varchar(50) not null primary key,
+  `del_flag` tinyint(1) default 0 null,
+  `create_time` timestamp null,
+  `update_time` timestamp null,
+  `expire_time` timestamp null,
+  `user_id` int null,
+  constraint `t_session_pk_2` unique (`user_id`, `expire_time`)
+)
+ENGINE = InnoDB
+DEFAULT CHARACTER SET = utf8mb4
+COLLATE = utf8mb4_unicode_ci;

broker/migrate/mysql/V14__alter_createtime_user_group_table.sql

@@ -0,0 +1,2 @@
+alter table t_user MODIFY column `_createTime` DATETIME NOT NULL DEFAULT NOW();
+alter table t_group MODIFY column `_createTime` DATETIME NOT NULL DEFAULT NOW();

broker/migrate/mysql/V15__alter_session_table_time.sql

@@ -0,0 +1,4 @@
+alter table t_session MODIFY column `create_time` DATETIME NOT NULL DEFAULT NOW();
+alter table t_session MODIFY column `update_time` DATETIME NOT NULL DEFAULT NOW();
+alter table t_session MODIFY column `expire_time` DATETIME NOT NULL DEFAULT NOW();
+

broker/migrate/mysql/V16__update_message_dt_gmt8.sql

@@ -0,0 +1,40 @@
+update t_messages_0 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_1 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_2 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_3 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_4 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_5 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_6 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_7 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_8 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_9 set _dt = date_add(_dt, interval 8 hour);
+
+update t_messages_10 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_11 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_12 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_13 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_14 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_15 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_16 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_17 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_18 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_19 set _dt = date_add(_dt, interval 8 hour);
+
+update t_messages_20 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_21 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_22 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_23 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_24 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_25 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_26 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_27 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_28 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_29 set _dt = date_add(_dt, interval 8 hour);
+
+
+update t_messages_30 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_31 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_32 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_33 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_34 set _dt = date_add(_dt, interval 8 hour);
+update t_messages_35 set _dt = date_add(_dt, interval 8 hour);

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.23</version>
+        <version>0.25</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>
@@ -115,29 +115,6 @@
              -->
         </dependency>
 
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-core</artifactId>
-            <version>3.2.2</version>
-        </dependency>
-        <dependency>
-            <groupId>io.dropwizard.metrics</groupId>
-            <artifactId>metrics-jvm</artifactId>
-            <version>3.2.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.librato.metrics</groupId>
-            <artifactId>metrics-librato</artifactId>
-            <version>5.1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.bugsnag</groupId>
-            <artifactId>bugsnag</artifactId>
-            <version>[3.0,4.0)</version>
-        </dependency>
-
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>

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

@@ -35,11 +35,14 @@ import java.util.concurrent.Executor;
 @HttpMethod("POST")
 public class RouteAction extends Action {
     private static final Logger LOG = LoggerFactory.getLogger(RouteAction.class);
+
     @Override
     public boolean action(Request request, Response response) {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
 
             response.setContentType("application/octet-stream");
+            response.setHeader("Access-Control-Allow-Origin", "*");
+
             FullHttpRequest fullHttpRequest = (FullHttpRequest) request.getNettyRequest();
             boolean b = false;
             if ("web".equalsIgnoreCase(fullHttpRequest.headers().get("p"))) {

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

@@ -42,7 +42,7 @@ public class KickoffGroupMemberAction extends AdminAction {
         if (request.getNettyRequest() instanceof FullHttpRequest) {
             InputKickoffGroupMember inputKickoffGroupMember = getRequestBody(request.getNettyRequest(), InputKickoffGroupMember.class);
             if (inputKickoffGroupMember.isValide()) {
-                RPCCenter.getInstance().sendRequest(inputKickoffGroupMember.getOperator(), null, IMTopic.AddGroupMemberTopic, inputKickoffGroupMember.toProtoGroupRequest().toByteArray(), inputKickoffGroupMember.getOperator(), TargetEntry.Type.TARGET_TYPE_USER, new RPCCenter.Callback() {
+                RPCCenter.getInstance().sendRequest(inputKickoffGroupMember.getOperator(), null, IMTopic.KickoffGroupMemberTopic, inputKickoffGroupMember.toProtoGroupRequest().toByteArray(), inputKickoffGroupMember.getOperator(), 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/handler/ActionHandler.java

@@ -110,6 +110,10 @@ 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())){
+	        handleOptions(ctx, request, response);
+	        return;
+        }
 		Action action;
 		if (isValidePath(request.getPath())) {
             action = ServerSetting.getAction(request.getPath(), request.getMethod().toUpperCase());
@@ -141,4 +145,11 @@ abstract public class ActionHandler extends SimpleChannelInboundHandler<FullHttp
         }
 	}
 	//---------------------------------------------------------------------------------------- Private method start
+
+
+    private void handleOptions(ChannelHandlerContext ctx, Request request, Response response){
+	    response.setHeader("Access-Control-Allow-Origin", "*");
+	    response.setHeader("Access-Control-Allow-Headers", "*");
+	    response.send();
+    }
 }

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

@@ -60,13 +60,6 @@ public final class BrokerConstants {
     public static final String NETTY_SO_KEEPALIVE_PROPERTY_NAME = "netty.so_keepalive";
     public static final String NETTY_CHANNEL_TIMEOUT_SECONDS_PROPERTY_NAME = "netty.channel_timeout.seconds";
     public static final String NETTY_EPOLL_PROPERTY_NAME = "netty.epoll";
-    public static final String METRICS_ENABLE_PROPERTY_NAME = "use_metrics";
-    public static final String METRICS_LIBRATO_EMAIL_PROPERTY_NAME = "metrics.librato.email";
-    public static final String METRICS_LIBRATO_TOKEN_PROPERTY_NAME = "metrics.librato.token";
-    public static final String METRICS_LIBRATO_SOURCE_PROPERTY_NAME = "metrics.librato.source";
-
-    public static final String BUGSNAG_ENABLE_PROPERTY_NAME = "use_bugsnag";
-    public static final String BUGSNAG_TOKEN_PROPERTY_NAME = "bugsnag.token";
 
     public static final String STORAGE_CLASS_NAME = "storage_class";
 
@@ -103,7 +96,7 @@ public final class BrokerConstants {
     public static final String HTTP_SERVER_API_NO_CHECK_TIME = "http.admin.no_check_time";
 
     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_SECRET_KEY = "token.key";
 
     public static final String EMBED_DB_PROPERTY_NAME = "embed.db";
 
@@ -113,6 +106,7 @@ public final class BrokerConstants {
 
     public static final String MESSAGE_Forward_Url = "message.forward.url";
 
+    public static final String MESSAGE_ROAMING = "message.roaming";
 
 
     private BrokerConstants() {

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

@@ -14,10 +14,18 @@ import io.netty.buffer.ByteBuf;
 import cn.wildfirechat.common.ErrorCode;
 import win.liyufan.im.IMTopic;
 
+import static cn.wildfirechat.common.ErrorCode.ERROR_CODE_SUCCESS;
+
 @Handler(IMTopic.DeleteFriendTopic)
 public class DeleteFriendHandler extends IMHandler<WFCMessage.IDBuf> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.IDBuf request, Qos1PublishHandler.IMCallback callback) {
-        return m_messagesStore.deleteFriend(fromUser, request.getId());
+        long[] head = new long[2];
+        ErrorCode errorCode = m_messagesStore.deleteFriend(fromUser, request.getId(), head);
+        if (errorCode == ERROR_CODE_SUCCESS) {
+            publisher.publishNotification(IMTopic.NotifyFriendTopic, fromUser, head[0]);
+            publisher.publishNotification(IMTopic.NotifyFriendTopic, request.getId(), head[1]);
+        }
+        return errorCode;
     }
 }

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

@@ -9,6 +9,7 @@
 package io.moquette.imhandler;
 
 import cn.wildfirechat.proto.WFCMessage;
+import com.hazelcast.util.StringUtil;
 import com.xiaoleilu.loServer.model.FriendData;
 import io.moquette.spi.impl.Qos1PublishHandler;
 import io.netty.buffer.ByteBuf;
@@ -25,7 +26,11 @@ public class FriendPullHandler extends IMHandler<WFCMessage.Version> {
         WFCMessage.GetFriendsResult.Builder builder = WFCMessage.GetFriendsResult.newBuilder();
         for (FriendData data : friendDatas
             ) {
-            builder.addEntry(WFCMessage.Friend.newBuilder().setState(data.getState()).setUid(data.getFriendUid()).setUpdateDt(data.getTimestamp()).setAlias(data.getAlias()).build());
+            WFCMessage.Friend.Builder builder1 = WFCMessage.Friend.newBuilder().setState(data.getState()).setUid(data.getFriendUid()).setUpdateDt(data.getTimestamp());
+            if (!StringUtil.isNullOrEmpty(data.getAlias())) {
+                builder1.setAlias(data.getAlias());
+            }
+            builder.addEntry(builder1.build());
         }
         byte[] data = builder.build().toByteArray();
         ackPayload.ensureWritable(data.length).writeBytes(data);

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

@@ -24,20 +24,32 @@ public class KickoffGroupMember extends GroupHandler<WFCMessage.RemoveGroupMembe
         WFCMessage.GroupInfo groupInfo = m_messagesStore.getGroupInfo(request.getGroupId());
         if (groupInfo == null) {
             errorCode = ErrorCode.ERROR_CODE_NOT_EXIST;
-
-        } else if ((groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted)
-            && groupInfo.getOwner() != null && groupInfo.getOwner().equals(fromUser)) {
-
-            //send notify message first, then kickoff the member
-            if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
-                sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
-            } else {
-                WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, request.getRemovedMemberList()).getKickokfMemberGroupNotifyContent();
-                sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
-            }
-            errorCode = m_messagesStore.kickoffGroupMembers(fromUser, request.getGroupId(), request.getRemovedMemberList());
         } else {
-            errorCode = ErrorCode.ERROR_CODE_NOT_RIGHT;
+            boolean isAllow = isAdmin;
+            if (!isAllow) {
+                if (groupInfo.getOwner() != null && groupInfo.getOwner().equals(fromUser)) {
+                    isAllow = true;
+                }
+            }
+
+            if (!isAllow) {
+                WFCMessage.GroupMember gm = m_messagesStore.getGroupMember(request.getGroupId(), fromUser);
+                if (gm != null && gm.getType() == ProtoConstants.GroupMemberType.GroupMemberType_Manager) {
+                    isAllow = true;
+                }
+            }
+            if (!isAllow && (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted)) {
+                errorCode = ErrorCode.ERROR_CODE_NOT_RIGHT;
+            } else {
+                //send notify message first, then kickoff the member
+                if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
+                    sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
+                } else {
+                    WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, request.getRemovedMemberList()).getKickokfMemberGroupNotifyContent();
+                    sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
+                }
+                errorCode = m_messagesStore.kickoffGroupMembers(fromUser, isAdmin, request.getGroupId(), request.getRemovedMemberList());
+            }
         }
         return errorCode;
     }

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

@@ -22,7 +22,7 @@ import static win.liyufan.im.IMTopic.ModifyGroupInfoTopic;
 public class ModifyGroupInfoHandler extends GroupHandler<WFCMessage.ModifyGroupInfoRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.ModifyGroupInfoRequest request, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode= m_messagesStore.modifyGroupInfo(fromUser, request.getGroupId(), request.getType(), request.getValue());
+        ErrorCode errorCode= m_messagesStore.modifyGroupInfo(fromUser, request.getGroupId(), request.getType(), request.getValue(), isAdmin);
         if (errorCode == ERROR_CODE_SUCCESS) {
             if(request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());

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

@@ -20,19 +20,14 @@ import static win.liyufan.im.IMTopic.QuitGroupTopic;
 public class QuitGroupHandler extends GroupHandler<WFCMessage.QuitGroupRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, boolean isAdmin, WFCMessage.QuitGroupRequest request, Qos1PublishHandler.IMCallback callback) {
-        ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
+        ErrorCode errorCode = m_messagesStore.quitGroup(fromUser, request.getGroupId());
-        WFCMessage.GroupInfo groupInfo = m_messagesStore.getGroupInfo(request.getGroupId());
+        if (errorCode == ErrorCode.ERROR_CODE_SUCCESS) {
-        if (groupInfo == null) {
-            errorCode = m_messagesStore.quitGroup(fromUser, request.getGroupId());
-        } else {
-            //send notify message first, then quit group
             if (request.hasNotifyContent() && request.getNotifyContent().getType() > 0) {
-                sendGroupNotification(fromUser, groupInfo.getTargetId(), request.getToLineList(), request.getNotifyContent());
+                sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), request.getNotifyContent());
             } else {
                 WFCMessage.MessageContent content = new GroupNotificationBinaryContent(request.getGroupId(), fromUser, null, "").getQuitGroupNotifyContent();
                 sendGroupNotification(fromUser, request.getGroupId(), request.getToLineList(), content);
             }
-            errorCode = m_messagesStore.quitGroup(fromUser, request.getGroupId());
         }
         return errorCode;
     }

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

@@ -46,6 +46,10 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
         ErrorCode errorCode = ErrorCode.ERROR_CODE_SUCCESS;
         if (message != null) {
             if (!isAdmin) {  //admin do not check the right
+                // 不能在端上直接发送撤回和群通知
+                if (message.getContent().getType() == 80 || (message.getContent().getType() >= 100 && message.getContent().getType() < 200)) {
+                    return ErrorCode.INVALID_PARAMETER;
+                }
                 int userStatus = m_messagesStore.getUserStatus(fromUser);
                 if (userStatus == 1 || userStatus == 2) {
                     return ErrorCode.ERROR_CODE_FORBIDDEN_SEND_MSG;

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

@@ -210,23 +210,27 @@ public class DatabaseStore {
         return 0;
     }
 
-    void reloadGroupMemberFromDB(HazelcastInstance hzInstance) {
+    synchronized Collection<WFCMessage.GroupMember>  reloadGroupMemberFromDB(HazelcastInstance hzInstance, String groupId) {
         MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(MemoryMessagesStore.GROUP_MEMBERS);
+        if (groupMembers.get(groupId).size() > 0) {
+            return groupMembers.get(groupId);
+        }
 
         Connection connection = null;
         PreparedStatement statement = null;
         ResultSet rs = null;
         try {
             connection = DBUtil.getConnection();
-            String sql = "select `_gid`" +
+            String sql = "select `_mid`" +
-                ", `_mid`" +
                 ", `_alias`" +
                 ", `_type`" +
-                ", `_dt` from t_group_member";
+                ", `_dt` from t_group_member where _gid = ?";
             statement = connection.prepareStatement(sql);
 
+            statement.setString(1, groupId);
             int index;
 
+
             rs = statement.executeQuery();
             while (rs.next()) {
                 WFCMessage.GroupMember.Builder builder = WFCMessage.GroupMember.newBuilder();
@@ -234,10 +238,6 @@ public class DatabaseStore {
 
                 String value = rs.getString(index++);
                 value = (value == null ? "" : value);
-                String groupId = value;
-
-                value = rs.getString(index++);
-                value = (value == null ? "" : value);
                 builder.setMemberId(value);
 
                 value = rs.getString(index++);
@@ -254,6 +254,7 @@ public class DatabaseStore {
                 WFCMessage.GroupMember member = builder.build();
                 groupMembers.put(groupId, member);
             }
+            return groupMembers.get(groupId);
         } catch (SQLException e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -261,6 +262,7 @@ public class DatabaseStore {
         } finally {
             DBUtil.closeDB(connection, statement, rs);
         }
+        return new ArrayList<>();
     }
 
     void reloadFriendsFromDB(HazelcastInstance hzInstance) {
@@ -688,6 +690,43 @@ public class DatabaseStore {
         });
     }
 
+    void removeFavGroup(final String groupId, final List<String> memberIds) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        try {
+            connection = DBUtil.getConnection();
+
+            StringBuilder sb = new StringBuilder("update t_user_setting set _value = ?, _dt = ? where _uid in (");
+            for (int i = 0; i < memberIds.size(); i++) {
+                sb.append("?");
+                if (i != memberIds.size() - 1) {
+                    sb.append(",");
+                }
+            }
+            sb.append(")");
+
+            sb.append(" and _scope = 6 and _key = ?");
+
+            statement = connection.prepareStatement(sb.toString());
+            int index = 1;
+            statement.setString(index++, "0");
+            statement.setLong(index++, System.currentTimeMillis());
+            for (int i = 0; i < memberIds.size(); i++) {
+                statement.setString(index++, memberIds.get(i));
+            }
+            statement.setString(index++, groupId);
+
+            int count = statement.executeUpdate();
+            LOG.info("Update rows {}", count);
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e);
+        } finally {
+            DBUtil.closeDB(connection, statement);
+        }
+    }
+
     void persistUserSetting(final String userId, WFCMessage.UserSettingEntry entry) {
         mScheduler.execute(()->{
             Connection connection = null;
@@ -2007,7 +2046,6 @@ public class DatabaseStore {
     }
 
     void persistFriendRequestUnreadStatus(String userId, long readDt, long updateDt) {
-        mScheduler.execute(()->{
             Connection connection = null;
             PreparedStatement statement = null;
             try {
@@ -2034,11 +2072,9 @@ public class DatabaseStore {
             } finally {
                 DBUtil.closeDB(connection, statement);
             }
-        });
     }
     //
     void persistOrUpdateFriendRequest(final WFCMessage.FriendRequest request) {
-        mScheduler.execute(()->{
             Connection connection = null;
             PreparedStatement statement = null;
             try {
@@ -2075,11 +2111,9 @@ public class DatabaseStore {
             } finally {
                 DBUtil.closeDB(connection, statement);
             }
-        });
     }
 
     void persistOrUpdateFriendData(final FriendData request) {
-        mScheduler.execute(()->{
             Connection connection = null;
             PreparedStatement statement = null;
             try {
@@ -2110,7 +2144,6 @@ public class DatabaseStore {
             } finally {
                 DBUtil.closeDB(connection, statement);
             }
-        });
     }
 
     boolean removeGroupInfoFromDB(String groupId) {

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

@@ -61,7 +61,6 @@ import static win.liyufan.im.MyInfoType.*;
 public class MemoryMessagesStore implements IMessagesStore {
     private static final String MESSAGES_MAP = "messages_map";
     private static final String GROUPS_MAP = "groups_map";
-    private static final String GROUP_ID_COUNTER = "group_id_counter";
     static int dumy = 0;
     static final String GROUP_MEMBERS = "group_members";
 
@@ -83,6 +82,8 @@ public class MemoryMessagesStore implements IMessagesStore {
 
     private static final String CHANNEL_LISTENERS = "channel_listeners";
 
+    private static boolean IS_MESSAGE_ROAMING = true;
+
     static final String USER_ROBOTS = "user_robots";
     static final String USER_THINGS = "user_things";
 
@@ -116,22 +117,19 @@ public class MemoryMessagesStore implements IMessagesStore {
     MemoryMessagesStore(Server server, DatabaseStore databaseStore) {
         m_Server = server;
         this.databaseStore = databaseStore;
+        IS_MESSAGE_ROAMING = "1".equals(m_Server.getConfig().getProperty(MESSAGE_ROAMING));
     }
 
     @Override
     public void initStore() {
-        //TODO reload data from mysql
-        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
-        MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(MemoryMessagesStore.GROUP_MEMBERS);
-        if (groupMembers.size() == 0) {
-            databaseStore.reloadGroupMemberFromDB(hzInstance);
-            databaseStore.reloadFriendsFromDB(hzInstance);
-            databaseStore.reloadFriendRequestsFromDB(hzInstance);
-        }
-
         updateSensitiveWord();
     }
 
+    private Collection<WFCMessage.GroupMember> loadGroupMemberFromDB(HazelcastInstance hzInstance, String groupId) {
+        Collection<WFCMessage.GroupMember> members = databaseStore.reloadGroupMemberFromDB(hzInstance, groupId);
+        return members;
+    }
+
     private void updateSensitiveWord() {
         long now = System.currentTimeMillis();
         if (now - lastUpdateSensitiveTime > 2 * 60 * 60 * 1000) {
@@ -195,6 +193,9 @@ public class MemoryMessagesStore implements IMessagesStore {
             } else {
                 MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
                 Collection<WFCMessage.GroupMember> members = groupMembers.get(message.getConversation().getTarget());
+                if (members == null || members.size() == 0) {
+                    members = loadGroupMemberFromDB(hzInstance, message.getConversation().getTarget());
+                }
                 for (WFCMessage.GroupMember member : members) {
                     if (member.getType() != GroupMemberType_Removed) {
                         notifyReceivers.add(member.getMemberId());
@@ -316,6 +317,10 @@ public class MemoryMessagesStore implements IMessagesStore {
                 });
             }
 
+            boolean noRoaming = false;
+            if (pullType == ProtoConstants.PullType.Pull_Normal && fromMessageId == 0 && !IS_MESSAGE_ROAMING) {
+                noRoaming = true;
+            }
             while (true) {
                 Map.Entry<Long, Long> entry = maps.higherEntry(current);
                 if (entry == null) {
@@ -335,6 +340,10 @@ public class MemoryMessagesStore implements IMessagesStore {
                             }
                         }
 
+                        if (noRoaming && (System.currentTimeMillis() - bundle.getMessage().getServerTimestamp() > 5 * 60 * 1000)) {
+                            continue;
+                        }
+
                         size += bundle.getMessage().getSerializedSize();
                         if (size >= 1 * 1024 * 1024) { //3M
                             break;
@@ -628,24 +637,35 @@ public class MemoryMessagesStore implements IMessagesStore {
         if (groupInfo == null) {
             return ErrorCode.ERROR_CODE_NOT_EXIST;
         }
-        if (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted && (groupInfo.getOwner() == null || !groupInfo.getOwner().equals(operator))) {
-            return ErrorCode.ERROR_CODE_NOT_RIGHT;
-        }
 
-        MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
 
         if (!isAdmin) {
             boolean isMember = false;
-            for (WFCMessage.GroupMember member : memberList) {
+            boolean isManager = false;
-                if (member.getType() == GroupMemberType_Removed) {
+            WFCMessage.GroupMember gm = getGroupMember(groupId, operator);
+            if (gm != null) {
+                if (gm.getType() == GroupMemberType_Removed && !(memberList.size() == 1 && operator.equals(memberList.get(0).getMemberId()))) {
                     return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
-                } else if(member.getType() == GroupMemberType_Silent) {
+                } else if (gm.getType() == GroupMemberType_Silent) {
                     return ErrorCode.ERROR_CODE_NOT_RIGHT;
                 }
-                isMember = true;
+                isManager = (gm.getType() == GroupMemberType_Manager || gm.getType() == GroupMemberType_Owner);
-                break;
+
+                if (gm.getType() != GroupMemberType_Removed) {
+                    isMember = true;
+                }
             }
-            if (!isMember) {
+
+            if (groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted && ((groupInfo.getOwner() == null || !groupInfo.getOwner().equals(operator)) && !isManager)) {
+                if (groupInfo.getJoinType() == 2) {
+                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                } else if (groupInfo.getJoinType() == 1) {
+                    if (memberList.size() == 1 && operator.equals(memberList.get(0).getMemberId()))
+                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                }
+            }
+
+            if (!isMember && !(memberList.size() == 1 && operator.equals(memberList.get(0).getMemberId()))) {
                 return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
             }
         }
@@ -661,7 +681,13 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
         memberList = tmp;
 
-        for (WFCMessage.GroupMember member : groupMembers.get(groupId)) {
+        MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
+        Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
+        if (members == null || members.size() == 0) {
+            members = loadGroupMemberFromDB(hzInstance, groupId);
+        }
+
+        for (WFCMessage.GroupMember member : members) {
             if (newInviteUsers.contains(member.getMemberId())) {
                 groupMembers.remove(groupId, member);
             }
@@ -685,7 +711,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public ErrorCode kickoffGroupMembers(String operator, String groupId, List<String> memberList) {
+    public ErrorCode kickoffGroupMembers(String operator, boolean isAdmin, String groupId, List<String> memberList) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);
 
@@ -693,8 +719,8 @@ public class MemoryMessagesStore implements IMessagesStore {
         if (groupInfo == null) {
             return ErrorCode.ERROR_CODE_NOT_EXIST;
         }
-        if ((groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal)
+        if (!isAdmin && ((groupInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted || groupInfo.getType() == ProtoConstants.GroupType.GroupType_Normal)
-            && (groupInfo.getOwner() == null || !groupInfo.getOwner().equals(operator))) {
+            && (groupInfo.getOwner() == null || !groupInfo.getOwner().equals(operator)))) {
             return ErrorCode.ERROR_CODE_NOT_RIGHT;
         }
 
@@ -703,7 +729,14 @@ public class MemoryMessagesStore implements IMessagesStore {
         int removeCount = 0;
         long updateDt = System.currentTimeMillis();
         ArrayList<WFCMessage.GroupMember> list = new ArrayList<>();
-        List<WFCMessage.GroupMember> allMembers = new ArrayList<>(groupMembers.get(groupId));
+        Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
+        if (members == null || members.size() == 0) {
+            members = loadGroupMemberFromDB(hzInstance, groupId);
+        }
+
+        List<WFCMessage.GroupMember> allMembers = new ArrayList<>(members);
+
+        List<String> removedIds = new ArrayList<>();
         for (WFCMessage.GroupMember member : allMembers) {
             if (memberList.contains(member.getMemberId())) {
                 boolean removed = groupMembers.remove(groupId, member);
@@ -712,6 +745,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                     member = member.toBuilder().setType(GroupMemberType_Removed).setUpdateDt(updateDt).build();
                     groupMembers.put(groupId, member);
                     list.add(member);
+                    removedIds.add(member.getMemberId());
                 }
             }
         }
@@ -722,9 +756,23 @@ public class MemoryMessagesStore implements IMessagesStore {
             mIMap.put(groupId, groupInfo.toBuilder().setMemberUpdateDt(updateDt).setUpdateDt(updateDt).setMemberCount(groupInfo.getMemberCount() - removeCount).build());
         }
 
+        removeFavGroup(groupId, removedIds);
+
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
+    void removeFavGroup(String groupId, List<String> memberIds) {
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+        MultiMap<String, WFCMessage.UserSettingEntry> userSettingMap = hzInstance.getMultiMap(USER_SETTING);
+
+        databaseStore.removeFavGroup(groupId, memberIds);
+
+        for (String member : memberIds) {
+            userSettingMap.remove(member);
+        }
+
+    }
+
     @Override
     public ErrorCode quitGroup(String operator, String groupId) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
@@ -733,8 +781,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         WFCMessage.GroupInfo groupInfo = mIMap.get(groupId);
         if (groupInfo == null) {
             MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
-            for (WFCMessage.GroupMember member : groupMembers.get(groupId)
+            Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
-                ) {
+            if (members == null || members.size() == 0) {
+                members = loadGroupMemberFromDB(hzInstance, groupId);
+            }
+            for (WFCMessage.GroupMember member :members) {
                 if (member.getMemberId().equals(operator)) {
                     groupMembers.remove(groupId, member);
                     break;
@@ -750,8 +801,11 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         long updateDt = System.currentTimeMillis();
         boolean removed = false;
-        for (WFCMessage.GroupMember member : groupMembers.get(groupId)
+        Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
-            ) {
+        if (members == null || members.size() == 0) {
+            members = loadGroupMemberFromDB(hzInstance, groupId);
+        }
+        for (WFCMessage.GroupMember member : members) {
             if (member.getMemberId().equals(operator)) {
                 removed = groupMembers.remove(groupId, member);
                 if (removed) {
@@ -770,6 +824,8 @@ public class MemoryMessagesStore implements IMessagesStore {
         if (removed) {
             mIMap.put(groupId, groupInfo.toBuilder().setMemberUpdateDt(updateDt).setUpdateDt(updateDt).setMemberCount(groupInfo.getMemberCount() - 1).build());
         }
+
+        removeFavGroup(groupId, Arrays.asList(operator));
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -795,16 +851,29 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
 
+        Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
+        if (members == null || members.size() == 0) {
+            members = loadGroupMemberFromDB(hzInstance, groupId);
+        }
+
         groupMembers.remove(groupId);
         mIMap.remove(groupId);
 
         databaseStore.removeGroupMemberFromDB(groupId);
 
+        ArrayList<String> ids = new ArrayList<>();
+        if (members != null) {
+            for (WFCMessage.GroupMember member : members) {
+                ids.add(member.getMemberId());
+            }
+        }
+        removeFavGroup(groupId, ids);
+
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
     @Override
-    public ErrorCode modifyGroupInfo(String operator, String groupId, int modifyType, String value) {
+    public ErrorCode modifyGroupInfo(String operator, String groupId, int modifyType, String value, boolean isAdmin) {
 
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);
@@ -815,22 +884,36 @@ public class MemoryMessagesStore implements IMessagesStore {
             return ErrorCode.ERROR_CODE_NOT_EXIST;
         }
 
-        if ((oldInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted)
+        if (!isAdmin) {
-            && (oldInfo.getOwner() == null || !oldInfo.getOwner().equals(operator))) {
+            if (oldInfo.getType() == ProtoConstants.GroupType.GroupType_Restricted) {
-            return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                boolean isAllow = false;
-        }
+                if ((oldInfo.getOwner() != null && oldInfo.getOwner().equals(operator))) {
-
+                    isAllow = true;
-        if (oldInfo.getType() == ProtoConstants.GroupType.GroupType_Normal) {
+                } else {
-            if (oldInfo.getOwner() == null) {
+                    WFCMessage.GroupMember gm = getGroupMember(groupId, operator);
-                return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                    if (gm != null && gm.getType() == GroupMemberType_Manager) {
-            }
+                        isAllow = true;
-            if (!oldInfo.getOwner().equals(operator)) {
+                    }
-                if (modifyType == Modify_Group_Extra) {
+                }
+                if (!isAllow) {
                     return ErrorCode.ERROR_CODE_NOT_RIGHT;
                 }
             }
+
+            if (oldInfo.getType() == ProtoConstants.GroupType.GroupType_Normal) {
+                if (oldInfo.getOwner() == null) {
+                    return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                }
+                if (!oldInfo.getOwner().equals(operator)) {
+                    if (modifyType == Modify_Group_Extra) {
+                        return ErrorCode.ERROR_CODE_NOT_RIGHT;
+                    }
+                }
+            }
         }
 
+
+
         WFCMessage.GroupInfo.Builder newInfoBuilder = oldInfo.toBuilder();
 
         if (modifyType == Modify_Group_Name)
@@ -874,8 +957,10 @@ public class MemoryMessagesStore implements IMessagesStore {
         long updateDt = System.currentTimeMillis();
         MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
         Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
-        for (WFCMessage.GroupMember member : members
+        if (members == null || members.size() == 0) {
-            ) {
+            members = loadGroupMemberFromDB(hzInstance, groupId);
+        }
+        for (WFCMessage.GroupMember member : members) {
             if (member.getMemberId().equals(operator)) {
                 groupMembers.remove(groupId, member);
                 member = member.toBuilder().setAlias(alias).setUpdateDt(updateDt).build();
@@ -941,11 +1026,41 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
+        Collection<WFCMessage.GroupMember> memberCollection = groupMembers.get(groupId);
+        if (memberCollection == null || memberCollection.size() == 0) {
+            memberCollection = loadGroupMemberFromDB(hzInstance, groupId);
+        }
+        for (WFCMessage.GroupMember member:memberCollection) {
+            if (member.getUpdateDt() > maxDt) {
+                members.add(member);
+            }
+        }
 
-        members.addAll(groupMembers.get(groupId));
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
+    @Override
+    public WFCMessage.GroupMember getGroupMember(String groupId, String memberId) {
+        HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
+
+        MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
+
+        Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
+        if (members == null || members.size() == 0) {
+            members = loadGroupMemberFromDB(hzInstance, groupId);
+        }
+
+        if (members != null) {
+            for (WFCMessage.GroupMember gm : members) {
+                if (gm.getMemberId().equals(memberId)) {
+                    return gm;
+                }
+            }
+        }
+
+        return null;
+    }
+
 
     @Override
     public ErrorCode transferGroup(String operator, String groupId, String newOwner, boolean isAdmin) {
@@ -965,8 +1080,8 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         //check the new owner is in member list? is that necessary?
-
+        long updateDt = System.currentTimeMillis();
-        groupInfo = groupInfo.toBuilder().setOwner(newOwner).build();
+        groupInfo = groupInfo.toBuilder().setOwner(newOwner).setUpdateDt(updateDt).build();
 
         mIMap.set(groupId, groupInfo);
 
@@ -993,10 +1108,13 @@ public class MemoryMessagesStore implements IMessagesStore {
         long updateDt = System.currentTimeMillis();
         MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
         Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
+        if (members == null || members.size() == 0) {
+            members = loadGroupMemberFromDB(hzInstance, groupId);
+        }
         for (WFCMessage.GroupMember member : members) {
             if (userList.contains(member.getMemberId())) {
                 groupMembers.remove(groupId, member);
-                member = member.toBuilder().setType(ProtoConstants.GroupMemberType.GroupMemberType_Manager).setUpdateDt(updateDt).build();
+                member = member.toBuilder().setType(type == 0 ? ProtoConstants.GroupMemberType.GroupMemberType_Normal : ProtoConstants.GroupMemberType.GroupMemberType_Manager).setUpdateDt(updateDt).build();
                 databaseStore.persistGroupMember(groupId, Arrays.asList(member));
                 groupMembers.put(groupId, member);
 //                userList.remove(member.getMemberId());
@@ -1013,7 +1131,9 @@ public class MemoryMessagesStore implements IMessagesStore {
         MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
 
         Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
-
+        if (members == null || members.size() == 0) {
+            members = loadGroupMemberFromDB(hzInstance, groupId);
+        }
         for (WFCMessage.GroupMember member : members
             ) {
             if (member.getMemberId().equals(memberId) && member.getType() != GroupMemberType_Removed)
@@ -1031,11 +1151,16 @@ public class MemoryMessagesStore implements IMessagesStore {
         WFCMessage.GroupInfo groupInfo = groups.get(groupId);
         boolean isMute = false;
         if (groupInfo != null) {
+            if (groupInfo.getOwner().equals(memberId)) {
+                return ErrorCode.ERROR_CODE_SUCCESS;
+            }
             isMute = groupInfo.getMute()>0;
         }
 
         Collection<WFCMessage.GroupMember> members = groupMembers.get(groupId);
-
+        if (members == null || members.size() == 0) {
+            members = loadGroupMemberFromDB(hzInstance, groupId);
+        }
         for (WFCMessage.GroupMember member : members
             ) {
             if (member.getMemberId().equals(memberId)) {
@@ -1047,9 +1172,10 @@ public class MemoryMessagesStore implements IMessagesStore {
                     return ErrorCode.ERROR_CODE_GROUP_MUTED;
                 }
 
-                if (member.getMemberId().equals(memberId) && member.getType() != GroupMemberType_Removed) {
+                if (member.getMemberId().equals(memberId) && member.getType() == GroupMemberType_Removed) {
                     return ErrorCode.ERROR_CODE_NOT_IN_GROUP;
                 }
+                break;
             }
 
         }
@@ -1083,6 +1209,9 @@ public class MemoryMessagesStore implements IMessagesStore {
 
                 MultiMap<String, WFCMessage.GroupMember> groupMembers = hzInstance.getMultiMap(GROUP_MEMBERS);
                 Collection<WFCMessage.GroupMember> members = groupMembers.get(message.getConversation().getTarget());
+                if (members == null || members.size() == 0) {
+                    members = loadGroupMemberFromDB(hzInstance, message.getConversation().getTarget());
+                }
                 for (WFCMessage.GroupMember member : members) {
                     if (member.getMemberId().equals(operatorId)) {
                         if (member.getType() == GroupMemberType_Manager || member.getType() == ProtoConstants.GroupMemberType.GroupMemberType_Owner) {
@@ -1429,8 +1558,8 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         Collection<FriendData> friendDatas = friendsMap.get(fromUser);
 
-        if (friendDatas == null) {
+        if (friendDatas == null || friendDatas.size() == 0) {
-            return false;
+            friendDatas = loadFriend(friendsMap, fromUser);
         }
 
         for (FriendData friendData : friendDatas) {
@@ -1501,6 +1630,31 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
     }
 
+    synchronized Collection<FriendData> loadFriend(MultiMap<String, FriendData> friendsMap, String userId) {
+        Collection<FriendData> friends = databaseStore.getPersistFriends(userId);
+        if (friends != null) {
+            for (FriendData friend : friends) {
+                friendsMap.put(userId, friend);
+            }
+        } else {
+            friends = new ArrayList<>();
+        }
+        return friends;
+    }
+
+    synchronized Collection<WFCMessage.FriendRequest> loadFriendRequest(MultiMap<String, WFCMessage.FriendRequest> requestMap, String userId) {
+        Collection<WFCMessage.FriendRequest> requests = databaseStore.getPersistFriendRequests(userId);
+        if (requests != null) {
+            for (WFCMessage.FriendRequest r : requests
+                ) {
+                requestMap.put(userId, r);
+            }
+        } else {
+            requests = new ArrayList<>();
+        }
+        return requests;
+    }
+
     @Override
     public List<FriendData> getFriendList(String userId, long version) {
         List<FriendData> out = new ArrayList<FriendData>();
@@ -1509,14 +1663,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
         Collection<FriendData> friends = friendsMap.get(userId);
         if (friends == null || friends.size() == 0) {
-            friends = databaseStore.getPersistFriends(userId);
+            friends = loadFriend(friendsMap, userId);
-            if (friends != null) {
-                for (FriendData friend : friends) {
-                    friendsMap.put(userId, friend);
-                }
-            } else {
-                friends = new ArrayList<>();
-            }
         }
 
         for (FriendData friend : friends) {
@@ -1536,15 +1683,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         MultiMap<String, WFCMessage.FriendRequest> requestMap = hzInstance.getMultiMap(USER_FRIENDS_REQUEST);
         Collection<WFCMessage.FriendRequest> requests = requestMap.get(userId);
         if (requests == null || requests.size() == 0) {
-            requests = databaseStore.getPersistFriendRequests(userId);
+            requests = loadFriendRequest(requestMap, userId);
-            if (requests != null) {
-                for (WFCMessage.FriendRequest request : requests) {
-                    if (request.getUpdateDt() > version)
-                        requestMap.put(userId, request);
-                }
-            } else {
-                requests = new ArrayList<>();
-            }
         }
 
         for (WFCMessage.FriendRequest request : requests) {
@@ -1562,15 +1701,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         MultiMap<String, WFCMessage.FriendRequest> requestMap = hzInstance.getMultiMap(USER_FRIENDS_REQUEST);
         Collection<WFCMessage.FriendRequest> requests = requestMap.get(userId);
         if (requests == null || requests.size() == 0) {
-            requests = databaseStore.getPersistFriendRequests(userId);
+            requests = loadFriendRequest(requestMap, userId);
-            if (requests != null) {
-                for (WFCMessage.FriendRequest r : requests
-                    ) {
-                    requestMap.put(userId, r);
-                }
-            } else {
-                requests = new ArrayList<>();
-            }
         }
 
         WFCMessage.FriendRequest existRequest = null;
@@ -1588,7 +1719,6 @@ public class MemoryMessagesStore implements IMessagesStore {
                     && System.currentTimeMillis() - existRequest.getUpdateDt() < 30 * 24 * 60 * 60 * 1000) {
                     return ErrorCode.ERROR_CODE_FRIEND_REQUEST_BLOCKED;
                 }
-                requestMap.remove(userId, existRequest);
             } else {
                 return ErrorCode.ERROR_CODE_FRIEND_ALREADY_REQUEST;
             }
@@ -1603,9 +1733,10 @@ public class MemoryMessagesStore implements IMessagesStore {
             .setUpdateDt(System.currentTimeMillis())
             .build();
 
-        requestMap.put(userId, newRequest);
-        requestMap.put(request.getTargetUid(), newRequest);
         databaseStore.persistOrUpdateFriendRequest(newRequest);
+        requestMap.remove(userId);
+        requestMap.remove(request.getTargetUid());
+
         head[0] = newRequest.getUpdateDt();
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
@@ -1633,6 +1764,9 @@ public class MemoryMessagesStore implements IMessagesStore {
 
             FriendData friendData1 = null;
             Collection<FriendData> friendDatas = friendsMap.get(userId);
+            if (friendDatas == null || friendDatas.size() == 0) {
+                friendDatas = loadFriend(friendsMap, userId);
+            }
             for (FriendData fd : friendDatas) {
                 if (fd.getFriendUid().equals(request.getTargetUid())) {
                     friendData1 = fd;
@@ -1642,18 +1776,19 @@ public class MemoryMessagesStore implements IMessagesStore {
             if (friendData1 == null) {
                 friendData1 = new FriendData(userId, request.getTargetUid(), "", request.getStatus(), System.currentTimeMillis());
             } else {
-                friendsMap.remove(userId, friendData1);
                 friendData1.setState(request.getStatus());
                 friendData1.setTimestamp(System.currentTimeMillis());
             }
 
-            friendsMap.put(userId, friendData1);
             databaseStore.persistOrUpdateFriendData(friendData1);
 
             if (request.getStatus() != 2) {
                 FriendData friendData2 = null;
 
                 friendDatas = friendsMap.get(request.getTargetUid());
+                if (friendDatas == null || friendDatas.size() == 0) {
+                    friendDatas = loadFriend(friendsMap, request.getTargetUid());
+                }
                 for (FriendData fd : friendDatas) {
                     if (fd.getFriendUid().equals(userId)) {
                         friendData2 = fd;
@@ -1668,8 +1803,6 @@ public class MemoryMessagesStore implements IMessagesStore {
                     friendData2.setTimestamp(System.currentTimeMillis());
                 }
 
-
-                friendsMap.put(request.getTargetUid(), friendData2);
                 databaseStore.persistOrUpdateFriendData(friendData2);
 
                 heads[0] = friendData2.getTimestamp();
@@ -1677,19 +1810,15 @@ public class MemoryMessagesStore implements IMessagesStore {
                 heads[0] = 0;
             }
             heads[1] = friendData1.getTimestamp();
+            friendsMap.remove(userId);
+            friendsMap.remove(request.getTargetUid());
             return ErrorCode.ERROR_CODE_SUCCESS;
         }
 
         MultiMap<String, WFCMessage.FriendRequest> requestMap = hzInstance.getMultiMap(USER_FRIENDS_REQUEST);
         Collection<WFCMessage.FriendRequest> requests = requestMap.get(userId);
         if (requests == null || requests.size() == 0) {
-            requests = databaseStore.getPersistFriendRequests(userId);
+            requests = loadFriendRequest(requestMap, userId);
-            if (requests != null) {
-                for (WFCMessage.FriendRequest r : requests
-                    ) {
-                    requestMap.put(userId, r);
-                }
-            }
         }
 
         WFCMessage.FriendRequest existRequest = null;
@@ -1704,22 +1833,21 @@ public class MemoryMessagesStore implements IMessagesStore {
             if (System.currentTimeMillis() - existRequest.getUpdateDt() > 7 * 24 * 60 * 60 * 1000) {
                 return ErrorCode.ERROR_CODE_FRIEND_REQUEST_OVERTIME;
             } else {
-                requestMap.remove(userId, existRequest);
                 existRequest = existRequest.toBuilder().setStatus(ProtoConstants.FriendRequestStatus.RequestStatus_Accepted).setUpdateDt(System.currentTimeMillis()).build();
                 databaseStore.persistOrUpdateFriendRequest(existRequest);
-                requestMap.put(userId, existRequest);
-
-
                 MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
 
                 FriendData friendData1 = new FriendData(userId, request.getTargetUid(), "", 0, System.currentTimeMillis());
-                friendsMap.put(userId, friendData1);
                 databaseStore.persistOrUpdateFriendData(friendData1);
 
                 FriendData friendData2 = new FriendData(request.getTargetUid(), userId, "", 0, friendData1.getTimestamp());
-                friendsMap.put(request.getTargetUid(), friendData2);
                 databaseStore.persistOrUpdateFriendData(friendData2);
 
+                requestMap.remove(userId);
+                requestMap.remove(request.getTargetUid());
+                friendsMap.remove(userId);
+                friendsMap.remove(request.getTargetUid());
+
                 heads[0] = friendData2.getTimestamp();
                 heads[1] = friendData1.getTimestamp();
 
@@ -1739,6 +1867,10 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         FriendData friendData = null;
         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)) {
                 friendData = fd;
@@ -1752,8 +1884,9 @@ public class MemoryMessagesStore implements IMessagesStore {
         friendData.setState(state);
         friendData.setTimestamp(System.currentTimeMillis());
 
-        friendsMap.put(fromUser, friendData);
+
         databaseStore.persistOrUpdateFriendData(friendData);
+        friendsMap.remove(fromUser);
 
         heads[0] = friendData.getTimestamp();
 
@@ -1767,6 +1900,10 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         FriendData friendData = null;
         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)) {
                 friendData = fd;
@@ -1777,16 +1914,16 @@ public class MemoryMessagesStore implements IMessagesStore {
         if (friendData == null) {
             return ErrorCode.ERROR_CODE_NOT_EXIST;
         }
-        friendsMap.remove(fromUser, friendData);
 
         friendData.setAlias(alias);
         friendData.setTimestamp(System.currentTimeMillis());
 
-        friendsMap.put(fromUser, friendData);
         databaseStore.persistOrUpdateFriendData(friendData);
 
         heads[0] = friendData.getTimestamp();
 
+        friendsMap.remove(fromUser);
+
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -1821,35 +1958,43 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public ErrorCode deleteFriend(String userId, String friendUid) {
+    public ErrorCode deleteFriend(String userId, String friendUid, long[] head) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
         Collection<FriendData> user1Friends = friendsMap.get(userId);
+        if (user1Friends == null || user1Friends.size() == 0) {
+            user1Friends = loadFriend(friendsMap, userId);
+        }
         for (FriendData data :
             user1Friends) {
             if (data.getFriendUid().equals(friendUid)) {
-                friendsMap.remove(userId, data);
+                long ts = System.currentTimeMillis();
+                head[0] = ts;
                 data.setState(1);
-                data.setTimestamp(System.currentTimeMillis());
+                data.setTimestamp(ts);
-                friendsMap.put(userId, data);
                 databaseStore.persistOrUpdateFriendData(data);
                 break;
             }
         }
 
         Collection<FriendData> user2Friends = friendsMap.get(friendUid);
+        if (user2Friends == null || user2Friends.size() == 0) {
+            user2Friends = loadFriend(friendsMap, friendUid);
+        }
         for (FriendData data :
             user2Friends) {
             if (data.getFriendUid().equals(userId)) {
-                friendsMap.remove(friendUid, data);
                 data.setState(1);
-                data.setTimestamp(System.currentTimeMillis());
+                long ts = System.currentTimeMillis();
-                friendsMap.put(friendUid, data);
+                head[1] = ts;
+                data.setTimestamp(ts);
                 databaseStore.persistOrUpdateFriendData(data);
                 break;
             }
         }
 
+        friendsMap.remove(userId);
+        friendsMap.remove(friendUid);
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
@@ -2171,7 +2316,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     public boolean addSensitiveWords(List<String> words) {
         for (String word :
             words) {
-            databaseStore.persistSensitiveWord(word);
+            databaseStore.persistSensitiveWord(word.toLowerCase());
         }
         lastUpdateSensitiveTime = 0;
         return true;
@@ -2240,15 +2385,10 @@ public class MemoryMessagesStore implements IMessagesStore {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
         Collection<FriendData> friends = friendsMap.get(userId);
-        long max = 0;
         if (friends == null || friends.size() == 0) {
-            friends = databaseStore.getPersistFriends(userId);
+            friends = loadFriend(friendsMap, userId);
-            for (FriendData friend :
-                friends) {
-                friendsMap.put(userId, friend);
-            }
         }
-
+        long max = 0;
         if (friends != null && friends.size() > 0) {
             for (FriendData friend :
                 friends) {
@@ -2267,11 +2407,7 @@ public class MemoryMessagesStore implements IMessagesStore {
         Collection<WFCMessage.FriendRequest> friendsReq = friendsReqMap.get(userId);
         long max = 0;
         if (friendsReq == null || friendsReq.size() == 0) {
-            friendsReq = databaseStore.getPersistFriendRequests(userId);
+            friendsReq = loadFriendRequest(friendsReqMap, userId);
-            for (WFCMessage.FriendRequest req : friendsReq
-                 ) {
-                friendsReqMap.put(userId, req);
-            }
         }
 
         if (friendsReq != null && friendsReq.size() > 0) {

broker/src/main/java/io/moquette/server/netty/BugSnagErrorsHandler.java

@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2012-2017 The original author or authors
- * ------------------------------------------------------
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- *
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * The Apache License v2.0 is available at
- * http://www.opensource.org/licenses/apache2.0.php
- *
- * You may elect to redistribute this code under either of these licenses.
- */
-package io.moquette.server.netty;
-
-import com.bugsnag.Bugsnag;
-import io.moquette.server.config.IConfig;
-import io.netty.channel.ChannelHandler.Sharable;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-
-import static io.moquette.BrokerConstants.BUGSNAG_TOKEN_PROPERTY_NAME;
-
-@Sharable
-public class BugSnagErrorsHandler extends ChannelInboundHandlerAdapter {
-
-    private Bugsnag bugsnag;
-
-    public void init(IConfig props) {
-        final String token = props.getProperty(BUGSNAG_TOKEN_PROPERTY_NAME);
-        this.bugsnag = new Bugsnag(token);
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        bugsnag.notify(cause);
-        ctx.fireExceptionCaught(cause);
-    }
-}

broker/src/main/java/io/moquette/server/netty/NettyAcceptor.java

@@ -139,25 +139,11 @@ public class NettyAcceptor implements ServerAcceptor {
 
         final NettyMQTTHandler mqttHandler = new NettyMQTTHandler(processor);
 
-        final boolean useFineMetrics = Boolean.parseBoolean(props.getProperty(METRICS_ENABLE_PROPERTY_NAME, "false"));
+        this.metrics = Optional.empty();
-        if (useFineMetrics) {
+
-            DropWizardMetricsHandler metricsHandler = new DropWizardMetricsHandler();
+        this.errorsCather = Optional.empty();
-            metricsHandler.init(props);
-            this.metrics = Optional.of(metricsHandler);
-        } else {
-            this.metrics = Optional.empty();
-        }
 
-        final boolean useBugSnag = Boolean.parseBoolean(props.getProperty(BUGSNAG_ENABLE_PROPERTY_NAME, "false"));
-        if (useBugSnag) {
-            BugSnagErrorsHandler bugSnagHandler = new BugSnagErrorsHandler();
-            bugSnagHandler.init(props);
-            this.errorsCather = Optional.of(bugSnagHandler);
-        } else {
-            this.errorsCather = Optional.empty();
-        }
         initializePlainTCPTransport(mqttHandler, props);
-        initializeWebSocketTransport(mqttHandler, props);
         String sslTcpPortProp = props.getProperty(BrokerConstants.SSL_PORT_PROPERTY_NAME);
         String wssPortProp = props.getProperty(BrokerConstants.WSS_PORT_PROPERTY_NAME);
         if (sslTcpPortProp != null || wssPortProp != null) {
@@ -239,42 +225,6 @@ public class NettyAcceptor implements ServerAcceptor {
         });
     }
 
-    private void initializeWebSocketTransport(final NettyMQTTHandler handler, IConfig props) throws IOException {
-        LOG.info("Configuring Websocket MQTT transport");
-        String webSocketPortProp = props.getProperty(WEB_SOCKET_PORT_PROPERTY_NAME, DISABLED_PORT_BIND);
-        if (DISABLED_PORT_BIND.equals(webSocketPortProp)) {
-            // Do nothing no WebSocket configured
-            LOG.info("Property {} has been setted to {}. Websocket MQTT will be disabled",
-                BrokerConstants.WEB_SOCKET_PORT_PROPERTY_NAME, DISABLED_PORT_BIND);
-            return;
-        }
-        int port = Integer.parseInt(webSocketPortProp);
-
-        final MoquetteIdleTimeoutHandler timeoutHandler = new MoquetteIdleTimeoutHandler();
-
-        String host = props.getProperty(BrokerConstants.HOST_PROPERTY_NAME);
-        initFactory(host, port, "Websocket MQTT", new PipelineInitializer() {
-
-            @Override
-            void init(ChannelPipeline pipeline) {
-                pipeline.addLast(new HttpServerCodec());
-                pipeline.addLast("aggregator", new HttpObjectAggregator(65536));
-                pipeline.addLast("webSocketHandler",
-                        new WebSocketServerProtocolHandler("/org/fusesource/mqtt", MQTT_SUBPROTOCOL_CSV_LIST));
-                pipeline.addLast("ws2bytebufDecoder", new WebSocketFrameToByteBufDecoder());
-                pipeline.addLast("bytebuf2wsEncoder", new ByteBufToWebSocketFrameEncoder());
-                pipeline.addFirst("idleStateHandler", new IdleStateHandler(nettyChannelTimeoutSeconds, 0, 0));
-                pipeline.addAfter("idleStateHandler", "idleEventHandler", timeoutHandler);
-                pipeline.addFirst("bytemetrics", new BytesMetricsHandler(m_bytesMetricsCollector));
-                pipeline.addLast("decoder", new MqttDecoder());
-                pipeline.addLast("encoder", MqttEncoder.INSTANCE);
-                pipeline.addLast("metrics", new MessageMetricsHandler(m_metricsCollector));
-                pipeline.addLast("messageLogger", new MQTTMessageLogger());
-                pipeline.addLast("handler", handler);
-            }
-        });
-    }
-
     private void initializeSSLTCPTransport(final NettyMQTTHandler handler, IConfig props, final SSLContext sslContext)
             throws IOException {
         LOG.info("Configuring SSL MQTT transport");

broker/src/main/java/io/moquette/server/netty/metrics/BytesMetricsHandler.java

@@ -16,6 +16,7 @@
 
 package io.moquette.server.netty.metrics;
 
+import io.moquette.server.netty.NettyUtils;
 import io.netty.buffer.ByteBuf;
 import io.netty.channel.Channel;
 import io.netty.channel.ChannelDuplexHandler;
@@ -23,10 +24,15 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPromise;
 import io.netty.util.Attribute;
 import io.netty.util.AttributeKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static io.moquette.server.netty.NettyUtils.ATTR_USERNAME;
 
 public class BytesMetricsHandler extends ChannelDuplexHandler {
-
+    private static final Logger LOG = LoggerFactory.getLogger(BytesMetricsHandler.class);
     private static final AttributeKey<BytesMetrics> ATTR_KEY_METRICS = AttributeKey.valueOf("BytesMetrics");
+    private static final AttributeKey<String> ATTR_KEY_USERNAME = AttributeKey.valueOf(ATTR_USERNAME);
 
     private BytesMetricsCollector m_collector;
 
@@ -59,6 +65,12 @@ public class BytesMetricsHandler extends ChannelDuplexHandler {
     @Override
     public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
         BytesMetrics metrics = ctx.channel().attr(ATTR_KEY_METRICS).get();
+        String userId = ctx.channel().attr(ATTR_KEY_USERNAME).get();
+        if (userId == null) {
+            userId = "";
+        }
+
+        LOG.info("channel<{}> closing after read {} bytes and wrote {} bytes", userId,  metrics.readBytes(), metrics.wroteBytes());
         m_collector.sumReadBytes(metrics.readBytes());
         m_collector.sumWroteBytes(metrics.wroteBytes());
         super.close(ctx, promise);

broker/src/main/java/io/moquette/server/netty/metrics/DropWizardMetricsHandler.java

@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2012-2017 The original author or authors
- * ------------------------------------------------------
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * and Apache License v2.0 which accompanies this distribution.
- *
- * The Eclipse Public License is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * The Apache License v2.0 is available at
- * http://www.opensource.org/licenses/apache2.0.php
- *
- * You may elect to redistribute this code under either of these licenses.
- */
-package io.moquette.server.netty.metrics;
-
-import com.codahale.metrics.Counter;
-import com.codahale.metrics.Meter;
-import com.codahale.metrics.MetricRegistry;
-import com.librato.metrics.reporter.Librato;
-import io.moquette.server.config.IConfig;
-import io.moquette.server.netty.NettyUtils;
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.ChannelInboundHandlerAdapter;
-import io.netty.handler.codec.mqtt.MqttMessage;
-import io.netty.handler.codec.mqtt.MqttMessageType;
-
-import java.util.concurrent.TimeUnit;
-
-import static io.moquette.BrokerConstants.*;
-import static io.netty.channel.ChannelHandler.Sharable;
-
-/**
- * Pipeline handler use to track some MQTT metrics.
- */
-@Sharable
-public final class DropWizardMetricsHandler extends ChannelInboundHandlerAdapter {
-    private MetricRegistry metrics;
-    private Meter publishesMetrics;
-    private Meter subscribeMetrics;
-    private Counter connectedClientsMetrics;
-
-    public void init(IConfig props) {
-        this.metrics = new MetricRegistry();
-        this.publishesMetrics = metrics.meter("publish.requests");
-        this.subscribeMetrics = metrics.meter("subscribe.requests");
-        this.connectedClientsMetrics = metrics.counter("connect.num_clients");
-//        ConsoleReporter reporter = ConsoleReporter.forRegistry(metrics)
-//            .convertRatesTo(TimeUnit.SECONDS)
-//            .convertDurationsTo(TimeUnit.MILLISECONDS)
-//            .build();
-//        reporter.start(1, TimeUnit.MINUTES);
-        final String email = props.getProperty(METRICS_LIBRATO_EMAIL_PROPERTY_NAME);
-        final String token = props.getProperty(METRICS_LIBRATO_TOKEN_PROPERTY_NAME);
-        final String source = props.getProperty(METRICS_LIBRATO_SOURCE_PROPERTY_NAME);
-
-        Librato.reporter(this.metrics, email, token)
-            .setSource(source)
-            .start(10, TimeUnit.SECONDS);
-    }
-
-    @Override
-    public void channelRead(ChannelHandlerContext ctx, Object message) {
-        MqttMessage msg = (MqttMessage) message;
-        MqttMessageType messageType = msg.fixedHeader().messageType();
-        switch (messageType) {
-            case PUBLISH:
-                this.publishesMetrics.mark();
-                break;
-            case SUBSCRIBE:
-                this.subscribeMetrics.mark();
-                break;
-            case CONNECT:
-                this.connectedClientsMetrics.inc();
-                break;
-            case DISCONNECT:
-                this.connectedClientsMetrics.dec();
-                break;
-            default:
-                break;
-        }
-        ctx.fireChannelRead(message);
-    }
-
-    @Override
-    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-        String clientID = NettyUtils.clientID(ctx.channel());
-        if (clientID != null && !clientID.isEmpty()) {
-            this.connectedClientsMetrics.dec();
-        }
-        ctx.fireChannelInactive();
-    }
-
-}

broker/src/main/java/io/moquette/server/netty/metrics/MessageMetricsHandler.java

@@ -22,10 +22,16 @@ import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.ChannelPromise;
 import io.netty.util.Attribute;
 import io.netty.util.AttributeKey;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import static io.moquette.server.netty.NettyUtils.ATTR_USERNAME;
 
 public class MessageMetricsHandler extends ChannelDuplexHandler {
-
+    private static final Logger LOG = LoggerFactory.getLogger(MessageMetricsHandler.class);
     private static final AttributeKey<MessageMetrics> ATTR_KEY_METRICS = AttributeKey.valueOf("MessageMetrics");
+    private static final AttributeKey<String> ATTR_KEY_USERNAME = AttributeKey.valueOf(ATTR_USERNAME);
+
 
     private MessageMetricsCollector m_collector;
 
@@ -58,6 +64,12 @@ public class MessageMetricsHandler extends ChannelDuplexHandler {
     @Override
     public void close(ChannelHandlerContext ctx, ChannelPromise promise) throws Exception {
         MessageMetrics metrics = ctx.channel().attr(ATTR_KEY_METRICS).get();
+        String userId = ctx.channel().attr(ATTR_KEY_USERNAME).get();
+        if (userId == null) {
+            userId = "";
+        }
+
+        LOG.info("channel<{}> closing after read {} messages and wrote {} messages", userId,  metrics.messagesRead(), metrics.messagesWrote());
         m_collector.sumReadMessages(metrics.messagesRead());
         m_collector.sumWroteMessages(metrics.messagesWrote());
         super.close(ctx, promise);

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

@@ -104,14 +104,15 @@ public interface IMessagesStore {
     long insertUserMessages(String sender, int conversationType, String target, int line, int messageContentType, String userId, long messageId);
     WFCMessage.GroupInfo createGroup(String operator, WFCMessage.GroupInfo groupInfo, List<WFCMessage.GroupMember> memberList);
     ErrorCode addGroupMembers(String operator, boolean isAdmin, String groupId, List<WFCMessage.GroupMember> memberList);
-    ErrorCode kickoffGroupMembers(String operator, String groupId, List<String> memberList);
+    ErrorCode kickoffGroupMembers(String operator, boolean isAdmin, String groupId, List<String> memberList);
     ErrorCode quitGroup(String operator, String groupId);
     ErrorCode dismissGroup(String operator, String groupId, boolean isAdmin);
-    ErrorCode modifyGroupInfo(String operator, String groupId, int modifyType, String value);
+    ErrorCode modifyGroupInfo(String operator, String groupId, int modifyType, String value, boolean isAdmin);
     ErrorCode modifyGroupAlias(String operator, String groupId, String alias);
     List<WFCMessage.GroupInfo> getGroupInfos(List<WFCMessage.UserRequest> requests);
     WFCMessage.GroupInfo getGroupInfo(String groupId);
     ErrorCode getGroupMembers(String groupId, long maxDt, List<WFCMessage.GroupMember> members);
+    WFCMessage.GroupMember getGroupMember(String groupId, String memberId);
     ErrorCode transferGroup(String operator, String groupId, String newOwner, boolean isAdmin);
     ErrorCode setGroupManager(String operator, String groupId, int type, List<String> userList, boolean isAdmin);
     boolean isMemberInGroup(String member, String groupId);
@@ -154,7 +155,7 @@ public interface IMessagesStore {
 
     ErrorCode saveAddFriendRequest(String userId, WFCMessage.AddFriendRequest request, long[] head);
     ErrorCode handleFriendRequest(String userId, WFCMessage.HandleFriendRequest request, WFCMessage.Message.Builder msgBuilder, long[] heads, boolean isAdmin);
-    ErrorCode deleteFriend(String userId, String friendUid);
+    ErrorCode deleteFriend(String userId, String friendUid, long[] head);
     ErrorCode blackUserRequest(String fromUser, String targetUserId, int status, long[] head);
     ErrorCode SyncFriendRequestUnread(String userId, long unreadDt, long[] head);
     boolean isBlacked(String fromUser, String userId);

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

@@ -623,7 +623,8 @@ public class ProtocolProcessor {
 
     public void onRpcMsg(String fromUser, String clientId, byte[] message, int messageId, String from, String request, boolean isAdmin) {
         if(request.equals(RPCCenter.KICKOFF_USER_REQUEST)) {
-            mServer.getImBusinessScheduler().execute(()->handleTargetRemovedFromCurrentNode(new TargetEntry(TargetEntry.Type.TARGET_TYPE_USER, from)));
+            String userId = new String(message);
+            mServer.getImBusinessScheduler().execute(()->handleTargetRemovedFromCurrentNode(new TargetEntry(TargetEntry.Type.TARGET_TYPE_USER, userId)));
             return;
         }
         qos1PublishHandler.onRpcMsg(fromUser, clientId, message, messageId, from, request, isAdmin);

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

@@ -54,10 +54,15 @@ public class MessageShardingUtil {
             return "t_messages";
         }
 
-        mid >>= (nodeIdWidth + rotateIdWidth);
-        Date date = new Date(mid + T201801010000);
         Calendar calendar = Calendar.getInstance();
-        calendar.setTime(date);
+        if (mid != Long.MAX_VALUE) {
+            mid >>= (nodeIdWidth + rotateIdWidth);
+            Date date = new Date(mid + T201801010000);
+            calendar.setTime(date);
+        } else {
+            Date date = new Date(System.currentTimeMillis());
+            calendar.setTime(date);
+        }
         int month = calendar.get(Calendar.MONTH);
         int year = calendar.get(Calendar.YEAR);
         year %= 3;

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

@@ -58,6 +58,7 @@ public class SensitiveFilter {
             return sensitiveWords;
         }
 
+        text = text.toLowerCase();
         for(int i=0;i<text.length();i++){
             int sensitiveWordLength = getSensitiveWordLength(text, i, matchType);
             if(sensitiveWordLength>0){

broker/src/main/resources/c3p0-config.xml

@@ -15,7 +15,7 @@
         <!--MySQL数据库驱动程序-->
         <property name="driverClass">com.mysql.cj.jdbc.Driver</property>
         <!--MySQL数据库地址-->
-        <property name="jdbcUrl">jdbc:mysql://localhost:3306/wfchat?useSSL=false&amp;serverTimezone=GMT&amp;allowPublicKeyRetrieval=true&amp;useUnicode=true&amp;characterEncoding=utf8</property>
+        <property name="jdbcUrl">jdbc:mysql://localhost:3306/wfchat?useSSL=false&amp;serverTimezone=GMT%2B8&amp;allowPublicKeyRetrieval=true&amp;useUnicode=true&amp;characterEncoding=utf8</property>
         <!--MySQL数据库用户名-->
         <property name="user">root</property>
         <!--MySQL数据库密码-->

client/pom.xml

@@ -6,7 +6,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>0.23</version>
+        <version>0.25</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common/pom.xml

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

distribution/pom.xml

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

distribution/src/main/resources/c3p0-config.xml

@@ -15,7 +15,7 @@
         <!--MySQL数据库驱动程序-->
         <property name="driverClass">com.mysql.cj.jdbc.Driver</property>
         <!--MySQL数据库地址-->
-        <property name="jdbcUrl">jdbc:mysql://localhost:3306/wfchat?useSSL=false&amp;serverTimezone=GMT&amp;allowPublicKeyRetrieval=true&amp;useUnicode=true&amp;characterEncoding=utf8</property>
+        <property name="jdbcUrl">jdbc:mysql://localhost:3306/wfchat?useSSL=false&amp;serverTimezone=GMT%2B8&amp;allowPublicKeyRetrieval=true&amp;useUnicode=true&amp;characterEncoding=utf8</property>
         <!--MySQL数据库用户名-->
         <property name="user">root</property>
         <!--MySQL数据库密码-->

distribution/src/main/resources/wildfirechat.conf

@@ -42,6 +42,9 @@ client.proto.secret_key 0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x78,0x79,0x7A,0
 ##用来生产im token的私钥，只在服务器使用，客户端不用。正式使用时为了安全一定要修改这个值，切记切记
 token.key testim
 
+##首次登录，是否接收之前的历史消息。0 不接收；1接收。
+message.roaming 1
+
 #*********************************************************************
 # hazelcase configuration
 #*********************************************************************

distribution/src/main/scripts/wildfirechat.sh

@@ -70,7 +70,7 @@ JAVA_OPTS="$JAVA_OPTS -XX:MaxGCPauseMillis=500"
 ### GC logging options -- uncomment to enable
 
 JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCDetails"
-JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCDateStamps"
+#JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCDateStamps"
 JAVA_OPTS="$JAVA_OPTS -XX:+PrintHeapAtGC"
 JAVA_OPTS="$JAVA_OPTS -XX:+PrintTenuringDistribution"
 JAVA_OPTS="$JAVA_OPTS -XX:+PrintGCApplicationStoppedTime"

pom.xml

@@ -12,7 +12,7 @@
     <artifactId>wildfirechat-parent</artifactId>
 
     <packaging>pom</packaging>
-    <version>0.23</version>
+    <version>0.25</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.23</version>
+        <version>0.25</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -103,7 +103,7 @@ public class Main {
             System.exit(-1);
         }
 
-        IMResult<Void> resultVoid =UserAdmin.updateUserBlockStatus(userInfo.getUserId(), 1);
+        IMResult<Void> resultVoid =UserAdmin.updateUserBlockStatus(userInfo.getUserId(), 2);
         if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("block user done");
         } else {
@@ -113,7 +113,7 @@ public class Main {
 
         IMResult<OutputUserStatus> resultCheckUserStatus = UserAdmin.checkUserBlockStatus(userInfo.getUserId());
         if (resultCheckUserStatus != null && resultCheckUserStatus.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
-            if (resultCheckUserStatus.getResult().getStatus() == 1) {
+            if (resultCheckUserStatus.getResult().getStatus() == 2) {
                 System.out.println("check user status success");
             } else {
                 System.out.println("user status not correct");
@@ -128,7 +128,7 @@ public class Main {
         if (resultBlockStatusList != null && resultBlockStatusList.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             boolean success = false;
             for (InputOutputUserBlockStatus blockStatus : resultBlockStatusList.getResult().getStatusList()) {
-                if (blockStatus.getUserId().equals(userInfo.getUserId()) && blockStatus.getStatus() == 1) {
+                if (blockStatus.getUserId().equals(userInfo.getUserId()) && blockStatus.getStatus() == 2) {
                     System.out.println("get block list done");
                     success = true;
                     break;
@@ -294,7 +294,7 @@ public class Main {
 
 
         //初始化机器人API
-        RobotHttpUtils.init("http://localhost:18080", "robot1", "123456");
+        RobotHttpUtils.init("http://localhost", "robot1", "123456");
         //***********************************************
         //****  机器人API
         //***********************************************
@@ -313,7 +313,7 @@ public class Main {
             System.exit(-1);
         }
 
-        IMResult<InputOutputUserInfo> resultRobotGetUserInfo = RobotService.getUserInfo("user1");
+        IMResult<InputOutputUserInfo> resultRobotGetUserInfo = RobotService.getUserInfo("userId1");
         if (resultRobotGetUserInfo != null && resultRobotGetUserInfo.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("robot get user info success");
         } else {

wildfire_jmeter/pom.xml

@@ -5,7 +5,7 @@
     <relativePath>../</relativePath>
     <artifactId>wildfirechat-parent</artifactId>
     <groupId>cn.wildfirechat</groupId>
-    <version>0.23</version>
+    <version>0.25</version>
   </parent>
 
   <groupId>net.xmeter</groupId>