提取 redis sid key 的字面量为函数

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;

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})

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;
 }