diff --git a/game-server/app/servers/gm/handler/gmHandler.ts b/game-server/app/servers/gm/handler/gmHandler.ts index 7db4a0177..021c0bf05 100644 --- a/game-server/app/servers/gm/handler/gmHandler.ts +++ b/game-server/app/servers/gm/handler/gmHandler.ts @@ -6,6 +6,7 @@ import { resResult } from '../../../pubUtils/util'; import { STATUS } from '../../../consts/statusCode'; import { GMMailModel } from '../../../db/GMMail'; import { setGmMails } from '../../../pubUtils/gmData/gmDataUtil'; +import { getRoleOnlineInfo } from '../../../services/redisService'; export default function(app: Application) { return new GmHandler(app); } @@ -48,7 +49,6 @@ export class GmHandler { async pushMessage(msg: { uid: number, serverId: number, eventName: string, message: string }, session: BackendSession) { - let sid = session.get('sid'); let { uid, serverId, eventName, message } = msg; @@ -61,22 +61,18 @@ export class GmHandler { console.log(uid, serverId) let role = await RoleModel.findByUid(uid, serverId); if(!role) return resResult(STATUS.GM_ROLE_NOT_FOUND); - let {roleId } = role; + let { roleId } = role; - let channelService = this.app.get('channelService'); - let channel = channelService.getChannel(roleId, true); - let users = channel.getMembers(); - if (users.indexOf(roleId) === -1) { - channel.add(roleId, sid); + let hisOnlineInfo = await getRoleOnlineInfo(role.roleId); + if(hisOnlineInfo.isOnline) { + let sid = hisOnlineInfo.sid; + if (!!sid) {//下发邮件,对应前端红点提示 + pinus.app.channelService.pushMessageByUids(eventName, resResult(STATUS.SUCCESS, content), [{uid: roleId, sid}]); + } } - - let tsid = channel.getMember(roleId)['sid']; - channelService.pushMessageByUids(eventName, resResult(STATUS.SUCCESS, content), [{ - uid: roleId, - sid: tsid - }]); return resResult(STATUS.SUCCESS, { msg: content }); } + //对接gm后台,下发邮件 async addMail(msg: { endTime: number, serverId: number, sendName: string, content: string, goods, sendRoles:[{roleId: string, status: number}], gmMailType: number, sendTime: number }) { let {sendRoles, endTime, content, sendName, gmMailType, sendTime, goods, serverId} = msg; diff --git a/shared/db/User.ts b/shared/db/User.ts index d80fe654b..fdb10c055 100644 --- a/shared/db/User.ts +++ b/shared/db/User.ts @@ -98,7 +98,7 @@ export default class User extends BaseModel { @prop({ required: true, default: 0 }) auth: number; - public static async createUser(isGuest: boolean, tel: string, token: string, platform: string, pkgName: string, serverType: string, deviceId: string, guestTime?: number) { + public static async createUser(isGuest: boolean, tel: string, token: string, platform: string, pkgName: string, serverType: string, deviceId: string, guestTime: number = 0) { const curTime: Date = new Date(); const uid = await CounterModel.getNewCounter(COUNTER.UID);