xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

监控

Browse Source
This commit is contained in:
luying
2022-04-13 08:56:28 +08:00
parent 63e3eef4d6
commit cac22d1a96
6 changed files with 45 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
game-server/app/servers/connector/handler/entryHandler.ts
View File

@@ -6,7 +6,7 @@ import { Application, HandlerService, pinus, } from 'pinus';
import { FrontendSession } from 'pinus'; import { FrontendSession } from 'pinus';
import { HeroModel } from './../../../db/Hero'; import { HeroModel } from './../../../db/Hero';
import { genCode, generateStr, resResult } from '../../../pubUtils/util'; import { genCode, generateStr, resResult } from '../../../pubUtils/util';
import { COM_BTL_QUALITY, HERO_SELECT, DEBUG_MAGIC_WORD, REDIS_KEY, TASK_TYPE, ENTERY_ROLE_PICK, COUNTER, DEFAULT_LV, TA_USERSET_TYPE, LOG_TYPE, JEWEL_SELECT, ITEM_SELECT, SKIN_SELECT } from '../../../consts'; import { COM_BTL_QUALITY, HERO_SELECT, DEBUG_MAGIC_WORD, REDIS_KEY, TASK_TYPE, ENTERY_ROLE_PICK, COUNTER, DEFAULT_LV, TA_USERSET_TYPE, LOG_TYPE, JEWEL_SELECT, ITEM_SELECT, SKIN_SELECT, PUSH_ROUTE } from '../../../consts';
// import { loginRefresh } from '../../../services/playerEventService'; // import { loginRefresh } from '../../../services/playerEventService';
import { nowSeconds, getZeroPoint } from '../../../pubUtils/timeUtil'; import { nowSeconds, getZeroPoint } from '../../../pubUtils/timeUtil';
import { rmRoleFromQueue, roleLeave, getRoleOnlineInfo, roleLogin } from '../../../services/redisService'; import { rmRoleFromQueue, roleLeave, getRoleOnlineInfo, roleLogin } from '../../../services/redisService';
@@ -25,6 +25,7 @@ import { ItemModel } from '../../../db/Item';
import { SkinModel } from '../../../db/Skin'; import { SkinModel } from '../../../db/Skin';
import { HeroParam } from '../../../domain/roleField/hero'; import { HeroParam } from '../../../domain/roleField/hero';
import { getAp } from '../../../services/actionPointService'; import { getAp } from '../../../services/actionPointService';
import { sendMessageToAllWithSuc } from '../../../services/pushService';
export default function (app: Application) { export default function (app: Application) {
new HandlerService(app, {}); new HandlerService(app, {});
@@ -346,14 +347,14 @@ export class EntryHandler {
return resResult(STATUS.SUCCESS, { user: token }); return resResult(STATUS.SUCCESS, { user: token });
} }
async debugPushRefToOnlineUsers(msg: { magicWord: string }, session: FrontendSession) { async debugPushRefToOnlineUsers(msg: { magicWord: string, todayZeroPoint: number }, session: FrontendSession) {
const { magicWord } = msg; const { magicWord, todayZeroPoint } = msg;
console.log('debugQueryTokenById msg:', msg); console.log('debugQueryTokenById msg:', msg);
if (magicWord !== DEBUG_MAGIC_WORD) { if (magicWord !== DEBUG_MAGIC_WORD) {
return resResult(STATUS.TOKEN_ERR); return resResult(STATUS.TOKEN_ERR);
} }
await everydayRefresh();
await sendMessageToAllWithSuc(PUSH_ROUTE.REFRESH_TIME, { todayZeroPoint });
return resResult(STATUS.SUCCESS); return resResult(STATUS.SUCCESS);
} }
} }

2
game-server/app/services/pushService.ts
View File

