version and release note

README.md

@@ -7,7 +7,7 @@
 * 性能强大，专业版IM服务支持百万在线和集群部署，业内顶尖性能水平，详情参考野火性能报告。
 * 部署运维简单，依赖服务少，稍加配置一键启动。
 * 安全加密。网络连接AES加密。客户端数据库SqlCipher加密。安全无小事。
-* 全平台客户端，支持Android、iOS、Web、小程序、UniApp、Flutter、Windows、Mac OS、Linux等所有常见平台。
+* 全平台客户端，支持Android、iOS、鸿蒙、Web、小程序、UniApp、Flutter、Windows、Mac OS、Linux等所有常见平台。
 * 四端同时在线（移动端，pc端，web端和小程序端），数据和状态多端完美同步。
 * 支持国产化。支持国产化操作系统、国产化芯片和国产操作系统。支持国密加密。
 * 客户端使用微信[mars](https://github.com/tencent/mars)连接库，野火IM可能是最适应中国网络国情的即时通讯服务。
@@ -22,9 +22,10 @@
 * API丰富，方便与其它服务系统的对接。
 * 拥有机器人和公众号功能，免费的频道（公众号）管理后台。
 * 超级群组功能，可以支持万人大群。
+* 支持多个IM服务组网互通，打破孤岛，适用于集团公司下多个分公司互联互通。
 * 社区版IM服务和移动端免费商用，可以免费构建出完备的移动互联网应用。
 * 收费项目非常便宜，野火独有的试用模式，可以先部署到客户环境试用6个月，试用满意后再购买，避免上当受骗。
-* 技术支持专业和高效，核心研发人员及时处理issue和论坛回复。
+* 技术支持专业和高效，***核心研发***及时处理issue和工单，能最快解决用户的技术难题。
 
 ## 野火开源项目
 主要包括以下项目：
@@ -156,6 +157,9 @@ mvn clean package
 ## 服务对象
 因为野火的使用范围比较广，难免被一些不法分子利用，国内反诈反赌力度很大，所以国内多地警方都跟我们都有过联系。***为了预防我们的产品被用于非法目的，试用及购买只能支持境内法人单位，不接受个人或者境外团体。如果我们发现产品被用于非法目的，我们会立即停止技术支持服务并且报警和配合警方调查。请用于非法目的用户绕行！***
 
+## 常见问题
+请参考文档[常见问题](https://docs.wildfirechat.cn/faq/server.html)
+
 ## 应用截图
 登录界面
 

broker/config/wildfirechat.conf

@@ -68,6 +68,10 @@ token.key testim
 ##是否使用AES256加密。默认客户端和服务器都是AES128加密，如果需要开启AES256，需要客户端和IM服务同时开通。
 #encrypt.use_aes256 true
 
+##当创建一个对象时（用户，群组，频道，机器人等），如果没有传入ID，野火会为这个对象生成一个ID。如果id.use_uuid为true，会使用uuid作为对象ID，否则会使用野火短ID，默认为false。
+## 短ID有个很大的风险是容易被人穷举进行攻击。建议用UUID。
+id.use_uuid true
+
 ##首次登录，是否接收之前的历史消息。
 ##0 不接收历史消息，只接收${message.compensate_time_limit}毫秒以内的消息，由于服务器没有保存已经收取记录，所以如果有超过${message.compensate_time_limit}毫秒之前未收取的消息也不会收取下拉；
 ##1接收，会接收 message.max_queue 配置的条数的历史消息
@@ -254,15 +258,6 @@ client.request_rate_limit 100
 ##关于对象存储的详细信息请参考：https://docs.wildfirechat.cn/server/oss.html
 media.server.use_qiniu 0
 
-##媒体类型分类
-#Media_Type_GENERAL = 0,
-#Media_Type_IMAGE = 1,
-#Media_Type_VOICE = 2,
-#Media_Type_VIDEO = 3,
-#Media_Type_FILE = 4,
-#Media_Type_PORTRAIT = 5,
-#Media_Type_FAVORITE = 6
-
 # qiniu media server configuration
 qiniu.server_url  http://up.qbox.me
 qiniu.access_key tU3vdBK5BL5j4N7jI5N5uZgq_HQDo170w5C9Amnn
@@ -286,11 +281,21 @@ qiniu.bucket_portrait_domain http://cdn2.wildfirechat.cn
 qiniu.bucket_favorite_name storage
 qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn
 
+##媒体类型分类
+#Media_Type_GENERAL = 0,
+#Media_Type_IMAGE = 1,
+#Media_Type_VOICE = 2,
+#Media_Type_VIDEO = 3,
+#Media_Type_FILE = 4,
+#Media_Type_PORTRAIT = 5,
+#Media_Type_FAVORITE = 6,
+#Media_Type_STICKER = 7,
+#Media_Type_MOMENTS = 8
 
 # local media server configuration
 # 本地媒体服务器配置。
 local.media.storage.root media
-# 如果使用内置文件存储，文件上传后地址默认为 http://server.ip:http_port/fs/5/2021/03/27/08/filename。
+# 如果使用内置文件存储，文件上传后地址默认为 http://server.ip:http_port/fs/5/2021/03/27/08/filename。fs目录下按照类型存放文件，媒体类型见上面注释，比如5就是Media_Type_PORTRAIT，是客户端的头像文件。
 # 如果需要使用nginx添加https支持，请打开下面配置，这样客户端得到的文件地址为 https://example.com/media/fs/5/2021/03/27/08/filename。
 # 需要nginx把请求从https://example.com/media/fs 转到 http://server.ip:http_port/fs。注意需要带上所有header。
 # 尽管内置文件存储可以使用，但是我们还是建议使用专业级别的对象存储服务，社区版可以使用七牛，专业版另外支持阿里云和也是私有对象存储。详情请参考 https://docs.wildfirechat.cn/server/oss.html

broker/pom.xml

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

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

@@ -53,6 +53,7 @@ public class GetGroupInfoAction extends AdminAction {
                     pojoGroupInfo.setPortrait(groupInfo.getPortrait());
                     pojoGroupInfo.setTarget_id(groupInfo.getTargetId());
                     pojoGroupInfo.setType(groupInfo.getType());
+                    pojoGroupInfo.setMember_count(groupInfo.getMemberCount());
                     pojoGroupInfo.setMute(groupInfo.getMute());
                     pojoGroupInfo.setJoin_type(groupInfo.getJoinType());
                     pojoGroupInfo.setPrivate_chat(groupInfo.getPrivateChat());
@@ -61,6 +62,8 @@ public class GetGroupInfoAction extends AdminAction {
                     pojoGroupInfo.setHistory_message(groupInfo.getHistoryMessage());
                     pojoGroupInfo.setSuper_group(groupInfo.getSuperGroup()>0);
                     pojoGroupInfo.setDeleted(groupInfo.getDeleted()>0);
+                    pojoGroupInfo.setUpdate_dt(groupInfo.getUpdateDt());
+                    pojoGroupInfo.setMember_update_dt(groupInfo.getMemberUpdateDt());
                     result = RestResult.ok(pojoGroupInfo);
                 }
                 setResponseContent(result, response);

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

@@ -52,6 +52,7 @@ public class GetGroupInfoAction extends RobotAction {
                     pojoGroupInfo.setPortrait(groupInfo.getPortrait());
                     pojoGroupInfo.setTarget_id(groupInfo.getTargetId());
                     pojoGroupInfo.setType(groupInfo.getType());
+                    pojoGroupInfo.setMember_count(groupInfo.getMemberCount());
                     pojoGroupInfo.setMute(groupInfo.getMute());
                     pojoGroupInfo.setJoin_type(groupInfo.getJoinType());
                     pojoGroupInfo.setPrivate_chat(groupInfo.getPrivateChat());
@@ -60,6 +61,8 @@ public class GetGroupInfoAction extends RobotAction {
                     pojoGroupInfo.setHistory_message(groupInfo.getHistoryMessage());
                     pojoGroupInfo.setSuper_group(groupInfo.getSuperGroup()>0);
                     pojoGroupInfo.setDeleted(groupInfo.getDeleted()>0);
+                    pojoGroupInfo.setUpdate_dt(groupInfo.getUpdateDt());
+                    pojoGroupInfo.setMember_update_dt(groupInfo.getMemberUpdateDt());
                     result = RestResult.ok(pojoGroupInfo);
                 }
                 setResponseContent(result, response);

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

@@ -115,6 +115,8 @@ public final class BrokerConstants {
     public static final String CONNECT_CLIENT_SIGNATURE_LIST = "connect.client_signature_list";
     public static final String CONNECT_REJECT_EMPTY_SIGNATURE = "connect.reject_empty_signature";
 
+    public static final String ID_USE_UUID = "id.use_uuid";
+
     public static final String EMBED_DB_PROPERTY_NAME = "embed.db";
     public static final String DB_AUTO_CLEAN_HISTORY_MESSAGES = "db.auto_clean_history_messages";
     public static final String H2DB_PATH = "h2db.path";

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

@@ -2203,6 +2203,7 @@ public class DatabaseStore {
                 ", `_join_type`" +
                 ", `_private_chat`" +
                 ", `_searchable`" +
+                ", _deleted" +
                 " from t_group  where `_gid` = ?";
 
             statement = connection.prepareStatement(sql);
@@ -2259,6 +2260,9 @@ public class DatabaseStore {
                 intValue = rs.getInt(index++);
                 builder.setSearchable(intValue);
 
+                intValue = rs.getInt(index++);
+                builder.setDeleted(intValue);
+
                 return builder.build();
             }
         } catch (SQLException e) {

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

@@ -166,6 +166,8 @@ public class MemoryMessagesStore implements IMessagesStore {
     private Set<String> mAllowStrangerChatSet = new HashSet<>();
     private boolean mDisableStrangerAddGroup = false;
 
+    private boolean mIDUseUUID = true;
+
     private Set<String> mClientSignatureSet = new HashSet<>();
     private boolean mRejectEmptySignature = true;
 
@@ -614,6 +616,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         } catch (Exception e) {
 
         }
+
+        try {
+            mIDUseUUID = Boolean.parseBoolean(server.getConfig().getProperty(BrokerConstants.ID_USE_UUID, "false"));
+        } catch (Exception e) {
+        }
     }
 
     private void printMissConfigLog(String config, String defaultValue) {
@@ -2421,7 +2428,8 @@ public class MemoryMessagesStore implements IMessagesStore {
 
                 WFCMessage.GroupInfo groupInfo = groupMap.get(message.getConversation().getTarget());
                 if (groupInfo == null) {
-                    return ErrorCode.ERROR_CODE_RECALL_TIME_EXPIRED;
+                    LOG.info("recall message failure, group {} not exist", message.getConversation().getTarget());
+                    return ErrorCode.ERROR_CODE_NOT_EXIST;
                 }
                 if (operatorId.equals(groupInfo.getOwner())) {
                     if(operatorId.equals(message.getFromUser())) {
@@ -2858,7 +2866,9 @@ public class MemoryMessagesStore implements IMessagesStore {
         IMap<String, Integer> mUserMap = hzInstance.getMap(USER_STATUS);
         ArrayList<InputOutputUserBlockStatus> out = new ArrayList<>();
         for (Map.Entry<String, Integer> entry : mUserMap.entrySet()) {
-            out.add(new InputOutputUserBlockStatus(entry.getKey(), entry.getValue()));
+            if(entry.getValue() > 0) {
+                out.add(new InputOutputUserBlockStatus(entry.getKey(), entry.getValue()));
+            }
         }
         return out;
     }
@@ -4788,9 +4798,11 @@ public class MemoryMessagesStore implements IMessagesStore {
 
     @Override
     public String getShortUUID(){
-        int id = databaseStore.getGeneratedId();
-        if (id > 0) {
-            return IDUtils.toUid(id);
+        if(!mIDUseUUID) {
+            int id = databaseStore.getGeneratedId();
+            if (id > 0) {
+                return IDUtils.toUid(id);
+            }
         }
         return UUIDGenerator.getUUID();
     }

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

@@ -102,7 +102,7 @@ public class HttpUtils {
                     if(httpCallback != null) {
                         int code = response.code();
                         if(code == 200) {
-                            if(response.body() != null && response.body().contentLength() > 0) {
+                            if(response.body() != null) {
                                 httpCallback.onSuccess(response.body().string());
                             } else {
                                 httpCallback.onSuccess(null);

common/pom.xml

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

common/src/main/java/cn/wildfirechat/messagecontentbuilder/MediaMessageContentBuilder.java

@@ -1,19 +0,0 @@
-package cn.wildfirechat.messagecontentbuilder;
-
-import cn.wildfirechat.pojos.MessagePayload;
-
-abstract public class MediaMessageContentBuilder extends MessageContentBuilder{
-    private String remoteMediaUrl;
-
-    public MediaMessageContentBuilder remoteMediaUrl(String remoteMediaUrl) {
-        this.remoteMediaUrl = remoteMediaUrl;
-        return this;
-    }
-
-    @Override
-    protected MessagePayload encodeBase() {
-        MessagePayload payload = super.encodeBase();
-        payload.setRemoteMediaUrl(remoteMediaUrl);
-        return payload;
-    }
-}

common/src/main/java/cn/wildfirechat/messagecontentbuilder/MessageContentBuilder.java

@@ -1,33 +0,0 @@
-package cn.wildfirechat.messagecontentbuilder;
-
-import cn.wildfirechat.pojos.MessagePayload;
-
-import java.util.List;
-
-public abstract class MessageContentBuilder {
-    private int mentionedType;
-    private List<String> mentionedTargets;
-    private String extra;
-    public MessageContentBuilder mentionedType(int mentionedType) {
-        this.mentionedType = mentionedType;
-        return this;
-    }
-    public MessageContentBuilder mentionedTargets(List<String> mentionedTargets) {
-        this.mentionedTargets = mentionedTargets;
-        return this;
-    }
-
-    public MessageContentBuilder extra(String extra) {
-        this.extra = extra;
-        return this;
-    }
-
-    protected MessagePayload encodeBase() {
-        MessagePayload payload = new MessagePayload();
-        payload.setMentionedType(mentionedType);
-        payload.setMentionedTarget(mentionedTargets);
-        payload.setExtra(extra);
-        return payload;
-    }
-    abstract public MessagePayload build();
-}

common/src/main/java/cn/wildfirechat/messagecontentbuilder/SoundMessageContentBuilder.java

@@ -1,25 +0,0 @@
-package cn.wildfirechat.messagecontentbuilder;
-
-import cn.wildfirechat.pojos.MessagePayload;
-import cn.wildfirechat.proto.ProtoConstants;
-import org.json.simple.JSONObject;
-
-public class SoundMessageContentBuilder extends MediaMessageContentBuilder {
-    private int duration;
-    public static SoundMessageContentBuilder newBuilder(int duration) {
-        SoundMessageContentBuilder builder = new SoundMessageContentBuilder();
-        builder.duration = duration;
-        return builder;
-    }
-    @Override
-    public MessagePayload build() {
-        MessagePayload payload = encodeBase();
-        payload.setType(ProtoConstants.ContentType.Voice);
-        payload.setMediaType(ProtoConstants.MessageMediaType.VOICE);
-        payload.setPersistFlag(ProtoConstants.PersistFlag.Persist_And_Count);
-        JSONObject jsonObject = new JSONObject();
-        jsonObject.put("duration", duration);
-        payload.setContent(jsonObject.toJSONString());
-        return payload;
-    }
-}

common/src/main/java/cn/wildfirechat/messagecontentbuilder/StreamingTextMessageContentBuilder.java

@@ -1,48 +0,0 @@
-package cn.wildfirechat.messagecontentbuilder;
-
-import cn.wildfirechat.pojos.MessagePayload;
-import cn.wildfirechat.proto.ProtoConstants;
-import com.google.gson.Gson;
-
-import java.nio.charset.StandardCharsets;
-import java.util.Base64;
-import java.util.HashMap;
-import java.util.Map;
-
-public class StreamingTextMessageContentBuilder extends MessageContentBuilder{
-    private String text;
-    private String streamId;
-    private boolean generating;
-    public static StreamingTextMessageContentBuilder newBuilder(String streamId) {
-        StreamingTextMessageContentBuilder builder = new StreamingTextMessageContentBuilder();
-        builder.generating = false;
-        builder.streamId = streamId;
-        return builder;
-    }
-    public StreamingTextMessageContentBuilder text(String text) {
-        this.text = text;
-        return this;
-    }
-
-    public StreamingTextMessageContentBuilder generating(boolean generating) {
-        this.generating = generating;
-        return this;
-    }
-
-    @Override
-    public MessagePayload build() {
-        MessagePayload payload = encodeBase();
-        payload.setSearchableContent(text);
-        payload.setContent(streamId);
-        if(generating) {
-            //正在生成消息的类型是14，存储标记位为透传为4。
-            payload.setType(14);
-            payload.setPersistFlag(4);
-        } else {
-            //已经生成消息的类型是15，存储标记位为透传为3。
-            payload.setType(15);
-            payload.setPersistFlag(3);
-        }
-        return payload;
-    }
-}

common/src/main/java/cn/wildfirechat/messagecontentbuilder/TextMessageContentBuilder.java

@@ -1,21 +0,0 @@
-package cn.wildfirechat.messagecontentbuilder;
-
-import cn.wildfirechat.pojos.MessagePayload;
-import cn.wildfirechat.proto.ProtoConstants;
-
-public class TextMessageContentBuilder extends MessageContentBuilder{
-    private String text;
-    public static TextMessageContentBuilder newBuilder(String text) {
-        TextMessageContentBuilder builder = new TextMessageContentBuilder();
-        builder.text = text;
-        return builder;
-    }
-    @Override
-    public MessagePayload build() {
-        MessagePayload payload = encodeBase();
-        payload.setType(ProtoConstants.ContentType.Text);
-        payload.setPersistFlag(ProtoConstants.PersistFlag.Persist_And_Count);
-        payload.setSearchableContent(text);
-        return payload;
-    }
-}

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

@@ -97,6 +97,10 @@ public class ProtoConstants {
         int Composited = 11;
         int Rich_Notification = 12;
         int Articles = 13;
+        int StreamingText_Generationg = 14;
+        int StreamingText_Generated = 15;
+        int Not_Delivered = 16;
+        int Ptt_Voice = 23;
         int Enter_Channel_Chat = 71;
         int Leave_Channel_Chat = 72;
         int Recall = 80;
@@ -126,6 +130,12 @@ public class ProtoConstants {
         int Quit_Group_Visible_Notification = 121;
         int Modify_Group_Extra = 122;
         int Modify_Group_Member_Extra = 123;
+
+        int Call_Start = 400;
+        int Call_Accept = 401;
+        int Call_End = 402;
+        int Call_Add_Participant = 406;
+        int Call_Multi_Call_Ongoing = 416;
     }
 
     public interface MessagePersistFlag {

distribution/pom.xml

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

distribution/src/main/resources/wildfirechat.conf

@@ -66,6 +66,10 @@ token.key testim
 ##是否使用AES256加密。默认客户端和服务器都是AES128加密，如果需要开启AES256，需要客户端和IM服务同时开通。
 #encrypt.use_aes256 true
 
+##当创建一个对象时（用户，群组，频道，机器人等），如果没有传入ID，野火会为这个对象生成一个ID。如果id.use_uuid为true，会使用uuid作为对象ID，否则会使用野火短ID，默认为false。
+## 短ID有个很大的风险是容易被人穷举进行攻击。建议用UUID。
+id.use_uuid true
+
 ##首次登录，是否接收之前的历史消息。
 ##0 不接收历史消息，只接收${message.compensate_time_limit}毫秒以内的消息，由于服务器没有保存已经收取记录，所以如果有超过${message.compensate_time_limit}毫秒之前未收取的消息也不会收取下拉；
 ##1接收，会接收 message.max_queue 配置的条数的历史消息
@@ -250,15 +254,6 @@ client.request_rate_limit 100
 ##关于对象存储的详细信息请参考：https://docs.wildfirechat.cn/server/oss.html
 media.server.use_qiniu 0
 
-##媒体类型分类
-#Media_Type_GENERAL = 0,
-#Media_Type_IMAGE = 1,
-#Media_Type_VOICE = 2,
-#Media_Type_VIDEO = 3,
-#Media_Type_FILE = 4,
-#Media_Type_PORTRAIT = 5,
-#Media_Type_FAVORITE = 6
-
 # qiniu media server configuration
 ## 上传地址，不同的区域，上传地址也不同，请注意现在正确的地址
 qiniu.server_url  http://up.qbox.me
@@ -284,11 +279,21 @@ qiniu.bucket_portrait_domain http://cdn2.wildfirechat.cn
 qiniu.bucket_favorite_name storage
 qiniu.bucket_favorite_domain http://cdn2.wildfirechat.cn
 
+##媒体类型分类
+#Media_Type_GENERAL = 0,
+#Media_Type_IMAGE = 1,
+#Media_Type_VOICE = 2,
+#Media_Type_VIDEO = 3,
+#Media_Type_FILE = 4,
+#Media_Type_PORTRAIT = 5,
+#Media_Type_FAVORITE = 6,
+#Media_Type_STICKER = 7,
+#Media_Type_MOMENTS = 8
 
 # local media server configuration
 # 本地媒体服务器配置。
-local.media.storage.root ./media
-# 如果使用内置文件存储，文件上传后地址默认为 http://server.ip:http_port/fs/5/2021/03/27/08/filename。
+local.media.storage.root media
+# 如果使用内置文件存储，文件上传后地址默认为 http://server.ip:http_port/fs/5/2021/03/27/08/filename。fs目录下按照类型存放文件，媒体类型见上面注释，比如5就是Media_Type_PORTRAIT，是客户端的头像文件。
 # 如果需要使用nginx添加https支持，请打开下面配置，这样客户端得到的文件地址为 https://example.com/media/fs/5/2021/03/27/08/filename。
 # 需要nginx把请求从https://example.com/media/fs 转到 http://server.ip:http_port/fs。注意需要带上所有header。
 # 尽管内置文件存储可以使用，但是我们还是建议使用专业级别的对象存储服务，社区版可以使用七牛，专业版另外支持阿里云和也是私有对象存储。详情请参考 https://docs.wildfirechat.cn/server/oss.html

pom.xml

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

release_note.md

@@ -12,6 +12,19 @@
 
 # 更新记录
 
+--------------
+Release note 1.2.9:
+1. 解决server api获取群组信息不全的问题。
+2. 添加配置使用uuid作为用户群组等ID。
+
+--------------
+Release note 1.2.8:
+1. server api获取被封禁用户时，过滤掉正常用户。
+2. 解决群组标记删除错误。
+3. SDK中添加发送消息的示例。
+4. 群解散后撤回群中的消息应该失败。
+5. 解决某些时候http请求返回信息无法读取问题。
+
 --------------
 Release note 1.2.7:
 1. 解决搜索频道时某些类型的频道无法被搜索的问题。

sdk/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.2.7</version>
+        <version>1.2.9</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/ArticlesMessageContent.java

@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2022 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+
+
+public class ArticlesMessageContent extends MessageContent {
+    public Article topArticle;
+    public ArrayList<Article> subArticles;
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Articles;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        payload.setSearchableContent(topArticle.title);
+        JSONObject object = new JSONObject();
+
+        object.put("top", topArticle.toJson());
+        if (subArticles != null) {
+            JSONArray jsonArray = new JSONArray();
+            object.put("subArticles", jsonArray);
+            for (Article article : subArticles) {
+                jsonArray.add(article.toJson());
+            }
+        }
+        payload.setBase64edData(Base64.getEncoder().encodeToString(object.toString().getBytes()));
+
+
+        return payload;
+    }
+
+    @Override
+    public void decode(MessagePayload payload) {
+        try {
+            JSONObject object = (JSONObject) new JSONParser().parse(new String(Base64.getDecoder().decode(payload.getBase64edData())));
+            JSONObject topObj = (JSONObject) object.get("top");
+            this.topArticle = Article.fromJson(topObj);
+            JSONArray jsonArray = (JSONArray) object.get("subArticles");
+            if (jsonArray != null && jsonArray.size() > 0) {
+                this.subArticles = new ArrayList<>();
+                for (int i = 0; i < jsonArray.size(); i++) {
+                    subArticles.add(Article.fromJson((JSONObject) jsonArray.get(i)));
+                }
+            }
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    public List<LinkMessageContent> toLinkMessageContent() {
+        List<LinkMessageContent> contents = new ArrayList<>();
+        contents.add(this.topArticle.toLinkMessageContent());
+        if (this.subArticles != null) {
+            for (Article article : subArticles) {
+                contents.add(article.toLinkMessageContent());
+            }
+        }
+        return contents;
+    }
+
+    public static class Article {
+        public String articleId;
+        public String cover;
+        public String title;
+        public String digest;
+        public String url;
+        boolean readReport;
+
+        JSONObject toJson() {
+            JSONObject obj = new JSONObject();
+            obj.put("id", articleId);
+            obj.put("cover", cover);
+            obj.put("title", title);
+            obj.put("digest", digest);
+            obj.put("url", url);
+            obj.put("rr", readReport);
+
+
+            return obj;
+        }
+
+        static Article fromJson(JSONObject obj) {
+            Article article = new Article();
+            article.articleId = (String) obj.get("id");
+            article.cover = (String) obj.get("cover");
+            article.title = (String) obj.get("title");
+            article.digest = (String) obj.get("digest");
+            article.url = (String) obj.get("url");
+            article.readReport = (boolean) obj.get("rr");
+            return article;
+        }
+
+        public LinkMessageContent toLinkMessageContent() {
+            LinkMessageContent content = new LinkMessageContent(this.title, this.url);
+            content.setContentDigest(this.digest);
+            content.setThumbnailUrl(this.cover);
+            return content;
+        }
+
+        public Article() {
+        }
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/CallStartMessageContent.java

@@ -0,0 +1,205 @@
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import io.netty.util.internal.StringUtil;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+
+/**
+ * Created by heavyrain lee on 2017/12/6.
+ */
+
+public class CallStartMessageContent extends MessageContent {
+    private String callId;
+    // 多人视音频是有效，不包含自己，一对一忽略此参数
+    private List<String> targetIds;
+    private long connectTime;
+    private long endTime;
+    private boolean audioOnly;
+    private String pin;
+
+
+    /**
+     * 0, UnKnown,
+     * 1, Busy,
+     * 2, SignalError,
+     * 3, Hangup,
+     * 4, MediaError,
+     * 5, RemoteHangup,
+     * 6, OpenCameraFailure,
+     * 7, Timeout,
+     * 8, AcceptByOtherClient
+     */
+    private int status;
+
+    /**
+     * 0，未知；1，多人版音视频；2，高级版音视频
+     */
+    private int type;
+
+    public CallStartMessageContent() {
+    }
+
+    public CallStartMessageContent(String callId, List<String> targetIds, boolean audioOnly) {
+        this.callId = callId;
+        this.audioOnly = audioOnly;
+        this.targetIds = targetIds;
+    }
+
+    public String getCallId() {
+        return callId;
+    }
+
+    public void setCallId(String callId) {
+        this.callId = callId;
+    }
+
+    public long getConnectTime() {
+        return connectTime;
+    }
+
+    public void setConnectTime(long connectTime) {
+        this.connectTime = connectTime;
+    }
+
+    public long getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(long endTime) {
+        this.endTime = endTime;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public boolean isAudioOnly() {
+        return audioOnly;
+    }
+
+    public void setAudioOnly(boolean audioOnly) {
+        this.audioOnly = audioOnly;
+    }
+
+    public List<String> getTargetIds() {
+        return targetIds;
+    }
+
+    public void setTargetIds(List<String> targetIds) {
+        this.targetIds = targetIds;
+    }
+
+    public String getPin() {
+        return pin;
+    }
+
+    public void setPin(String pin) {
+        this.pin = pin;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Call_Start;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        payload.setContent(callId);
+        payload.setPushContent("音视频通话邀请");
+
+            JSONObject objWrite = new JSONObject();
+            if (connectTime > 0) {
+                objWrite.put("c", connectTime);
+            }
+
+            if (endTime > 0) {
+                objWrite.put("e", endTime);
+            }
+
+            if (status > 0) {
+                objWrite.put("s", status);
+            }
+
+            objWrite.put("t", targetIds.get(0));
+            JSONArray ts = new JSONArray();
+            ts.addAll(targetIds);
+            objWrite.put("ts", ts);
+            objWrite.put("a", audioOnly ? 1 : 0);
+            objWrite.put("p", pin);
+            if (this.type > 0) {
+                objWrite.put("ty", this.type);
+            }
+
+            payload.setBase64edData(Base64.getEncoder().encodeToString(objWrite.toString().getBytes()));
+
+            JSONObject pushDataWrite = new JSONObject();
+            pushDataWrite.put("callId", callId);
+            pushDataWrite.put("audioOnly", audioOnly);
+            if (targetIds != null && targetIds.size() > 0) {
+                pushDataWrite.put("participants", targetIds);
+            }
+            payload.setPushData(pushDataWrite.toString());
+        return payload;
+    }
+
+
+    @Override
+    public void decode(MessagePayload payload) {
+        callId = payload.getContent();
+
+        try {
+            if (!StringUtil.isNullOrEmpty(payload.getBase64edData())) {
+                JSONObject jsonObject = (JSONObject) new JSONParser().parse(new String(Base64.getDecoder().decode(payload.getBase64edData())));
+                connectTime = (long) jsonObject.get("c");
+                endTime = (long) jsonObject.get("e");
+                status = (int) jsonObject.get("s");
+                pin = (String) jsonObject.get("p");
+                type = (int) jsonObject.get("ty");
+                JSONArray array = (JSONArray) jsonObject.get("ts");
+                targetIds = new ArrayList<>();
+                if (array == null) {
+                    targetIds.add((String) jsonObject.get("t"));
+                } else {
+                    for (int i = 0; i < array.size(); i++) {
+                        if (array.get(i) instanceof String) {
+                            targetIds.add((String) array.get(i));
+                        }
+                    }
+                }
+                audioOnly = (int)jsonObject.get("a") > 0;
+            }
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/CardMessageContent.java

@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import io.netty.util.internal.StringUtil;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.util.Base64;
+
+public class CardMessageContent extends MessageContent {
+    /**
+     * 0，用户；1，群组；2，聊天室；3，频道
+     */
+    private int type;
+    private String target;
+    // 用户名，一般是type为用户时使用
+    private String name;
+    private String displayName;
+    private String portrait;
+    private String from;
+
+    public CardMessageContent() {
+    }
+
+    public CardMessageContent(int type, String target, String displayName, String portrait, String from) {
+        this.type = type;
+        this.target = target;
+        this.displayName = displayName;
+        this.portrait = portrait;
+        this.from = from;
+    }
+
+    public String getTarget() {
+        return target;
+    }
+
+    public void setTarget(String target) {
+        this.target = target;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
+
+    public String getPortrait() {
+        return portrait;
+    }
+
+    public void setPortrait(String portrait) {
+        this.portrait = portrait;
+    }
+
+    public int getType() {
+        return type;
+    }
+
+    public void setType(int type) {
+        this.type = type;
+    }
+
+    public String getFrom() {
+        return from;
+    }
+
+    public void setFrom(String from) {
+        this.from = from;
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Name_Card;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        payload.setContent(target);
+            JSONObject objWrite = new JSONObject();
+            objWrite.put("t", type);
+            objWrite.put("n", name);
+            objWrite.put("d", displayName);
+            objWrite.put("p", portrait);
+            objWrite.put("f", from);
+
+            payload.setBase64edData(Base64.getEncoder().encodeToString(objWrite.toString().getBytes()));
+        return payload;
+    }
+
+
+    @Override
+    public void decode(MessagePayload payload) {
+        target = payload.getContent();
+        try {
+            if (!StringUtil.isNullOrEmpty(payload.getBase64edData())) {
+                JSONObject jsonObject = (JSONObject) new JSONParser().parse(new String(Base64.getDecoder().decode(payload.getBase64edData())));
+                type = (int) jsonObject.get("t");
+                name = (String) jsonObject.get("n");
+                displayName = (String) jsonObject.get("d");
+                portrait = (String) jsonObject.get("p");
+                from = (String) jsonObject.get("f");
+            }
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/FileMessageContent.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+
+public class FileMessageContent extends MediaMessageContent {
+    private String name;
+    private int size;
+    private static final String FILE_NAME_PREFIX = "[文件] ";
+
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.File;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        payload.setSearchableContent(name);
+        payload.setContent(size + "");
+
+        return payload;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getSize() {
+        return size;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setSize(int size) {
+        this.size = size;
+    }
+
+    @Override
+    public void decode(MessagePayload payload) {
+        super.decodeBase(payload);
+
+        if (payload.getSearchableContent().startsWith(FILE_NAME_PREFIX)) {
+            name = payload.getSearchableContent().substring(payload.getSearchableContent().indexOf(FILE_NAME_PREFIX) + FILE_NAME_PREFIX.length());
+        } else {
+            name = payload.getSearchableContent();
+        }
+        size = Integer.parseInt(payload.getContent());
+    }
+
+    @Override
+    protected int getMediaType() {
+        return ProtoConstants.MessageMediaType.FILE;
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/ImageMessageContent.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+
+import java.util.Base64;
+
+public class ImageMessageContent extends MediaMessageContent {
+    private byte[] thumbnailBytes;
+
+
+    public void setThumbnailBytes(byte[] thumbnailBytes) {
+        this.thumbnailBytes = thumbnailBytes;
+    }
+
+    public byte[] getThumbnailBytes() {
+        return thumbnailBytes;
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Image;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        payload.setSearchableContent("[图片]");
+        payload.setBase64edData(Base64.getEncoder().encodeToString(thumbnailBytes));
+
+        return payload;
+    }
+
+
+    @Override
+    public void decode(MessagePayload payload) {
+        super.decodeBase(payload);
+        thumbnailBytes = Base64.getDecoder().decode(payload.getBase64edData());
+    }
+
+    @Override
+    protected int getMediaType() {
+        return ProtoConstants.MessageMediaType.IMAGE;
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/LinkMessageContent.java

@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import io.netty.util.internal.StringUtil;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.util.Base64;
+
+public class LinkMessageContent extends MessageContent {
+    private String title;
+    private String contentDigest;
+    private String url;
+    private String thumbnailUrl;
+
+    public LinkMessageContent() {
+    }
+
+    public LinkMessageContent(String title, String url) {
+        this.title = title;
+        this.url = url;
+    }
+
+    public String getContentDigest() {
+        return contentDigest;
+    }
+
+    public void setContentDigest(String contentDigest) {
+        this.contentDigest = contentDigest;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getUrl() {
+        return url;
+    }
+
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public String getThumbnailUrl() {
+        return thumbnailUrl;
+    }
+
+    public void setThumbnailUrl(String thumbnailUrl) {
+        this.thumbnailUrl = thumbnailUrl;
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Link;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+
+
+        payload.setSearchableContent(title);
+        JSONObject objWrite = new JSONObject();
+        objWrite.put("d", contentDigest);
+        objWrite.put("u", url);
+        objWrite.put("t", thumbnailUrl);
+        payload.setBase64edData(Base64.getEncoder().encodeToString(objWrite.toString().getBytes()));
+
+        return payload;
+    }
+
+
+    @Override
+    public void decode(MessagePayload payload) {
+        title = payload.getSearchableContent();
+
+
+        try {
+            if (!StringUtil.isNullOrEmpty(payload.getBase64edData())) {
+                JSONObject jsonObject = (JSONObject) new JSONParser().parse(new String(Base64.getDecoder().decode(payload.getBase64edData())));
+                contentDigest = (String) jsonObject.get("d");
+                url = (String) jsonObject.get("u");
+                thumbnailUrl = (String) jsonObject.get("t");
+            }
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/LocationMessageContent.java

@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import io.netty.util.internal.StringUtil;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.util.Base64;
+
+public class LocationMessageContent extends MessageContent {
+    private String title;
+    public byte[] thumbnailByte;
+    private double longitude;
+    private double latitude;
+
+    public LocationMessageContent() {
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public byte[] getThumbnailByte() {
+        return thumbnailByte;
+    }
+
+    public void setThumbnailByte(byte[] thumbnailByte) {
+        this.thumbnailByte = thumbnailByte;
+    }
+
+    public double getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(double longitude) {
+        this.longitude = longitude;
+    }
+
+    public double getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(double latitude) {
+        this.latitude = latitude;
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Location;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        payload.setSearchableContent(title);
+        payload.setBase64edData(Base64.getEncoder().encodeToString(this.thumbnailByte));
+
+        JSONObject objWrite = new JSONObject();
+        objWrite.put("lat", latitude);
+        objWrite.put("long", longitude);
+
+        payload.setContent(objWrite.toString());
+
+        return payload;
+    }
+
+
+    @Override
+    public void decode(MessagePayload payload) {
+        if (!StringUtil.isNullOrEmpty(payload.getBase64edData())) {
+            this.thumbnailByte = Base64.getDecoder().decode(payload.getBase64edData());
+        }
+        title = payload.getSearchableContent();
+        try {
+            if (payload.getContent() != null) {
+                JSONObject jsonObject = (JSONObject) new JSONParser().parse(payload.getContent());
+                latitude = (double) jsonObject.get("lat");
+                longitude = (double) jsonObject.get("long");
+            }
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/MediaMessageContent.java

@@ -0,0 +1,25 @@
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+
+abstract public class MediaMessageContent extends MessageContent {
+    private String remoteMediaUrl;
+
+    public String getRemoteMediaUrl() {
+        return remoteMediaUrl;
+    }
+
+    public void setRemoteMediaUrl(String remoteMediaUrl) {
+        this.remoteMediaUrl = remoteMediaUrl;
+    }
+
+    @Override
+    protected MessagePayload encodeBase() {
+        MessagePayload payload = super.encodeBase();
+        payload.setRemoteMediaUrl(remoteMediaUrl);
+        payload.setMediaType(getMediaType());
+        return payload;
+    }
+
+    protected abstract int getMediaType();
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/MessageContent.java

@@ -0,0 +1,44 @@
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+
+import java.util.List;
+
+public abstract class MessageContent {
+    private int mentionedType;
+    private List<String> mentionedTargets;
+    private String extra;
+    public MessageContent mentionedType(int mentionedType) {
+        this.mentionedType = mentionedType;
+        return this;
+    }
+    public MessageContent mentionedTargets(List<String> mentionedTargets) {
+        this.mentionedTargets = mentionedTargets;
+        return this;
+    }
+
+    public MessageContent extra(String extra) {
+        this.extra = extra;
+        return this;
+    }
+
+    protected MessagePayload encodeBase() {
+        MessagePayload payload = new MessagePayload();
+        payload.setType(getContentType());
+        payload.setPersistFlag(getPersistFlag());
+        payload.setMentionedType(mentionedType);
+        payload.setMentionedTarget(mentionedTargets);
+        payload.setExtra(extra);
+        return payload;
+    }
+
+    protected void decodeBase(MessagePayload payload) {
+        this.mentionedType = payload.getMentionedType();
+        this.mentionedTargets = payload.getMentionedTarget();
+        this.extra = payload.getExtra();
+    }
+    abstract public int getContentType();
+    abstract public int getPersistFlag();
+    abstract public MessagePayload encode();
+    abstract public void decode(MessagePayload payload);
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/MessageContentFactory.java

@@ -0,0 +1,77 @@
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.Conversation;
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.WFCMessage;
+import cn.wildfirechat.sdk.model.Message;
+import cn.wildfirechat.sdk.utilities.ClassUtil;
+
+import java.io.IOException;
+import java.lang.reflect.Modifier;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class MessageContentFactory {
+    private static final Map<Integer, Class<MessageContent>> contentClassMap = new ConcurrentHashMap<>();
+
+    static  {
+        registerAllMessageContent();
+    }
+
+    public static Message decodeMessage(WFCMessage.Message protoMessage) {
+        Message message = new Message();
+        message.content = decodeMessageContent(protoMessage.getContent());
+        WFCMessage.Conversation protoConversation = protoMessage.getConversation();
+        message.conversation = new Conversation(protoConversation.getType(), protoConversation.getTarget(), protoConversation.getLine());
+        message.messageUid = protoMessage.getMessageId();
+        message.sender = protoMessage.getFromUser();
+        message.serverTime = protoMessage.getServerTimestamp();
+        message.toUsers = protoMessage.getToList();
+        return message;
+    }
+
+    public static MessageContent decodeMessageContent(WFCMessage.MessageContent protoMessageContent) {
+        MessagePayload payload = MessagePayload.fromProtoMessageContent(protoMessageContent);
+        return decodeMessageContent(payload);
+    }
+
+    public static MessageContent decodeMessageContent(MessagePayload messagePayload) {
+        Class<MessageContent> cls = contentClassMap.get(messagePayload.getType());
+        MessageContent messageContent;
+        if(cls != null) {
+            try {
+                messageContent = cls.newInstance();
+            } catch (InstantiationException e) {
+                throw new RuntimeException(e);
+            } catch (IllegalAccessException e) {
+                throw new RuntimeException(e);
+            }
+        } else {
+            messageContent = new UnknownMessageContent();
+        }
+        messageContent.decodeBase(messagePayload);
+        messageContent.decode(messagePayload);
+        return messageContent;
+    }
+
+    private static void registerAllMessageContent() {
+        try {
+            for (Class cls : ClassUtil.getAllAssignedClass(MessageContent.class)) {
+                if(!Modifier.isAbstract(cls.getModifiers())) {
+                    try {
+                        MessageContent content = (MessageContent)cls.newInstance();
+                        contentClassMap.put(content.getContentType(), cls);
+                    } catch (InstantiationException e) {
+                        e.printStackTrace();
+                    } catch (IllegalAccessException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/MultiCallOngoingMessageContent.java

@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2022 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+
+public class MultiCallOngoingMessageContent extends MessageContent {
+    private String callId;
+    private String initiator;
+    private boolean audioOnly;
+    private List<String> targets;
+
+    public MultiCallOngoingMessageContent() {
+    }
+
+    public MultiCallOngoingMessageContent(String callId, String initiator, boolean audioOnly, List<String> targets) {
+        this.callId = callId;
+        this.initiator = initiator;
+        this.audioOnly = audioOnly;
+        this.targets = targets;
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Call_Multi_Call_Ongoing;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Transparent;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        payload.setContent(callId);
+        JSONObject object = new JSONObject();
+        object.put("initiator", this.initiator);
+        JSONArray arr = new JSONArray();
+        for (int i = 0; i < targets.size(); i++) {
+            arr.add(i, targets.get(i));
+        }
+        object.put("targets", arr);
+        object.put("audioOnly", this.audioOnly ? 1 : 0);
+        payload.setBase64edData(Base64.getEncoder().encodeToString(object.toString().getBytes()));
+
+        return payload;
+    }
+
+    @Override
+    public void decode(MessagePayload payload) {
+        this.callId = payload.getContent();
+        try {
+            JSONObject object = (JSONObject) new JSONParser().parse(new String(Base64.getDecoder().decode(payload.getBase64edData())));
+            this.initiator = (String) object.get("initiator");
+            this.targets = new ArrayList<>();
+            JSONArray array = (JSONArray) object.get("targets");
+            if (array != null) {
+                for (int i = 0; i < array.size(); i++) {
+                    targets.add((String) array.get(i));
+                }
+            }
+            this.audioOnly = (int)object.get("audioOnly") == 1;
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public String getCallId() {
+        return callId;
+    }
+
+    public void setCallId(String callId) {
+        this.callId = callId;
+    }
+
+    public String getInitiator() {
+        return initiator;
+    }
+
+    public void setInitiator(String initiator) {
+        this.initiator = initiator;
+    }
+
+    public boolean isAudioOnly() {
+        return audioOnly;
+    }
+
+    public void setAudioOnly(boolean audioOnly) {
+        this.audioOnly = audioOnly;
+    }
+
+    public List<String> getTargets() {
+        return targets;
+    }
+
+    public void setTargets(List<String> targets) {
+        this.targets = targets;
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/NotDeliveredMessageContent.java

@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2024 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.List;
+
+public class NotDeliveredMessageContent extends MessageContent {
+    // 请求的类型，1 发送消息，2 撤回消息，3 删除消息
+    private int type;
+
+    // 发送的消息 uid
+    private long messageUid;
+
+    // 是全部失败，还是部分失败
+    private boolean allFailure;
+
+    // 部分失败时，失败的用户 id 列表
+    private List<String> userIds;
+
+    // 归属IM服务请求桥接服务出现的错误，有可能是桥接服务没有配置，或者不可用。
+    private int localImErrorCode;
+
+    // 归属桥接服务出现的错误
+    private int localBridgeErrorCode;
+
+    // 远端桥接服务出现的错误
+    private int remoteBridgeErrorCode;
+
+    // 远端IM服务出现的错误
+    private int remoteServerErrorCode;
+
+    // 错误提示信息
+    private String errorMessage;
+
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Not_Delivered;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        JSONObject obj = new JSONObject();
+        obj.put("mid", this.messageUid);
+        obj.put("all", this.allFailure);
+        obj.put("us", this.userIds);
+        obj.put("lme", this.localImErrorCode);
+        obj.put("lbe", this.localBridgeErrorCode);
+        obj.put("rbe", this.remoteBridgeErrorCode);
+        obj.put("rme", this.remoteServerErrorCode);
+        obj.put("em", this.errorMessage);
+        payload.setBase64edData(Base64.getEncoder().encodeToString(obj.toString().getBytes()));
+        return payload;
+    }
+
+    @Override
+    public void decode(MessagePayload payload) {
+        try {
+
+                JSONObject obj = (JSONObject) new JSONParser().parse(new String(Base64.getDecoder().decode(payload.getBase64edData())));
+                this.messageUid = (long) obj.get("mid");
+                this.allFailure = (boolean) obj.get("all");
+                this.userIds = new ArrayList<>();
+                JSONArray arr = (JSONArray) obj.get("us");
+                if (arr != null) {
+                    for (int i = 0; i < arr.size(); i++) {
+                        this.userIds.add((String) arr.get(i));
+                    }
+                }
+                this.localImErrorCode = (int) obj.get("lme");
+                this.localBridgeErrorCode = (int) obj.get("lbe");
+                this.remoteBridgeErrorCode = (int) obj.get("rbe");
+                this.remoteServerErrorCode = (int) obj.get("rme");
+                this.errorMessage = (String) obj.get("em");
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/PTTSoundMessageContent.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2021 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import org.json.simple.JSONObject;
+
+public class PTTSoundMessageContent extends SoundMessageContent {
+
+    public PTTSoundMessageContent() {
+        super();
+    }
+
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encode();
+        payload.setSearchableContent("[对讲语音]");
+
+        return payload;
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Ptt_Voice;
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/RichNotificationMessageContent.java

@@ -1,4 +1,4 @@
-package cn.wildfirechat.messagecontentbuilder;
+package cn.wildfirechat.sdk.messagecontent;
 
 import cn.wildfirechat.pojos.MessagePayload;
 import cn.wildfirechat.proto.ProtoConstants;
@@ -9,7 +9,7 @@ import org.json.simple.JSONObject;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 
-public class RichNotificationContentBuilder extends MessageContentBuilder{
+public class RichNotificationMessageContent extends MessageContent {
     private String title;
     private String desc;
     private String remark;
@@ -19,34 +19,51 @@ public class RichNotificationContentBuilder extends MessageContentBuilder{
     private String exUrl;
     private String appId;
 
-    public static RichNotificationContentBuilder newBuilder(String title, String desc, String exUrl) {
-        RichNotificationContentBuilder builder = new RichNotificationContentBuilder();
-        builder.title = title;
-        builder.desc = desc;
-        builder.exUrl = exUrl;
-        return builder;
+    //必须有个空的构造函数
+    public RichNotificationMessageContent() {
     }
 
-    public RichNotificationContentBuilder remark(String remark) {
+    public RichNotificationMessageContent(String title, String desc, String exUrl) {
+        this.title = title;
+        this.desc = desc;
+        this.exUrl = exUrl;
+    }
+
+    public RichNotificationMessageContent title(String title) {
+        this.title = title;
+        return this;
+    }
+
+    public RichNotificationMessageContent desc(String desc) {
+        this.desc = desc;
+        return this;
+    }
+
+    public RichNotificationMessageContent exUrl(String exUrl) {
+        this.exUrl = exUrl;
+        return this;
+    }
+
+    public RichNotificationMessageContent remark(String remark) {
         this.remark = remark;
         return this;
     }
-    public RichNotificationContentBuilder exName(String exName) {
+    public RichNotificationMessageContent exName(String exName) {
         this.exName = exName;
         return this;
     }
-    public RichNotificationContentBuilder exPortrait(String exPortrait) {
+    public RichNotificationMessageContent exPortrait(String exPortrait) {
         this.exPortrait = exPortrait;
         return this;
     }
-    public RichNotificationContentBuilder appId(String appId) {
+    public RichNotificationMessageContent appId(String appId) {
         this.appId = appId;
         return this;
     }
-    public RichNotificationContentBuilder addItem(String key, String value) {
+    public RichNotificationMessageContent addItem(String key, String value) {
         return addItem(key, value, null);
     }
-    public RichNotificationContentBuilder addItem(String key, String value, String color) {
+    public RichNotificationMessageContent addItem(String key, String value, String color) {
         if(this.datas == null) {
             this.datas = new JSONArray();
         }
@@ -61,10 +78,18 @@ public class RichNotificationContentBuilder extends MessageContentBuilder{
     }
 
     @Override
-    public MessagePayload build() {
+    public int getContentType() {
+        return ProtoConstants.ContentType.Rich_Notification;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public MessagePayload encode() {
         MessagePayload payload = encodeBase();
-        payload.setType(ProtoConstants.ContentType.Rich_Notification);
-        payload.setPersistFlag(ProtoConstants.PersistFlag.Persist_And_Count);
         payload.setPushContent(title);
         payload.setContent(desc);
         JSONObject jsonObject = new JSONObject();
@@ -85,4 +110,8 @@ public class RichNotificationContentBuilder extends MessageContentBuilder{
 
         return payload;
     }
+
+    @Override
+    public void decode(MessagePayload payload) {
+    }
 }

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/SoundMessageContent.java

@@ -0,0 +1,53 @@
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import org.json.simple.JSONObject;
+
+public class SoundMessageContent extends MediaMessageContent {
+    private int duration;
+
+    //必须有个空的构造函数
+    public SoundMessageContent() {
+    }
+
+    public SoundMessageContent(int duration) {
+        this.duration = duration;
+    }
+
+    public int getDuration() {
+        return duration;
+    }
+
+    public void setDuration(int duration) {
+        this.duration = duration;
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Voice;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public void decode(MessagePayload payload) {
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = encodeBase();
+        JSONObject jsonObject = new JSONObject();
+        jsonObject.put("duration", duration);
+        payload.setContent(jsonObject.toJSONString());
+        return payload;
+    }
+
+    @Override
+    protected int getMediaType() {
+        return ProtoConstants.MessageMediaType.VOICE;
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/StickerMessageContent.java

@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.util.Base64;
+
+public class StickerMessageContent extends MediaMessageContent {
+    public int width;
+    public int height;
+
+    public int getWidth() {
+        return width;
+    }
+
+    public void setWidth(int width) {
+        this.width = width;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public void setHeight(int height) {
+        this.height = height;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        payload.setSearchableContent("[动态表情]");
+        JSONObject objWrite = new JSONObject();
+        objWrite.put("x", width);
+        objWrite.put("y", height);
+        payload.setBase64edData(Base64.getEncoder().encodeToString(objWrite.toString().getBytes()));
+
+        return payload;
+    }
+
+
+    @Override
+    public void decode(MessagePayload payload) {
+        super.decodeBase(payload);
+
+        try {
+            JSONObject jsonObject = (JSONObject) new JSONParser().parse(new String(Base64.getDecoder().decode(payload.getBase64edData())));
+            width = (int) jsonObject.get("x");
+            height = (int) jsonObject.get("y");
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    protected int getMediaType() {
+        return ProtoConstants.MessageMediaType.STICKER;
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Sticker;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/StreamTextGeneratedMessageContent.java

@@ -0,0 +1,52 @@
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+
+public class StreamTextGeneratedMessageContent extends MessageContent {
+    private String text;
+    private String streamId;
+
+    //必须有个空的构造函数
+    public StreamTextGeneratedMessageContent() {
+    }
+
+    public StreamTextGeneratedMessageContent(String text, String streamId) {
+        this.text = text;
+        this.streamId = streamId;
+    }
+
+    public StreamTextGeneratedMessageContent text(String text) {
+        this.text = text;
+        return this;
+    }
+
+    public StreamTextGeneratedMessageContent streamId(String streamId) {
+        this.streamId = streamId;
+        return this;
+    }
+
+    @Override
+    public int getContentType() {
+            return ProtoConstants.ContentType.StreamingText_Generated;
+    }
+
+    @Override
+    public int getPersistFlag() {
+            return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public void decode(MessagePayload payload) {
+        this.streamId = payload.getContent();
+        this.text = payload.getSearchableContent();
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = encodeBase();
+        payload.setSearchableContent(text);
+        payload.setContent(streamId);
+        return payload;
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/StreamTextGeneratingMessageContent.java

@@ -0,0 +1,52 @@
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+
+public class StreamTextGeneratingMessageContent extends MessageContent {
+    private String text;
+    private String streamId;
+
+    //必须有个空的构造函数
+    public StreamTextGeneratingMessageContent() {
+    }
+
+    public StreamTextGeneratingMessageContent(String text, String streamId) {
+        this.text = text;
+        this.streamId = streamId;
+    }
+
+    public StreamTextGeneratingMessageContent text(String text) {
+        this.text = text;
+        return this;
+    }
+
+    public StreamTextGeneratingMessageContent streamId(String streamId) {
+        this.streamId = streamId;
+        return this;
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.StreamingText_Generationg;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Transparent;
+    }
+
+    @Override
+    public void decode(MessagePayload payload) {
+        streamId = payload.getContent();
+        text = payload.getSearchableContent();
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = encodeBase();
+        payload.setSearchableContent(text);
+        payload.setContent(streamId);
+        return payload;
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/TextMessageContent.java

@@ -0,0 +1,81 @@
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.sdk.model.QuoteInfo;
+import org.apache.http.util.TextUtils;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+
+public class TextMessageContent extends MessageContent {
+    private String text;
+    private QuoteInfo quoteInfo;
+
+    //必须有个空的构造函数
+    public TextMessageContent() {
+    }
+
+    public TextMessageContent(String text) {
+        this.text = text;
+    }
+
+    public TextMessageContent text(String text) {
+        this.text = text;
+        return this;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public QuoteInfo getQuoteInfo() {
+        return quoteInfo;
+    }
+
+    public void setQuoteInfo(QuoteInfo quoteInfo) {
+        this.quoteInfo = quoteInfo;
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Text;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = encodeBase();
+        payload.setSearchableContent(text);
+        if(quoteInfo != null) {
+            payload.setBase64edData(Base64.getEncoder().encodeToString(quoteInfo.encode().toJSONString().getBytes(StandardCharsets.UTF_8)));
+        }
+        return payload;
+    }
+
+    @Override
+    public void decode(MessagePayload payload) {
+        text = payload.getSearchableContent();
+        if(!TextUtils.isEmpty(payload.getBase64edData())) {
+            String jsonStr = new String(Base64.getDecoder().decode(payload.getBase64edData()), StandardCharsets.UTF_8);
+            try {
+                JSONObject jsonObject = (JSONObject) new JSONParser().parse(jsonStr);
+                quoteInfo = new QuoteInfo();
+                quoteInfo.decode(jsonObject);
+            } catch (ParseException e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/TipNotificationMessageContent.java

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+
+public class TipNotificationMessageContent extends MessageContent {
+    public String tip;
+
+    public TipNotificationMessageContent() {
+    }
+
+    public String getTip() {
+        return tip;
+    }
+
+    public void setTip(String tip) {
+        this.tip = tip;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        payload.setContent(tip);
+
+        return payload;
+    }
+
+    @Override
+    public void decode(MessagePayload payload) {
+        super.decodeBase(payload);
+        tip = payload.getContent();
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Tip;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist;
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/TypingMessageContent.java

@@ -0,0 +1,56 @@
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+
+public class TypingMessageContent extends MessageContent {
+    public static final int TYPING_TEXT = 0;
+    public static final int TYPING_VOICE = 1;
+    public static final int TYPING_CAMERA = 2;
+    public static final int TYPING_LOCATION = 3;
+    public static final int TYPING_FILE = 4;
+
+    private int typingType;
+
+    public TypingMessageContent() {
+    }
+
+    public TypingMessageContent(int typingType) {
+        this.typingType = typingType;
+    }
+
+    public int getTypingType() {
+        return typingType;
+    }
+
+    public void setTypingType(int typingType) {
+        this.typingType = typingType;
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Typing;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Transparent;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        payload.setContent(typingType + "");
+        return payload;
+    }
+
+    @Override
+    public void decode(MessagePayload payload) {
+        super.decodeBase(payload);
+        typingType = Integer.parseInt(payload.getContent());
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/UnknownMessageContent.java

@@ -0,0 +1,32 @@
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+
+public class UnknownMessageContent extends MessageContent {
+    private MessagePayload orignalPayload;
+
+    //必须有个空的构造函数
+    public UnknownMessageContent() {
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Text;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        return orignalPayload;
+    }
+
+    @Override
+    public void decode(MessagePayload payload) {
+        this.orignalPayload = payload;
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/messagecontent/VideoMessageContent.java

@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.messagecontent;
+
+import cn.wildfirechat.pojos.MessagePayload;
+import cn.wildfirechat.proto.ProtoConstants;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
+
+import java.util.Base64;
+
+
+/**
+ * Created by heavyrain lee on 2017/12/6.
+ *
+ * @refactor dhl
+ * 添加小视频的宽高，时长
+ */
+
+
+public class VideoMessageContent extends MediaMessageContent {
+    private byte[] thumbnailBytes;
+    private long duration ;
+
+    //必须有个空的构造函数
+    public VideoMessageContent() {
+    }
+
+    public VideoMessageContent setThumbnailBytes(byte[] thumbnailBytes) {
+        this.thumbnailBytes = thumbnailBytes;
+        return this;
+    }
+
+    public byte[] getThumbnailBytes() {
+        return thumbnailBytes;
+    }
+
+    public void setDuration(long duration) {
+        this.duration = duration;
+    }
+
+    public long getDuration() {
+        return duration;
+    }
+
+    @Override
+    public int getContentType() {
+        return ProtoConstants.ContentType.Video;
+    }
+
+    @Override
+    public int getPersistFlag() {
+        return ProtoConstants.PersistFlag.Persist_And_Count;
+    }
+
+    @Override
+    public MessagePayload encode() {
+        MessagePayload payload = super.encodeBase();
+        payload.setSearchableContent("[视频]");
+
+        payload.setBase64edData(Base64.getEncoder().encodeToString(thumbnailBytes));
+
+        JSONObject objWrite = new JSONObject();
+        objWrite.put("d", duration);
+        objWrite.put("duration", duration);
+        payload.setContent(objWrite.toJSONString());
+
+        return payload;
+    }
+
+    @Override
+    public void decode(MessagePayload payload) {
+        super.decodeBase(payload);
+        thumbnailBytes = Base64.getDecoder().decode(payload.getBase64edData());
+        try {
+            JSONObject jsonObject = (JSONObject) new JSONParser().parse(payload.getContent());
+            if(jsonObject.containsKey("d")) {
+                duration = (long) jsonObject.get("d");
+            } else {
+                duration = (long) jsonObject.get("duration");
+            }
+        } catch (ParseException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    protected int getMediaType() {
+        return ProtoConstants.MessageMediaType.VIDEO;
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/model/Message.java

@@ -0,0 +1,15 @@
+package cn.wildfirechat.sdk.model;
+
+import cn.wildfirechat.pojos.Conversation;
+import cn.wildfirechat.sdk.messagecontent.MessageContent;
+
+import java.util.List;
+
+public class Message {
+    public Conversation conversation;
+    public MessageContent content;
+    public long messageUid;
+    public String sender;
+    public long serverTime;
+    public List<String> toUsers;
+}

sdk/src/main/java/cn/wildfirechat/sdk/model/QuoteInfo.java

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2020 WildFireChat. All rights reserved.
+ */
+
+package cn.wildfirechat.sdk.model;
+
+import org.json.simple.JSONObject;
+
+public class QuoteInfo {
+    private long messageUid;
+    private String userId;
+    private String userDisplayName;
+    private String messageDigest;
+
+    public long getMessageUid() {
+        return messageUid;
+    }
+
+    public void setMessageUid(long messageUid) {
+        this.messageUid = messageUid;
+    }
+
+    public String getUserId() {
+        return userId;
+    }
+
+    public void setUserId(String userId) {
+        this.userId = userId;
+    }
+
+    public String getUserDisplayName() {
+        return userDisplayName;
+    }
+
+    public void setUserDisplayName(String userDisplayName) {
+        this.userDisplayName = userDisplayName;
+    }
+
+    public String getMessageDigest() {
+        return messageDigest;
+    }
+
+    public void setMessageDigest(String messageDigest) {
+        this.messageDigest = messageDigest;
+    }
+
+    public JSONObject encode() {
+        JSONObject object = new JSONObject();
+        object.put("u", messageUid);
+        object.put("i", userId);
+        object.put("n", userDisplayName);
+        object.put("d", messageDigest);
+        return object;
+    }
+
+    public void decode(JSONObject object) {
+        messageUid = (long) object.get("u");
+        userId = (String) object.get("i");
+        userDisplayName = (String) object.get("n");
+        messageDigest = (String) object.get("d");
+    }
+}

sdk/src/main/java/cn/wildfirechat/sdk/utilities/AdminHttpUtils.java

@@ -1,5 +1,6 @@
 package cn.wildfirechat.sdk.utilities;
 
+import cn.wildfirechat.common.ErrorCode;
 import cn.wildfirechat.sdk.model.IMResult;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -157,7 +158,15 @@ public class AdminHttpUtils extends JsonUtils {
                 LOG.info("Request error: " + statusCode + " error msg:" + content);
                 throw new Exception("Http request error with code:" + statusCode);
             } else {
-                return fromJsonObject(content, clazz);
+                IMResult<T> result = fromJsonObject(content, clazz);
+                if(result != null){
+                    if(result.getErrorCode() == ErrorCode.ERROR_CODE_AUTH_FAILURE) {
+                        LOG.error("鉴权失败，IM服务地址或者密钥配置错误，请检查IM服务{}的配置文件中的http.admin.secret_key是否是{}", adminUrl, adminSecret);
+                    } else if(result.getErrorCode() == ErrorCode.ERROR_CODE_SIGN_EXPIRED) {
+                        LOG.error("时间验证失败，请确保当前服务和IM服务{}的时间是一致的", adminUrl);
+                    }
+                }
+                return result;
             }
         } catch (Exception e) {
             e.printStackTrace();

sdk/src/main/java/cn/wildfirechat/sdk/utilities/ClassUtil.java

@@ -0,0 +1,234 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.sdk.utilities;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+
+public class ClassUtil {
+
+    /**
+     * 获取同一路径下所有子类或接口实现类
+     *
+     * @param cls
+     * @return
+     * @throws IOException
+     * @throws ClassNotFoundException
+     */
+    public static List<Class<?>> getAllAssignedClass(Class<?> cls) throws IOException,
+        ClassNotFoundException {
+        List<Class<?>> classes = new ArrayList<Class<?>>();
+        for (Class<?> c : getClasses(cls)) {
+            if (cls.isAssignableFrom(c) && !cls.equals(c)) {
+                classes.add(c);
+            }
+        }
+        return classes;
+    }
+
+    /**
+     * 取得当前类路径下的所有类
+     *
+     * @param cls
+     * @return
+     * @throws IOException
+     * @throws ClassNotFoundException
+     */
+    public static List<Class<?>> getClasses(Class<?> cls) throws IOException,
+        ClassNotFoundException {
+        String pk = cls.getPackage().getName();
+//        String path = pk.replace('.', '/');
+//        ClassLoader classloader = Thread.currentThread().getContextClassLoader();
+//        URL url = classloader.getResource(path);
+//        String type = url.getProtocol();
+//
+//        System.out.println("the type is " + type);
+//        System.out.println(url.getPath());
+//
+//        return getClasses(new File(url.getFile()), pk);
+        List<String> classNames = getClassName(pk, true);
+        List<Class<?>> classes = new ArrayList<>();
+        for (String className :
+             classNames) {
+            if (className.endsWith(".class")) {
+                className = className.substring(0, className.length() - 6);
+                className = className.substring(className.lastIndexOf("/")+1, className.length());
+            }
+
+            classes.add(Class.forName(className));
+        }
+        return classes;
+    }
+
+    /**
+     * 迭代查找类
+     *
+     * @param dir
+     * @param pk
+     * @return
+     * @throws ClassNotFoundException
+     */
+    private static List<Class<?>> getClasses(File dir, String pk) throws ClassNotFoundException {
+        System.out.println(dir.getAbsolutePath());
+        List<Class<?>> classes = new ArrayList<Class<?>>();
+        if (!dir.exists()) {
+            return classes;
+        }
+        for (File f : dir.listFiles()) {
+            if (f.isDirectory()) {
+                classes.addAll(getClasses(f, pk + "." + f.getName()));
+            }
+            String name = f.getName();
+            if (name.endsWith(".class")) {
+                classes.add(Class.forName(pk + "." + name.substring(0, name.length() - 6)));
+            }
+        }
+        return classes;
+    }
+
+
+
+
+    /**
+     * 获取某包下所有类
+     * @param packageName 包名
+     * @param childPackage 是否遍历子包
+     * @return 类的完整名称
+     */
+    public static List<String> getClassName(String packageName, boolean childPackage) {
+        List<String> fileNames = null;
+        ClassLoader loader = Thread.currentThread().getContextClassLoader();
+        String packagePath = packageName.replace(".", "/");
+        URL url = loader.getResource(packagePath);
+        if (url != null) {
+            String type = url.getProtocol();
+            if (type.equals("file")) {
+                fileNames = getClassNameByFile(url.getPath(), null, childPackage);
+            } else if (type.equals("jar")) {
+                fileNames = getClassNameByJar(url.getPath(), childPackage);
+            }
+        } else {
+            fileNames = getClassNameByJars(((URLClassLoader) loader).getURLs(), packagePath, childPackage);
+        }
+        return fileNames;
+    }
+
+    /**
+     * 从项目文件获取某包下所有类
+     * @param filePath 文件路径
+     * @param className 类名集合
+     * @param childPackage 是否遍历子包
+     * @return 类的完整名称
+     */
+    private static List<String> getClassNameByFile(String filePath, List<String> className, boolean childPackage) {
+        List<String> myClassName = new ArrayList<String>();
+        File file = new File(filePath);
+        File[] childFiles = file.listFiles();
+        for (File childFile : childFiles) {
+            if (childFile.isDirectory()) {
+                if (childPackage) {
+                    myClassName.addAll(getClassNameByFile(childFile.getPath(), myClassName, childPackage));
+                }
+            } else {
+                String childFilePath = childFile.getPath();
+                if (childFilePath.endsWith(".class")) {
+                    if (childFilePath.indexOf("\\classes") >= 0 || childFilePath.indexOf("/classes") >= 0) {
+                        int start = childFilePath.indexOf("\\classes");
+                        if (start == -1) {
+                            start = childFilePath.indexOf("/classes");
+                        }
+                        childFilePath = childFilePath.substring(start + 9, childFilePath.lastIndexOf("."));
+                    }
+                    childFilePath = childFilePath.replace("\\", ".");
+                    childFilePath = childFilePath.replace("/", ".");
+                    myClassName.add(childFilePath);
+                }
+            }
+        }
+
+        return myClassName;
+    }
+
+    /**
+     * 从jar获取某包下所有类
+     * @param jarPath jar文件路径
+     * @param childPackage 是否遍历子包
+     * @return 类的完整名称
+     */
+    private static List<String> getClassNameByJar(String jarPath, boolean childPackage) {
+        List<String> myClassName = new ArrayList<String>();
+        String[] jarInfo = jarPath.split("!");
+        String jarFilePath = jarInfo[0].substring(jarInfo[0].indexOf("/"));
+        String packagePath = jarInfo[1].substring(1);
+        try {
+            JarFile jarFile = new JarFile(jarFilePath);
+            Enumeration<JarEntry> entrys = jarFile.entries();
+            while (entrys.hasMoreElements()) {
+                JarEntry jarEntry = entrys.nextElement();
+                String entryName = jarEntry.getName();
+
+                if (entryName.endsWith(".class")) {
+                    if (childPackage) {
+                        if (entryName.startsWith(packagePath)) {
+                            entryName = entryName.replace("/", ".").substring(0, entryName.lastIndexOf("."));
+                            myClassName.add(entryName);
+                        }
+                    } else {
+                        int index = entryName.lastIndexOf("/");
+                        String myPackagePath;
+                        if (index != -1) {
+                            myPackagePath = entryName.substring(0, index);
+                        } else {
+                            myPackagePath = entryName;
+                        }
+                        if (myPackagePath.equals(packagePath)) {
+                            entryName = entryName.replace("/", ".").substring(0, entryName.lastIndexOf("."));
+                            myClassName.add(entryName);
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return myClassName;
+    }
+
+    /**
+     * 从所有jar中搜索该包，并获取该包下所有类
+     * @param urls URL集合
+     * @param packagePath 包路径
+     * @param childPackage 是否遍历子包
+     * @return 类的完整名称
+     */
+    private static List<String> getClassNameByJars(URL[] urls, String packagePath, boolean childPackage) {
+        List<String> myClassName = new ArrayList<String>();
+        if (urls != null) {
+            for (int i = 0; i < urls.length; i++) {
+                URL url = urls[i];
+                String urlPath = url.getPath();
+                // 不必搜索classes文件夹
+                if (urlPath.endsWith("classes/")) {
+                    continue;
+                }
+                String jarPath = urlPath + "!/" + packagePath;
+                myClassName.addAll(getClassNameByJar(jarPath, childPackage));
+            }
+        }
+        return myClassName;
+    }
+
+}