修改解绑用户的逻辑，增加设备判断

mpusher · Feb 29, 2016 · 57052b7 · 57052b7
1 parent ed92777
commit 57052b7
Showing 1 changed file with 22 additions and 4 deletions.
diff --git a/mpush-core/src/main/java/com/shinemo/mpush/core/handler/UnbindUserHandler.java b/mpush-core/src/main/java/com/shinemo/mpush/core/handler/UnbindUserHandler.java
@@ -13,6 +13,8 @@
 import com.shinemo.mpush.common.message.OkMessage;
 import com.shinemo.mpush.common.router.RemoteRouter;
 import com.shinemo.mpush.common.router.RemoteRouterManager;
+import com.shinemo.mpush.core.router.LocalRouter;
+import com.shinemo.mpush.core.router.LocalRouterManager;
 import com.shinemo.mpush.core.router.RouterCenter;
 import com.shinemo.mpush.log.LogType;
 import com.shinemo.mpush.log.LoggerManage;
@@ -27,31 +29,47 @@ public BindUserMessage decode(Packet packet, Connection connection) {
         return new BindUserMessage(packet, connection);
     }
 
+    /**
+     * 目前是以用户维度来存储路由信息的，所以在删除路由信息时要判断下是否是同一个设备
+     * 后续可以修改为按设备来存储路由信息。
+     *
+     * @param message
+     */
     @Override
     public void handle(BindUserMessage message) {
         if (Strings.isNullOrEmpty(message.userId)) {
             ErrorMessage.from(message).setReason("invalid param").close();
             LoggerManage.info(LogType.CONNECTION, "unbind user failure invalid param, session={}", message.getConnection().getSessionContext());
             return;
         }
+
         //1.解绑用户时先看下是否握手成功
         SessionContext context = message.getConnection().getSessionContext();
         if (context.handshakeOk()) {
             //2.先删除远程路由, 必须是同一个设备才允许解绑
+            boolean unRegisterSuccess = true;
             RemoteRouterManager remoteRouterManager = RouterCenter.INSTANCE.getRemoteRouterManager();
             RemoteRouter remoteRouter = remoteRouterManager.lookup(message.userId);
             if (remoteRouter != null) {
                 String deviceId = remoteRouter.getRouteValue().getDeviceId();
                 if (context.deviceId.equals(deviceId)) {//判断是否是同一个设备
-                    remoteRouterManager.unRegister(message.userId);
+                    unRegisterSuccess = remoteRouterManager.unRegister(message.userId);
                 }
             }
+
             //3.删除本地路由信息
-            boolean success = RouterCenter.INSTANCE.getLocalRouterManager().unRegister(message.userId);
-            if (success) {
+            LocalRouterManager localRouterManager = RouterCenter.INSTANCE.getLocalRouterManager();
+            LocalRouter localRouter = localRouterManager.lookup(message.userId);
+            if (localRouter != null) {
+                String deviceId = localRouter.getRouteValue().getSessionContext().deviceId;
+                if (context.deviceId.equals(deviceId)) {//判断是否是同一个设备
+                    unRegisterSuccess = localRouterManager.unRegister(message.userId) && unRegisterSuccess;
+                }
+            }
 
+            //4.路由删除成功，广播用户下线事件
+            if (unRegisterSuccess) {
                 EventBus.INSTANCE.post(new UserOfflineEvent(message.getConnection(), message.userId));
-
                 OkMessage.from(message).setData("unbind success").send();
                 LoggerManage.info(LogType.CONNECTION, "unbind user success, userId={}, session={}", message.userId, context);
             } else {