version and release note

README.md

@@ -20,7 +20,8 @@
 * 结构设计合理，客户端分功能库、UI库和应用三层。应用成熟完善，开箱即用，也可把SDK嵌入其它应用。
 * 拥有应用开放平台，可以开发和创建自建应用，扩展您的工作台。
 * API丰富，方便与其它服务系统的对接。
-* 拥有机器人和公众号功能。
+* 拥有机器人和公众号功能，免费的频道（公众号）管理后台。
+* 超级群组功能，可以支持万人大群。
 * 社区版IM服务和移动端免费商用，可以免费构建出完备的移动互联网应用。
 * 收费项目非常便宜，野火独有的试用模式，可以先部署到客户环境试用6个月，试用满意后再购买，避免上当受骗。
 * 技术支持专业和高效，核心研发人员及时处理issue和论坛回复。

broker/config/wildfirechat.conf

@@ -65,6 +65,9 @@ token.key testim
 ##是否拒绝空签名的android客户端， 默认为true。当有旧的客户端需要兼容时改成false，当所有都是新客户端时，改成true。
 #connect.reject_empty_signature true
 
+##是否使用AES256加密。默认客户端和服务器都是AES128加密，如果需要开启AES256，需要客户端和IM服务同时开通。
+#encrypt.use_aes256 true
+
 ##首次登录，是否接收之前的历史消息。
 ##0 不接收历史消息，只接收${message.compensate_time_limit}毫秒以内的消息，由于服务器没有保存已经收取记录，所以如果有超过${message.compensate_time_limit}毫秒之前未收取的消息也不会收取下拉；
 ##1接收，会接收 message.max_queue 配置的条数的历史消息
@@ -151,6 +154,9 @@ friend.reject_request_duration 2592000000
 ##好友请求过期时间，单位是毫秒，默认是7天，0为无限长期限。
 friend.request_expiration_duration 604800000
 
+##请求添加机器人为好友时，机器人是否自动接受，默认为true
+friend.robot_auto_accept true
+
 ## 聊天室观众空闲退出时间，单位为毫秒，默认为15分钟，0为永远不退出
 chatroom.participant_idle_time 900000
 

broker/pom.xml

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

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

@@ -0,0 +1,59 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetUserInfo;
+import cn.wildfirechat.pojos.InputGetUserList;
+import cn.wildfirechat.pojos.InputOutputUserInfo;
+import cn.wildfirechat.pojos.OutputGetUserList;
+import cn.wildfirechat.proto.WFCMessage;
+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 io.netty.util.internal.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.User_Get_All)
+@HttpMethod("POST")
+public class GetAllUserAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetUserList input = getRequestBody(request.getNettyRequest(), InputGetUserList.class);
+            if (input != null && input.count > 0 && input.offset >= 0) {
+                List<WFCMessage.User> users = messagesStore.getUserInfoList(input.count, input.offset);
+                OutputGetUserList outputGetUserList = new OutputGetUserList();
+                outputGetUserList.userInfoList = new ArrayList<>();
+                for (WFCMessage.User user : users) {
+                    outputGetUserList.userInfoList.add(InputOutputUserInfo.fromPbUser(user));
+                }
+
+                RestResult result = RestResult.ok(outputGetUserList);
+                setResponseContent(result, response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,69 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package com.xiaoleilu.loServer.action.admin;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetGroup;
+import cn.wildfirechat.pojos.InputGetGroupMember;
+import cn.wildfirechat.pojos.OutputGroupMemberList;
+import cn.wildfirechat.pojos.PojoGroupMember;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+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 io.netty.util.internal.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.Group_Member_Get)
+@HttpMethod("POST")
+public class GetGroupMemberAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetGroupMember input = getRequestBody(request.getNettyRequest(), InputGetGroupMember.class);
+            if (input != null
+                && (!StringUtil.isNullOrEmpty(input.getGroupId()))
+                && (!StringUtil.isNullOrEmpty(input.getMemberId()))) {
+
+                WFCMessage.GroupMember groupMember = messagesStore.getGroupMember(input.getGroupId(), input.getMemberId());
+
+                RestResult result;
+                if (groupMember == null || StringUtil.isNullOrEmpty(groupMember.getMemberId()) || groupMember.getType() == ProtoConstants.GroupMemberType.GroupMemberType_Removed) {
+                    result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+                } else {
+                    PojoGroupMember pm = new PojoGroupMember();
+                    pm.setMember_id(groupMember.getMemberId());
+                    pm.setAlias(groupMember.getAlias());
+                    pm.setType(groupMember.getType());
+                    pm.setExtra(groupMember.getExtra());
+                    pm.setCreateDt(groupMember.getCreateDt());
+                    result = RestResult.ok(pm);
+                }
+                setResponseContent(result, response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+
+        }
+        return true;
+    }
+}

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

