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

Merge branch 'master' of gitlab.trgame.cn:zyztech/zyz_server into feature/normalBattle

Browse Source 
Conflicts:
	game-server/startGameServer.sh
	web-server/package.json
This commit is contained in:
luying
2020-09-14 10:55:46 +08:00
parent 0880f26aa1 47c902b931
commit b6725151d0
40 changed files with 145 additions and 875 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,8 +21,8 @@ export default (appInfo: EggAppInfo) => {
config.middleware = [ 'parmsDecode' ];
config.mongoose = {
url: 'mongodb://root:zyz_2020@dds-8vbdb47c6fb58a541.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdb47c6fb58a542.mongodb.zhangbei.rds.aliyuncs.com:3717/admin?replicaSet=mgset-500808098', // 内网
options: {},
url: 'mongodb://dbop:zyzdbopbantu@dds-8vbdb47c6fb58a541.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vbdb47c6fb58a542.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-500808098', // 内网
options: { useNewUrlParser: true, useUnifiedTopology: true },
};
config.alinode = {