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

🐎 ci(服务器): 添加永测服

Browse Source
This commit is contained in:
luying
2023-08-03 10:37:41 +08:00
parent e2648b21ea
commit aa02cd48ad
10 changed files with 380 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game-server/app.ts
View File

@@ -57,7 +57,7 @@ filePath.CONFIG_DIR = '/config';
const adminfilePath = _pinus.DEFAULT_ADMIN_PATH;
adminfilePath.ADMIN_FILENAME = 'adminUser';
adminfilePath.ADMIN_USER = 'config/adminUser';
const ALL_ENVS = 'stable|development|alpha|dev|isbn|isbnhk|monitor|monitor2|distribute|sq1|sq3|sq4|sq7|sq9|zy1|yjzios|ch1';
const ALL_ENVS = 'stable|development|alpha|dev|isbn|isbnhk|monitor|monitor2|distribute|sq1|sq3|sq4|sq7|sq9|zy1|yjzios|ch1|zytest';
/**
* 替换全局Promise
* 自动解析sourcemap

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

@@ -108,4 +108,10 @@ module.exports = {
'redisLock': 'r-8vbiuvng869tbuynxn.redis.zhangbei.rds.aliyuncs.com',
'redisLockpw': 'hWCJ$HDajm9SN&&Z'
},
'zytest': {
'mongo': 'mongodb://yjzDbOp:yjz2023ZyDb@dds-8vba9fd556eda4742.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vba9fd556eda4741.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-516347208',
'gmmongo': 'mongodb://yjzGmDbOp:yjz2023ZyGmDB@dds-8vbdf8c89bbdbd241.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd242.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd243.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd244.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?replicaSet=mgset-515829436',
'redis': 'r-8vbl4pz5gqqgfbnwtb.redis.zhangbei.rds.aliyuncs.com',
'redispw': 'hWCJ$HDajm9SN&&Z'
},
};

5
game-server/config/master.ts
View File

@@ -133,5 +133,10 @@ module.exports = {
'id': 'master-server-1',
'host': '172.16.4.144',
'port': 3005
},
'zytest': {
'id': 'master-server-1',
'host': '172.16.4.195',
'port': 3005
}
};

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

@@ -679,5 +679,38 @@ module.exports = {
},
'zy1': zy1, 'zy2': zy2, 'zy3': zy3, 'zy4': zy4, 'zy5': zy5, 'zy6': zy6, 'zy7': zy7, 'zy8': zy8, 'zy9': zy9, 'zy10': zy10, 'zy11': zy11, 'zy12': zy12, 'zy13': zy13, 'zy14': zy14, 'zy15': zy15, 'zy16': zy16, // 公测自营服务器
'yjzios': yjzios, // 公测 ios 审核服
'ch1': ch1, 'ch2': ch2, 'ch3': ch3, 'ch4': ch4, 'ch5': ch5, 'ch6': ch6, 'ch7': ch7, 'ch8': ch8, 'ch9': ch9 // 公测渠道服
'ch1': ch1, 'ch2': ch2, 'ch3': ch3, 'ch4': ch4, 'ch5': ch5, 'ch6': ch6, 'ch7': ch7, 'ch8': ch8, 'ch9': ch9, // 公测渠道服
'zytest': {
'connector': [
{ 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'yjz-bk-game1.fdd73.com', 'host': '172.16.4.195', 'clientPort': 3050, 'frontend': true },
],
'chat': [
{ 'id': 'chat-server-1', 'host': '172.16.4.195', 'port': 6050 },
],
'role': [
{ 'id': 'role-server-1', 'host': '172.16.4.195', 'port': 6051 }
],
'battle': [
{ 'id': 'battle-server-1', 'host': '172.16.4.195', 'port': 6052 }
],
'comBattle': [
{ 'id': 'comBattle-server-1', 'host': '172.16.4.195', 'port': 6053 }
],
'gm': [
{ 'id': 'gm-server-1', 'host': '172.16.4.195', 'port': 6054 }
],
'systimer': [
{ 'id': 'systimer-server-1', 'host': '172.16.4.195', 'port': 6055 }
],
'guild': [
{ 'id': 'guild-server-1', 'host': '172.16.4.195', 'port': 6056 },
{ 'id': 'guild-server-2', 'host': '172.16.4.195', 'port': 6057 },
],
'activity': [
{ 'id': 'activity-server-1', 'host': '172.16.4.195', 'port': 6058 },
],
'order': [
{ 'id': 'order-server-1', 'host': '172.16.4.195', 'port': 6059 },
]
},
};

190
game-server/config/zytest/log4js.ts Normal file
View File

@@ -0,0 +1,190 @@
module.exports = {
'appenders': {
'console': {
'type': 'console'
},
'con-log': {
'type': 'file',
'filename': '/zyz_logs/log4js/con-log-${opts:serverId}.log',
'pattern': 'connector',
'maxLogSize': 104857600,
'layout': {
'type': 'basic'
},
'backups': 5
},
'rpc-log': {
'type': 'file',
'filename': '/zyz_logs/log4js/rpc-log-${opts:serverId}.log',
'maxLogSize': 104857600,
'layout': {
'type': 'basic'
},
'backups': 5
},
'forward-log': {
'type': 'file',
'filename': '/zyz_logs/log4js/forward-log-${opts:serverId}.log',
'maxLogSize': 104857600,
'layout': {
'type': 'basic'
},
'backups': 5
},
'rpc-debug': {
'type': 'file',
'filename': '/zyz_logs/log4js/rpc-debug-${opts:serverId}.log',
'maxLogSize': 104857600,
'layout': {
'type': 'basic'
},
'backups': 5
},
'crash-log': {
'type': 'file',
'filename': '/zyz_logs/log4js/crash.log',
'maxLogSize': 104857600,
'layout': {
'type': 'basic'
},
'backups': 5
},
'admin-log': {
'type': 'file',
'filename': '/zyz_logs/log4js/admin.log',
'maxLogSize': 104857600,
'layout': {
'type': 'basic'
},
'backups': 5
},
'pinus': {
'type': 'file',
'filename': '/zyz_logs/log4js/pinus-${opts:serverId}.log',
'maxLogSize': 1073741824,
'layout': {
'type': 'basic'
},
'backups': 20
},
'pinus-admin': {
'type': 'file',
'filename': '/zyz_logs/log4js/pinus-admin.log',
'maxLogSize': 104857600,
'layout': {
'type': 'basic'
},
'backups': 5
},
'pinus-rpc': {
'type': 'file',
'filename': '/zyz_logs/log4js/pinus-rpc-${opts:serverId}.log',
'maxLogSize': 104857600,
'layout': {
'type': 'basic'
},
'backups': 5
},
'app': {
'type': 'file',
'filename': '/zyz_logs/sls/app.log',
'maxLogSize': 1073741824,
'layout': {
'type': 'basic'
},
'backups': 20
},
'error': {
'type': 'file',
'filename': '/zyz_logs/sls/error.log',
'maxLogSize': 1073741824,
'layout': {
'type': 'basic'
},
'backups': 5
},
'ta': {
'type': 'file',
'filename': '/zyz_logs/ta/log',
'pattern': 'yyyy-MM-dd-hh',
'alwaysIncludePattern': true,
'layout': {
'type': 'pattern',
'pattern': '%m',
},
'backups': 240,
},
'item': {
'type': 'file',
'filename': '/zyz_logs/item/log',
'maxLogSize': 1073741824,
'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': ['pinus'],
'level': 'debug'
},
'info': {
'appenders': ['console', 'app'],
'level': 'debug'
},
'err': {
'appenders': ['console', 'error'],
'level': 'debug'
},
'ta': {
'appenders': ['console', 'ta'],
'level': 'info'
},
'item': {
'appenders': ['console', 'item'],
'level': 'info'
}
},
'replaceConsole': true,
'lineDebug': false,
'errorStack': true
};

2
game-server/pm2Config.js
View File

@@ -69,7 +69,7 @@ pm2Master.cwd= cwd;
pm2Master.env={NODE_PROCESS_TITLE: envType+'_'+masterConfig.id};
titles.push(envType+'_'+masterConfig.id);
let onairEnvs = ['sq1', 'sq3', 'sq4', 'sq7', 'sq9', 'zy1', 'ch1'];
let onairEnvs = ['sq1', 'sq3', 'sq4', 'sq7', 'sq9', 'zy1', 'ch1', 'zytest'];
if(onairEnvs.indexOf(envType) > -1) {
pm2Master.out_file = '/zyz_logs/pm2/'+masterConfig.id+"_app.log";
pm2Master.error_file='/zyz_logs/pm2/'+masterConfig.id+'_error.log';

27
game-server/xtransitConfig/zytest.js Normal file
View File

@@ -0,0 +1,27 @@
// config
const fs = require('fs');
module.exports = {
// I. 必须的配置
server: 'ws://172.16.4.147:9092', // 填写前一节中部署的 xtransit-server 地址
appId: 1, // 创建应用得到的应用 ID
appSecret: '85f4533264626c1eeb35e9c0c72579ae', // 创建应用得到的应用 Secret
// II. 比较重要的可选配置
disks: [], // 数组，配置需要监控的 disk 全路径
errors: [], // 数组，配置需要监控的 error 日志全路径
packages: [], // 数组，配置需要监控的项目依赖文件全路径
// III. 不是很重要的可选的配置
logDir: '/zyz_logs/xprofiler', // xprofiler 插件生成性能日志文件的目录，默认两者均为 os.tmpdir()
docker: false, // 默认 false, 系统数据采集会依赖当前是否是 docker 环境而进行一些特殊处理，可以手动强制指定当前实例是否为 docker 环境
ipMode: false, // 默认 false，此时仅使用 hostname 作为 agentId；设置为 true 后 agentId 组装形式为 ${ip}_${hostname}
libMode: false, // 默认 false，此时采集如果收到 shutdown 事件会退出当前进程；如果是以第三方库的形式引用接入应用内，请将此属性设置为 true
errexp: /\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}/i, // 匹配错误日志起始的正则，默认为匹配到 YYYY-MM-DD HH:mm:ss 时间戳即认为是一条错误日志的起始
logger: console, // 可以传入应用日志句柄方便日志统一管理，需要实现 error, info, warn 和 debug 四个方法
logLevel: 2, // 默认内置 logger 的日志级别，0 error，1 info，2 warning，3 debug,
titles: [], // 数组，如果应用使用了 process.title 自定义了名称，可以通过配置这里上报进程数据
customAgent: () => {
const hostname = fs.readFileSync('/etc/aliashost', 'utf8').trim();
return hostname;
}
};

56
gm-server/config/config.zytest.ts Normal file
View File

@@ -0,0 +1,56 @@
import { EggAppConfig, EggAppInfo, PowerPartial } from 'egg';
import defaultConfig from './config.default';
export default (appInfo: EggAppInfo) => {
const config = {} as PowerPartial<EggAppConfig>;
// add your special config in here
config.mongoose = {
url: 'mongodb://yjzDbOp:yjz2023ZyDb@dds-8vba9fd556eda4742.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vba9fd556eda4741.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-516347208', // 内网
options: { useNewUrlParser: true, useUnifiedTopology: true },
};
config.gmmongoose = {
url: 'mongodb://yjzGmDbOp:yjz2023ZyGmDB@dds-8vbdf8c89bbdbd241.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd242.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd243.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd244.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?replicaSet=mgset-515829436', // 内网
options: { useNewUrlParser: true, useUnifiedTopology: true },
};
config.submongoose = {
url: 'mongodb://yjzDbOp:yjz2023ZyDb@dds-8vba9fd556eda4742.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vba9fd556eda4741.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-516347208', // 内网
options: { useNewUrlParser: true, useUnifiedTopology: true },
};
config.redis = {
url: 'r-8vbl4pz5gqqgfbnwtb.redis.zhangbei.rds.aliyuncs.com', // 内网
pw: 'hWCJ$HDajm9SN&&Z'
};
config.xtransit = {
server: 'ws://172.16.4.147:9092',
appId: 3,
appSecret: 'bc33c837395b6dc272fd67f4cf38ef77'
};
config.customLogger = {
linkLogger: {
file: '/zyz_logs/gm-server/link-log.log',
formatter(meta) {
return `[${meta.level}] [${meta.date}] ${meta.message}`;
},
},
};
config.logrotator = {
filesRotateBySize: [
'/zyz_logs/gm-server/link-log.log',
],
maxFileSize: 1024,
};
// the return config will combines to EggAppConfig
return {
...defaultConfig(appInfo),
...config,
};
};

4
pushdocker.sh
View File

@@ -242,6 +242,10 @@ elif [ ${1} == 'ch9' ] ; then
# destUrl="root@yjz-bk-15:/root/zyz/"
# port=22
# env='ch1'
elif [ ${1} == 'zytest' ] ; then
destUrl="root@yjz-bk-1:/root/zyz/"
port=22
env='zytest'
else
echo "需要一个参数指明服务器"
exit 1;

56
web-server/config/config.zytest.ts Normal file
View File

@@ -0,0 +1,56 @@
import { EggAppConfig, EggAppInfo, PowerPartial } from 'egg';
import defaultConfig from './config.default';
export default (appInfo: EggAppInfo) => {
const config = {} as PowerPartial<EggAppConfig>;
config.middleware = [ 'parmsDecode', 'getIp', 'proxy' ];
config.mongoose = {
url: 'mongodb://yjzDbOp:yjz2023ZyDb@dds-8vba9fd556eda4742.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vba9fd556eda4741.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-516347208', // 内网
options: { useNewUrlParser: true, useUnifiedTopology: true },
};
config.gmmongoose = {
url: 'mongodb://yjzGmDbOp:yjz2023ZyGmDB@dds-8vbdf8c89bbdbd241.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd242.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd243.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdf8c89bbdbd244.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?replicaSet=mgset-515829436', // 内网
options: { useNewUrlParser: true, useUnifiedTopology: true },
};
config.submongoose = {
url: 'mongodb://yjzDbOp:yjz2023ZyDb@dds-8vba9fd556eda4742.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vba9fd556eda4741.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-516347208', // 内网
options: { useNewUrlParser: true, useUnifiedTopology: true },
};
config.redis = {
url: 'r-8vbl4pz5gqqgfbnwtb.redis.zhangbei.rds.aliyuncs.com', // 内网
pw: 'hWCJ$HDajm9SN&&Z'
};
config.xtransit = {
server: 'ws://172.16.4.147:9092',
appId: 2,
appSecret: '700e3bc3e55236f31ea52780041ac039'
};
config.customLogger = {
linkLogger: {
file: '/zyz_logs/web-server/link-log.log',
formatter(meta) {
return `[${meta.level}] [${meta.date}] ${meta.message}`;
},
},
};
config.logrotator = {
filesRotateBySize: [
'/zyz_logs/web-server/link-log.log',
],
maxFileSize: 1024 * 1024 * 1024,
};
// the return config will combines to EggAppConfig
return {
...defaultConfig(appInfo),
...config
};
};