diff --git a/broker/config/wildfirechat.conf b/broker/config/wildfirechat.conf index 7aec013c..7e44c5ae 100755 --- a/broker/config/wildfirechat.conf +++ b/broker/config/wildfirechat.conf @@ -133,7 +133,7 @@ push.ios.server.address http://localhost:8085/ios/push # User online status event callback #********************************************************************* ##用户在线状态事件回调地址 -user.online_status_callback http://localhost:8888/user/online_event +#user.online_status_callback http://localhost:8888/user/online_event #********************************************************************* # MongoDB configuration diff --git a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java index 6066a362..7dbf4852 100755 --- a/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java +++ b/broker/src/main/java/io/moquette/spi/impl/ProtocolProcessor.java @@ -18,6 +18,7 @@ package io.moquette.spi.impl; import cn.wildfirechat.common.ErrorCode; import cn.wildfirechat.pojos.SendMessageData; +import cn.wildfirechat.pojos.UserOnlineStatus; import cn.wildfirechat.proto.ProtoConstants; import cn.wildfirechat.proto.WFCMessage; import com.google.gson.Gson; @@ -256,25 +257,6 @@ public class ProtocolProcessor { LOG.info("The CONNECT message has been processed. CId={}, username={}", clientId, payload.userName()); } - private static class UserOnlineStatus { - public static final int ONLINE = 0; - public static final int OFFLINE = 1; - public static final int LOGOUT = -1; - public String userId; - public String clientId; - public int platform; - public int status; - public long timestamp; - - public UserOnlineStatus(String userId, String clientId, int platform, int status) { - this.userId = userId; - this.clientId = clientId; - this.platform = platform; - this.status = status; - this.timestamp = System.currentTimeMillis(); - } - } - public void forwardOnlineStatusEvent(String userId, String clientId, int platform, int status) { if (!StringUtil.isNullOrEmpty(mUserOnlineStatusCallback)) { executorCallback.execute(() -> HttpUtils.httpJsonPost(mUserOnlineStatusCallback, new Gson().toJson(new UserOnlineStatus(userId, clientId, platform, status)))); diff --git a/common/src/main/java/cn/wildfirechat/pojos/UserOnlineStatus.java b/common/src/main/java/cn/wildfirechat/pojos/UserOnlineStatus.java new file mode 100644 index 00000000..edfbc000 --- /dev/null +++ b/common/src/main/java/cn/wildfirechat/pojos/UserOnlineStatus.java @@ -0,0 +1,20 @@ +package cn.wildfirechat.pojos; + +public class UserOnlineStatus { + public static final int ONLINE = 0; + public static final int OFFLINE = 1; + public static final int LOGOUT = -1; + public String userId; + public String clientId; + public int platform; + public int status; + public long timestamp; + + public UserOnlineStatus(String userId, String clientId, int platform, int status) { + this.userId = userId; + this.clientId = clientId; + this.platform = platform; + this.status = status; + this.timestamp = System.currentTimeMillis(); + } +} diff --git a/distribution/src/main/resources/wildfirechat.conf b/distribution/src/main/resources/wildfirechat.conf index 9d10820b..01f0e4a9 100755 --- a/distribution/src/main/resources/wildfirechat.conf +++ b/distribution/src/main/resources/wildfirechat.conf @@ -127,7 +127,7 @@ push.ios.server.address http://localhost:8085/ios/push # User online status event callback #********************************************************************* ##用户在线状态事件回调地址 -user.online_status_callback http://localhost:8888/user/online_event +#user.online_status_callback http://localhost:8888/user/online_event #*********************************************************************