fix build error

README.md

@@ -39,6 +39,7 @@
 | [open-platform](https://github.com/wildfirechat/open-platform)   | [open-platform](https://gitee.com/wfchat/open-platform)   | 野火开放平台服务。  |
 | [daily-report](https://github.com/wildfirechat/daily-report)   | [daily-report](https://github.com/wildfirechat/daily-report)   | 野火开放平台日报 demo服务。 |
 | [channel-platform](https://github.com/wildfirechat/channel-platform)   | [channel-platform](https://gitee.com/wfchat/channel-platform)   | 野火频道(公众号)平台服务。  |
+| [organization-platform](https://github.com/wildfirechat/organization-platform)   | [organization-platform](https://gitee.com/wfchat/organization-platform)   | 野火组织通讯录服务。  |
 | [android-chat](https://github.com/wildfirechat/android-chat) | [android-chat](https://gitee.com/wfchat/android-chat) | 野火IM Android SDK源码和App源码。 |
 | [ios-chat](https://github.com/wildfirechat/ios-chat)         | [ios-chat](https://gitee.com/wfchat/ios-chat)         | 野火IM iOS SDK源码和App源码。|
 | [pc-chat](https://github.com/wildfirechat/vue-pc-chat)       | [pc-chat](https://gitee.com/wfchat/vue-pc-chat)       | 基于[Electron](https://electronjs.org/)的PC 端，支持Windows、Mac、Linux（包括国产化linux系统和CPU）。   |
@@ -46,7 +47,7 @@
 | [wx-chat](https://github.com/wildfirechat/wx-chat)           | [wx-chat](https://gitee.com/wfchat/wx-chat)           | 小程序平台的Demo(支持微信、百度、阿里、字节、QQ 等小程序平台)。  |
 | [uni-chat](https://github.com/wildfirechat/uni-chat)           | [uni-chat](https://gitee.com/wfchat/uni-chat)           | UniApp平台移动端应用(使用原生插件)。   |
 | [uni-wfc-client](https://github.com/wildfirechat/uni-wfc-client)           | [uni-wfc-client](https://gitee.com/wfchat/uni-wfc-client)           | UniApp平台原生插件。已[商店](https://ext.dcloud.net.cn/plugin?id=7895)上架   |
-| [flutter_imclient](https://github.com/wildfirechat/flutter_imclient)           | [flutter_imclient](https://gitee.com/wfchat/flutter_imclient)           | Flutter平台原生插件。   |
+| [wfc_flutter_plugins](https://github.com/wildfirechat/wfc_flutter_plugins)           | [flutter_imclient](https://gitee.com/wfchat/wfc_flutter_plugins)           | Flutter平台原生插件，支持IM和音视频通话。   |
 | [docs](https://github.com/wildfirechat/docs)                 | [docs](https://gitee.com/wfchat/docs)                 | 野火IM相关文档，包含设计、概念、开发、使用说明，[在线查看](https://docs.wildfirechat.cn/)。 |
 
 ## 野火开发文档

broker/pom.xml

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

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

@@ -90,6 +90,8 @@ public class FileAction extends Action {
         }
 
         response.setContent(file);
+        response.setHeader("Content-Disposition", "attachment; filename=\"" + file.getName() + "\"");
+
         return true;
     }
 

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

@@ -187,6 +187,10 @@ public class UploadFileAction extends Action {
                     return false;
                 }
 
+                if(remoteFileName != null && remoteFileName.length() > 2 && remoteFileName.startsWith("'") && remoteFileName.endsWith("'")) {
+                    remoteFileName = remoteFileName.substring(1, remoteFileName.length()-1);
+                }
+
                 if (StringUtil.isNullOrEmpty(remoteFileName)) {
                     logger.warn("remoteFileName is empty!");
 
@@ -235,7 +239,7 @@ public class UploadFileAction extends Action {
                 int offset = 0; // 断点续传开始位置
 
                 Date nowTime=new Date();
-                SimpleDateFormat time=new SimpleDateFormat("yyyy/MM/dd/HH");
+                SimpleDateFormat time=new SimpleDateFormat("yyyy/MM/dd/HH/mm/ss");
                 String datePath = time.format(nowTime);
 
                 datePath = "fs/" + bucket[0] + "/" + datePath; //add bucket
@@ -253,6 +257,7 @@ public class UploadFileAction extends Action {
                 if(!bFile) {
                     bFile = dirFile.mkdirs();
                     if (!bFile) {
+                        logger.error("create dirs error! {}", dir);
                         response.setStatus(HttpResponseStatus.INTERNAL_SERVER_ERROR);
                         response.setContent("服务器错误：无法创建文件");
                         return false;

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

@@ -0,0 +1,37 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.channel;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.pojos.InputChannelSubscribe;
+import cn.wildfirechat.pojos.InputUserId;
+import cn.wildfirechat.pojos.OutputStringList;
+import com.xiaoleilu.loServer.RestResult;
+import com.xiaoleilu.loServer.annotation.HttpMethod;
+import com.xiaoleilu.loServer.annotation.Route;
+import com.xiaoleilu.loServer.handler.Request;
+import com.xiaoleilu.loServer.handler.Response;
+import io.netty.handler.codec.http.FullHttpRequest;
+
+import java.util.ArrayList;
+
+@Route(APIPath.Channel_Is_Subscriber)
+@HttpMethod("POST")
+public class GetIsChannelSubscriberAction extends ChannelAction {
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputUserId input = getRequestBody(request.getNettyRequest(), InputUserId.class);
+            boolean isSubscriber = messagesStore.checkUserInChannel(input.getUserId(), channelInfo.getTargetId());
+            setResponseContent(RestResult.ok(isSubscriber), response);
+        }
+        return true;
+    }
+}

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

@@ -21,7 +21,7 @@ import java.util.List;
 public class GetGroupInfoHandler extends IMHandler<WFCMessage.PullUserRequest> {
     @Override
     public ErrorCode action(ByteBuf ackPayload, String clientID, String fromUser, ProtoConstants.RequestSourceType requestSourceType, WFCMessage.PullUserRequest request, Qos1PublishHandler.IMCallback callback) {
-            List<WFCMessage.GroupInfo> infos = m_messagesStore.getGroupInfos(request.getRequestList());
+            List<WFCMessage.GroupInfo> infos = m_messagesStore.getGroupInfos(request.getRequestList(), fromUser, requestSourceType == ProtoConstants.RequestSourceType.Request_From_Admin);
 
             WFCMessage.PullGroupInfoResult result = WFCMessage.PullGroupInfoResult.newBuilder().addAllInfo(infos).build();
             byte[] data = result.toByteArray();

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

@@ -182,6 +182,15 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
                         }
                     }
                 }
+            } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Group) {
+                if(m_messagesStore.getGroupInfo(message.getConversation().getTarget()) == null) {
+                    return ErrorCode.ERROR_CODE_NOT_EXIST;
+                }
+            } else if (message.getConversation().getType() == ProtoConstants.ConversationType.ConversationType_Channel) {
+                WFCMessage.ChannelInfo channelData = m_messagesStore.getChannelInfo(message.getConversation().getTarget());
+                if(channelData == null || channelData.getStatus() == ProtoConstants.ChannelState.Channel_State_Mask_Deleted) {
+                    return ErrorCode.ERROR_CODE_NOT_EXIST;
+                }
             }
 
             long timestamp = System.currentTimeMillis();

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

@@ -203,7 +203,7 @@ public class DatabaseStore {
             }
 
 
-            sql += " and _type <> 2"; //can search normal user(0) and robot(1) and admin(100), can not search things
+            sql += " and `_type` <> 2 and `_deleted` = 0"; //can search normal user(0) and robot(1) and admin(100), can not search things
 
             if (searchType == SearchUserType_Name_Mobile || searchType == SearchUserType_Name || searchType == SearchUserType_Mobile) {
                 sql += " limit 1";
@@ -815,7 +815,7 @@ public class DatabaseStore {
         long beforeUid = before[0];
         String sql = "select `_mid`, `_from`, `_type`, `_target`, `_line`, `_data`, `_dt`, `_to` from " + table +" where";
         if (conversation.getType() == ProtoConstants.ConversationType.ConversationType_Private) {
-            sql += " _type = ? and _line = ? and _mid < ? and ((_target = ?  and _from = ?) or (_target = ?  and _from = ?))";
+            sql += " _type = ? and _line = ? and _mid < ? and ((_target = ?  and _from = ?) or (_target = ?  and _from = ?)) and (_to = '' or _to = ?)";
         } else if (conversation.getType() == ProtoConstants.ConversationType.ConversationType_Channel && !user.equals(channelOwner)) {
             sql += " _type = ? and _line = ? and _mid < ? and _target = ? and ((_from = ? and (_to = '' or _to = ?)) or (_from = ?))";
         } else {
@@ -853,6 +853,7 @@ public class DatabaseStore {
                 statement.setString(index++, user);
                 statement.setString(index++, user);
                 statement.setString(index++, conversation.getTarget());
+                statement.setString(index++, user);
             } else if (conversation.getType() == ProtoConstants.ConversationType.ConversationType_Channel && !user.equals(channelOwner)) {
                 statement.setString(index++, channelOwner);
                 statement.setString(index++, user);
@@ -914,7 +915,7 @@ public class DatabaseStore {
         return false;
     }
 
-    void persistUserMessage(final String userId, final long messageId, final long messageSeq, int type, String target, int line, boolean directing, final int messageContentType) {
+    void persistUserMessage(final String userId, final  String sender, final long messageId, final long messageSeq, int type, String target, int line, boolean directing, final int messageContentType) {
         mScheduler.execute(()->{
             Connection connection = null;
             PreparedStatement statement = null;
@@ -929,7 +930,7 @@ public class DatabaseStore {
                 statement.setString(index++, userId);
                 statement.setLong(index++, messageSeq);
                 statement.setInt(index++, type);
-                statement.setString(index++, target);
+                statement.setString(index++, getPrivateChatUserMessageTarget(type, target, sender));
                 statement.setInt(index++, line);
                 statement.setInt(index++, directing ? 1 :0);
                 statement.setInt(index++, messageContentType);
@@ -945,6 +946,14 @@ public class DatabaseStore {
         });
     }
 
+    String getPrivateChatUserMessageTarget(int conversationType, String target, String userId) {
+        if(conversationType == ProtoConstants.ConversationType.ConversationType_Private) {
+            return target.compareTo(userId) > 0 ? (userId + "|" + target) : (target + "|" + userId);
+        } else {
+            return target;
+        }
+    }
+
     void clearUserMessage(final String userId) {
         mScheduler.execute(()->{
             String tableName = getUserMessageTable(userId);

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

@@ -467,21 +467,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                 s = s.toLowerCase();
                 if(s.startsWith("0x")) {
                     s = s.substring(2);
-                    for (int i = 0; i < s.length(); i++) {
-                        char ch = s.charAt(s.length()-1-i);
-                        mGroupForbiddenClientOperation <<= 4;
-                        if(ch <= 9) {
-                            mGroupForbiddenClientOperation += ch;
-                        } else {
-                            if(ch > 'f' || ch < 'a') {
-                                mGroupForbiddenClientOperation = 0;
-                                LOG.error("Invalid group.forbidden_client_operation {}", server.getConfig().getProperty(GROUP_Forbidden_Client_Operation, null));
-                                break;
-                            } else {
-                                mGroupForbiddenClientOperation += (ch - 'a' + 10);
-                            }
-                        }
-                    }
+                    mGroupForbiddenClientOperation = Integer.parseInt(s, 16);
                 } else {
                     mGroupForbiddenClientOperation = Integer.parseInt(s);
                 }
@@ -599,21 +585,17 @@ public class MemoryMessagesStore implements IMessagesStore {
         int pullType = ProtoConstants.PullType.Pull_Normal;
 
         if (type == ProtoConstants.ConversationType.ConversationType_Private) {
+            notifyReceivers.add(fromUser);
             if(message.getToCount() > 0) {
-                if(message.getToList().contains(fromUser)) {
-                    notifyReceivers.add(fromUser);
-                }
                 if(message.getToList().contains(message.getConversation().getTarget())) {
                     notifyReceivers.add(message.getConversation().getTarget());
                 }
             } else {
-                notifyReceivers.add(fromUser);
                 notifyReceivers.add(message.getConversation().getTarget());
             }
             pullType = ProtoConstants.PullType.Pull_Normal;
         } else if (type == ProtoConstants.ConversationType.ConversationType_Group) {
             notifyReceivers.add(fromUser);
-
             if (!StringUtil.isNullOrEmpty(message.getToUser())) {
                 notifyReceivers.add(message.getToUser());
             } else if(message.getToList()!=null && !message.getToList().isEmpty()) {
@@ -639,9 +621,6 @@ public class MemoryMessagesStore implements IMessagesStore {
                     }
                 }
             }
-
-            //如果是群助手的消息，返回pull type group，否则返回normal
-            //群助手还没有实现
             pullType = ProtoConstants.PullType.Pull_Normal;
         } else if (type == ProtoConstants.ConversationType.ConversationType_ChatRoom) {
             boolean isDirect = !StringUtil.isNullOrEmpty(message.getToUser());
@@ -847,6 +826,10 @@ public class MemoryMessagesStore implements IMessagesStore {
             mReadLock.unlock();
         }
 
+        if(current == 0) {
+            current = 2;
+            head = 2;
+        }
         builder.setCurrent(current);
         builder.setHead(head);
         return builder.build();
@@ -1000,7 +983,7 @@ public class MemoryMessagesStore implements IMessagesStore {
                 messageSeq = maxPullSeq + 1;
             }
 
-            if (messageSeq == 0) {
+            if (messageSeq < messageId) {
                 messageSeq = messageId;
             }
 
@@ -1012,7 +995,7 @@ public class MemoryMessagesStore implements IMessagesStore {
             mWriteLock.unlock();
         }
 
-        databaseStore.persistUserMessage(user, messageId, messageSeq, conversationType, target, line, directing, messageContentType);
+        databaseStore.persistUserMessage(user, sender, messageId, messageSeq, conversationType, target, line, directing, messageContentType);
         return messageSeq;
     }
 
@@ -1886,7 +1869,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public List<WFCMessage.GroupInfo> getGroupInfos(List<WFCMessage.UserRequest> requests) {
+    public List<WFCMessage.GroupInfo> getGroupInfos(List<WFCMessage.UserRequest> requests, String fromUser, boolean isAdmin) {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.GroupInfo> mIMap = hzInstance.getMap(GROUPS_MAP);
         ArrayList<WFCMessage.GroupInfo> out = new ArrayList<>();
@@ -1900,6 +1883,14 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
 
             if (groupInfo != null && groupInfo.getUpdateDt() > request.getUpdateDt()) {
+                if(!isAdmin && !StringUtil.isNullOrEmpty(fromUser)) {
+                    WFCMessage.GroupMember gm = getGroupMember(groupInfo.getTargetId(), fromUser);
+                    if(gm == null) {
+                        groupInfo = groupInfo.toBuilder().setMemberUpdateDt(-1).build();
+                    } else if(gm.getType() == GroupMemberType_Removed) {
+                        groupInfo = groupInfo.toBuilder().setMemberUpdateDt(-groupInfo.getMemberUpdateDt()).build();
+                    }
+                }
                 out.add(groupInfo);
             }
         }

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

@@ -116,7 +116,7 @@ public interface IMessagesStore {
     ErrorCode modifyGroupInfo(String operator, String groupId, int modifyType, String value, boolean isAdmin);
     ErrorCode modifyGroupMemberAlias(String operator, String groupId, String alias, String memberId, boolean isAdmin);
     ErrorCode modifyGroupMemberExtra(String operator, String groupId, String extra, String memberId, boolean isAdmin);
-    List<WFCMessage.GroupInfo> getGroupInfos(List<WFCMessage.UserRequest> requests);
+    List<WFCMessage.GroupInfo> getGroupInfos(List<WFCMessage.UserRequest> requests, String fromUser, boolean isAdmin);
     WFCMessage.GroupInfo getGroupInfo(String groupId);
     Set<String> getUserGroupIds(String userId);
     Set<String> getCommonGroupIds(String userId1, String userId2);

broker/src/main/resources/log4j2.xml

@@ -20,14 +20,14 @@
 
         <RollingRandomAccessFile name="RollingFileInfo" immediateFlush="false"
                                  fileName="${MSG_LOG_HOME}/wildfirechat.log"
-                                 filePattern="${MSG_LOG_HOME}/backup/wildfirechat.%d{yyyyMMddHH}.zip">
+                                 filePattern="${MSG_LOG_HOME}/backup/wildfirechat.%d{yyyyMMddHHmm}.zip">
             <Filters>
                 <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
             <PatternLayout pattern="${pattern}" />
             <Policies>
                 <!-- TimeBasedTriggeringPolicy :时间滚动策略,默认0点小时产生新的文件,interval="6" : 自定义文件滚动时间间隔,每隔6小时产生新文件, modulate="true" : 产生文件是否以0点偏移时间,即6点,12点,18点,0点-->
-<!--                <TimeBasedTriggeringPolicy interval="6" modulate="true"/>-->
+                <TimeBasedTriggeringPolicy interval="6" modulate="true"/>
                 <!-- SizeBasedTriggeringPolicy :文件大小滚动策略-->
                 <SizeBasedTriggeringPolicy size="100 MB"/>
             </Policies>

common/pom.xml

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

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

@@ -90,6 +90,7 @@ public interface APIPath {
     String Health = "/admin/health";
 
     String Conference_List = "/admin/conference/list";
+    String Conference_Exist = "/admin/conference/exist";
     String Conference_List_Participant = "/admin/conference/list_participant";
     String Conference_Create = "/admin/conference/create";
     String Conference_Destroy = "/admin/conference/destroy";
@@ -104,6 +105,7 @@ public interface APIPath {
     String Channel_Message_Send = "/channel/message/send";
     String Channel_Subscribe = "/channel/subscribe";
     String Channel_Subscriber_List = "/channel/subscriber_list";
+    String Channel_Is_Subscriber = "/channel/is_subscriber";
     String Channel_Application_Get_UserInfo = "/channel/application/get_user_info";
 
     String Robot_User_Info = "/robot/user_info";

distribution/pom.xml

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

distribution/src/main/resources/log4j2.xml

@@ -20,14 +20,14 @@
 
         <RollingRandomAccessFile name="RollingFileInfo" immediateFlush="false"
                                  fileName="${MSG_LOG_HOME}/wildfirechat.log"
-                                 filePattern="${MSG_LOG_HOME}/backup/wildfirechat.%d{yyyyMMddHH}.zip">
+                                 filePattern="${MSG_LOG_HOME}/backup/wildfirechat.%d{yyyyMMddHHmm}.zip">
             <Filters>
                 <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
             </Filters>
             <PatternLayout pattern="${pattern}" />
             <Policies>
                 <!-- TimeBasedTriggeringPolicy :时间滚动策略,默认0点小时产生新的文件,interval="6" : 自定义文件滚动时间间隔,每隔6小时产生新文件, modulate="true" : 产生文件是否以0点偏移时间,即6点,12点,18点,0点-->
-<!--                <TimeBasedTriggeringPolicy interval="6" modulate="true"/>-->
+                <TimeBasedTriggeringPolicy interval="6" modulate="true"/>
                 <!-- SizeBasedTriggeringPolicy :文件大小滚动策略-->
                 <SizeBasedTriggeringPolicy size="100 MB"/>
             </Policies>

pom.xml

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

release_note.md

@@ -12,6 +12,26 @@
 
 # 更新记录
 
+--------------
+Release note 1.1.2:
+1. 会议SDK添加查询会议是否存在的接口
+2. 单聊会话定向消息分发包含发送者
+
+--------------
+Release note 1.1.1:
+1. 当用户获取群组信息，可以根据返回信息判断是否在群中。
+2. 搜索用户时，过滤掉已删除用户
+3. 支持单聊消息的定向消息
+4. 解决关闭roaming，且message.compensate_time_limit配置为-1时，首次消息无法同步的问题
+5. 解决禁止客户端群操作flag 解析错误
+
+--------------
+Release note 1.1:
+1. Channel API添加检查用户是否订阅接口
+2. Server API发送消息时添加检查对象是否存在
+3. Channel API添加修改频道菜单接口
+4. 内置对象存储的优化
+
 --------------
 Release note 1.0:
 1. SDK检查工具添加help命令

sdk/pom.xml

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

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

@@ -2,14 +2,15 @@ package cn.wildfirechat.sdk;
 
 import cn.wildfirechat.common.APIPath;
 import cn.wildfirechat.pojos.*;
+import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.sdk.model.IMResult;
 import cn.wildfirechat.sdk.utilities.ChannelHttpUtils;
+import com.google.gson.Gson;
 import org.apache.commons.codec.digest.DigestUtils;
 
 import java.util.List;
 
 import static cn.wildfirechat.proto.ProtoConstants.ApplicationType.ApplicationType_Channel;
-import static cn.wildfirechat.proto.ProtoConstants.ApplicationType.ApplicationType_Robot;
 
 //仅专业版支持，社区版不支持
 public class ChannelServiceApi {
@@ -50,6 +51,11 @@ public class ChannelServiceApi {
         return channelHttpUtils.httpJsonPost(path, null, OutputGetChannelInfo.class);
     }
 
+    public IMResult<Void> modifyChannelMenu(List<OutputGetChannelInfo.OutputMenu> menus) throws Exception {
+        String menuStr = new Gson().toJson(menus);
+        return modifyChannelInfo(ProtoConstants.ModifyChannelInfoType.Modify_Channel_Menu, menuStr);
+    }
+
     public IMResult<SendMessageResult> sendMessage(int line, List<String> targets, MessagePayload payload) throws Exception {
         String path = APIPath.Channel_Message_Send;
         SendChannelMessageData messageData = new SendChannelMessageData();
@@ -80,6 +86,12 @@ public class ChannelServiceApi {
         return channelHttpUtils.httpJsonPost(path, null, OutputStringList.class);
     }
 
+    public IMResult<Boolean> isSubscriber(String userId) throws Exception {
+        String path = APIPath.Channel_Is_Subscriber;
+        InputUserId input = new InputUserId(userId);
+        return channelHttpUtils.httpJsonPost(path, input, Boolean.class);
+    }
+
     public IMResult<OutputApplicationUserInfo> applicationGetUserInfo(String authCode) throws Exception {
         String path = APIPath.Channel_Application_Get_UserInfo;
         InputApplicationGetUserInfo input = new InputApplicationGetUserInfo();

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

@@ -11,6 +11,12 @@ public class ConferenceAdmin {
         return AdminHttpUtils.httpJsonPost(path, null, PojoConferenceInfoList.class);
     }
 
+    public static IMResult<Boolean> existsConferences(String conferenceId) throws Exception {
+        String path = APIPath.Conference_Exist;
+        PojoConferenceRoomId data = new PojoConferenceRoomId(conferenceId, false);
+        return AdminHttpUtils.httpJsonPost(path, data, Boolean.class);
+    }
+
     public static IMResult<PojoConferenceParticipantList> listParticipants(String roomId, boolean advance) throws Exception {
         String path = APIPath.Conference_List_Participant;
         PojoConferenceRoomId data = new PojoConferenceRoomId(roomId, advance);

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

@@ -50,10 +50,10 @@ public class Main {
 
 
         //admin使用的是18080端口，超级管理接口，理论上不能对外开放端口，也不能让非内部服务知悉密钥。
-        testAdmin();
+//        testAdmin();
 
         //Robot和Channel都是使用的80端口，第三方可以创建或者为第三方创建，第三方可以使用robot或者channel与IM系统进行对接。
-        testRobot();
+//        testRobot();
         testChannel();
     }
 
@@ -1443,6 +1443,14 @@ public class Main {
             System.exit(-1);
         }
 
+        IMResult<Boolean> booleanIMResult = channelServiceApi.isSubscriber("userId2");
+        if(booleanIMResult != null && booleanIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS && booleanIMResult.getResult()) {
+            System.out.println("is subscriber success");
+        } else {
+            System.out.println("is subscriber failure");
+            System.exit(-1);
+        }
+
         resultVoid = channelServiceApi.unsubscribe("userId2");
         if (resultVoid != null && resultVoid.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("unsubscriber done");
@@ -1683,6 +1691,14 @@ public class Main {
             System.out.println("create conference");
         }
 
+        IMResult<Boolean> booleanIMResult = ConferenceAdmin.existsConferences("helloroomid2");
+        if(booleanIMResult == null || booleanIMResult.getErrorCode() != ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("exist conference failure");
+            System.exit(-1);
+        } else {
+            System.out.println("exit conference success");
+        }
+
         voidIMResult = ConferenceAdmin.enableRecording("helloroomid2", true, true);
         if(voidIMResult == null || voidIMResult.getErrorCode() != ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("recording conference failure");

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

@@ -128,7 +128,7 @@ public class AdminHttpUtils extends JsonUtils {
             if (object != null) {
                 jsonStr = gson.toJson(object);
             }
-            LOG.info("http request content: {}", jsonStr);
+            LOG.info("http request:{} content: {}", path, jsonStr);
 
             StringEntity entity = new StringEntity(jsonStr, Charset.forName("UTF-8"));
             entity.setContentEncoding("UTF-8");

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

@@ -78,7 +78,7 @@ public class ChannelHttpUtils extends JsonUtils {
             if (object != null) {
                 jsonStr = gson.toJson(object);
             }
-            LOG.info("http request content: {}", jsonStr);
+            LOG.info("http request:{} content: {}", path, jsonStr);
 
             StringEntity entity = new StringEntity(jsonStr, Charset.forName("UTF-8"));
             entity.setContentEncoding("UTF-8");

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

@@ -79,7 +79,7 @@ public class RobotHttpUtils extends JsonUtils {
             if (object != null) {
                 jsonStr = gson.toJson(object);
             }
-            LOG.info("http request content: {}", jsonStr);
+            LOG.info("http request:{} content: {}", path, jsonStr);
 
             if(!StringUtil.isNullOrEmpty(jsonStr)) {
                 StringEntity entity = new StringEntity(jsonStr, Charset.forName("UTF-8"));