From 998f01a584d74a8719b3cf1d455632534d0e9d04 Mon Sep 17 00:00:00 2001
From: "heavyrain.lee" <heavyrain.lee@gmail.com>
Date: Sat, 4 Jan 2020 14:51:46 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=85=B3=E6=8E=89=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E5=9C=A8=E7=BA=BF=E7=8A=B6=E6=80=81=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 broker/config/wildfirechat.conf               |  2 +-
 .../moquette/spi/impl/ProtocolProcessor.java  | 20 +------------------
 .../wildfirechat/pojos/UserOnlineStatus.java  | 20 +++++++++++++++++++
 .../src/main/resources/wildfirechat.conf      |  2 +-
 4 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100644 common/src/main/java/cn/wildfirechat/pojos/UserOnlineStatus.java

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
 
 
 #*********************************************************************