version 0.42 -> 0.43

.github/ISSUE_TEMPLATE.md

@@ -1,13 +1,17 @@
-### Expected behavior
+## 提issue小提示
+为了尽快定位问题，需要提供足够的信息，请按照我们的要求格式来提问。***如果您不按照格式提问，我们将无法回复您的问题***
 
-### Actual behavior
+#### 操作说明
+详细说明操作那个界面，每一步骤都要说得详细，如果是SDK或者api使用问题，需要详细说明调用的那个函数，参数都是什么。
 
-### Steps to reproduce
+#### 表现现象
+描述一下什么现象，比如说函数返回error，errorcode是多少，或者界面上是什么状态，比如发送消息显示发送失败的红点。不要笼统的说功能有问题，不起作用。
 
-### Minimal yet complete reproducer code (or URL to code) or complete log file
+#### 预期结果
+你认为正确的表现应该是什么样的。
 
-### Moquette MQTT version
+#### 补充条件
+是否是毕现的，还是偶现的？是否只有在特殊的网络/设备/平台上出现，还是所有的都出现。还有您用的版本是什么时候的，是不是最新版
 
-### JVM version (e.g. `java -version`)
-
-### OS version (e.g. `uname -a`)
+#### demo对比结果
+请用demo对比测试，demo上是什么状态。

broker/config/wildfirechat.conf

@@ -154,10 +154,10 @@ qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn
 # 本地媒体服务器配置。
 local.media.storage.root media
 
-# 是否支持多端登陆
+# 是否支持多端登陆，为true时支持任意平台任意多个客户端同时登录；为false时每个平台只支持一个端登录，但不同平台可以同时登录。
 server.multi_endpoint false
 
-# 多平台连接状态通知（仅当multi_endpoint为false时有效）
+# 多平台连接状态通知（仅当multi_endpoint为false时有效），true时移动端可以收到pc或web端登录的通知。
 server.multi_platform_notification false
 
 #*********************************************************************

broker/migrate/h2/V32__alter_setting_column_name.sql

@@ -0,0 +1,2 @@
+alter table `t_settings` change column `value` `_value` varchar(64) NOT NULL;
+alter table `t_settings` change column `desc` `_desc` varchar(64) NOT NULL;

broker/migrate/mysql/V37__alter_setting_column_name.sql

@@ -0,0 +1,2 @@
+alter table `t_settings` change column `value` `_value` varchar(64) NOT NULL;
+alter table `t_settings` change column `desc` `_desc` varchar(64) NOT NULL;

broker/migrate/重要！！！必看！！！.txt

@@ -0,0 +1,6 @@
+程序会自动创建数据库和执行migrate里的数据库，不需要手动创建库和执行sql语句。
+
+数据库版本管理使用了flyway，flyway进行数据库升级时会校验数据库脚本的有效性，如果修改过这里的脚本，下次升级时就会失败。
+
+强烈不建议修改数据库表结构，如果有内容（比如默认用户或者默认机器人的属性）需要修改，可以等数据库升级完成后，通过命令行或者数据库客户端进行修改。
+由于服务具有缓存，一般修改过数据库内容后要重启后才能生效。

broker/pom.xml

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

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

