diff --git a/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts b/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts index a6e75c92d..8e5373593 100644 --- a/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts +++ b/game-server/app/servers/activity/handler/rechargeMoneyHandler.ts @@ -63,7 +63,7 @@ export class RechargeMoneyHandler { let recordArray = playerData.recordArray.filter(obj => { return obj && !obj.rewardTime }) let rechargeItem = recordArray[0]; - console.log(JSON.stringify(recordArray)); + console.log('recordArray', JSON.stringify(recordArray)); await ActivityRechargeMoneyModel.addRecord(rechargeItem._id, item.id, item.reward) let rewardParamArr: Array = stringToRewardParam(item.reward); let result = await addReward(roleId, roleName, sid, serverId, rewardParamArr) diff --git a/game-server/app/servers/connector/handler/entryHandler.ts b/game-server/app/servers/connector/handler/entryHandler.ts index daa0f00d1..d6eaedd64 100644 --- a/game-server/app/servers/connector/handler/entryHandler.ts +++ b/game-server/app/servers/connector/handler/entryHandler.ts @@ -138,7 +138,7 @@ export class EntryHandler { session.push('serverId', () => { }); session.push('updatedMailAt', () => { }); session.push('guildCode', () => { }); - console.log(role.guildCode) + // console.log(role.guildCode) // session.push('rid', function (err) { // if (err) { // console.error('set rid for session service failed! error is : %j', err.stack); @@ -228,7 +228,7 @@ export class EntryHandler { return resResult(STATUS.TOKEN_ERR); } - console.log(self.app.get('serverId')); + // console.log(self.app.get('serverId')); await session.abind(user.username); session.set('uid', user.uid); session.set('roleId', user.username); diff --git a/game-server/app/servers/gate/handler/gateHandler.ts b/game-server/app/servers/gate/handler/gateHandler.ts index 5b0de7254..9a8a99ca4 100644 --- a/game-server/app/servers/gate/handler/gateHandler.ts +++ b/game-server/app/servers/gate/handler/gateHandler.ts @@ -26,7 +26,7 @@ export class GateHandler { } // get all connectors let connectors = this.app.getServersByType('connector'); - console.log(connectors); + // console.log(connectors); if (!connectors || connectors.length === 0) { return resResult(STATUS.CONNECTOR_ERR); } diff --git a/game-server/app/servers/gm/handler/gmHandler.ts b/game-server/app/servers/gm/handler/gmHandler.ts index b0a77130f..87e11d32e 100644 --- a/game-server/app/servers/gm/handler/gmHandler.ts +++ b/game-server/app/servers/gm/handler/gmHandler.ts @@ -64,7 +64,7 @@ export class GmHandler { } catch (e) { return resResult(STATUS.GM_JSON_FORMAT_ERR); } - console.log(uid, serverId) + // console.log(uid, serverId) let role = await RoleModel.findByUid(uid, serverId); if (!role) return resResult(STATUS.GM_ROLE_NOT_FOUND); let { roleId } = role; @@ -319,7 +319,7 @@ export class GmHandler { if(!activityGroupType) return resResult(STATUS.GM_ACTIVITY_GROUP_TYPE_NOT_FOUND); let dic = activityGroupType.activityTypes; let curDic = dic.find(cur => cur.index == index); - console.log(dic, curDic) + // console.log(dic, curDic) if(curDic.activityType != activity.type) return resResult(STATUS.GM_ACTIVITY_NOT_FIT_GROUP_TYPE) } diff --git a/game-server/app/servers/order/handler/orderHandler.ts b/game-server/app/servers/order/handler/orderHandler.ts index e03f3aafd..96bf73da4 100644 --- a/game-server/app/servers/order/handler/orderHandler.ts +++ b/game-server/app/servers/order/handler/orderHandler.ts @@ -44,7 +44,7 @@ export class orderHandler { //商品价格信息 let productInfo = dicRMB.get(productID) if (!productInfo) { - console.log(productID) + console.log('productID', productID) return resResult(STATUS.NO_PRODUCT_ID); } @@ -235,7 +235,7 @@ export class orderHandler { //商品价格信息 let productInfo = dicRMB.get(productID) if (!productInfo) { - console.log(productID) + console.log('productID', productID) return resResult(STATUS.NO_PRODUCT_ID); } diff --git a/game-server/app/servers/role/handler/equipHandler.ts b/game-server/app/servers/role/handler/equipHandler.ts index 1acc8693a..684efbca6 100644 --- a/game-server/app/servers/role/handler/equipHandler.ts +++ b/game-server/app/servers/role/handler/equipHandler.ts @@ -496,7 +496,7 @@ export class EquipHandler { let dicGoods = gameData.goods.get(id); if (!dicGoods) return resResult(STATUS.DIC_DATA_NOT_FOUND); let dicQuench = gameData.quenchByQuality.get(dicGoods.quality)?.get(grade); - console.log(dicQuench, dicGoods.quality, grade) + // console.log(dicQuench, dicGoods.quality, grade) if (!dicQuench) return resResult(STATUS.EQUIP_QUENCH_MAX); let check = new CheckMeterial(roleId); @@ -750,7 +750,7 @@ export class EquipHandler { let { id, lvLimited, ePlaceId } = equipInfos; return lv >= lvLimited && checkEquipCanPut(hero, id) && curEPlace.id == ePlaceId; }); - console.log('sortedAndSuitEquips', JSON.stringify(sortedAndSuitEquips, null, 4)) + // console.log('sortedAndSuitEquips', JSON.stringify(sortedAndSuitEquips, null, 4)) sortedAndSuitEquips = sortedAndSuitEquips.sort((a, b) => { // 排序按:战力 => 根据位置看个别属性 => 品质 if (b.ce - a.ce != 0) return b.ce - a.ce; let abilityA = a.goodsAbility.get(sortAttrId) || 0; diff --git a/game-server/app/servers/role/handler/heroHandler.ts b/game-server/app/servers/role/handler/heroHandler.ts index 671cb6952..343f14b0c 100644 --- a/game-server/app/servers/role/handler/heroHandler.ts +++ b/game-server/app/servers/role/handler/heroHandler.ts @@ -552,7 +552,7 @@ export class HeroHandler { let sid: string = session.get('sid'); let { id } = msg; let skinInfo = gameData.fashion.get(id); - console.log('*****', id, skinInfo) + // console.log('*****', id, skinInfo) if (!skinInfo) return resResult(STATUS.HERO_SKIN_NOT_FIND); let hero = await HeroModel.findByHidAndRole(skinInfo.actorId, roleId); if (!hero) return resResult(STATUS.HERO_NOT_FIND); diff --git a/game-server/app/services/auctionService.ts b/game-server/app/services/auctionService.ts index 93e1e40b3..6318f5858 100644 --- a/game-server/app/services/auctionService.ts +++ b/game-server/app/services/auctionService.ts @@ -80,14 +80,14 @@ export function todayGuildBegin() { // 明天军团拍卖行开始时间 20:20 export function tomorrowGuildBegin() { let { hour, minute } = gameData.auctionTime.get(AUCTION_TIME.GUILD_OPEN); - console.log(hour, minute) + // console.log(hour, minute) return getTimeFunD().getAfterDayAndSetHour(1, hour, minute); } // 明天军团拍卖行开始时间 20:20 export function tomorrowGuildEnd() { let { hour, minute } = gameData.auctionTime.get(AUCTION_TIME.GUILD_CLOSE); - console.log(hour, minute) + // console.log(hour, minute) return getTimeFunD().getAfterDayAndSetHour(1, hour, minute); } diff --git a/game-server/app/services/connectorService.ts b/game-server/app/services/connectorService.ts index 0d09bcd16..381728458 100644 --- a/game-server/app/services/connectorService.ts +++ b/game-server/app/services/connectorService.ts @@ -225,7 +225,7 @@ export async function everydayRefresh() { let allOnlineUsers = await getAllOnlineRoles(); let todayZeroPoint = getZeroPoint(); let n = Math.ceil(allOnlineUsers.length / PUSH_BATCH); // 一共多少批 - console.log(n) + // console.log(n) let i = -1; let interval = setInterval(() => { if (++i < n) { diff --git a/game-server/config/monitor/log4js.ts b/game-server/config/monitor/log4js.ts new file mode 100644 index 000000000..54072bf79 --- /dev/null +++ b/game-server/config/monitor/log4js.ts @@ -0,0 +1,164 @@ +module.exports = { + 'appenders': { + 'console': { + 'type': 'console' + }, + 'con-log': { + 'type': 'file', + 'filename': '${opts:base}/logs/con-log-${opts:serverId}.log', + 'pattern': 'connector', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'rpc-log': { + 'type': 'file', + 'filename': '${opts:base}/logs/rpc-log-${opts:serverId}.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'forward-log': { + 'type': 'file', + 'filename': '${opts:base}/logs/forward-log-${opts:serverId}.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'rpc-debug': { + 'type': 'file', + 'filename': '${opts:base}/logs/rpc-debug-${opts:serverId}.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'crash-log': { + 'type': 'file', + 'filename': '${opts:base}/logs/crash.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'admin-log': { + 'type': 'file', + 'filename': '${opts:base}/logs/admin.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'pinus': { + 'type': 'file', + 'filename': '${opts:base}/logs/pinus-${opts:serverId}.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'pinus-admin': { + 'type': 'file', + 'filename': '${opts:base}/logs/pinus-admin.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'pinus-rpc': { + 'type': 'file', + 'filename': '${opts:base}/logs/pinus-rpc-${opts:serverId}.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'app': { + 'type': 'file', + 'filename': '${opts:base}/../logs/app/app.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + }, + 'error': { + 'type': 'file', + 'filename': '${opts:base}/../logs/app/error.log', + 'maxLogSize': 1048576, + 'layout': { + 'type': 'basic' + }, + 'backups': 5 + } + }, + + 'categories': { + 'default': { + 'appenders': ['console', 'pinus'], + 'level': 'debug' + }, + 'con-log': { + 'appenders': ['con-log'], + 'level': 'debug' + }, + 'rpc-log': { + 'appenders': ['rpc-log'], + 'level': 'debug' + }, + 'forward-log': { + 'appenders': ['forward-log'], + 'level': 'debug' + }, + 'rpc-debug': { + 'appenders': ['rpc-debug'], + 'level': 'debug' + }, + 'crash-log': { + 'appenders': ['crash-log'], + 'level': 'debug' + }, + 'admin-log': { + 'appenders': ['admin-log'], + 'level': 'debug' + }, + 'pinus-admin': { + 'appenders': ['pinus-admin'], + 'level': 'debug' + }, + 'pinus-rpc': { + 'appenders': ['pinus-rpc'], + 'level': 'debug' + }, + 'pinus': { + 'appenders': ['console', 'pinus', 'app'], + 'level': 'debug' + }, + 'info': { + 'appenders': ['console', 'app'], + 'level': 'debug' + }, + 'err': { + 'appenders': ['console', 'error'], + 'level': 'debug' + } + + }, + + 'prefix': '${opts:serverId} ', + 'replaceConsole': true, + 'lineDebug': false, + 'errorStack': true +}; diff --git a/game-server/config/servers.ts b/game-server/config/servers.ts index 57dee7e87..b443feb0e 100644 --- a/game-server/config/servers.ts +++ b/game-server/config/servers.ts @@ -226,7 +226,10 @@ module.exports = { 'connector': [ { 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'zyz_monitor.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3050, 'frontend': true }, { 'id': 'connector-server-2', 'port': 4051, 'clientHost': 'zyz_monitor.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3051, 'frontend': true }, - { 'id': 'connector-server-3', 'port': 4052, 'clientHost': 'zyz_monitor.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3052, 'frontend': true } + { 'id': 'connector-server-3', 'port': 4052, 'clientHost': 'zyz_monitor.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3052, 'frontend': true }, + { 'id': 'connector-server-4', 'port': 4053, 'clientHost': 'zyz_monitor.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3053, 'frontend': true }, + { 'id': 'connector-server-5', 'port': 4054, 'clientHost': 'zyz_monitor.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3054, 'frontend': true } + ], 'chat': [ { 'id': 'chat-server-1', 'host': '127.0.0.1', 'port': 6050 }, diff --git a/shared/db/RScriptRecord.ts b/shared/db/RScriptRecord.ts index e3c53f590..001821d5d 100644 --- a/shared/db/RScriptRecord.ts +++ b/shared/db/RScriptRecord.ts @@ -53,7 +53,7 @@ export default class RScriptRecord extends BaseModel { if(dicWar.scriptAfter) param.scriptAfter = dicWar.scriptAfter; return param; }); - // console.log('&&&&', insertParams) + // console.log('&&&&', insertParams return await RScriptRecordModel.insertMany(insertParams); } } diff --git a/shared/pubUtils/taskUtil.ts b/shared/pubUtils/taskUtil.ts index 2c43abafe..d05091326 100644 --- a/shared/pubUtils/taskUtil.ts +++ b/shared/pubUtils/taskUtil.ts @@ -567,7 +567,7 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: // } // } - console.log('***** sevenDay before', Date.now()); + // console.log('***** sevenDay before', Date.now()); //七天乐 let allActivity: ActivityModelType[] = await findActivitiesByTypes([ACTIVITY_TYPE.SEVEN_DAY]); for (let activity of allActivity) { @@ -625,9 +625,9 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: } } } - console.log('***** sevenDay after', Date.now()); + // console.log('***** sevenDay after', Date.now()); - console.log('***** DailyChallenge before', Date.now()); + // console.log('***** DailyChallenge before', Date.now()); //今日挑战统计 allActivity = await findActivitiesByTypes([ACTIVITY_TYPE.TASK_DAILY_CHALLENGES]); for (let activity of allActivity) { @@ -657,9 +657,9 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: } } } - console.log('***** DailyChallenge after', Date.now()); + // console.log('***** DailyChallenge after', Date.now()); - console.log('***** RefreshTask before', Date.now()); + // console.log('***** RefreshTask before', Date.now()); //刷新任务统计 allActivity = await findActivitiesByTypes([ACTIVITY_TYPE.REFRESH_TASK]); for (let activity of allActivity) { @@ -689,9 +689,9 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: } } } - console.log('***** RefreshTask after', Date.now()); + // console.log('***** RefreshTask after', Date.now()); - console.log('***** hunt before', Date.now()); + // console.log('***** hunt before', Date.now()); //寻宝骑兵活动任务 let tempData: ServerTempModelType = await ServerTempModel.findData(serverId); if (tempData) { @@ -730,10 +730,10 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: } } } - console.log('***** hunt after', Date.now()); + // console.log('***** hunt after', Date.now()); - console.log('***** thirtyDay before', Date.now()); + // console.log('***** thirtyDay before', Date.now()); //30天任务统计 if (taskType === TASK_TYPE.HERO_QUALITY_STAR_UP || taskType === TASK_TYPE.HERO_QUALITY_TO_QUALITY_COUNT || @@ -785,9 +785,9 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: } } } - console.log('***** thirtyDay after', Date.now()); + // console.log('***** thirtyDay after', Date.now()); - console.log('***** popUpShop before', Date.now()); + // console.log('***** popUpShop before', Date.now()); //弹出商店 { allActivity = await findActivitiesByTypes([ACTIVITY_TYPE.POP_UP_SHOP]); @@ -860,8 +860,8 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: } } } - console.log('***** popUpShop after', Date.now()); - console.log('***** growthFund before', Date.now()); + // console.log('***** popUpShop after', Date.now()); + // console.log('***** growthFund before', Date.now()); //主线成长基金 if (taskType === TASK_TYPE.BATTLE_MAIN) { allActivity = await findActivitiesByTypes([ACTIVITY_TYPE.GROWTH_FUND_MAIN, ACTIVITY_TYPE.GROWTH_FUND_MAIN_VIP]); @@ -878,8 +878,8 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: pushMessage = pushMessage.concat(taskArray); } } - console.log('***** growthFund after', Date.now()); - console.log('***** growthFundTower before', Date.now()); + // console.log('***** growthFund after', Date.now()); + // console.log('***** growthFundTower before', Date.now()); //镇念塔成长基金getRoleOnlineInfo if (taskType === TASK_TYPE.BATTLE_TOWER_LV) { allActivity = await findActivitiesByTypes([ACTIVITY_TYPE.GROWTH_FUND_TOWER, ACTIVITY_TYPE.GROWTH_FUND_TOWER_VIP]); @@ -896,8 +896,8 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: pushMessage = pushMessage.concat(taskArray); } } - console.log('***** growthFundTower after', Date.now()); - console.log('***** growthFundElite before', Date.now()); + // console.log('***** growthFundTower after', Date.now()); + // console.log('***** growthFundElite before', Date.now()); //精英成长基金 if (taskType === TASK_TYPE.BATTLE_MAIN_ELITE) { allActivity = await findActivitiesByTypes([ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE, ACTIVITY_TYPE.GROWTH_FUND_MAIN_ELITE_VIP]); @@ -914,7 +914,7 @@ export async function accomplishTask(serverId: number, roleId: string, taskType: pushMessage = pushMessage.concat(taskArray); } } - console.log('***** growthFundElite after', Date.now()); + // console.log('***** growthFundElite after', Date.now()); return pushMessage; }