diff --git a/game-server/app/servers/connector/filter/global.ts b/game-server/app/servers/connector/filter/global.ts index e25335a3f..3e9526827 100644 --- a/game-server/app/servers/connector/filter/global.ts +++ b/game-server/app/servers/connector/filter/global.ts @@ -9,7 +9,7 @@ import { nowSeconds } from "../../../pubUtils/timeUtil"; import { getServerMainten } from "../../../services/gmService"; import { errlogger } from "../../../util/logger"; import { gameData } from "../../../pubUtils/data"; -import { sendMessageToUser, sendMessageToUserWithSuc } from "../../../services/pushService"; +import { sendMessageToUser } from "../../../services/pushService"; export function globalFilter(app: Application) { return new Filter(app); } diff --git a/game-server/app/servers/role/handler/roleHandler.ts b/game-server/app/servers/role/handler/roleHandler.ts index bd3c73d90..2f94840a2 100644 --- a/game-server/app/servers/role/handler/roleHandler.ts +++ b/game-server/app/servers/role/handler/roleHandler.ts @@ -26,7 +26,7 @@ import { UserModel } from '../../../db/User'; import { checkFilterWords, reportTAEvent, treatRoleName } from '../../../services/sdkService'; import { createHeroes } from '../../../services/role/createHero'; import { calculateCeWithHero, calculateCeWithRole } from '../../../services/playerCeService'; -import { sendMessageToUser, sendMessageToUserWithSuc } from '../../../services/pushService'; +import { sendMessageToUserWithSuc } from '../../../services/pushService'; export default function (app: Application) { new HandlerService(app, {}); diff --git a/game-server/app/services/activity/activityService.ts b/game-server/app/services/activity/activityService.ts index 046b0d84e..dcf34cd01 100644 --- a/game-server/app/services/activity/activityService.ts +++ b/game-server/app/services/activity/activityService.ts @@ -40,7 +40,7 @@ import { addTaskPassPoint, getTaskPassDataShow } from './taskPassService'; import { getGuildChannelSid } from '../chatService'; import { getGuildPayDataShow } from './guildPayService'; import { PopUpShopItemShow } from '../../domain/activityField/popUpShopField'; -import { sendMessageToGuildWithSuc, sendMessageToUser, sendMessageToUserWithSuc } from '../pushService'; +import { sendMessageToGuildWithSuc, sendMessageToUserWithSuc } from '../pushService'; /** * 获取活动数据 diff --git a/game-server/app/services/normalBattleService.ts b/game-server/app/services/normalBattleService.ts index 83b4c9d5d..850271a42 100644 --- a/game-server/app/services/normalBattleService.ts +++ b/game-server/app/services/normalBattleService.ts @@ -17,7 +17,7 @@ import { WarStar } from '../domain/dbGeneral'; import { uniq } from 'underscore'; import { checkPopUpCondition } from './activity/popUpShopService'; import { calculateCeWithRole } from './playerCeService'; -import { sendMessageToUser, sendMessageToUserWithSuc } from './pushService'; +import { sendMessageToUserWithSuc } from './pushService'; export async function roleLevelup(type: KING_EXP_RATIO_TYPE, roleId: string, kingExp: number = 0, session: BackendSession) { const serverId = session.get('serverId'); diff --git a/game-server/app/services/orderService.ts b/game-server/app/services/orderService.ts index 9d027dc6b..d4018044b 100644 --- a/game-server/app/services/orderService.ts +++ b/game-server/app/services/orderService.ts @@ -31,7 +31,7 @@ import { savePayLog } from '../pubUtils/logUtil'; import { recordFirstGift } from './activity/firstGiftService'; import { makeTaskPass } from './activity/taskPassService'; import { addGuildPay } from './activity/guildPayService'; -import { sendMessageToUser } from './pushService'; +import { sendMessageToUserWithSuc } from './pushService'; /** @@ -149,7 +149,7 @@ export async function makeOrder(orderInfo: UserOrderModelType, sid: string) { await recordFirstGift(roleInfo, orderInfo.serverId); } - sendMessageToUser(roleId, PUSH_ROUTE.PLAYER_DATA_CHANGE, { totalPay: roleInfo.totalPay }, sid); + sendMessageToUserWithSuc(roleId, PUSH_ROUTE.PLAYER_DATA_CHANGE, { totalPay: roleInfo.totalPay }, sid); return {...rewardResult, roleInfo} } @@ -170,7 +170,7 @@ export async function settleOrder(order: UserOrderModelType, serverId: number, s //推送 console.log('***** settleOrder', order.roleId, sid) if(!!sid) { - sendMessageToUser(order.roleId, PUSH_ROUTE.ORDER, { + sendMessageToUserWithSuc(order.roleId, PUSH_ROUTE.ORDER, { ...result.data, price: order.price, state: order.state, @@ -306,7 +306,7 @@ export async function refundOrderFromRedisPub(message: string) { let role = await RoleModel.incRoleInfo(order.roleId, { gold: -refundGold }, {}); let onlineUser = await getRoleOnlineInfo(order.roleId); let sid = onlineUser.sid; - sendMessageToUser(order.roleId, PUSH_ROUTE.PLAYER_DATA_CHANGE, { gold: role.gold }, sid); + sendMessageToUserWithSuc(order.roleId, PUSH_ROUTE.PLAYER_DATA_CHANGE, { gold: role.gold }, sid); await UserOrderModel.refund(order.roleId, order.localOrderID, message); return true diff --git a/game-server/app/services/role/createHero.ts b/game-server/app/services/role/createHero.ts index c8c804a72..ea7bedfcb 100644 --- a/game-server/app/services/role/createHero.ts +++ b/game-server/app/services/role/createHero.ts @@ -12,7 +12,7 @@ import { addItems, unlockFigure, } from "./rewardService"; import { CounterModel } from "../../db/Counter"; import { calculateCes } from "../playerCeService"; import { RoleModel, RoleType, RoleUpdate } from "../../db/Role"; -import { sendMessageToUser, sendMessageToUserWithSuc } from "../pushService"; +import { sendMessageToUserWithSuc } from "../pushService"; import { checkTaskInCreateHero } from "../task/taskService"; import { Rank } from "../rankService";