@@ -23,6 +23,7 @@ public class PushMessage {
     //推送类型，android推送分为小米/华为/魅族等。ios分别为开发和发布。
     public int pushType;
     public String pushContent;
+    public String pushData;
     public int unReceivedMsg;
     public int mentionedType;
     public String packageName;

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

@@ -19,6 +19,8 @@ abstract public class GroupHandler<T> extends IMHandler<T> {
     protected void sendGroupNotification(String fromUser, String targetId, List<Integer> lines, WFCMessage.MessageContent content) {
         if (lines == null) {
             lines = new ArrayList<>();
+        } else {
+            lines = new ArrayList<>(lines);
         }
 
         if (lines.isEmpty()) {

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

@@ -86,10 +86,10 @@ public class DatabaseStore {
         try {
             connection = DBUtil.getConnection();
             String sql = "insert into t_settings " +
-                " (`id`, `value`, `desc`) values(?, ?, ?)" +
+                " (`id`, `_value`, `_desc`) values(?, ?, ?)" +
                 " ON DUPLICATE KEY UPDATE " +
-                "`value` = ?," +
-                "`desc` = ?";
+                "`_value` = ?," +
+                "`_desc` = ?";
 
 
             statement = connection.prepareStatement(sql);
@@ -120,7 +120,7 @@ public class DatabaseStore {
 
         try {
             connection = DBUtil.getConnection();
-            String sql = "select `value`, `desc` from t_settings where `id` = ?";
+            String sql = "select `_value`, `_desc` from t_settings where `id` = ?";
 
             statement = connection.prepareStatement(sql);
             int index = 1;
@@ -826,7 +826,16 @@ public class DatabaseStore {
                     }
                 }
                 WFCMessage.Message message = builder.build();
-                messages.add(message);
+                boolean expired = false;
+                if (message.getContent().getExpireDuration() > 0) {
+                    if (System.currentTimeMillis() > message.getServerTimestamp() + message.getContent().getExpireDuration()*1000) {
+                        expired = true;
+                    }
+                }
+
+                if (!expired) {
+                    messages.add(message);
+                }
             }
 
             if (count == 0) {

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

@@ -34,6 +34,7 @@ import io.moquette.spi.IMessagesStore;
 import io.moquette.spi.security.Tokenor;
 import io.moquette.spi.impl.subscriptions.Topic;
 import io.netty.handler.codec.mqtt.MqttVersion;
+import org.json.simple.JSONObject;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import win.liyufan.im.*;
@@ -492,7 +493,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                         }
 
                         if (bundle.getMessage().getContent().getExpireDuration() > 0) {
-                            if (System.currentTimeMillis() < bundle.getMessage().getServerTimestamp() + bundle.getMessage().getContent().getExpireDuration()) {
+                            if (System.currentTimeMillis() > bundle.getMessage().getServerTimestamp() + bundle.getMessage().getContent().getExpireDuration()*1000) {
                                 continue;
                             }
                         }
@@ -586,6 +587,12 @@ public class MemoryMessagesStore implements IMessagesStore {
                 MessageBundle bundle = mIMap.get(targetMessageId);
                 if (bundle != null) {
                     if (exceptClientId == null || !exceptClientId.equals(bundle.getFromClientId()) || !fromUser.equals(bundle.getFromUser())) {
+                        if (bundle.getMessage().getContent().getExpireDuration() > 0) {
+                            if (System.currentTimeMillis() > bundle.getMessage().getServerTimestamp() + bundle.getMessage().getContent().getExpireDuration() * 1000) {
+                                continue;
+                            }
+                        }
+
                         size += bundle.getMessage().getSerializedSize();
                         if (size >= 3 * 1024 * 1024) { //3M
                             break;
@@ -1469,9 +1476,16 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
 
             String searchContent = message.getContent().getSearchableContent() == null ? "" : message.getContent().getSearchableContent();
-            String cont = message.getContent().getContent() == null ? "" : message.getContent().getContent();
-            String extra = message.getContent().getExtra() == null ? "" : message.getContent().getExtra();
-            String recalledContent = "{\"s\":\"" + message.getFromUser() +  "\",\"ts\":" + message.getServerTimestamp() +  ",\"t\":" + message.getContent().getType() + ",\"sc\":\"" + searchContent + "\",\"c\":\"" + cont + "\",\"e\":\"" + extra  + "\"}";
+            String cont = message.getContent().getContent() == null ? "" : message.getContent().getContent().replace("\"", "\\\"");
+            String extra = message.getContent().getExtra() == null ? "" : message.getContent().getExtra().replace("\"", "\\\"");
+            JSONObject json = new JSONObject();
+            json.put("s", message.getFromUser());
+            json.put("ts", message.getServerTimestamp());
+            json.put("t", message.getContent().getType());
+            json.put("sc", message.getContent().getSearchableContent());
+            json.put("c", message.getContent().getContent());
+            json.put("e", message.getContent().getExtra());
+            String recalledContent = json.toJSONString();
 
             message = message.toBuilder().setContent(message.getContent().toBuilder().setContent(operatorId).setType(80).clearSearchableContent().setData(ByteString.copyFrom(String.valueOf(messageUid).getBytes())).setExtra(recalledContent).build()).build();
             messageBundle.setMessage(message);
@@ -1941,60 +1955,6 @@ public class MemoryMessagesStore implements IMessagesStore {
         return ErrorCode.ERROR_CODE_SUCCESS;
     }
 
-    @Override
-    public ErrorCode login(String name, String password, List<String> userIdRet) {
-        Connection connection = null;
-        PreparedStatement statement = null;
-        ResultSet rs = null;
-        try {
-            connection = DBUtil.getConnection();
-            String sql = "select `_uid`, `_passwd_md5` from t_user where `_name` = ?";
-
-            statement = connection.prepareStatement(sql);
-
-            int index = 1;
-            statement.setString(index++, name);
-
-            rs = statement.executeQuery();
-            if (rs.next()) {
-                String uid = rs.getString(1);
-
-                int status = getUserStatus(uid);
-                if (status == 1) {
-                    return ErrorCode.ERROR_CODE_USER_FORBIDDEN;
-                }
-                String pwd_md5 = rs.getString(2);
-                try {
-                    MessageDigest md5 = MessageDigest.getInstance("MD5");
-                    String passwdMd5 = Base64.getEncoder().encodeToString(md5.digest(password.getBytes("utf-8")));
-                    if (passwdMd5.equals(pwd_md5)) {
-                        LOG.info("login success userName={}, userId={}", name, uid);
-                        userIdRet.add(uid);
-                        return ErrorCode.ERROR_CODE_SUCCESS;
-                    } else {
-                        LOG.info("login failure incorrect password, userName={}, userId={}", name, uid);
-                        return ErrorCode.ERROR_CODE_PASSWORD_INCORRECT;
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    Utility.printExecption(LOG, e);
-                    LOG.info("login failure execption password, userName={}", name);
-                    return ErrorCode.ERROR_CODE_PASSWORD_INCORRECT;
-                }
-            } else {
-                LOG.info("login failure user not exist, userName={}", name);
-                return ErrorCode.ERROR_CODE_NOT_EXIST;
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-            Utility.printExecption(LOG, e);
-            LOG.info("login failure db execption, userName={}", name);
-            return ErrorCode.ERROR_CODE_SERVER_ERROR;
-        } finally {
-            DBUtil.closeDB(connection, statement, rs);
-        }
-    }
-
     synchronized Collection<FriendData> loadFriend(MultiMap<String, FriendData> friendsMap, String userId) {
         Collection<FriendData> friends = databaseStore.getPersistFriends(userId);
         if (friends != null) {
@@ -2318,6 +2278,8 @@ public class MemoryMessagesStore implements IMessagesStore {
 
         if (state == 2) {
             state = 1;
+        } else {
+            state = 0;
         }
 
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();

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

@@ -159,7 +159,6 @@ public interface IMessagesStore {
     WFCMessage.PullMessageResult fetchChatroomMessage(String fromUser, String chatroomId, String exceptClientId, long fromMessageId);
 
     ErrorCode verifyToken(String userId, String token, List<String> serverIPs, List<Integer> ports);
-    ErrorCode login(String name, String password, List<String> userIdRet);
 
     List<FriendData> getFriendList(String userId, String clientId, long version);
     void clearUserFriend(String userId);

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

@@ -159,7 +159,7 @@ public class MessagesPublisher {
         }
     }
 
-    private void publish2Receivers(String sender, int conversationType, String target, int line, long messageHead, Collection<String> receivers, String pushContent, String exceptClientId, int pullType, int messageContentType, long serverTime, int mentionType, List<String> mentionTargets, int persistFlag) {
+    private void publish2Receivers(String sender, int conversationType, String target, int line, long messageHead, Collection<String> receivers, String pushContent, String pushData, String exceptClientId, int pullType, int messageContentType, long serverTime, int mentionType, List<String> mentionTargets, int persistFlag) {
         if (persistFlag == Transparent) {
             publishTransparentMessage2Receivers(messageHead, receivers, pullType);
             return;
@@ -254,7 +254,7 @@ public class MessagesPublisher {
                     }
 
                     if (!StringUtil.isNullOrEmpty(pushContent) || messageContentType == 400) {
-                        if (!isSlient) {
+                        if (!isSlient && (persistFlag & 0x02) > 0) {
                             targetSession.setUnReceivedMsgs(targetSession.getUnReceivedMsgs() + 1);
                         }
                     }
@@ -332,7 +332,7 @@ public class MessagesPublisher {
                             name = fd.getAlias();
                         }
                     }
-                    this.messageSender.sendPush(sender, conversationType, target, line, messageHead, targetSession.getClientID(), pushContent, messageContentType, serverTime, name, targetName, targetSession.getUnReceivedMsgs(), curMentionType, isHiddenDetail, targetSession.getLanguage());
+                    this.messageSender.sendPush(sender, conversationType, target, line, messageHead, targetSession.getClientID(), pushContent, pushData, messageContentType, serverTime, name, targetName, targetSession.getUnReceivedMsgs(), curMentionType, isHiddenDetail, targetSession.getLanguage());
                 }
 
             }
@@ -545,7 +545,7 @@ public class MessagesPublisher {
                     message.getConversation().getType(), message.getConversation().getTarget(), message.getConversation().getLine(),
                     messageId,
                     receivers,
-                    pushContent, exceptClientId, pullType, message.getContent().getType(), message.getServerTimestamp(), message.getContent().getMentionedType(), message.getContent().getMentionedTargetList(), message.getContent().getPersistFlag());
+                    pushContent, message.getContent().getPushData(), exceptClientId, pullType, message.getContent().getType(), message.getServerTimestamp(), message.getContent().getMentionedType(), message.getContent().getMentionedTargetList(), message.getContent().getPersistFlag());
 
     }
 

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

@@ -37,10 +37,11 @@ class PersistentQueueMessageSender {
         this.connectionDescriptorStore = connectionDescriptorStore;
     }
 
-    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) {
+    void sendPush(String sender, int conversationType, String target, int line, long messageHead, String deviceId, String pushContent, String pushData, 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;
+        pushMessage.pushData = pushData;
         PushServer.getServer().pushMessage(pushMessage, deviceId, pushContent);
     }
 

common/pom.xml

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

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

@@ -29,10 +29,6 @@ public enum ErrorCode {
     //Group error
     ERROR_CODE_GROUP_ALREADY_EXIST(11, "group aleady exist"),
 
-
-    //user error
-    ERROR_CODE_PASSWORD_INCORRECT(15, "password incorrect"),
-
     //user error
     ERROR_CODE_FRIEND_ALREADY_REQUEST(16, "already send request"),
     ERROR_CODE_FRIEND_REQUEST_BLOCKED(18, "friend request blocked"),

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

@@ -24,27 +24,41 @@ public class InputCreateGroup extends InputGroupBase {
     public WFCMessage.CreateGroupRequest toProtoGroupRequest() {
         WFCMessage.Group.Builder groupBuilder = WFCMessage.Group.newBuilder();
         WFCMessage.GroupInfo.Builder groupInfoBuilder = WFCMessage.GroupInfo.newBuilder();
-        if (!StringUtil.isNullOrEmpty(group.getGroup_info().target_id)) {
-            groupInfoBuilder.setTargetId(group.getGroup_info().getTarget_id());
+        PojoGroupInfo group_info = group.getGroup_info();
+        if (!StringUtil.isNullOrEmpty(group_info.target_id)) {
+            groupInfoBuilder.setTargetId(group_info.getTarget_id());
         }
 
-        if (!StringUtil.isNullOrEmpty(group.getGroup_info().name)) {
-            groupInfoBuilder.setName(group.getGroup_info().getName());
+        if (!StringUtil.isNullOrEmpty(group_info.name)) {
+            groupInfoBuilder.setName(group_info.getName());
         }
 
-        if (!StringUtil.isNullOrEmpty(group.getGroup_info().portrait)) {
-            groupInfoBuilder.setPortrait(group.getGroup_info().getPortrait());
+        if (!StringUtil.isNullOrEmpty(group_info.portrait)) {
+            groupInfoBuilder.setPortrait(group_info.getPortrait());
         }
-        if (!StringUtil.isNullOrEmpty(group.getGroup_info().owner)) {
-            groupInfoBuilder.setOwner(group.getGroup_info().getOwner());
+        if (!StringUtil.isNullOrEmpty(group_info.owner)) {
+            groupInfoBuilder.setOwner(group_info.getOwner());
         }
 
-            groupInfoBuilder.setType(group.getGroup_info().getType());
+        groupInfoBuilder.setType(group_info.getType());
 
-        if (!StringUtil.isNullOrEmpty(group.getGroup_info().extra)) {
-            groupInfoBuilder.setExtra(group.getGroup_info().getExtra());
+        if (!StringUtil.isNullOrEmpty(group_info.extra)) {
+            groupInfoBuilder.setExtra(group_info.getExtra());
         }
 
+        if (group_info.join_type > 0 && group_info.join_type < 128) {
+            groupInfoBuilder.setJoinType(group_info.join_type);
+        }
+
+        if (group_info.mute > 0 && group_info.mute < 128) {
+            groupInfoBuilder.setMute(group_info.mute);
+        }
+        if (group_info.private_chat > 0 && group_info.private_chat < 128) {
+            groupInfoBuilder.setPrivateChat(group_info.private_chat);
+        }
+        if (group_info.searchable > 0) {
+            groupInfoBuilder.setSearchable(group_info.searchable);
+        }
 
         groupBuilder.setGroupInfo(groupInfoBuilder);
         for (PojoGroupMember pojoGroupMember : group.getMembers()) {

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

@@ -20,6 +20,7 @@ public class MessagePayload {
     private int type;
     private String searchableContent;
     private String pushContent;
+    private String pushData;
     private String content;
     private String base64edData;
     private int mediaType;
@@ -127,6 +128,14 @@ public class MessagePayload {
         this.extra = extra;
     }
 
+    public String getPushData() {
+        return pushData;
+    }
+
+    public void setPushData(String pushData) {
+        this.pushData = pushData;
+    }
+
     public WFCMessage.MessageContent toProtoMessageContent() {
         WFCMessage.MessageContent.Builder builder = WFCMessage.MessageContent.newBuilder()
             .setType(type)
@@ -149,6 +158,8 @@ public class MessagePayload {
             builder.addAllMentionedTarget(mentionedTarget);
         if (!StringUtil.isNullOrEmpty(extra))
             builder.setExtra(extra);
+        if (!StringUtil.isNullOrEmpty(pushData))
+            builder.setPushData(pushData);
 
         return builder.build();
     }
@@ -172,6 +183,7 @@ public class MessagePayload {
         payload.mentionedTarget = new ArrayList<>();
         payload.mentionedTarget.addAll(protoContent.getMentionedTargetList());
         payload.extra = protoContent.getExtra();
+        payload.pushData = protoContent.getPushData();
         return payload;
     }
 }

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

@@ -15,6 +15,12 @@ public class PojoGroupInfo {
     String owner;
     int type;
     String extra;
+    int mute;
+    int join_type;
+    int private_chat;
+    int searchable;
+    int max_member_count;
+    int history_message;
 
     public String getTarget_id() {
         return target_id;
@@ -63,4 +69,52 @@ public class PojoGroupInfo {
     public void setExtra(String extra) {
         this.extra = extra;
     }
+
+    public int getMax_member_count() {
+        return max_member_count;
+    }
+
+    public void setMax_member_count(int max_member_count) {
+        this.max_member_count = max_member_count;
+    }
+
+    public int getMute() {
+        return mute;
+    }
+
+    public void setMute(int mute) {
+        this.mute = mute;
+    }
+
+    public int getJoin_type() {
+        return join_type;
+    }
+
+    public void setJoin_type(int join_type) {
+        this.join_type = join_type;
+    }
+
+    public int getPrivate_chat() {
+        return private_chat;
+    }
+
+    public void setPrivate_chat(int private_chat) {
+        this.private_chat = private_chat;
+    }
+
+    public int getSearchable() {
+        return searchable;
+    }
+
+    public void setSearchable(int searchable) {
+        this.searchable = searchable;
+    }
+
+    public int getHistory_message() {
+        return history_message;
+    }
+
+    public void setHistory_message(int history_message) {
+        this.history_message = history_message;
+    }
 }

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

@@ -11552,6 +11552,21 @@ public final class WFCMessage {
      */
     com.google.protobuf.ByteString
         getExtraBytes();
+
+    // optional string push_data = 13;
+    /**
+     * <code>optional string push_data = 13;</code>
+     */
+    boolean hasPushData();
+    /**
+     * <code>optional string push_data = 13;</code>
+     */
+    java.lang.String getPushData();
+    /**
+     * <code>optional string push_data = 13;</code>
+     */
+    com.google.protobuf.ByteString
+        getPushDataBytes();
   }
   /**
    * Protobuf type {@code MessageContent}
@@ -11667,6 +11682,11 @@ public final class WFCMessage {
               extra_ = input.readBytes();
               break;
             }
+            case 106: {
+              bitField0_ |= 0x00000800;
+              pushData_ = input.readBytes();
+              break;
+            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -12051,6 +12071,49 @@ public final class WFCMessage {
       }
     }
 
+    // optional string push_data = 13;
+    public static final int PUSH_DATA_FIELD_NUMBER = 13;
+    private java.lang.Object pushData_;
+    /**
+     * <code>optional string push_data = 13;</code>
+     */
+    public boolean hasPushData() {
+      return ((bitField0_ & 0x00000800) == 0x00000800);
+    }
+    /**
+     * <code>optional string push_data = 13;</code>
+     */
+    public java.lang.String getPushData() {
+      java.lang.Object ref = pushData_;
+      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()) {
+          pushData_ = s;
+        }
+        return s;
+      }
+    }
+    /**
+     * <code>optional string push_data = 13;</code>
+     */
+    public com.google.protobuf.ByteString
+        getPushDataBytes() {
+      java.lang.Object ref = pushData_;
+      if (ref instanceof java.lang.String) {
+        com.google.protobuf.ByteString b = 
+            com.google.protobuf.ByteString.copyFromUtf8(
+                (java.lang.String) ref);
+        pushData_ = b;
+        return b;
+      } else {
+        return (com.google.protobuf.ByteString) ref;
+      }
+    }
+
     private void initFields() {
       type_ = 0;
       searchableContent_ = "";
@@ -12064,6 +12127,7 @@ public final class WFCMessage {
       mentionedType_ = 0;
       mentionedTarget_ = com.google.protobuf.LazyStringArrayList.EMPTY;
       extra_ = "";
+      pushData_ = "";
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -12117,6 +12181,9 @@ public final class WFCMessage {
       if (((bitField0_ & 0x00000400) == 0x00000400)) {
         output.writeBytes(12, getExtraBytes());
       }
+      if (((bitField0_ & 0x00000800) == 0x00000800)) {
+        output.writeBytes(13, getPushDataBytes());
+      }
       getUnknownFields().writeTo(output);
     }
 
@@ -12179,6 +12246,10 @@ public final class WFCMessage {
         size += com.google.protobuf.CodedOutputStream
           .computeBytesSize(12, getExtraBytes());
       }
+      if (((bitField0_ & 0x00000800) == 0x00000800)) {
+        size += com.google.protobuf.CodedOutputStream
+          .computeBytesSize(13, getPushDataBytes());
+      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -12319,6 +12390,8 @@ public final class WFCMessage {
         bitField0_ = (bitField0_ & ~0x00000400);
         extra_ = "";
         bitField0_ = (bitField0_ & ~0x00000800);
+        pushData_ = "";
+        bitField0_ = (bitField0_ & ~0x00001000);
         return this;
       }
 
@@ -12397,6 +12470,10 @@ public final class WFCMessage {
           to_bitField0_ |= 0x00000400;
         }
         result.extra_ = extra_;
+        if (((from_bitField0_ & 0x00001000) == 0x00001000)) {
+          to_bitField0_ |= 0x00000800;
+        }
+        result.pushData_ = pushData_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -12466,6 +12543,11 @@ public final class WFCMessage {
           extra_ = other.extra_;
           onChanged();
         }
+        if (other.hasPushData()) {
+          bitField0_ |= 0x00001000;
+          pushData_ = other.pushData_;
+          onChanged();
+        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -13161,6 +13243,80 @@ public final class WFCMessage {
         return this;
       }
 
+      // optional string push_data = 13;
+      private java.lang.Object pushData_ = "";
+      /**
+       * <code>optional string push_data = 13;</code>
+       */
+      public boolean hasPushData() {
+        return ((bitField0_ & 0x00001000) == 0x00001000);
+      }
+      /**
+       * <code>optional string push_data = 13;</code>
+       */
+      public java.lang.String getPushData() {
+        java.lang.Object ref = pushData_;
+        if (!(ref instanceof java.lang.String)) {
+          java.lang.String s = ((com.google.protobuf.ByteString) ref)
+              .toStringUtf8();
+          pushData_ = s;
+          return s;
+        } else {
+          return (java.lang.String) ref;
+        }
+      }
+      /**
+       * <code>optional string push_data = 13;</code>
+       */
+      public com.google.protobuf.ByteString
+          getPushDataBytes() {
+        java.lang.Object ref = pushData_;
+        if (ref instanceof String) {
+          com.google.protobuf.ByteString b = 
+              com.google.protobuf.ByteString.copyFromUtf8(
+                  (java.lang.String) ref);
+          pushData_ = b;
+          return b;
+        } else {
+          return (com.google.protobuf.ByteString) ref;
+        }
+      }
+      /**
+       * <code>optional string push_data = 13;</code>
+       */
+      public Builder setPushData(
+          java.lang.String value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00001000;
+        pushData_ = value;
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string push_data = 13;</code>
+       */
+      public Builder clearPushData() {
+        bitField0_ = (bitField0_ & ~0x00001000);
+        pushData_ = getDefaultInstance().getPushData();
+        onChanged();
+        return this;
+      }
+      /**
+       * <code>optional string push_data = 13;</code>
+       */
+      public Builder setPushDataBytes(
+          com.google.protobuf.ByteString value) {
+        if (value == null) {
+    throw new NullPointerException();
+  }
+  bitField0_ |= 0x00001000;
+        pushData_ = value;
+        onChanged();
+        return this;
+      }
+
       // @@protoc_insertion_point(builder_scope:MessageContent)
     }
 
@@ -59026,131 +59182,132 @@ public final class WFCMessage {
       "et\030\002 \002(\005\022\020\n\010listener\030\003 \003(\t\"3\n\rListenChan" +
       "nel\022\022\n\nchannel_id\030\001 \002(\t\022\016\n\006listen\030\002 \002(\005\"" +
       "E\n\023SearchChannelResult\022\035\n\007channel\030\001 \003(\0132",
-      "\014.ChannelInfo\022\017\n\007keyword\030\002 \002(\t\"\212\002\n\016Messa" +
+      "\014.ChannelInfo\022\017\n\007keyword\030\002 \002(\t\"\235\002\n\016Messa" +
       "geContent\022\014\n\004type\030\001 \002(\005\022\032\n\022searchable_co" +
       "ntent\030\002 \001(\t\022\024\n\014push_content\030\003 \001(\t\022\017\n\007con" +
       "tent\030\004 \001(\t\022\014\n\004data\030\005 \001(\014\022\021\n\tmediaType\030\006 " +
       "\001(\005\022\026\n\016remoteMediaUrl\030\007 \001(\t\022\024\n\014persist_f" +
       "lag\030\010 \001(\005\022\027\n\017expire_duration\030\t \001(\005\022\026\n\016me" +
       "ntioned_type\030\n \001(\005\022\030\n\020mentioned_target\030\013" +
-      " \003(\t\022\r\n\005extra\030\014 \001(\t\"\207\001\n\025AddGroupMemberRe" +
-      "quest\022\020\n\010group_id\030\001 \002(\t\022\"\n\014added_member\030" +
-      "\002 \003(\0132\014.GroupMember\022\017\n\007to_line\030\003 \003(\005\022\'\n\016",
-      "notify_content\030\004 \001(\0132\017.MessageContent\"e\n" +
-      "\022CreateGroupRequest\022\025\n\005group\030\001 \002(\0132\006.Gro" +
-      "up\022\017\n\007to_line\030\002 \003(\005\022\'\n\016notify_content\030\003 " +
-      "\001(\0132\017.MessageContent\"a\n\023DismissGroupRequ" +
-      "est\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\"" +
-      "\226\001\n\rFriendRequest\022\020\n\010from_uid\030\001 \001(\t\022\016\n\006t" +
-      "o_uid\030\002 \002(\t\022\016\n\006reason\030\003 \002(\t\022\016\n\006status\030\004 " +
-      "\001(\005\022\021\n\tupdate_dt\030\005 \001(\003\022\030\n\020from_read_stat" +
-      "us\030\006 \001(\010\022\026\n\016to_read_status\030\007 \001(\010\"#\n\rGene",
-      "ralResult\022\022\n\nerror_code\030\001 \002(\005\"?\n\025GetUplo" +
-      "adTokenRequest\022\022\n\nmedia_type\030\001 \002(\005\022\022\n\nme" +
-      "dia_path\030\002 \002(\t\"S\n\024GetUploadTokenResult\022\016" +
-      "\n\006domain\030\001 \002(\t\022\r\n\005token\030\002 \002(\t\022\016\n\006server\030" +
-      "\003 \002(\t\022\014\n\004port\030\004 \001(\005\"H\n\023HandleFriendReque" +
-      "st\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\005IDBuf\022\n\n\002id\030\001 \002(\t\"\027\n\tID" +
-      "ListBuf\022\n\n\002id\030\001 \003(\t\"\256\001\n\007Message\022#\n\014conve" +
-      "rsation\030\001 \002(\0132\r.Conversation\022\021\n\tfrom_use" +
-      "r\030\002 \002(\t\022 \n\007content\030\003 \002(\0132\017.MessageConten",
-      "t\022\022\n\nmessage_id\030\004 \001(\003\022\030\n\020server_timestam" +
-      "p\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\014disp" +
-      "lay_name\030\003 \001(\t\022\020\n\010portrait\030\004 \001(\t\022\016\n\006mobi" +
-      "le\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\tupda" +
-      "te_dt\030\n \001(\003\022\016\n\006gender\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\005Ro" +
-      "bot\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\005en" +
-      "try\030\001 \003(\0132\006.Robot\"g\n\030UploadDeviceTokenRe" +
-      "quest\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\tpush_type\030\004 \002" +
-      "(\005\"\201\001\n\026ModifyGroupInfoRequest\022\020\n\010group_i" +
-      "d\030\001 \002(\t\022\014\n\004type\030\002 \002(\005\022\r\n\005value\030\003 \002(\t\022\017\n\007" +
-      "to_line\030\004 \003(\005\022\'\n\016notify_content\030\005 \001(\0132\017." +
-      "MessageContent\"\203\001\n\026SetGroupManagerReques" +
-      "t\022\020\n\010group_id\030\001 \002(\t\022\014\n\004type\030\002 \002(\005\022\017\n\007use" +
-      "r_id\030\003 \003(\t\022\017\n\007to_line\030\004 \003(\005\022\'\n\016notify_co",
-      "ntent\030\005 \001(\0132\017.MessageContent\"(\n\tInfoEntr" +
-      "y\022\014\n\004type\030\001 \002(\005\022\r\n\005value\030\002 \002(\t\"0\n\023Modify" +
-      "MyInfoRequest\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\022PullMessageRequ" +
-      "est\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\007message\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\004info\030\001 \003(\013" +
-      "2\n.GroupInfo\"6\n\026PullGroupMemberRequest\022\016",
-      "\n\006target\030\001 \002(\t\022\014\n\004head\030\002 \002(\003\"5\n\025PullGrou" +
-      "pMemberResult\022\034\n\006member\030\001 \003(\0132\014.GroupMem" +
-      "ber\"-\n\013UserRequest\022\013\n\003uid\030\001 \002(\t\022\021\n\tupdat" +
-      "e_dt\030\002 \001(\003\"0\n\017PullUserRequest\022\035\n\007request" +
-      "\030\001 \003(\0132\014.UserRequest\"/\n\nUserResult\022\023\n\004us" +
-      "er\030\001 \002(\0132\005.User\022\014\n\004code\030\002 \002(\005\"-\n\016PullUse" +
-      "rResult\022\033\n\006result\030\001 \003(\0132\013.UserResult\"^\n\020" +
-      "QuitGroupRequest\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.Me" +
-      "ssageContent\"~\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.MessageContent\"u\n\024TransferGroupReq" +
-      "uest\022\020\n\010group_id\030\001 \002(\t\022\021\n\tnew_owner\030\002 \002(" +
-      "\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016notify_content\030\004 \001" +
-      "(\0132\017.MessageContent\"s\n\026ModifyGroupMember" +
-      "Alias\022\020\n\010group_id\030\001 \002(\t\022\r\n\005alias\030\002 \002(\t\022\017" +
+      " \003(\t\022\r\n\005extra\030\014 \001(\t\022\021\n\tpush_data\030\r \001(\t\"\207" +
+      "\001\n\025AddGroupMemberRequest\022\020\n\010group_id\030\001 \002" +
+      "(\t\022\"\n\014added_member\030\002 \003(\0132\014.GroupMember\022\017",
       "\n\007to_line\030\003 \003(\005\022\'\n\016notify_content\030\004 \001(\0132" +
-      "\017.MessageContent\"P\n\020UserSettingEntry\022\r\n\005" +
-      "scope\030\001 \002(\005\022\013\n\003key\030\002 \002(\t\022\r\n\005value\030\003 \002(\t\022",
-      "\021\n\tupdate_dt\030\004 \002(\003\"A\n\024ModifyUserSettingR" +
-      "eq\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\024Get" +
-      "UserSettingResult\022 \n\005entry\030\001 \003(\0132\021.UserS" +
-      "ettingEntry\"f\n\006Friend\022\013\n\003uid\030\001 \002(\t\022\r\n\005st" +
-      "ate\030\002 \002(\005\022\021\n\tupdate_dt\030\003 \002(\003\022\r\n\005alias\030\004 " +
-      "\001(\t\022\017\n\007blacked\030\005 \001(\005\022\r\n\005extra\030\006 \001(\t\"*\n\020G" +
-      "etFriendsResult\022\026\n\005entry\030\001 \003(\0132\007.Friend\"" +
-      "7\n\026GetFriendRequestResult\022\035\n\005entry\030\001 \003(\013" +
-      "2\016.FriendRequest\"\243\001\n\021ConnectAckPayload\022\020",
-      "\n\010msg_head\030\001 \001(\003\022\023\n\013friend_head\030\002 \001(\003\022\026\n" +
-      "\016friend_rq_head\030\003 \001(\003\022\024\n\014setting_head\030\004 " +
-      "\001(\003\022\021\n\tnode_addr\030\005 \001(\t\022\021\n\tnode_port\030\006 \001(" +
-      "\005\022\023\n\013server_time\030\007 \001(\003\"P\n\rIMHttpWrapper\022" +
-      "\r\n\005token\030\001 \002(\t\022\021\n\tclient_id\030\002 \002(\t\022\017\n\007req" +
-      "uest\030\003 \002(\t\022\014\n\004data\030\004 \001(\014\"A\n\021SearchUserRe" +
-      "quest\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\013chatroom_id\030\001 \002(\t\022\021\n\tupdate_dt\030\002 \001(\003\"",
-      "\227\001\n\014ChatroomInfo\022\r\n\005title\030\001 \002(\t\022\014\n\004desc\030" +
-      "\002 \001(\t\022\020\n\010portrait\030\003 \001(\t\022\024\n\014member_count\030" +
-      "\004 \001(\005\022\021\n\tcreate_dt\030\005 \001(\003\022\021\n\tupdate_dt\030\006 " +
-      "\001(\003\022\r\n\005extra\030\007 \001(\t\022\r\n\005state\030\010 \001(\005\"F\n\034Get" +
-      "ChatroomMemberInfoRequest\022\023\n\013chatroom_id" +
-      "\030\001 \002(\t\022\021\n\tmax_count\030\002 \001(\005\";\n\022ChatroomMem" +
-      "berInfo\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\023Notify" +
-      "RecallMessage\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",
-      "\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_version\030\n \001(\t\"D\n\rRouteResp" +
-      "onse\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\007" +
-      "user_id\030\001 \002(\t\022\021\n\tclient_id\030\002 \002(\t\022\020\n\010plat" +
-      "form\030\003 \001(\005\"\\\n\022LoadRemoteMessages\022#\n\014conv",
-      "ersation\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\020MultiCastMes" +
-      "sage\022\021\n\tfrom_user\030\001 \002(\t\022 \n\007content\030\002 \002(\013" +
-      "2\017.MessageContent\022\n\n\002to\030\003 \003(\t\022\014\n\004line\030\004 " +
-      "\002(\005B#\n\025cn.wildfirechat.protoB\nWFCMessage"
+      "\017.MessageContent\"e\n\022CreateGroupRequest\022\025" +
+      "\n\005group\030\001 \002(\0132\006.Group\022\017\n\007to_line\030\002 \003(\005\022\'" +
+      "\n\016notify_content\030\003 \001(\0132\017.MessageContent\"" +
+      "a\n\023DismissGroupRequest\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\"\226\001\n\rFriendRequest\022\020\n\010" +
+      "from_uid\030\001 \001(\t\022\016\n\006to_uid\030\002 \002(\t\022\016\n\006reason" +
+      "\030\003 \002(\t\022\016\n\006status\030\004 \001(\005\022\021\n\tupdate_dt\030\005 \001(" +
+      "\003\022\030\n\020from_read_status\030\006 \001(\010\022\026\n\016to_read_s",
+      "tatus\030\007 \001(\010\"#\n\rGeneralResult\022\022\n\nerror_co" +
+      "de\030\001 \002(\005\"?\n\025GetUploadTokenRequest\022\022\n\nmed" +
+      "ia_type\030\001 \002(\005\022\022\n\nmedia_path\030\002 \002(\t\"S\n\024Get" +
+      "UploadTokenResult\022\016\n\006domain\030\001 \002(\t\022\r\n\005tok" +
+      "en\030\002 \002(\t\022\016\n\006server\030\003 \002(\t\022\014\n\004port\030\004 \001(\005\"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\005IDBu" +
+      "f\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.Conve" +
+      "rsation\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\010por" +
+      "trait\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\005" +
+      "extra\030\t \001(\t\022\021\n\tupdate_dt\030\n \001(\003\022\016\n\006gender" +
+      "\030\013 \001(\005\022\016\n\006social\030\014 \001(\t\022\014\n\004type\030\r \001(\005\022\017\n\007" +
+      "deleted\030\016 \001(\005\"c\n\005Robot\022\013\n\003uid\030\001 \002(\t\022\r\n\005s" +
+      "tate\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\017Ge" +
+      "tRobotsResult\022\025\n\005entry\030\001 \003(\0132\006.Robot\"g\n\030" +
+      "UploadDeviceTokenRequest\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\tpush_type\030\004 \002(\005\"\201\001\n\026ModifyGroupInf" +
+      "oRequest\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\016noti" +
+      "fy_content\030\005 \001(\0132\017.MessageContent\"\203\001\n\026Se" +
+      "tGroupManagerRequest\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.Message" +
+      "Content\"(\n\tInfoEntry\022\014\n\004type\030\001 \002(\005\022\r\n\005va" +
+      "lue\030\002 \002(\t\"0\n\023ModifyMyInfoRequest\022\031\n\005entr" +
+      "y\030\001 \003(\0132\n.InfoEntry\";\n\rNotifyMessage\022\014\n\004" +
+      "type\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\004ty" +
+      "pe\030\002 \002(\005\022\r\n\005delay\030\003 \001(\003\"M\n\021PullMessageRe" +
+      "sult\022\031\n\007message\030\001 \003(\0132\010.Message\022\017\n\007curre" +
+      "nt\030\002 \002(\003\022\014\n\004head\030\003 \002(\003\"/\n\023PullGroupInfoR" +
+      "esult\022\030\n\004info\030\001 \003(\0132\n.GroupInfo\"6\n\026PullG",
+      "roupMemberRequest\022\016\n\006target\030\001 \002(\t\022\014\n\004hea" +
+      "d\030\002 \002(\003\"5\n\025PullGroupMemberResult\022\034\n\006memb" +
+      "er\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\017PullUse" +
+      "rRequest\022\035\n\007request\030\001 \003(\0132\014.UserRequest\"" +
+      "/\n\nUserResult\022\023\n\004user\030\001 \002(\0132\005.User\022\014\n\004co" +
+      "de\030\002 \002(\005\"-\n\016PullUserResult\022\033\n\006result\030\001 \003" +
+      "(\0132\013.UserResult\"^\n\020QuitGroupRequest\022\020\n\010g" +
+      "roup_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\030Remov",
+      "eGroupMemberRequest\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\024TransferGroupRequest\022\020\n\010group_id\030\001 \002(" +
+      "\t\022\021\n\tnew_owner\030\002 \002(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n" +
+      "\016notify_content\030\004 \001(\0132\017.MessageContent\"s" +
+      "\n\026ModifyGroupMemberAlias\022\020\n\010group_id\030\001 \002" +
+      "(\t\022\r\n\005alias\030\002 \002(\t\022\017\n\007to_line\030\003 \003(\005\022\'\n\016no" +
+      "tify_content\030\004 \001(\0132\017.MessageContent\"P\n\020U" +
+      "serSettingEntry\022\r\n\005scope\030\001 \002(\005\022\013\n\003key\030\002 ",
+      "\002(\t\022\r\n\005value\030\003 \002(\t\022\021\n\tupdate_dt\030\004 \002(\003\"A\n" +
+      "\024ModifyUserSettingReq\022\r\n\005scope\030\001 \002(\005\022\013\n\003" +
+      "key\030\002 \002(\t\022\r\n\005value\030\003 \002(\t\"\032\n\007Version\022\017\n\007v" +
+      "ersion\030\001 \002(\003\"8\n\024GetUserSettingResult\022 \n\005" +
+      "entry\030\001 \003(\0132\021.UserSettingEntry\"f\n\006Friend" +
+      "\022\013\n\003uid\030\001 \002(\t\022\r\n\005state\030\002 \002(\005\022\021\n\tupdate_d" +
+      "t\030\003 \002(\003\022\r\n\005alias\030\004 \001(\t\022\017\n\007blacked\030\005 \001(\005\022" +
+      "\r\n\005extra\030\006 \001(\t\"*\n\020GetFriendsResult\022\026\n\005en" +
+      "try\030\001 \003(\0132\007.Friend\"7\n\026GetFriendRequestRe" +
+      "sult\022\035\n\005entry\030\001 \003(\0132\016.FriendRequest\"\243\001\n\021",
+      "ConnectAckPayload\022\020\n\010msg_head\030\001 \001(\003\022\023\n\013f" +
+      "riend_head\030\002 \001(\003\022\026\n\016friend_rq_head\030\003 \001(\003" +
+      "\022\024\n\014setting_head\030\004 \001(\003\022\021\n\tnode_addr\030\005 \001(" +
+      "\t\022\021\n\tnode_port\030\006 \001(\005\022\023\n\013server_time\030\007 \001(" +
+      "\003\"P\n\rIMHttpWrapper\022\r\n\005token\030\001 \002(\t\022\021\n\tcli" +
+      "ent_id\030\002 \002(\t\022\017\n\007request\030\003 \002(\t\022\014\n\004data\030\004 " +
+      "\001(\014\"A\n\021SearchUserRequest\022\017\n\007keyword\030\001 \002(" +
+      "\t\022\r\n\005fuzzy\030\002 \001(\005\022\014\n\004page\030\003 \001(\005\"(\n\020Search" +
+      "UserResult\022\024\n\005entry\030\001 \003(\0132\005.User\"@\n\026GetC" +
+      "hatroomInfoRequest\022\023\n\013chatroom_id\030\001 \002(\t\022",
+      "\021\n\tupdate_dt\030\002 \001(\003\"\227\001\n\014ChatroomInfo\022\r\n\005t" +
+      "itle\030\001 \002(\t\022\014\n\004desc\030\002 \001(\t\022\020\n\010portrait\030\003 \001" +
+      "(\t\022\024\n\014member_count\030\004 \001(\005\022\021\n\tcreate_dt\030\005 " +
+      "\001(\003\022\021\n\tupdate_dt\030\006 \001(\003\022\r\n\005extra\030\007 \001(\t\022\r\n" +
+      "\005state\030\010 \001(\005\"F\n\034GetChatroomMemberInfoReq" +
+      "uest\022\023\n\013chatroom_id\030\001 \002(\t\022\021\n\tmax_count\030\002" +
+      " \001(\005\";\n\022ChatroomMemberInfo\022\024\n\014member_cou" +
+      "nt\030\001 \001(\005\022\017\n\007members\030\002 \003(\t\"\026\n\010INT64Buf\022\n\n" +
+      "\002id\030\001 \002(\003\"4\n\023NotifyRecallMessage\022\n\n\002id\030\001" +
+      " \002(\003\022\021\n\tfrom_user\030\002 \002(\t\"/\n\020BlackUserRequ",
+      "est\022\013\n\003uid\030\001 \002(\t\022\016\n\006status\030\002 \002(\005\"\323\001\n\014Rou" +
+      "teRequest\022\013\n\003app\030\001 \001(\t\022\020\n\010platform\030\002 \001(\005" +
+      "\022\021\n\tpush_type\030\003 \001(\005\022\023\n\013device_name\030\004 \001(\t" +
+      "\022\026\n\016device_version\030\005 \001(\t\022\022\n\nphone_name\030\006" +
+      " \001(\t\022\020\n\010language\030\007 \001(\t\022\024\n\014carrier_name\030\010" +
+      " \001(\t\022\023\n\013app_version\030\t \001(\t\022\023\n\013sdk_version" +
+      "\030\n \001(\t\"D\n\rRouteResponse\022\014\n\004host\030\001 \002(\t\022\021\n" +
+      "\tlong_port\030\002 \002(\005\022\022\n\nshort_port\030\003 \002(\005\"G\n\017" +
+      "GetTokenRequest\022\017\n\007user_id\030\001 \002(\t\022\021\n\tclie" +
+      "nt_id\030\002 \002(\t\022\020\n\010platform\030\003 \001(\005\"\\\n\022LoadRem",
+      "oteMessages\022#\n\014conversation\030\001 \002(\0132\r.Conv" +
+      "ersation\022\022\n\nbefore_uid\030\002 \002(\003\022\r\n\005count\030\003 " +
+      "\002(\005\"a\n\020MultiCastMessage\022\021\n\tfrom_user\030\001 \002" +
+      "(\t\022 \n\007content\030\002 \002(\0132\017.MessageContent\022\n\n\002" +
+      "to\030\003 \003(\t\022\014\n\004line\030\004 \002(\005B#\n\025cn.wildfirecha" +
+      "t.protoB\nWFCMessage"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -59240,7 +59397,7 @@ public final class WFCMessage {
           internal_static_MessageContent_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_MessageContent_descriptor,
-              new java.lang.String[] { "Type", "SearchableContent", "PushContent", "Content", "Data", "MediaType", "RemoteMediaUrl", "PersistFlag", "ExpireDuration", "MentionedType", "MentionedTarget", "Extra", });
+              new java.lang.String[] { "Type", "SearchableContent", "PushContent", "Content", "Data", "MediaType", "RemoteMediaUrl", "PersistFlag", "ExpireDuration", "MentionedType", "MentionedTarget", "Extra", "PushData", });
           internal_static_AddGroupMemberRequest_descriptor =
             getDescriptor().getMessageTypes().get(14);
           internal_static_AddGroupMemberRequest_fieldAccessorTable = new

distribution/pom.xml

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

distribution/src/main/resources/wildfirechat.conf

@@ -148,10 +148,10 @@ qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn
 local.media.storage.root ./media
 
 
-# 是否支持多端登陆
+# 是否支持多端登陆，为true时支持任意平台任意多个客户端同时登录；为false时每个平台只支持一个端登录，但不同平台可以同时登录。
 server.multi_endpoint false
 
-# 多平台连接状态通知（仅当multi_endpoint为false时有效）
+# 多平台连接状态通知（仅当multi_endpoint为false时有效），true时移动端可以收到pc或web端登录的通知。
 server.multi_platform_notification false
 
 #*********************************************************************

pom.xml

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

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

@@ -574,7 +574,7 @@ public class Main {
                 System.out.println("chatroom info incorrect");
                 System.exit(-1);
             } else {
-                System.out.println("chatroom info incorrect");
+                System.out.println("chatroom info correct");
             }
         } else {
             System.out.println("get chatroom info failure");