diff --git a/game-server/app.ts b/game-server/app.ts index e2a809a9e..bc83f3694 100644 --- a/game-server/app.ts +++ b/game-server/app.ts @@ -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 diff --git a/game-server/config/database.ts b/game-server/config/database.ts index 4eeb3e898..b6c6d8473 100644 --- a/game-server/config/database.ts +++ b/game-server/config/database.ts @@ -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' + }, }; \ No newline at end of file diff --git a/game-server/config/master.ts b/game-server/config/master.ts index 0f20c7fed..48352847c 100644 --- a/game-server/config/master.ts +++ b/game-server/config/master.ts @@ -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', diff --git a/game-server/config/servers.ts b/game-server/config/servers.ts index 648e7d085..6aab05235 100644 --- a/game-server/config/servers.ts +++ b/game-server/config/servers.ts @@ -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': [], diff --git a/game-server/config/sq9/log4js.ts b/game-server/config/sq9/log4js.ts new file mode 100644 index 000000000..edc8e2583 --- /dev/null +++ b/game-server/config/sq9/log4js.ts @@ -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 +}; diff --git a/game-server/pm2Config.js b/game-server/pm2Config.js index dd26d753e..567cf457b 100644 --- a/game-server/pm2Config.js +++ b/game-server/pm2Config.js @@ -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'; diff --git a/gm-server/config/config.default.ts b/gm-server/config/config.default.ts index 2394baf4b..1c9d15d4b 100644 --- a/gm-server/config/config.default.ts +++ b/gm-server/config/config.default.ts @@ -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; diff --git a/gm-server/config/config.sq9.ts b/gm-server/config/config.sq9.ts new file mode 100644 index 000000000..d01efdda3 --- /dev/null +++ b/gm-server/config/config.sq9.ts @@ -0,0 +1,51 @@ +import { EggAppConfig, EggAppInfo, PowerPartial } from 'egg'; +import defaultConfig from './config.default'; + +export default (appInfo: EggAppInfo) => { + const config = {} as PowerPartial; + + // 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, + }; +}; diff --git a/pushdocker.sh b/pushdocker.sh index 948aa1163..0c9c52b3d 100755 --- a/pushdocker.sh +++ b/pushdocker.sh @@ -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 \ No newline at end of file +git checkout ./web-server/config/env diff --git a/shared/pubUtils/battleUtils.ts b/shared/pubUtils/battleUtils.ts index e97055e1a..117080a97 100644 --- a/shared/pubUtils/battleUtils.ts +++ b/shared/pubUtils/battleUtils.ts @@ -21,6 +21,7 @@ function getPrefixByEnv(env: string) { case 'sq1': case 'sq4': case 'sq7': + case 'sq9': default: return CDN_URL_PREFIX_SQ; } diff --git a/web-server/config/config.sq9.ts b/web-server/config/config.sq9.ts new file mode 100644 index 000000000..27469227a --- /dev/null +++ b/web-server/config/config.sq9.ts @@ -0,0 +1,48 @@ +import { EggAppConfig, EggAppInfo, PowerPartial } from 'egg'; +import defaultConfig from './config.default'; + +export default (appInfo: EggAppInfo) => { + const config = {} as PowerPartial; + + 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 + }; +};