diff --git a/game-server/app/servers/battle/handler/guildHandler.ts b/game-server/app/servers/battle/handler/guildHandler.ts index 8847c6dd1..b80e6f745 100644 --- a/game-server/app/servers/battle/handler/guildHandler.ts +++ b/game-server/app/servers/battle/handler/guildHandler.ts @@ -15,7 +15,7 @@ import { UserGuildApplyModel } from '../../../db/UserGuildApply'; import { hasStructureConsume, getStructureConsume, gameData } from '../../../pubUtils/data'; import { GuildRecModel } from '../../../db/GuildRec'; import { sendMail } from '../../../services/mailService'; -import { existsRank, initSingleRankWithServer, getRank, setRank, redisUserInfoUpdate, redisUserInfoAdd, removeFromRank, getMyRank, isRoleOnline, getRedis } from '../../../services/redisService'; +import { existsRank, initSingleRankWithServer, getRank, setRank, redisUserInfoUpdate, redisUserInfoAdd, removeFromRank, getMyRank, isRoleOnline, getRedis, redisSidKey } from '../../../services/redisService'; import { lockData } from '../../../services/redLockService'; import { DATA_NAME } from '../../../consts/dataName'; import { openGuildRefine } from '../../../services/guildRefineService'; @@ -450,7 +450,7 @@ export class GuildHandler { if(!role.hasGuild) { await UserGuildApplyModel.createUserGuildApply(role, guild, GUILD_APPLY_TYPE.INVITE); result.push(role.roleId); - let hisSid = await getRedis(`login_roleId_${role.roleId}`); + let hisSid = await getRedis(redisSidKey(role.roleId)); uids.push({ uid: role.roleId, sid: hisSid }) } } diff --git a/game-server/app/servers/battle/handler/wishPoolHandler.ts b/game-server/app/servers/battle/handler/wishPoolHandler.ts index 489bf6ae7..f9c3d05bd 100644 --- a/game-server/app/servers/battle/handler/wishPoolHandler.ts +++ b/game-server/app/servers/battle/handler/wishPoolHandler.ts @@ -11,7 +11,7 @@ import { GUILD_STRUCTURE } from '../../../consts/constModules/guildConst'; import { getUserGuildWithRefActive } from '../../../services/guildService'; import { findIndex, findWhere } from 'underscore'; import { RoleModel } from '../../../db/Role'; -import { getRedis } from '../../../services/redisService'; +import { getRedis, redisSidKey } from '../../../services/redisService'; import { ARMY } from '../../../pubUtils/dicParam'; export default function(app: Application) { return new WishPoolHandler(app); @@ -119,7 +119,7 @@ export class WishPoolHandler { return resResult(STATUS.HAS_RECEIVE_WISH_GOOD);//已经收到 let { wishDntCnt } = await UserGuildModel.donateGoods(dntRoleId, 1, 'wishDntCnt'); let { wishGoods: resWishGoods } = await UserGuildModel.donateUpdate(wishRoleId, dntRoleName, id, 'wishGoods'); - let key = 'login_roleId_' + wishRoleId; + let key = redisSidKey(wishRoleId); let sid = await getRedis(key); await addItems(wishRoleId, role.roleName , sid , [{ id : wishGood.goodId, count: 1 }]); if (!!sid) { diff --git a/game-server/app/servers/connector/handler/entryHandler.ts b/game-server/app/servers/connector/handler/entryHandler.ts index 6f104b45e..e1e7c0397 100644 --- a/game-server/app/servers/connector/handler/entryHandler.ts +++ b/game-server/app/servers/connector/handler/entryHandler.ts @@ -13,7 +13,7 @@ import { ItemModel } from '../../../db/Item'; import { chackFunOpenWhenLogin } from '../../../services/funcSwitchService'; import { loginRefresh } from '../../../services/playerEventService'; import { nowSeconds } from '../../../pubUtils/timeUtil'; -import { getRedis, setRedis, delRedis, rmRoleFromQueue } from '../../../services/redisService'; +import { getRedis, setRedis, delRedis, rmRoleFromQueue, redisSidKey } from '../../../services/redisService'; import { UserGuildModel } from '../../../db/UserGuild'; import { GuildModel } from '../../../db/Guild'; import { gameData } from '../../../pubUtils/data'; @@ -47,7 +47,7 @@ export class EntryHandler { if (!role) { return resResult(STATUS.ROLE_NOT_FOUND); } - let key = 'login_roleId_' + role.roleId; + let key = redisSidKey(role.roleId); let connect = await getRedis(key); if (!!connect) { await self.app.rpc.connector.connectorRemote.remoteLogin.toServer(connect, role.roleId); @@ -139,7 +139,7 @@ export class EntryHandler { let roleId = session.get('roleId'); let sid = session.get('sid'); let serverId = session.get('serverId'); - let key = 'login_roleId_' + roleId; + let key = redisSidKey(roleId); delRedis(key); rmRoleFromQueue(roleId, sid, COM_BTL_QUALITY, null); // 删除redis中寻宝的匹配记录 let channelService = this.app.get('channelService'); diff --git a/game-server/app/servers/role/handler/friendHandler.ts b/game-server/app/servers/role/handler/friendHandler.ts index c47f7164e..e58b0a1e7 100644 --- a/game-server/app/servers/role/handler/friendHandler.ts +++ b/game-server/app/servers/role/handler/friendHandler.ts @@ -7,7 +7,7 @@ import { FriendApplyModel } from "../../../db/FriendApply"; import { FriendApplyParams, FriendListParam, FriendRecommendParams, BlackListParam, FriendValueListParam } from "../../../domain/roleField/friend"; import { FriendShipModel, FriendShipType } from "../../../db/FriendShip"; import { FriendRelationModel, Relation } from "../../../db/FriendRelation"; -import { isRoleOnline, getServerName, getMyRank, getRedis } from "../../../services/redisService"; +import { isRoleOnline, getServerName, getMyRank, getRedis, redisSidKey } from "../../../services/redisService"; import { increaseFrdCnt, getRecommendType, sortByBeSentHeart } from "../../../services/friendService"; import { FriendPointModel } from "../../../db/FriendPoint"; import { gameData } from "../../../pubUtils/data"; @@ -146,7 +146,7 @@ export class FriendHandler { await FriendApplyModel.createApply(hisRoleId, role); resultRoleIds.push(hisRoleId); - let hisSid = await getRedis(`login_roleId_${hisRoleId}`); + let hisSid = await getRedis(redisSidKey(hisRoleId)); uids.push({ uid: hisRoleId, sid: hisSid }); } @@ -517,7 +517,7 @@ export class FriendHandler { todaySendCnt += FRIEND.FRIEND_FRIENDPOINT_ADD; todaySendInc += FRIEND.FRIEND_FRIENDPOINT_ADD; - let hisSid = await getRedis(`login_roleId_${relation.roleId}`); + let hisSid = await getRedis(redisSidKey(relation.roleId)); uids.push({ uid: relation.roleId, sid: hisSid }) } this.channelService.pushMessageByUids('onFriendSendHeart', resResult(STATUS.SUCCESS, {roleId}), uids); diff --git a/game-server/app/services/guildBossService.ts b/game-server/app/services/guildBossService.ts index 750dcd675..a38c83fb1 100644 --- a/game-server/app/services/guildBossService.ts +++ b/game-server/app/services/guildBossService.ts @@ -3,7 +3,7 @@ import { getTodayZeroPoint, nowSeconds } from '../pubUtils/timeUtil'; import { lockData } from '../services/redLockService'; import { findIndex, indexBy, values } from 'underscore'; import { MailModel, MailType } from '../db/Mail'; -import { getRedis, sismemberAsync, smembersAsync, saddAsync, delAsync, sremAsync } from '../services/redisService'; +import { getRedis, sismemberAsync, smembersAsync, saddAsync, delAsync, sremAsync, redisSidKey } from '../services/redisService'; import { pinus } from 'pinus'; import { STATUS } from '../consts/statusCode'; import { deepCopy, resResult } from '../pubUtils/util'; @@ -159,7 +159,7 @@ export function getArmyBossRankReward(rankLv: number) { * @param roleId */ export async function addBossInstance(code: string, serverId:number, roleId: string) { - let loginKey = 'login_roleId_' + roleId; + let loginKey = redisSidKey(roleId); let sid = await getRedis(loginKey); let key = 'serverId_' + serverId + 'guildCode_' + code; let value = roleId+ '|' + sid; @@ -194,7 +194,7 @@ export async function pushBossHpMessage(code: string, serverId:number, bossHp:nu * @param battleCode */ export async function checkBossBattleMemberExists(code: string, serverId:number, roleId: string, battleCode:string ) { - let loginKey = 'login_roleId_' + roleId; + let loginKey = redisSidKey(roleId); let sid = await getRedis(loginKey); let key = 'serverId_' + serverId + 'guildCode_' + code ; let value = roleId+ '|' + sid; diff --git a/game-server/app/services/mailService.ts b/game-server/app/services/mailService.ts index 4bc2eb073..d29d6d874 100644 --- a/game-server/app/services/mailService.ts +++ b/game-server/app/services/mailService.ts @@ -1,6 +1,6 @@ import { RewardInter, pushMail, mailData } from "../pubUtils/interface"; import { MailModel, MailType } from "../db/Mail"; -import { getRedis } from "./redisService"; +import { getRedis, redisSidKey } from "./redisService"; import { pinus } from "pinus"; import { gameData } from "../pubUtils/data"; import { nowSeconds } from '../pubUtils/timeUtil'; @@ -26,7 +26,7 @@ export async function sendMail(operate: number, toRoleId: string, sendName: stri if (!content) return; let mail = await MailModel.addMail({roleId: toRoleId, sendTime, goods, sendName, mailId: JSON.stringify(operate), endTime: time + nowSeconds(), mailTemType: MAIL_TEM_TYPE.GAMEMAIL, params}); - let key = 'login_roleId_' + toRoleId; + let key = redisSidKey(toRoleId); let sid = await getRedis(key); if (!!sid) {//下发邮件,对应前端红点提示 pinus.app.channelService.pushMessageByUids('onMailsAdd', resResult(STATUS.SUCCESS, { mails:[{ @@ -68,7 +68,7 @@ export async function getMailContent(roleId: string, operate: number, params: st return; const mail = Object.assign(doc.toJSON(), { roleId, goods, sendName, mailId: operate, sendTime: sendTime||nowSeconds(), mailTemType: MAIL_TEM_TYPE.GAMEMAIL, endTime: time + nowSeconds(), params }); mails.push(mail); - let key = 'login_roleId_' + roleId; + let key = redisSidKey(roleId); let sid = await getRedis(key); if (!!sid) { pushMessage.push({route: 'onMailsAdd', data:[{ @@ -167,7 +167,7 @@ export async function sendRolesMails(mails) { return; } for (let { roleId } of sendRoles) { - let key = 'login_roleId_' + roleId; + let key = redisSidKey(roleId); let sid = await getRedis(key); if (!!sid) { uids.push({sid, uid: roleId}) diff --git a/game-server/app/services/redisService.ts b/game-server/app/services/redisService.ts index 211c21785..936823cea 100644 --- a/game-server/app/services/redisService.ts +++ b/game-server/app/services/redisService.ts @@ -358,8 +358,12 @@ export async function delRedis(key: string) { await client.delAsync(key); } +export function redisSidKey(roleId: string) { + return `login_roleId_${roleId}`; +} + export async function isRoleOnline(roleId: string) { - let key = `login_roleId_${roleId}`; + let key = redisSidKey(roleId); let result = await getRedis(key); return !!result; }