diff --git a/game-server/app/services/friendService.js b/game-server/app/services/friendService.js index 1e86b7a..db8766a 100644 --- a/game-server/app/services/friendService.js +++ b/game-server/app/services/friendService.js @@ -1,6 +1,7 @@ // friendService.js const friendDao = require('../dao/friendDao'); const userDao = require("../dao/userDao"); +const guildDao = require("../dao/guildDao"); class FriendService { @@ -70,6 +71,8 @@ class FriendService { for (const member of users) { const list = await this.gcs.getMemberByUid(channelId, member.account_id); member.online = list.length>0 ? 1 : 0; + const guildInfo = await guildDao.getGuildInfoByUID(member.account_id); + member.guildInfo = guildInfo; // member.isMyFriend = await friendDao.isMyFriend(uid, member.account_id); // member.isMyBlackUser = await friendDao.isMyBlackUser(uid, member.account_id); } diff --git a/proxy/testbase.js b/proxy/testbase.js index 770bdb0..fe38cda 100644 --- a/proxy/testbase.js +++ b/proxy/testbase.js @@ -5,9 +5,9 @@ const { Message } = require("./Message"); class TestBase { constructor() { this.port = 4999; - // this.host = "192.168.100.83"; + this.host = "192.168.100.83"; // this.host = "62.234.46.11"; - this.host = "r2.cebggame.com"; + // this.host = "r2.cebggame.com"; this.stick = new Stick(1024); this.stick.setMaxBodyLen(MaxBodyLen["32K"], true);