diff --git a/game-server/app/servers/connector/handler/entryHandler.ts b/game-server/app/servers/connector/handler/entryHandler.ts index d02492a02..61a68edf8 100644 --- a/game-server/app/servers/connector/handler/entryHandler.ts +++ b/game-server/app/servers/connector/handler/entryHandler.ts @@ -299,6 +299,16 @@ export class EntryHandler { return resResult(STATUS.SUCCESS, { user }); } + async debugQueryTokenByTel(msg: { tel: string, magicWord: string }, session: FrontendSession) { + const { tel, magicWord } = msg; + if (magicWord !== DEBUG_MAGIC_WORD) { + return resResult(STATUS.TOKEN_ERR); + } + const user = await UserModel.findTokenByTel(tel); + console.log('debugQueryTokenByTel got user:', user); + return resResult(STATUS.SUCCESS, { user }); + } + async debugPushRefToOnlineUsers(msg: { magicWord: string }, session: FrontendSession) { const { magicWord } = msg; console.log('debugQueryTokenById msg:', msg); diff --git a/game-server/config/clientProtos.ts b/game-server/config/clientProtos.ts index 5e6e3d3d8..3c1ef87eb 100644 --- a/game-server/config/clientProtos.ts +++ b/game-server/config/clientProtos.ts @@ -152,7 +152,9 @@ module.exports = { "role.heroHandler.roleTeraphQualityUp": { "required uInt32 id": 1 }, - + "role.roleHandler.initRole": { + "required string roleName": 1 + }, "battle.normalBattleHandler.getBattleList": { "required uInt32 type": 1 }, diff --git a/game-server/config/servers.ts b/game-server/config/servers.ts index 4608ae991..05c2b875d 100644 --- a/game-server/config/servers.ts +++ b/game-server/config/servers.ts @@ -1,15 +1,9 @@ module.exports = { 'development': { 'connector': [ - { - 'id': 'connector-server-1', - 'host': '127.0.0.1', - 'port': 4050, - 'clientHost': '127.0.0.1', - 'clientPort': 3050, - 'frontend': true, - 'args': '--inspect=10001' - } + { 'id': 'connector-server-1', 'port': 4050, 'clientHost': '127.0.0.1', 'host': '127.0.0.1', 'clientPort': 3050, 'frontend': true }, + { 'id': 'connector-server-2', 'port': 4051, 'clientHost': '127.0.0.1', 'host': '127.0.0.1', 'clientPort': 3051, 'frontend': true }, + { 'id': 'connector-server-3', 'port': 4052, 'clientHost': '127.0.0.1', 'host': '127.0.0.1', 'clientPort': 3052, 'frontend': true } ], 'chat': [ { 'id': 'chat-server-1', 'host': '127.0.0.1', 'port': 6050, "args": " --inspect=9237" } diff --git a/shared/consts/constModules/selectConst.ts b/shared/consts/constModules/selectConst.ts index 018c91e04..616b0302b 100644 --- a/shared/consts/constModules/selectConst.ts +++ b/shared/consts/constModules/selectConst.ts @@ -49,4 +49,4 @@ export enum FRIEND_SHIP_SELECT { GET_FRIEND_VALUE = 'friendValue friendLv' } -export const ENTERY_ROLE_PICK = ['roleId', 'roleName', 'serverId', 'ce', 'topLineupCe', 'coin', 'lv', 'exp', 'vLv', 'gold', 'heros', 'equips', 'consumeGoods', 'title', 'teraphs', 'showLineup', 'heads', 'head', 'frames', 'frame', 'spines', 'spine', 'hasGuild', 'guildCode', 'todayZeroPoint', 'apJson', 'skins', 'totalPay', 'guide']; \ No newline at end of file +export const ENTERY_ROLE_PICK = ['roleId', 'roleName', 'serverId', 'ce', 'topLineupCe', 'coin', 'lv', 'exp', 'vLv', 'gold', 'heros', 'equips', 'consumeGoods', 'title', 'teraphs', 'showLineup', 'heads', 'head', 'frames', 'frame', 'spines', 'spine', 'hasGuild', 'guildCode', 'todayZeroPoint', 'apJson', 'skins', 'totalPay', 'guide', 'hasInit']; \ No newline at end of file diff --git a/shared/db/User.ts b/shared/db/User.ts index 7afbbb271..7e2f03cd4 100644 --- a/shared/db/User.ts +++ b/shared/db/User.ts @@ -192,9 +192,8 @@ export default class User extends BaseModel { } public static async findTokenByTel(tel: string) { - const user: UserType = await UserModel.findOne({ tel }).lean(); - return user.token; + return user ? user.token : null; } public static async findTokenByUid(uid: number) {