@@ -18,7 +18,7 @@ export async function sendMessageToAll(route: string, data: any) {
if (++i < n) { if (++i < n) {
let users = allOnlineUsers.slice(i * PUSH_BATCH, (i + 1) * PUSH_BATCH - 1); let users = allOnlineUsers.slice(i * PUSH_BATCH, (i + 1) * PUSH_BATCH - 1);
let uids = users.map(cur => ({ uid: cur.roleId, sid: cur.sid })); let uids = users.map(cur => ({ uid: cur.roleId, sid: cur.sid }));
pinus.app.channelService.pushMessageByUids(route, data, uids); pinus.app.get('channelService').pushMessageByUids(route, data, uids);
} else { } else {
clearInterval(interval); clearInterval(interval);
} }

2
game-server/config/database.ts
View File

@@ -32,7 +32,7 @@ module.exports = {
}, },
'monitor': { 'monitor': {
'mongo': 'mongodb://dbop:zyzMon2021@dds-8vb7474e31ba7ed41.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb7474e31ba7ed42.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-505529944', 'mongo': 'mongodb://dbop:zyzMon2021@dds-8vb7474e31ba7ed41.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb7474e31ba7ed42.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-505529944',
'gmmongo': 'mongodb://dbop:zyzGm2021@dds-8vb9964bb4cc7f241.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb9964bb4cc7f242.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?replicaSet=mgset-507933150', 'gmmongo': 'mongodb://dbop:zyzMon2021@dds-8vb7474e31ba7ed41.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb7474e31ba7ed42.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzmon?replicaSet=mgset-505529944',
'redis': 'r-8vb130185rp2ir3lqn.redis.zhangbei.rds.aliyuncs.com', 'redis': 'r-8vb130185rp2ir3lqn.redis.zhangbei.rds.aliyuncs.com',
'redispw': 'zyz_monitor_2021' 'redispw': 'zyz_monitor_2021'
}, },

8
game-server/config/servers.ts
View File