@@ -0,0 +1,98 @@
+/*
+ * 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.robot;
+
+import cn.wildfirechat.common.APIPath;
+import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.InputGetGroup;
+import cn.wildfirechat.pojos.InputGetGroupMember;
+import cn.wildfirechat.pojos.OutputGroupMemberList;
+import cn.wildfirechat.pojos.PojoGroupMember;
+import cn.wildfirechat.proto.ProtoConstants;
+import cn.wildfirechat.proto.WFCMessage;
+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 io.netty.util.internal.StringUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.Robot_Group_Member_Get)
+@HttpMethod("POST")
+public class GetGroupMemberAction extends RobotAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetGroupMember input = getRequestBody(request.getNettyRequest(), InputGetGroupMember.class);
+            String robotId = robot.getUid();
+            if (input != null
+                && (!StringUtil.isNullOrEmpty(input.getGroupId()))
+                && (!StringUtil.isNullOrEmpty(input.getMemberId()))) {
+
+                List<WFCMessage.GroupMember> members = new ArrayList<>();
+                ErrorCode errorCode = messagesStore.getGroupMembers(null, input.getGroupId(), 0, members);
+                RestResult result;
+                if (errorCode != ErrorCode.ERROR_CODE_SUCCESS) {
+                    result = RestResult.resultOf(errorCode);
+                } else {
+                    WFCMessage.GroupMember groupMember = null;
+                    boolean isInGroup = false;
+                    for (WFCMessage.GroupMember member : members) {
+                        if (member.getType() == ProtoConstants.GroupMemberType.GroupMemberType_Removed) {
+                            continue;
+                        }
+                        if(member.getMemberId().equals(robotId)) {
+                            isInGroup = true;
+                            if(groupMember != null) {
+                                break;
+                            }
+                        }
+                        if(member.getMemberId().equals(input.getMemberId())) {
+                            groupMember = member;
+                            if(isInGroup) {
+                                break;
+                            }
+                        }
+                    }
+                    if(!isInGroup) {
+                        result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_IN_GROUP);
+                    } else {
+                        if(groupMember == null) {
+                            result = RestResult.resultOf(ErrorCode.ERROR_CODE_NOT_EXIST);
+                        } else {
+                            PojoGroupMember pm = new PojoGroupMember();
+                            pm.setMember_id(groupMember.getMemberId());
+                            pm.setAlias(groupMember.getAlias());
+                            pm.setType(groupMember.getType());
+                            pm.setExtra(groupMember.getExtra());
+                            pm.setCreateDt(groupMember.getCreateDt());
+                            result = RestResult.ok(pm);
+                        }
+                    }
+                }
+
+                setResponseContent(result, response);
+            } else {
+                setResponseContent(RestResult.resultOf(ErrorCode.INVALID_PARAMETER), response);
+            }
+
+        }
+        return true;
+    }
+}

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

@@ -29,6 +29,8 @@ public final class BrokerConstants {
     public static final String HTTP_SERVER_PORT = "http_port";
     public static final String HTTP_LOCAL_PORT = "local_port";
 
+    public static final String ENCRYPT_AES256 = "encrypt.use_aes256";
+
     public static final String HTTP_ADMIN_PORT = "http.admin.port";
     public static final String DEFAULT_MOQUETTE_STORE_MAP_DB_FILENAME = "moquette_store.mapdb";
     public static final String DEFAULT_PERSISTENT_PATH = System.getProperty("user.dir") + File.separator
@@ -161,6 +163,8 @@ public final class BrokerConstants {
     public static final String FRIEND_Repeat_Request_Duration = "friend.repeat_request_duration";
     public static final String FRIEND_Reject_Request_Duration = "friend.reject_request_duration";
     public static final String FRIEND_Request_Expiration_Duration = "friend.request_expiration_duration";
+    public static final String FRIEND_Request_Robot_Auto_Accept = "friend.robot_auto_accept";
+
 
     public static final String CHATROOM_Participant_Idle_Time = "chatroom.participant_idle_time";
     public static final String CHATROOM_Rejoin_When_Active = "chatroom.rejoin_when_active";

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

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

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

@@ -2640,6 +2640,103 @@ public class DatabaseStore {
         return null;
     }
 
+    List<WFCMessage.User> getAllUsers(int count, int offset) {
+        Connection connection = null;
+        PreparedStatement statement = null;
+        ResultSet rs = null;
+        List<WFCMessage.User> outList = new ArrayList<>();
+        try {
+            connection = DBUtil.getConnection();
+            String sql = "select `_uid`, `_name`" +
+                ", `_display_name`" +
+                ", `_portrait`" +
+                ", `_mobile`" +
+                ", `_gender`" +
+                ", `_email`" +
+                ", `_address`" +
+                ", `_company`" +
+                ", `_social`" +
+                ", `_extra`" +
+                ", `_type`" +
+                ", `_deleted`" +
+                ", `_dt` from t_user where `_deleted` = 0 order by _createTime limit ? offset ?";
+            statement = connection.prepareStatement(sql);
+
+            int index = 1;
+            statement.setInt(1, count);
+            statement.setInt(2, offset);
+
+
+            rs = statement.executeQuery();
+            while (rs.next()) {
+                WFCMessage.User.Builder builder = WFCMessage.User.newBuilder();
+                index = 1;
+                String value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setUid(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setName(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setDisplayName(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setPortrait(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setMobile(value);
+
+                int gender = rs.getInt(index++);
+                builder.setGender(gender);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setEmail(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setAddress(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setCompany(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setSocial(value);
+
+                value = rs.getString(index++);
+                value = (value == null ? "" : value);
+                builder.setExtra(value);
+
+                int type = rs.getInt(index++);
+                builder.setType(type);
+
+                int deleted = rs.getInt(index++);
+                builder.setDeleted(deleted);
+
+                long longValue = rs.getLong(index++);
+                if(longValue <= 0)
+                    longValue = 1;
+                builder.setUpdateDt(longValue);
+
+                outList.add(builder.build());
+            }
+        } catch (SQLException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+            Utility.printExecption(LOG, e, RDBS_Exception);
+        } finally {
+            DBUtil.closeDB(connection, statement, rs);
+        }
+        return outList;
+    }
+
     Set<String> getAllEnds() {
         Connection connection = null;
         PreparedStatement statement = null;

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

@@ -141,6 +141,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     private long mFriendRequestDuration = 7 * 24 * 60 * 60 * 1000;
     private long mFriendRejectDuration = 30 * 24 * 60 * 60 * 1000;
     private long mFriendRequestExpiration = 7 * 24 * 60 * 60 * 1000;
+    private boolean mFriendRobotAutoAccept = true;
 
     private boolean mMultiPlatformNotification = false;
     private boolean mMobileDefaultSilentWhenPCOnline = true;
@@ -297,6 +298,12 @@ public class MemoryMessagesStore implements IMessagesStore {
             printMissConfigLog(FRIEND_Request_Expiration_Duration, mFriendRequestExpiration + "");
         }
 
+
+        try {
+            mFriendRobotAutoAccept = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.FRIEND_Request_Robot_Auto_Accept, "true"));
+        } catch (Exception e) {
+        }
+
         try {
             mChatroomRejoinWhenActive = Boolean.parseBoolean(m_Server.getConfig().getProperty(BrokerConstants.CHATROOM_Rejoin_When_Active));
         } catch (Exception e) {
@@ -2510,6 +2517,28 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
     }
 
+    private boolean isOnlineValueEqual(WFCMessage.UserSettingEntry pcentry, String newValue) {
+        if(pcentry == null) {
+            return StringUtil.isNullOrEmpty(newValue);
+        }
+
+        String oldValue = pcentry.getValue();
+        if(StringUtil.isNullOrEmpty(oldValue) && StringUtil.isNullOrEmpty(newValue)) {
+            return true;
+        }
+
+        if(StringUtil.isNullOrEmpty(oldValue) || StringUtil.isNullOrEmpty(newValue)) {
+            return false;
+        }
+
+        String[] ssOld = oldValue.split("\\|");
+        String[] ssNew = newValue.split("\\|");
+        if(ssOld.length != 4 || ssNew.length != 4 || !ssOld[1].equals(ssNew[1]) || !ssOld[2].equals(ssNew[2]) || !ssOld[3].equals(ssNew[3])) {
+            return false;
+        }
+        return true;
+    }
+
     @Override
     public void updateUserOnlineSetting(MemorySessionStore.Session session, boolean online) {
         if(!mMultiPlatformNotification) {
@@ -2541,14 +2570,8 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
 
         WFCMessage.UserSettingEntry pcentry = getUserSetting(session.getUsername(), kUserSettingPCOnline, "PC");
-        if (pcValue != null) {
-            if (pcentry == null || StringUtil.isNullOrEmpty(pcentry.getValue())) {
-                updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("PC").setValue(pcValue).build(), session.clientID);
-            }
-        } else {
-            if (pcentry != null && !StringUtil.isNullOrEmpty(pcentry.getValue())) {
-                updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("PC").setValue("").build(), session.clientID);
-            }
+        if (!isOnlineValueEqual(pcentry, pcValue)) {
+            updateUserSettings(session.username, WFCMessage.ModifyUserSettingReq.newBuilder().setScope(kUserSettingPCOnline).setKey("PC").setValue(pcValue==null?"":pcValue).build(), session.clientID);
         }
     }
 
@@ -2741,6 +2764,12 @@ public class MemoryMessagesStore implements IMessagesStore {
         String userId = databaseStore.getUserIdByMobile(mobile);
         return getUserInfo(userId);
     }
+
+    @Override
+    public List<WFCMessage.User> getUserInfoList(int count, int offset) {
+        return databaseStore.getAllUsers(count, offset);
+    }
+
     @Override
     public List<WFCMessage.User> searchUser(String keyword, int searchType, int page) {
         if (mDisableSearch) {
@@ -3078,27 +3107,16 @@ public class MemoryMessagesStore implements IMessagesStore {
             }
         }
 
-        MultiMap<String, FriendData> friendsMap = hzInstance.getMultiMap(USER_FRIENDS);
-
-        FriendData friendData1 = null;
-        Collection<FriendData> friendDatas = friendsMap.get(userId);
-        if (friendDatas == null || friendDatas.size() == 0) {
-            friendDatas = loadFriend(friendsMap, userId);
-        }
-        for (FriendData fd : friendDatas) {
-            if (fd.getFriendUid().equals(request.getTargetUid())) {
-                friendData1 = fd;
-                break;
-            }
-        }
-        if (friendData1 != null && friendData1.getBlacked() > 0 && !isAdmin) {
-            return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
-        }
-
+        FriendData friendData1 = getFriendData(userId, request.getTargetUid());
         if (friendData1 != null && friendData1.getState() == 0) {
             return ErrorCode.ERROR_CODE_ALREADY_FRIENDS;
         }
 
+        FriendData friendData2 = getFriendData(request.getTargetUid(), userId);
+        if (friendData2 != null && friendData2.getBlacked() > 0 && !isAdmin) {
+            return ErrorCode.ERROR_CODE_IN_BLACK_LIST;
+        }
+
         WFCMessage.FriendRequest newRequest = WFCMessage.FriendRequest
             .newBuilder()
             .setFromUid(userId)
@@ -3476,7 +3494,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     private String ensureSecretLength(String secret) {
-        while ( secret.length() < 16) {
+        while ( secret.length() < AES.keyLen) {
             secret += "w";
             secret += secret;
         }
@@ -4290,6 +4308,11 @@ public class MemoryMessagesStore implements IMessagesStore {
         return mChannelCallbackWithClientInfo;
     }
 
+    @Override
+    public boolean isRobotAutoAcceptFriendRequest() {
+        return mFriendRobotAutoAccept;
+    }
+
     @Override
     public List<Integer> getClientForbiddenSendTypes() {
         return mForbiddenClientSendTypes;

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

@@ -232,18 +232,6 @@ public class Server {
             handlers = Collections.emptyList();
         }
         DBUtil.init(config);
-        String strKey = "0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F";
-        String[] strs = strKey.split(",");
-        if(strs.length != 16) {
-            LOG.error("Key error, it length should be 16");
-        }
-        byte[] keys = new byte[16];
-        for (int i = 0; i < 16; i++) {
-            keys[i] = (byte)(Integer.parseInt(strs[i].replace("0X", "").replace("0x", ""), 16));
-        }
-
-
-        AES.init(keys);
 
         LOG.info("Starting Moquette Server. MQTT message interceptors={}", getInterceptorIds(handlers));
 
@@ -393,9 +381,13 @@ public class Server {
 
         longPort = config.getProperty(BrokerConstants.PORT_PROPERTY_NAME);
         shortPort = config.getProperty(BrokerConstants.HTTP_SERVER_PORT);
+        boolean aes256 = Boolean.parseBoolean(config.getProperty(ENCRYPT_AES256, "false"));
 
         MessageShardingUtil.setNodeId(1);
         Tokenor.setKey(config.getProperty(BrokerConstants.TOKEN_SECRET_KEY));
+
+        AES.useAes256(aes256);
+
         String expirTimeStr = config.getProperty(TOKEN_EXPIRE_TIME);
         if (!StringUtil.isNullOrEmpty(expirTimeStr)) {
             try {

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

@@ -158,6 +158,8 @@ public interface IMessagesStore {
     WFCMessage.User getUserInfoByMobile(String mobile);
     List<WFCMessage.User> searchUser(String keyword, int searchType, int page);
 
+    List<WFCMessage.User> getUserInfoList(int count, int offset);
+
     boolean updateSystemSetting(int id, String value, String desc);
     SystemSettingPojo getSystemSetting(int id);
     void createChatroom(String chatroomId, WFCMessage.ChatroomInfo chatroomInfo);
@@ -239,6 +241,8 @@ public interface IMessagesStore {
     boolean isRobotCallbackWithClientInfo();
     boolean isChannelCallbackWithClientInfo();
 
+    boolean isRobotAutoAcceptFriendRequest();
+
     List<Integer> getClientForbiddenSendTypes();
     List<Integer> getBlackListExceptionTypes();
     List<Integer> getGroupMuteExceptionTypes();

common/pom.xml

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

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

@@ -26,6 +26,7 @@ public interface APIPath {
     String User_Get_Token = "/admin/user/get_token";
     String User_Update_Block_Status = "/admin/user/update_block_status";
     String User_Get_Info = "/admin/user/get_info";
+    String User_Get_All = "/admin/user/all";
     String User_Get_Robot_Info = "/admin/user/get_robot_info";
     String User_Get_Blocked_List = "/admin/user/get_blocked_list";
     String User_Check_Block_Status = "/admin/user/check_block_status";
@@ -68,6 +69,7 @@ public interface APIPath {
     String Group_Get_Info = "/admin/group/get_info";
     String Group_Modify_Info = "/admin/group/modify";
     String Group_Member_List = "/admin/group/member/list";
+    String Group_Member_Get = "/admin/group/member/get";
     String Group_Member_Add = "/admin/group/member/add";
     String Group_Member_Kickoff = "/admin/group/member/del";
     String Group_Member_Quit = "/admin/group/member/quit";
@@ -122,6 +124,7 @@ public interface APIPath {
     String Robot_Group_Dismiss = "/robot/group/del";
     String Robot_Group_Get_Info = "/robot/group/get_info";
     String Robot_Group_Member_List = "/robot/group/member/list";
+    String Robot_Group_Member_Get = "/robot/group/member/get";
     String Robot_Group_Member_Kickoff = "/robot/group/member/del";
     String Robot_Group_Modify_Info = "/robot/group/modify";
     String Robot_Group_Set_Member_Alias = "/robot/group/member/set_alias";

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

@@ -48,9 +48,7 @@ public enum ErrorCode {
     ERROR_CODE_NOT_YOUR_LOCKED(26, "unload failure, not your lock"),
     ERROR_CODE_ROBOT_NO_TOKEN(27, "robot no token"),
     ERROR_CODE_WS_NOT_CONFIGURED_CORRECTLY(28, "ws not configured correctly"),
-
     ERROR_CODE_TIME_INCONSISTENT(30, "time inconsistent"),
-
     ERROR_CODE_CONFERENCE_ROOM_NOT_EXIST(60, "conference room not exist"),
     ERROR_CODE_CONFERENCE_SERVICE_NOT_AVAILABLE(61, "conference service not available"),
 

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

@@ -0,0 +1,30 @@
+/*
+ * This file is part of the Wildfire Chat package.
+ * (c) Heavyrain2012 <heavyrain.lee@gmail.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+package cn.wildfirechat.pojos;
+
+public class InputGetGroupMember {
+    private String groupId;
+    private String memberId;
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public String getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(String memberId) {
+        this.memberId = memberId;
+    }
+}

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

@@ -0,0 +1,6 @@
+package cn.wildfirechat.pojos;
+
+public class InputGetUserList {
+    public int count;
+    public int offset;
+}

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

@@ -0,0 +1,7 @@
+package cn.wildfirechat.pojos;
+
+import java.util.List;
+
+public class OutputGetUserList {
+    public List<InputOutputUserInfo> userInfoList;
+}

common/src/main/java/io/moquette/spi/impl/security/AES.java

@@ -5,6 +5,7 @@ import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.security.SecureRandom;
 import java.security.spec.InvalidKeySpecException;
+import java.util.Arrays;
 import java.util.Base64;
 
 import javax.crypto.BadPaddingException;
@@ -18,38 +19,46 @@ import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 
 public class AES {
-    private static byte[] aes_key= {0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F};
-    public static void init(byte[] secret) {
-        if (secret != null && secret.length == 16) {
-            aes_key = new byte[16];
-            for (int i = 0; i < 16; i++) {
-                aes_key[i] = secret[i];
-            }
-        } else {
-            System.out.println("Error int key error, secret incorrect");
-        }
-    }
+    public static int keyLen = 16;
+    private final static int ivLen = 16;
+    private static byte[] aes_key= {0x00,0x11,0x22,0x33,0x44,0x55,0x66,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,0x3A,0x1F,0x28,0x39,0x4F,0x52,0x68,0x79,0x71,0x73,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F};
 
     public static byte[] AESEncrypt(String sSrc, String userKey) {
         return AESEncrypt(sSrc.getBytes(), userKey);
     }
 
+    public static void useAes256(boolean aes256) {
+        if(aes256)
+            keyLen = 32;
+        else
+            keyLen = 16;
+    }
+
     public static byte[] AESEncrypt(byte[] tobeencrypdata, byte[] aesKey) {
         if (aesKey == null) {
             System.out.print("Key为空null");
             return null;
         }
         // 判断Key是否为16位
-        if (aesKey.length != 16) {
+        if (aesKey.length < keyLen) {
             System.out.print("Key长度不是16位");
             return null;
         }
+        if(aesKey.length > keyLen) {
+            aesKey = Arrays.copyOfRange(aesKey, 0, keyLen);
+        }
 
+        byte[] ivKeys;
+        if(aesKey.length == ivLen) {
+            ivKeys = aesKey;
+        } else {
+            ivKeys = Arrays.copyOfRange(aesKey, 0, ivLen);
+        }
 
         try {
             SecretKeySpec skeySpec = new SecretKeySpec(aesKey, "AES");
             Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");//"算法/模式/补码方式"
-            IvParameterSpec iv = new IvParameterSpec(aesKey);//使用CBC模式，需要一个向量iv，可增加加密算法的强度
+            IvParameterSpec iv = new IvParameterSpec(ivKeys);//使用CBC模式，需要一个向量iv，可增加加密算法的强度
             cipher.init(Cipher.ENCRYPT_MODE, skeySpec, iv);
 
             //2018.1.1 0:0:0 以来的小时数
@@ -101,8 +110,8 @@ public class AES {
     }
 
     private static byte[] convertUserKey(String userKey) {
-        byte[] key = new byte[16];
-        for (int i = 0; i < 16; i++) {
+        byte[] key = new byte[keyLen];
+        for (int i = 0; i < keyLen; i++) {
             key[i] = (byte) (userKey.charAt(i) & 0xFF);
         }
         return key;
@@ -128,14 +137,25 @@ public class AES {
                 aesKey = aes_key;
             }
             // 判断Key是否为16位
-            if (aesKey.length != 16) {
+            if (aesKey.length < keyLen) {
                 System.out.print("Key长度不是16位");
                 return null;
             }
 
+            if(aesKey.length > keyLen) {
+                aesKey = Arrays.copyOfRange(aesKey, 0, keyLen);
+            }
+
+            byte[] ivKeys;
+            if(aesKey.length == ivLen) {
+                ivKeys = aesKey;
+            } else {
+                ivKeys = Arrays.copyOfRange(aesKey, 0, ivLen);
+            }
+
             SecretKeySpec skeySpec = new SecretKeySpec(aesKey, "AES");
             Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
-            IvParameterSpec iv = new IvParameterSpec(aesKey);
+            IvParameterSpec iv = new IvParameterSpec(ivKeys);
             cipher.init(Cipher.DECRYPT_MODE, skeySpec, iv);
             try {
                 byte[] original = cipher.doFinal(sSrc);

distribution/pom.xml

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

distribution/src/main/resources/wildfirechat.conf

@@ -63,6 +63,9 @@ token.key testim
 ##是否拒绝空签名的android客户端， 默认为true。当有旧的客户端需要兼容时改成false，当所有都是新客户端时，改成true。
 #connect.reject_empty_signature true
 
+##是否使用AES256加密。默认客户端和服务器都是AES128加密，如果需要开启AES256，需要客户端和IM服务同时开通。
+#encrypt.use_aes256 true
+
 ##首次登录，是否接收之前的历史消息。
 ##0 不接收历史消息，只接收${message.compensate_time_limit}毫秒以内的消息，由于服务器没有保存已经收取记录，所以如果有超过${message.compensate_time_limit}毫秒之前未收取的消息也不会收取下拉；
 ##1接收，会接收 message.max_queue 配置的条数的历史消息
@@ -149,6 +152,9 @@ friend.reject_request_duration 2592000000
 ##好友请求过期时间，单位是毫秒，默认是7天，0为无限长期限。
 friend.request_expiration_duration 604800000
 
+##请求添加机器人为好友时，机器人是否自动接受，默认为true
+friend.robot_auto_accept true
+
 ## 聊天室观众空闲退出时间，单位为毫秒，默认为15分钟，0为永远不退出
 chatroom.participant_idle_time 900000
 

distribution/src/main/scripts/stop.sh

@@ -9,7 +9,7 @@ fi
 
 kill -15 $pid
 
-for i in {1..15}
+for i in {1..30}
 do
   pid=`ps -ef | grep wildfirechat.server.Server | grep -v grep | awk '{print $2}'`
   if [ -z $pid ]; then

docker/Dockerfile

@@ -5,6 +5,8 @@ ADD distribution-*-bundle-tar.tar.gz /opt/im-server/
 RUN sed -i 's/#JAVA_OPTS="$JAVA_OPTS -Xmx128M"/JAVA_OPTS="$JAVA_OPTS -Xmx$JVM_XMX"/g' /opt/im-server/bin/wildfirechat.sh
 RUN sed -i 's/#JAVA_OPTS="$JAVA_OPTS -Xms128M"/JAVA_OPTS="$JAVA_OPTS -Xms$JVM_XMS"/g' /opt/im-server/bin/wildfirechat.sh
 
+RUN chmod a+x /opt/im-server/bin/wildfirechat.sh
+
 WORKDIR /opt/im-server
 
 VOLUME /opt/im-server/config

pom.xml

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

release_note.md

@@ -12,6 +12,18 @@
 
 # 更新记录
 
+--------------
+Release note 1.1.5:
+1. 添加获取所有用户的Server API。
+2. 解决添加好友时没有处理黑名单的问题。
+
+--------------
+Release note 1.1.4:
+1. 添加PC客户端多端登录互踢时没有更新pc在线状态问题。
+2. 添加支持使用AES256加密。
+3. Server API添加获取单个群成员的接口。
+4. 添加配置，添加机器人为好友时是否自动接受。
+
 --------------
 Release note 1.1.3:
 1. 添加服务器和客户端时间检查功能。

sdk/pom.xml

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

sdk/sdk_readme.txt

@@ -27,7 +27,7 @@
 		<dependency>
 			<groupId>commons-codec</groupId>
 			<artifactId>commons-codec</artifactId>
-			<version>1.11</version>
+			<version>1.15</version>
 		</dependency>
 
 		<dependency>

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

@@ -71,6 +71,14 @@ public class GroupAdmin {
         return AdminHttpUtils.httpJsonPost(path, input, OutputGroupMemberList.class);
     }
 
+    public static IMResult<PojoGroupMember> getGroupMember(String groupId, String memberId) throws Exception {
+        String path = APIPath.Group_Member_Get;
+        InputGetGroupMember input = new InputGetGroupMember();
+        input.setGroupId(groupId);
+        input.setMemberId(memberId);
+        return AdminHttpUtils.httpJsonPost(path, input, PojoGroupMember.class);
+    }
+
     public static IMResult<Void> addGroupMembers(String operator, String groupId, List<PojoGroupMember> groupMembers, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
         String path = APIPath.Group_Member_Add;
         InputAddGroupMember addGroupMember = new InputAddGroupMember();

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

@@ -300,6 +300,20 @@ public class Main {
             System.exit(-1);
         }
 
+        int limit = 5;
+        for (int i = 0; i < 100; i++) {
+            IMResult<OutputGetUserList> getUserListIMResult = UserAdmin.getAllUsers(limit, i*limit);
+            if (getUserListIMResult != null && getUserListIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+                System.out.println("getUserListIMResult success");
+                if(getUserListIMResult.getResult().userInfoList.size() < limit) {
+                    break;
+                }
+            } else {
+                System.out.println("getUserListIMResult failure");
+                System.exit(-1);
+            }
+        }
+
         if (commercialServer) {
             IMResult<GetOnlineUserCountResult> getOnlineUserCountResultIMResult = UserAdmin.getOnlineUserCount();
             if (getOnlineUserCountResultIMResult != null && getOnlineUserCountResultIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
@@ -572,6 +586,14 @@ public class Main {
             System.exit(-1);
         }
 
+        IMResult<PojoGroupMember> groupMemberIMResult = GroupAdmin.getGroupMember(groupInfo.getTarget_id(), "user1");
+        if (groupMemberIMResult != null && groupMemberIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("get group member success");
+        } else {
+            System.out.println("get group member failure");
+            System.exit(-1);
+        }
+
         voidIMResult = GroupAdmin.kickoffGroupMembers("user1", groupInfo.getTarget_id(), Arrays.asList("user3"), null, null);
         if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("kickoff group member success");
@@ -1215,7 +1237,7 @@ public class Main {
         if (resultGetMembers != null && resultGetMembers.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("get group member success");
         } else {
-            System.out.println("create group failure");
+            System.out.println("get group member failure");
             System.exit(-1);
         }
 
@@ -1231,6 +1253,14 @@ public class Main {
             System.exit(-1);
         }
 
+        IMResult<PojoGroupMember> groupMemberIMResult = robotService.getGroupMember(groupInfo.getTarget_id(), "user0");
+        if (groupMemberIMResult != null && groupMemberIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("get group member success");
+        } else {
+            System.out.println("get group member failure");
+            System.exit(-1);
+        }
+
         voidIMResult = robotService.kickoffGroupMembers(groupInfo.getTarget_id(), Arrays.asList("user3"), null, null);
         if (voidIMResult != null && voidIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("kickoff group member success");

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

@@ -134,6 +134,14 @@ public class RobotService {
         return robotHttpUtils.httpJsonPost(path, input, OutputGroupMemberList.class);
     }
 
+    public IMResult<PojoGroupMember> getGroupMember(String groupId, String memberId) throws Exception {
+        String path = APIPath.Robot_Group_Member_Get;
+        InputGetGroupMember input = new InputGetGroupMember();
+        input.setGroupId(groupId);
+        input.setMemberId(memberId);
+        return robotHttpUtils.httpJsonPost(path, input, PojoGroupMember.class);
+    }
+
     public IMResult<Void> addGroupMembers(String groupId, List<PojoGroupMember> groupMembers, List<Integer> to_lines, MessagePayload  notify_message) throws Exception {
         String path = APIPath.Robot_Group_Member_Add;
         InputAddGroupMember addGroupMember = new InputAddGroupMember();

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

@@ -24,6 +24,14 @@ public class UserAdmin {
         return AdminHttpUtils.httpJsonPost(path, getUserInfo, InputOutputUserInfo.class);
     }
 
+    public static IMResult<OutputGetUserList> getAllUsers(int count, int offset) throws Exception {
+        String path = APIPath.User_Get_All;
+        InputGetUserList input = new InputGetUserList();
+        input.count = count;
+        input.offset = offset;
+        return AdminHttpUtils.httpJsonPost(path, input, OutputGetUserList.class);
+    }
+
     public static IMResult<OutputCreateUser> createUser(InputOutputUserInfo user) throws Exception {
         String path = APIPath.Create_User;
         return AdminHttpUtils.httpJsonPost(path, user, OutputCreateUser.class);