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

✨ feat(config): 增加sq9服务器配置

Browse Source
This commit is contained in:
liangtongchuan
2023-02-10 20:51:55 +08:00
parent e8b8f6373b
commit f36d9e5fff
11 changed files with 387 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game-server/app.ts
View File

@@ -49,7 +49,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|monitor|monitor2|distribute|sq1|sq3|sq4|sq7';
const ALL_ENVS = 'stable|development|alpha|dev|isbn|monitor|monitor2|distribute|sq1|sq3|sq4|sq7|sq9';
/**
* 替换全局Promise
* 自动解析sourcemap

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

@@ -72,4 +72,10 @@ module.exports = {
'redis': 'r-8vb53gmaww4042b2qb.redis.zhangbei.rds.aliyuncs.com',
'redispw': 'X9j2TKYy@cE6sSQD'
},
'sq9': {
'mongo': 'mongodb://dbop:zyzSQ92023@dds-8vb6eea40c3207641.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb6eea40c3207642.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-515389269',
'gmmongo': 'mongodb://dbop:zyzSQGm2021@dds-8vb5de93552a67941.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5de93552a67942.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5de93552a67943.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?readPreference=secondary&replicaSet=mgset-508112742',
'redis': 'r-8vbjy2v5jepcsozyum.redis.zhangbei.rds.aliyuncs.com',
'redispw': 'hWCJ$HDajm9SN&&Z'
},
};

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

@@ -79,6 +79,16 @@ module.exports = {
'host': '172.16.4.126',
'port': 3005
},
'sq9': {
'id': 'master-server-1',
'host': '172.16.4.132',
'port': 3005
},
'sq10': {
'id': 'master-server-1',
'host': '172.16.4.132',
'port': 3005
},
'sq4add': { // sq4=>sq7
'id': 'master-server-1',
'host': '172.16.4.126',

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

@@ -496,6 +496,75 @@ module.exports = {
{ 'id': 'order-server-3', 'host': '172.16.4.127', 'port': 6080 },
],
},
'sq9': {
'connector': [
{ 'id': 'connector-server-1', 'port': 4051, 'clientHost': 'sq9-game-yjz.yev242.com', 'host': '172.16.4.132', 'clientPort': 3051, 'frontend': true },
{ 'id': 'connector-server-2', 'port': 4052, 'clientHost': 'sq9-game-yjz.yev242.com', 'host': '172.16.4.132', 'clientPort': 3052, 'frontend': true },
{ 'id': 'connector-server-gm', 'port': 4099, 'clientHost': 'sq9-game-yjz.yev242.com', 'host': '172.16.4.132', 'clientPort': 3099, 'frontend': true, 'isGM': 'true' }
],
'chat': [
{ 'id': 'chat-server-1', 'host': '172.16.4.132', 'port': 6071 },
],
'role': [
{ 'id': 'role-server-1', 'host': '172.16.4.132', 'port': 6072 },
{ 'id': 'role-server-2', 'host': '172.16.4.132', 'port': 6073 },
{ 'id': 'role-server-3', 'host': '172.16.4.132', 'port': 6074 },
],
'battle': [
{ 'id': 'battle-server-1', 'host': '172.16.4.132', 'port': 6075 },
{ 'id': 'battle-server-2', 'host': '172.16.4.132', 'port': 6076 },
],
'guild': [
{ 'id': 'guild-server-1', 'host': '172.16.4.132', 'port': 6077 },
{ 'id': 'guild-server-2', 'host': '172.16.4.132', 'port': 6078 },
{ 'id': 'guild-server-3', 'host': '172.16.4.132', 'port': 6079 }
],
'activity': [
{ 'id': 'activity-server-1', 'host': '172.16.4.132', 'port': 6080 },
{ 'id': 'activity-server-2', 'host': '172.16.4.132', 'port': 6081 },
{ 'id': 'activity-server-3', 'host': '172.16.4.132', 'port': 6082 },
],
'order': [
{ 'id': 'order-server-1', 'host': '172.16.4.132', 'port': 6083 },
],
'gm': [
{ 'id': 'gm-server-1', 'host': '172.16.4.132', 'port': 6084 }
],
'systimer': [
{ 'id': 'systimer-server-1', 'host': '172.16.4.132', 'port': 6056 }
],
},
'sq10': {
'connector': [
{ 'id': 'connector-server-3', 'port': 4053, 'clientHost': 'sq10-game-yjz.yev242.com', 'host': '172.16.4.131', 'clientPort': 3053, 'frontend': true },
{ 'id': 'connector-server-4', 'port': 4054, 'clientHost': 'sq10-game-yjz.yev242.com', 'host': '172.16.4.131', 'clientPort': 3054, 'frontend': true },
{ 'id': 'connector-server-5', 'port': 4055, 'clientHost': 'sq10-game-yjz.yev242.com', 'host': '172.16.4.131', 'clientPort': 3055, 'frontend': true },
],
'chat': [
{ 'id': 'chat-server-2', 'host': '172.16.4.131', 'port': 6060 },
],
'role': [
{ 'id': 'role-server-3', 'host': '172.16.4.131', 'port': 6061 },
{ 'id': 'role-server-4', 'host': '172.16.4.131', 'port': 6062 },
{ 'id': 'role-server-5', 'host': '172.16.4.131', 'port': 6063 },
],
'battle': [
{ 'id': 'battle-server-3', 'host': '172.16.4.131', 'port': 6064 },
],
'gm': [],
'systimer': [],
'guild': [
{ 'id': 'guild-server-4', 'host': '172.16.4.131', 'port': 6065 },
{ 'id': 'guild-server-5', 'host': '172.16.4.131', 'port': 6066 },
{ 'id': 'guild-server-6', 'host': '172.16.4.131', 'port': 6067 },
],
'activity': [
{ 'id': 'activity-server-4', 'host': '172.16.4.131', 'port': 6068 },
],
'order': [
{ 'id': 'order-server-2', 'host': '172.16.4.131', 'port': 6069 },
]
},
'sq4add': { // sq4=>sq7
'connector': [],
'chat': [],

190
game-server/config/sq9/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

@@ -62,7 +62,7 @@ pm2Master.args.push('port='+masterConfig.port);
pm2Master.args.push('env='+envType);
pm2Master.args.push('mode=stand-alone');
pm2Master.cwd= cwd;
let onairEnvs = ['sq1', 'sq3', 'sq4', 'sq7'];
let onairEnvs = ['sq1', 'sq3', 'sq4', 'sq7', 'sq9'];
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';

1
gm-server/config/config.default.ts
View File

@@ -86,6 +86,7 @@ export default (appInfo: EggAppInfo) => {
{ env: 'sq3', name: "小范围对外测试", domain: 'http://sq3-web-sgzzyz.yev242.com' },
{ env: 'sq4', name: "渠道二测", domain: 'http://sq6-web-sgzzyz.yev242.com' },
{ env: 'sq7', name: "精英测试", domain: 'http://sq8-web-sgzzyz.yev242.com' },
{ env: 'sq9', name: "渠道吸量", domain: 'http://sq9-web-yjz.yev242.com' },
];
config.regions = regions;

51
gm-server/config/config.sq9.ts Normal file
View File

@@ -0,0 +1,51 @@
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://dbop:zyzSQ92023@dds-8vb6eea40c3207641.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb6eea40c3207642.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-515389269', // 内网
options: { useNewUrlParser: true, useUnifiedTopology: true },
};
config.gmmongoose = {
url: 'mongodb://dbop:zyzSQGm2021@dds-8vb5de93552a67941.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5de93552a67942.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5de93552a67943.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?readPreference=secondary&replicaSet=mgset-508112742', // 内网
options: { useNewUrlParser: true, useUnifiedTopology: true },
};
config.redis = {
url: 'r-8vbjy2v5jepcsozyum.redis.zhangbei.rds.aliyuncs.com', // 内网
pw: 'hWCJ$HDajm9SN&&Z'
};
config.xtransit = {
server: 'ws://172.16.4.109:9092',
appId: 5,
appSecret: '4441a80f2516a879fa3e4c7c096ab4f1'
};
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,
};
};

10
pushdocker.sh
View File

@@ -58,6 +58,14 @@ elif [ ${1} == 'sq8' ] ; then
destUrl="root@sq8:/root/zyz/"
port=3737
env='sq7'
elif [ ${1} == 'sq9' ] ; then
destUrl="root@sq9:/root/zyz/"
port=22
env='sq9'
elif [ ${1} == 'sq10' ] ; then
destUrl="root@sq10:/root/zyz/"
port=22
env='sq9'
else
echo "需要一个参数指明服务器"
exit 1;
@@ -105,4 +113,4 @@ esac
git checkout ./game-server/config.json
git checkout ./gm-server/config/env
git checkout ./web-server/config/env
git checkout ./web-server/config/env

1
shared/pubUtils/battleUtils.ts
View File

@@ -21,6 +21,7 @@ function getPrefixByEnv(env: string) {
case 'sq1':
case 'sq4':
case 'sq7':
case 'sq9':
default:
return CDN_URL_PREFIX_SQ;
}

48
web-server/config/config.sq9.ts Normal file
View File

@@ -0,0 +1,48 @@
import { EggAppConfig, EggAppInfo, PowerPartial } from 'egg';
import defaultConfig from './config.default';
export default (appInfo: EggAppInfo) => {
const config = {} as PowerPartial<EggAppConfig>;
config.mongoose = {
url: 'mongodb://dbop:zyzSQ92023@dds-8vb6eea40c3207641.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb6eea40c3207642.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-515389269', // 内网
options: { useNewUrlParser: true, useUnifiedTopology: true },
};
config.gmmongoose = {
url: 'mongodb://dbop:zyzSQGm2021@dds-8vb5de93552a67941.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5de93552a67942.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb5de93552a67943.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?readPreference=secondary&replicaSet=mgset-508112742', // 内网
options: { useNewUrlParser: true, useUnifiedTopology: true },
};
config.redis = {
url: 'r-8vbjy2v5jepcsozyum.redis.zhangbei.rds.aliyuncs.com', // 内网
pw: 'hWCJ$HDajm9SN&&Z'
};
config.xtransit = {
server: 'ws://172.16.4.109:9092',
appId: 2,
appSecret: '103981eb5b7781fedea116ece0ee00ac'
};
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,
};
// the return config will combines to EggAppConfig
return {
...defaultConfig(appInfo),
...config
};
};