version and release note

broker/pom.xml

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

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

@@ -48,10 +48,6 @@ public class CreateChatroomAction extends AdminAction {
                     inputCreateChatroom.setChatroomId(messagesStore.getShortUUID());
                 }
 
-                if (inputCreateChatroom.getPortrait() == null || inputCreateChatroom.getPortrait().length() == 0) {
-                    inputCreateChatroom.setPortrait("https://avatars.io/gravatar/" + inputCreateChatroom.getChatroomId());
-                }
-
                 WFCMessage.ChatroomInfo info = inputCreateChatroom.toChatroomInfo();
                 messagesStore.createChatroom(inputCreateChatroom.getChatroomId(), info);
                 setResponseContent(RestResult.ok(new OutputCreateChatroom(inputCreateChatroom.getChatroomId())), response);

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

@@ -45,23 +45,13 @@ public class CreateRobotAction extends AdminAction {
             if (inputCreateRobot != null
                 && !StringUtil.isNullOrEmpty(inputCreateRobot.getName())) {
 
-                if(StringUtil.isNullOrEmpty(inputCreateRobot.getPassword())) {
-                    inputCreateRobot.setPassword(UUIDGenerator.getUUID());
-                }
-
                 if(StringUtil.isNullOrEmpty(inputCreateRobot.getUserId())) {
                     inputCreateRobot.setUserId(messagesStore.getShortUUID());
                 }
 
-                if (inputCreateRobot.getPortrait() == null || inputCreateRobot.getPortrait().length() == 0) {
-                    inputCreateRobot.setPortrait("https://avatars.io/gravatar/" + inputCreateRobot.getUserId());
-                }
-
                 WFCMessage.User newUser = inputCreateRobot.toUser();
-
-
                 try {
-                    messagesStore.addUserInfo(newUser, inputCreateRobot.getPassword());
+                    messagesStore.addUserInfo(newUser);
                 } catch (Exception e) {
                     e.printStackTrace();
                     Utility.printExecption(LOG, e, IMExceptionEvent.EventType.ADMIN_API_Exception);

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

@@ -47,10 +47,6 @@ public class CreateUserAction extends AdminAction {
                 && !StringUtil.isNullOrEmpty(inputCreateUser.getName())
                 && (inputCreateUser.getType() == ProtoConstants.UserType.UserType_Normal || inputCreateUser.getType() == ProtoConstants.UserType.UserType_Admin || inputCreateUser.getType() == ProtoConstants.UserType.UserType_Super_Admin)) {
 
-                if(StringUtil.isNullOrEmpty(inputCreateUser.getPassword())) {
-                    inputCreateUser.setPassword(UUIDGenerator.getUUID());
-                }
-
                 if(StringUtil.isNullOrEmpty(inputCreateUser.getUserId())) {
                     inputCreateUser.setUserId(messagesStore.getShortUUID());
                 }
@@ -85,7 +81,7 @@ public class CreateUserAction extends AdminAction {
 
 
                 try {
-                    messagesStore.addUserInfo(newUserBuilder.build(), inputCreateUser.getPassword());
+                    messagesStore.addUserInfo(newUserBuilder.build());
                 } catch (Exception e) {
                     e.printStackTrace();
                     Utility.printExecption(LOG, e, IMExceptionEvent.EventType.ADMIN_API_Exception);

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

@@ -2893,7 +2893,7 @@ public class MemoryMessagesStore implements IMessagesStore {
     }
 
     @Override
-    public void addUserInfo(WFCMessage.User user, String password) throws Exception {
+    public void addUserInfo(WFCMessage.User user) throws Exception {
         HazelcastInstance hzInstance = m_Server.getHazelcastInstance();
         IMap<String, WFCMessage.User> mUserMap = hzInstance.getMap(USERS);
         if (databaseStore.isUidAndNameConflict(user.getUid(), user.getName())) {
@@ -2901,7 +2901,6 @@ public class MemoryMessagesStore implements IMessagesStore {
         }
         databaseStore.updateUser(user);
         mUserMap.put(user.getUid(), user);
-        databaseStore.updateUserPassword(user.getUid(), password);
 
         callbackUserInfoEvent(user);
     }

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

@@ -147,7 +147,7 @@ public interface IMessagesStore {
     List<InputOutputUserBlockStatus> getUserStatusList();
 
     ErrorCode updateUserInfo(InputOutputUserInfo userInfo, int flag);
-    void addUserInfo(WFCMessage.User user, String password) throws Exception;
+    void addUserInfo(WFCMessage.User user) throws Exception;
     void destroyUser(String userId);
     void updateUserInfo(WFCMessage.User user) throws Exception;
     WFCMessage.User getUserInfo(String userId);

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

@@ -17,6 +17,7 @@
 package io.moquette.spi.impl;
 
 import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.OutputCheckUserOnline;
 import cn.wildfirechat.pojos.UserOnlineStatus;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
@@ -266,7 +267,27 @@ public class ProtocolProcessor {
         if (!StringUtil.isNullOrEmpty(mUserOnlineStatusCallback)) {
             mServer.getCallbackScheduler().execute(() -> {
                 try {
-                    HttpUtils.httpJsonPost(mUserOnlineStatusCallback, GsonUtil.gson.toJson(new UserOnlineStatus(userId, clientId, platform, status, packageName)), HttpUtils.HttpPostType.POST_TYPE_User_Online_Event_Callback);
+                    int sessionstatus;
+                    Collection<MemorySessionStore.Session> useSessions = m_sessionsStore.sessionForUser(userId);
+                    UserOnlineStatus userOnlineStatus = new UserOnlineStatus(userId, clientId, platform, status, packageName);
+                    userOnlineStatus.sessions = new ArrayList<>();
+
+                    for (MemorySessionStore.Session session : useSessions) {
+                        if (session.getDeleted() > 0) {
+                            continue;
+                        }
+
+                        ConnectionDescriptor descriptor = connectionDescriptors.getConnection(session.getClientID());
+                        if (descriptor == null) {
+                            sessionstatus = 1;
+                        } else {
+                            sessionstatus = 0;
+                        }
+
+                        userOnlineStatus.sessions.add(new OutputCheckUserOnline.Session(userId, session.getClientID(), session.getPlatform(), sessionstatus, session.getLastActiveTime(), session.getAppName()));
+                    }
+
+                    HttpUtils.httpJsonPost(mUserOnlineStatusCallback, GsonUtil.gson.toJson(userOnlineStatus), HttpUtils.HttpPostType.POST_TYPE_User_Online_Event_Callback);
                 } catch (Exception e) {
                     e.printStackTrace();
                     Utility.printExecption(LOG, e, EVENT_CALLBACK_Exception);

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

@@ -141,7 +141,7 @@ public class Qos1PublishHandler extends QosPublishHandler {
                     status = 0;
                 }
 
-                out.addSession(userId, session.getClientID(), session.getPlatform(), status, session.getLastActiveTime());
+                out.addSession(userId, session.getClientID(), session.getPlatform(), status, session.getLastActiveTime(), session.getAppName());
             }
 
             callback.onRouteHandled(GsonUtil.gson.toJson(out).getBytes());

common/pom.xml

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

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

@@ -19,18 +19,23 @@ public class OutputCheckUserOnline {
         public int platform;
         public int status; //0 online, 1 have session offline
         public long lastSeen;
+        public String packageName;
 
-        public Session(String clientId, String userId, int platform, int status, long lastSeen) {
+        public Session() {
+        }
+
+        public Session(String clientId, String userId, int platform, int status, long lastSeen, String packageName) {
             this.clientId = clientId;
             this.userId = userId;
             this.platform = platform;
             this.status = status;
             this.lastSeen = lastSeen;
+            this.packageName = packageName;
         }
     }
 
-    public void addSession(String userId, String clientId, int platform, int status, long lastSeen) {
+    public void addSession(String userId, String clientId, int platform, int status, long lastSeen, String packageName) {
-        Session session = new Session(clientId, userId, platform, status, lastSeen);
+        Session session = new Session(clientId, userId, platform, status, lastSeen, packageName);
         sessions.add(session);
     }
 

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

@@ -1,5 +1,7 @@
 package cn.wildfirechat.pojos;
 
+import java.util.List;
+
 public class UserOnlineStatus {
     public static final int ONLINE = 0;
     public static final int OFFLINE = 1;
@@ -11,6 +13,9 @@ public class UserOnlineStatus {
     public int status;
     public long timestamp;
     public String packageName;
+    public int customState;
+    public String customText;
+    public List<OutputCheckUserOnline.Session> sessions;
 
     public UserOnlineStatus() {
     }

distribution/pom.xml

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

pom.xml

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

release_note.md

@@ -12,6 +12,12 @@
 
 # 更新记录
 
+--------------
+Release note 1.2.4:
+1. 去掉用户的默认密码。
+2. 去掉频道和机器人的默认头像。
+3. 修改在线状态回调数据，返回此用户的所有端状态。
+
 --------------
 Release note 1.2.3:
 1. 同步专业版IM服务server SDK。

sdk/pom.xml

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