@@ -210,15 +210,15 @@ module.exports = {
], ],
'role': [ 'role': [
{ 'id': 'role-server-1', 'host': '127.0.0.1', 'port': 6053 }, { 'id': 'role-server-1', 'host': '127.0.0.1', 'port': 6053 },
{ 'id': 'role-server-2', 'host': '127.0.0.1', 'port': 6061 }, // { 'id': 'role-server-2', 'host': '127.0.0.1', 'port': 6061 },
{ 'id': 'role-server-3', 'host': '127.0.0.1', 'port': 6062 }, // { 'id': 'role-server-3', 'host': '127.0.0.1', 'port': 6062 },
], ],
'battle': [ 'battle': [
{ 'id': 'battle-server-1', 'host': '127.0.0.1', 'port': 6054 } { 'id': 'battle-server-1', 'host': '127.0.0.1', 'port': 6054 }
], ],
'gate': [ 'gate': [
{ 'id': 'gate-server-1', 'host': '127.0.0.1', 'clientHost': 'zyz_monitor.trgame.cn', 'clientPort': 3014, 'frontend': true }, { 'id': 'gate-server-1', 'host': '127.0.0.1', 'clientHost': 'zyz_monitor.trgame.cn', 'clientPort': 3014, 'frontend': true },
{ 'id': 'gate-server-2', 'host': '127.0.0.1', 'clientHost': 'zyz_monitor.trgame.cn', 'clientPort': 3015, 'frontend': true } // { 'id': 'gate-server-2', 'host': '127.0.0.1', 'clientHost': 'zyz_monitor.trgame.cn', 'clientPort': 3015, 'frontend': true }
], ],
'gm': [ 'gm': [
{ 'id': 'gm-server-1', 'host': '127.0.0.1', 'port': 6055 } { 'id': 'gm-server-1', 'host': '127.0.0.1', 'port': 6055 }
@@ -228,7 +228,7 @@ module.exports = {
], ],
'guild': [ 'guild': [
{ 'id': 'guild-server-1', 'host': '127.0.0.1', 'port': 6057, "args": " --inspect=9239" }, { 'id': 'guild-server-1', 'host': '127.0.0.1', 'port': 6057, "args": " --inspect=9239" },
{ 'id': 'guild-server-2', 'host': '127.0.0.1', 'port': 6058, "args": " --inspect=9240" } // { 'id': 'guild-server-2', 'host': '127.0.0.1', 'port': 6058, "args": " --inspect=9240" }
], ],
'activity': [ 'activity': [
{ 'id': 'activity-server-1', 'host': '127.0.0.1', 'port': 6059, "args": " --inspect=9241" }, { 'id': 'activity-server-1', 'host': '127.0.0.1', 'port': 6059, "args": " --inspect=9241" },

55
web-server/app/controller/game.ts
View File

@@ -25,37 +25,42 @@ export default class GameController extends Controller {
} }
public async getServerList() { public async getServerList() {
const { ctx } = this; try {
let { uid, clientVersion } = ctx; const { ctx } = this;
console.log('clientVersion', clientVersion); let { uid, clientVersion } = ctx;
let serverList = new Array<GroupParam>(); console.log('clientVersion', clientVersion);
let loginServerList = new Array<ServerParamWithRole>(); let serverList = new Array<GroupParam>();
let loginServerList = new Array<ServerParamWithRole>();
let allServers = await ServerlistModel.findByEnv(ctx.app.config.realEnv); let allServers = await ServerlistModel.findByEnv(ctx.app.config.realEnv);
let roles = await RoleModel.findAllByUid(uid, true, true); let roles = await RoleModel.findAllByUid(uid, true, true);
for (let server of allServers) { for (let server of allServers) {
let curGroup = serverList.find(cur => cur.groupId == server.groupId); let curGroup = serverList.find(cur => cur.groupId == server.groupId);
if (!curGroup) { if (!curGroup) {
curGroup = new GroupParam(server); curGroup = new GroupParam(server);
serverList.push(curGroup); serverList.push(curGroup);
}
curGroup.pushServer(server);
let role = roles.find(role => role.serverId == server.id);
if (!!role) {
let curLoginInfo = new ServerParamWithRole(role, server);
loginServerList.push(curLoginInfo);
}
} }
curGroup.pushServer(server);
let role = roles.find(role => role.serverId == server.id); loginServerList.sort((a, b) => { return b.updatedAt.getTime() - a.updatedAt.getTime() });
if (!!role) {
let curLoginInfo = new ServerParamWithRole(role, server); if (serverList) {
loginServerList.push(curLoginInfo); ctx.body = ctx.service.utils.resResult(STATUS.SUCCESS, { serverList, loginServerList });
} else {
ctx.body = ctx.service.utils.resResult(STATUS.SERVER_NOT_FOUND);
} }
} return
loginServerList.sort((a, b) => { return b.updatedAt.getTime() - a.updatedAt.getTime() }); }catch(e) {
console.error(e);
if (serverList) {
ctx.body = ctx.service.utils.resResult(STATUS.SUCCESS, { serverList, loginServerList });
} else {
ctx.body = ctx.service.utils.resResult(STATUS.SERVER_NOT_FOUND);
} }
return
} }
public async newServer() { public async newServer() {

4
web-server/config/config.monitor.ts
View File

@@ -8,6 +8,10 @@ export default (appInfo: EggAppInfo) => {
url: 'mongodb://dbop:zyzMon2021@dds-8vb7474e31ba7ed41.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb7474e31ba7ed42.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-505529944', // 内网 url: 'mongodb://dbop:zyzMon2021@dds-8vb7474e31ba7ed41.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb7474e31ba7ed42.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-505529944', // 内网
options: { useNewUrlParser: true, useUnifiedTopology: true }, options: { useNewUrlParser: true, useUnifiedTopology: true },
}; };
config.gmmongoose = {
url: 'mongodb://dbop:zyzMon2021@dds-8vb7474e31ba7ed41.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb7474e31ba7ed42.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzmon?replicaSet=mgset-505529944', // 内网
options: { useNewUrlParser: true, useUnifiedTopology: true },
};
config.redis = { config.redis = {
url: 'r-8vb130185rp2ir3lqn.redis.zhangbei.rds.aliyuncs.com', // 内网 url: 'r-8vb130185rp2ir3lqn.redis.zhangbei.rds.aliyuncs.com', // 内网
pw: 'zyz_monitor_2021' pw: 'zyz_monitor_2021'