From 3dbd8ca66abfba79757b12ba59d4d4e6f35af88e Mon Sep 17 00:00:00 2001
From: lightings <17062401@qq.com>
Date: Wed, 17 May 2023 16:18:37 +0800
Subject: [PATCH] private chat ok

---
 game-server/app/servers/chat/handler/chatHandler.js  |  2 --
 game-server/app/servers/chat/remote/chatRemote.js    |  2 +-
 .../app/servers/connector/handler/entryHandler.js    | 12 +++++++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/game-server/app/servers/chat/handler/chatHandler.js b/game-server/app/servers/chat/handler/chatHandler.js
index 2513efa..c3a66af 100644
--- a/game-server/app/servers/chat/handler/chatHandler.js
+++ b/game-server/app/servers/chat/handler/chatHandler.js
@@ -361,8 +361,6 @@ class ChatHandler {
     const contentType = msg.contentType;
     const targetuid = msg.targetuid;
     const channelId = `privateChannel_${targetuid}`;
-
-    this.gcs.add(channelId, session.uid, session.get("sid"), function () {});
     this.gcs.pushMessage(
       "connector",
       "onChat",
diff --git a/game-server/app/servers/chat/remote/chatRemote.js b/game-server/app/servers/chat/remote/chatRemote.js
index e65b3bd..36c4678 100644
--- a/game-server/app/servers/chat/remote/chatRemote.js
+++ b/game-server/app/servers/chat/remote/chatRemote.js
@@ -27,7 +27,7 @@ class ChatRemote {
       const teamChannelId = `teamChannel_${teamId}`
       this.gcs.leave(teamChannelId, uid, sid);
     }
-
+    
     this.chatService.kick(uid, cb);
     cb();
   }
diff --git a/game-server/app/servers/connector/handler/entryHandler.js b/game-server/app/servers/connector/handler/entryHandler.js
index 64891ab..f5e5d56 100644
--- a/game-server/app/servers/connector/handler/entryHandler.js
+++ b/game-server/app/servers/connector/handler/entryHandler.js
@@ -13,6 +13,7 @@ var Handler = function (app) {
   this.gameapiUrl = this.app.get("gameapi").gameBaseURL; 
   this.valid_entry_login = axios.create({baseURL:this.gameapiUrl});
   this.channelService = this.app.get("channelService");
+  this.gcs = this.app.get("globalChannelService");
 };
 
 /** @api {post} connector.entryHandler.entry entry 建立连接-登录-入口
@@ -81,6 +82,10 @@ Handler.prototype.entry = function (msg, session, next) {
           next(null, { code: 500, error: true });
           return;
         }
+
+        const channelId = `privateChannel_${uid}`;
+        this.gcs.add(channelId, session.uid, session.get("sid"), function () {});
+
         next(null, { code: 200, msg: "game server is ok." });
       });
     });
@@ -103,10 +108,15 @@ var onUserLeave = function (app, session, reason) {
   if (!session || !session.uid) {
     return;
   }
+
   logger.debug(`onUserLeave ${session.id} : ${session.uid}`);
+  const uid = session.uid;
+  const sid = session.get("sid");
+  const privateChannelId = `privateChannel_${uid}`;
+  this.gcs.leave(privateChannelId, uid, sid);
 
   const teamid = session.get("teamid");
-  app.rpc.chat.chatRemote.kick(session, session.uid, session.get('sid'), teamid, null);
+  app.rpc.chat.chatRemote.kick(session, uid, sid, teamid, null);
   
 };