添加设置/获取备注api，添加用户在线状态回调功能

2020-01-04 14:45:49 +08:00
parent 41d326d40f
commit 70c390dea9
7 changed files with 153 additions and 1 deletions
@@ -0,0 +1,53 @@
+/*
+ * 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.pojos.InputGetFriendList;
+import cn.wildfirechat.pojos.OutputStringList;
+import com.google.gson.Gson;
+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 com.xiaoleilu.loServer.model.FriendData;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.Friend_Get_Alias)
+@HttpMethod("POST")
+public class AliasGetAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetFriendList inputGetFriendList = getRequestBody(request.getNettyRequest(), InputGetFriendList.class);
+            List<FriendData> dataList = messagesStore.getFriendList(inputGetFriendList.getUserId(), null, 0);
+            List<String> list = new ArrayList<>();
+            for (FriendData data : dataList) {
+                if (data.getState() == inputGetFriendList.getStatus()) {
+                    list.add(data.getFriendUid());
+                }
+            }
+            response.setStatus(HttpResponseStatus.OK);
+            RestResult result = RestResult.ok(new OutputStringList(list));
+            response.setContent(new Gson().toJson(result));
+        }
+        return true;
+    }
+}
@@ -0,0 +1,53 @@
+/*
+ * 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.pojos.InputGetFriendList;
+import cn.wildfirechat.pojos.OutputStringList;
+import com.google.gson.Gson;
+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 com.xiaoleilu.loServer.model.FriendData;
+import io.netty.handler.codec.http.FullHttpRequest;
+import io.netty.handler.codec.http.HttpResponseStatus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Route(APIPath.Friend_Set_Alias)
+@HttpMethod("POST")
+public class AliasPutAction extends AdminAction {
+
+    @Override
+    public boolean isTransactionAction() {
+        return true;
+    }
+
+    @Override
+    public boolean action(Request request, Response response) {
+        if (request.getNettyRequest() instanceof FullHttpRequest) {
+            InputGetFriendList inputGetFriendList = getRequestBody(request.getNettyRequest(), InputGetFriendList.class);
+            List<FriendData> dataList = messagesStore.getFriendList(inputGetFriendList.getUserId(), null, 0);
+            List<String> list = new ArrayList<>();
+            for (FriendData data : dataList) {
+                if (data.getState() == inputGetFriendList.getStatus()) {
+                    list.add(data.getFriendUid());
+                }
+            }
+            response.setStatus(HttpResponseStatus.OK);
+            RestResult result = RestResult.ok(new OutputStringList(list));
+            response.setContent(new Gson().toJson(result));
+        }
+        return true;
+    }
+}
@@ -88,6 +88,8 @@ public final class BrokerConstants {
    public static final String PUSH_ANDROID_SERVER_ADDRESS = "push.android.server.address";
    public static final String PUSH_IOS_SERVER_ADDRESS = "push.ios.server.address";

+    public static final String USER_ONLINE_STATUS_CALLBACK = "user.online_status_callback";
+
    public static final String HZ_Cluster_Node_External_IP = "node_external_ip";
    public static final String HZ_Cluster_Node_External_Long_Port = "node_external_long_port";
    public static final String HZ_Cluster_Node_External_Short_Port = "node_external_short_port";
@@ -386,6 +386,12 @@ public class MemoryMessagesStore implements IMessagesStore {
                            continue;
                        }

+                        if (bundle.getMessage().getContent().getExpireDuration() > 0) {
+                            if (System.currentTimeMillis() < bundle.getMessage().getServerTimestamp() + bundle.getMessage().getContent().getExpireDuration()) {
+                                continue;
+                            }
+                        }
+
                        size += bundle.getMessage().getSerializedSize();
                        if (size >= 512 * 1024) { //3M
                            if(builder.getMessageCount() == 0){
@@ -17,8 +17,13 @@
 package io.moquette.spi.impl;

 import cn.wildfirechat.common.ErrorCode;
+import cn.wildfirechat.pojos.SendMessageData;
 import cn.wildfirechat.proto.ProtoConstants;
 import cn.wildfirechat.proto.WFCMessage;
+import com.google.gson.Gson;
+import com.hazelcast.core.Member;
+import com.hazelcast.util.StringUtil;
+import io.moquette.BrokerConstants;
 import io.moquette.persistence.RPCCenter;
 import io.moquette.interception.InterceptHandler;
 import io.moquette.interception.messages.InterceptAcknowledgedMessage;
@@ -40,9 +45,12 @@ import io.netty.handler.codec.mqtt.*;
 import io.netty.handler.timeout.IdleStateHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import win.liyufan.im.HttpUtils;
 import win.liyufan.im.Utility;

 import java.util.*;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;

 import static io.moquette.spi.impl.InternalRepublisher.createPublishForQos;
 import static io.moquette.spi.impl.Utils.readBytesAndRewind;
@@ -59,7 +67,7 @@ import static io.moquette.server.ConnectionDescriptor.ConnectionState.*;
 */

 public class ProtocolProcessor {
-
+    private static ExecutorService executorCallback = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());

    public void kickoffSession(final MemorySessionStore.Session session) {
        mServer.getImBusinessScheduler().execute(()->{
@@ -154,8 +162,15 @@ public class ProtocolProcessor {
                this.connectionDescriptors, this.messagesPublisher, sessionsStore, server.getImBusinessScheduler(), server);

        mServer = server;
+
+        String onlineStatusCallback = server.getConfig().getProperty(BrokerConstants.USER_ONLINE_STATUS_CALLBACK);
+        if (!com.hazelcast.util.StringUtil.isNullOrEmpty(onlineStatusCallback)) {
+            mUserOnlineStatusCallback = onlineStatusCallback;
+        }
    }

+    private String mUserOnlineStatusCallback;
+
    public void processConnect(Channel channel, MqttConnectMessage msg) {
        MqttConnectPayload payload = msg.payload();
        String clientId = payload.clientIdentifier();
@@ -238,6 +253,22 @@ public class ProtocolProcessor {
        LOG.info("The CONNECT message has been processed. CId={}, username={}", clientId, payload.userName());
    }

+    private static class UserOnlineStatus {
+        public String userId;
+        public int status; //0 offline; 1 online; -1 logout
+
+        public UserOnlineStatus(String userId, int status) {
+            this.userId = userId;
+            this.status = status;
+        }
+    }
+
+    public void forwardOnlineStatusEvent(String userId, int status) {
+        if (!StringUtil.isNullOrEmpty(mUserOnlineStatusCallback)) {
+            executorCallback.execute(() -> HttpUtils.httpJsonPost(mUserOnlineStatusCallback, new Gson().toJson(new UserOnlineStatus(userId, status))));
+        }
+    }
+
    private MqttConnAckMessage connAck(MqttConnectReturnCode returnCode) {
        return connAck(returnCode, false);
    }