diff --git a/game-server/app.ts b/game-server/app.ts index 3d1f85f95..4fd88c8f5 100644 --- a/game-server/app.ts +++ b/game-server/app.ts @@ -52,7 +52,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|sq9'; +const ALL_ENVS = 'stable|development|alpha|dev|isbn|isbnhk|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 1480be334..c452b38c6 100644 --- a/game-server/config/database.ts +++ b/game-server/config/database.ts @@ -30,6 +30,12 @@ module.exports = { 'redis': 'r-8vbekkbb3z8ru2ckuj.redis.zhangbei.rds.aliyuncs.com', 'redispw': 'zyz_isbn_2021' }, + 'isbnhk': { + 'mongo': 'mongodb://dbop:zyzIsbnhk2023@dds-j6caf3517de221e41.mongodb.rds.aliyuncs.com:3717,dds-j6caf3517de221e42.mongodb.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-504694158', + 'gmmongo': 'mongodb://dbop:zyzGm2021@dds-8vb9964bb4cc7f241476-pub.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb9964bb4cc7f242319-pub.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?replicaSet=mgset-507933150', + 'redis': 'r-j6czst8l1620hdzwqj.redis.rds.aliyuncs.com', + 'redispw': 'zyz_isbn_hk_2023' + }, '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', 'gmmongo': 'mongodb://dbop:zyzMon2021@dds-8vb7474e31ba7ed41.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb7474e31ba7ed42.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzmon?replicaSet=mgset-505529944', diff --git a/game-server/config/isbnhk/log4js.ts b/game-server/config/isbnhk/log4js.ts new file mode 100644 index 000000000..20c573220 --- /dev/null +++ b/game-server/config/isbnhk/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'], + '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/master.ts b/game-server/config/master.ts index 48352847c..001415f73 100644 --- a/game-server/config/master.ts +++ b/game-server/config/master.ts @@ -29,6 +29,11 @@ module.exports = { 'host': '127.0.0.1', 'port': 3005 }, + 'isbnhk': { + 'id': 'master-server-1', + 'host': '127.0.0.1', + 'port': 3005 + }, 'monitor': { 'id': 'master-server-1', 'host': '127.0.0.1', diff --git a/game-server/config/servers.ts b/game-server/config/servers.ts index 3cb52d66a..c1c0fc6ef 100644 --- a/game-server/config/servers.ts +++ b/game-server/config/servers.ts @@ -208,6 +208,47 @@ module.exports = { { 'id': 'order-server-1', 'host': '127.0.0.1', 'port': 6060, "args": " --inspect=9242" }, ] }, + 'isbnhk': { + 'connector': [ + { 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'zyz_isbn_hk.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3050, 'frontend': true }, + { 'id': 'connector-server-2', 'port': 4051, 'clientHost': 'zyz_isbn_hk.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3051, 'frontend': true }, + ], + 'chat': [ + { 'id': 'chat-server-1', 'host': '127.0.0.1', 'port': 6050 }, + // { 'id': 'chat-server-2', 'host': '127.0.0.1', 'port': 6051 }, + ], + 'role': [ + { 'id': 'role-server-1', 'host': '127.0.0.1', 'port': 6053 } + ], + 'battle': [ + { 'id': 'battle-server-1', 'host': '127.0.0.1', 'port': 6054 } + ], + 'gate': [ + { 'id': 'gate-server-1', 'host': '127.0.0.1', 'clientHost': 'zyz_isbn_hk.trgame.cn', 'clientPort': 3014, 'frontend': true }, + { + 'id': 'gate-server-2', + 'host': '127.0.0.1', + 'clientHost': 'zyz_isbn_hk.trgame.cn', + 'clientPort': 3015, + 'frontend': true + } + ], + 'gm': [ + { 'id': 'gm-server-1', 'host': '127.0.0.1', 'port': 6055 } + ], + 'systimer': [ + { 'id': 'systimer-server-1', 'host': '127.0.0.1', 'port': 6056 } + ], + 'guild': [ + { 'id': 'guild-server-1', 'host': '127.0.0.1', 'port': 6057, "args": " --inspect=9239" }, + ], + 'activity': [ + { 'id': 'activity-server-1', 'host': '127.0.0.1', 'port': 6059, "args": " --inspect=9241" }, + ], + 'order': [ + { 'id': 'order-server-1', 'host': '127.0.0.1', 'port': 6060, "args": " --inspect=9242" }, + ] + }, 'monitor': { 'connector': [ { 'id': 'connector-server-1', 'port': 4050, 'clientHost': 'zyz_monitor.trgame.cn', 'host': '127.0.0.1', 'clientPort': 3050, 'frontend': true }, diff --git a/gm-server/config/config.default.ts b/gm-server/config/config.default.ts index dc58145ae..cde64ca6f 100644 --- a/gm-server/config/config.default.ts +++ b/gm-server/config/config.default.ts @@ -81,6 +81,7 @@ export default (appInfo: EggAppInfo) => { { env: 'alpha', name: "测试服", domain: 'http://pinus_gm_test.trgame.cn' }, { env: 'dev', name: "开发服", domain: 'http://zyzdev_gm.trgame.cn' }, { env: 'isbn', name: "办好福", domain: 'http://zyz_isbn_gm.trgame.cn' }, + { env: 'isbnhk', name: "海外审核服", domain: 'http://zyz_isbn_gm_hk.trgame.cn' }, // 37测试服组 { env: 'sq1', name: "37测试1服", domain: 'http://gm-sgzzyz.yev242.com' }, { env: 'sq3', name: "小范围对外测试", domain: 'http://sq3-web-sgzzyz.yev242.com' }, diff --git a/gm-server/config/config.isbnhk.ts b/gm-server/config/config.isbnhk.ts new file mode 100644 index 000000000..a1a46aa3e --- /dev/null +++ b/gm-server/config/config.isbnhk.ts @@ -0,0 +1,27 @@ +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:zyzIsbnhk2023@dds-j6caf3517de221e41.mongodb.rds.aliyuncs.com:3717,dds-j6caf3517de221e42.mongodb.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-504694158', // 内网 + options: { useNewUrlParser: true, useUnifiedTopology: true }, + }; + config.gmmongoose = { + url: 'mongodb://dbop:zyzGm2021@dds-8vb9964bb4cc7f241476-pub.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb9964bb4cc7f242319-pub.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?replicaSet=mgset-507933150', // 内网 + options: { useNewUrlParser: true, useUnifiedTopology: true }, + }; + config.redis = { + url: 'r-j6czst8l1620hdzwqj.redis.rds.aliyuncs.com', // 内网 + pw: 'zyz_isbn_hk_2023' + }; + + // the return config will combines to EggAppConfig + return { + ...defaultConfig(appInfo), + ...config, + }; +}; diff --git a/pushdocker.sh b/pushdocker.sh index 0c9c52b3d..a4a9379c2 100755 --- a/pushdocker.sh +++ b/pushdocker.sh @@ -21,6 +21,8 @@ elif [ ${1} == 'dev' ] ; then destUrl="root@zyzdev:/root/zyz/" elif [ ${1} == 'isbn' ] ; then destUrl="root@zyzisbn:/root/zyz/" +elif [ ${1} == 'isbnhk' ] ; then + destUrl="root@zyzisbnhk:/root/zyz/" elif [ ${1} == 'monitor' ] ; then destUrl="root@zyzmon:/root/zyz/" elif [ ${1} == 'monitor2' ] ; then diff --git a/web-server/config/config.isbnhk.ts b/web-server/config/config.isbnhk.ts new file mode 100644 index 000000000..ced41c53c --- /dev/null +++ b/web-server/config/config.isbnhk.ts @@ -0,0 +1,25 @@ +import { EggAppConfig, EggAppInfo, PowerPartial } from 'egg'; +import defaultConfig from './config.default'; + +export default (appInfo: EggAppInfo) => { + const config = {} as PowerPartial; + + config.mongoose = { + url: 'mongodb://dbop:zyzIsbnhk2023@dds-j6caf3517de221e41.mongodb.rds.aliyuncs.com:3717,dds-j6caf3517de221e42.mongodb.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-504694158', // 内网 + options: { useNewUrlParser: true, useUnifiedTopology: true }, + }; + config.gmmongoose = { + url: 'mongodb://dbop:zyzGm2021@dds-8vb9964bb4cc7f241476-pub.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb9964bb4cc7f242319-pub.mongodb.zhangbei.rds.aliyuncs.com:3717/zyzgm?replicaSet=mgset-507933150', // 内网 + options: { useNewUrlParser: true, useUnifiedTopology: true }, + }; + config.redis = { + url: 'r-j6czst8l1620hdzwqj.redis.rds.aliyuncs.com', // 内网 + pw: 'zyz_isbn_hk_2023' + }; + + // the return config will combines to EggAppConfig + return { + ...defaultConfig(appInfo), + ...config + }; +};