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

Merge branch 'master' into feature/backend

Browse Source 
# Conflicts:
#	game-server/app/servers/connector/filter/global.ts
This commit is contained in:
luying
2021-12-03 18:36:39 +08:00
parent 11bba498ce 5bd6eb573c
commit b505381fa9
25 changed files with 3682 additions and 1674 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web-server/app/service/Auth.ts
View File

@@ -312,7 +312,7 @@ export default class Auth extends Service {
const code = ctx.service.utils.genCode(6);
const seqId = await Counter.getNewCounter(COUNTER.ROLE) || -1;
const role = await RoleModel.createRole(uid, serverId, { roleId, code, roleName: roleId, seqId, lv: DEFAULT_LV, exp: (getExpByLv(DEFAULT_LV - 1) || { sum: 0 }).sum || 0 });
const role = await RoleModel.createRole(uid, serverId, { roleId, code, roleName: "", seqId, lv: DEFAULT_LV, exp: (getExpByLv(DEFAULT_LV - 1) || { sum: 0 }).sum || 0 });
if (role) {
// 任务
await checkTask(roleId, TASK_TYPE.ROLE_LV, role.lv, false, {});

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

@@ -21,7 +21,7 @@ export default (appInfo: EggAppInfo) => {
config.middleware = [ 'parmsDecode' ];
config.mongoose = {
url: 'mongodb://dbop:zyzMon2021@dds-8vb7474e31ba7ed41.mongodb.zhangbei.rds.aliyuncs.com:3717,dds-8vb7474e31ba7ed42.mongodb.zhangbei.rds.aliyuncs.com:3717/zyz?replicaSet=mgset-505529944', // 内网
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.gmmongoose = {
@@ -29,8 +29,8 @@ export default (appInfo: EggAppInfo) => {
options: { useNewUrlParser: true, useUnifiedTopology: true },
};
config.redis = {
url: 'r-8vb130185rp2ir3lqn.redis.zhangbei.rds.aliyuncs.com', // 内网
pw: 'zyz_monitor_2021'
url: 'r-8vb4i2kgl91886fkxd.redis.zhangbei.rds.aliyuncs.com', // 内网
pw: 'zyz_2020'
};
// config.alinode = {

3
web-server/package.json
View File

@@ -25,7 +25,8 @@
"monitor": "cross-env EGG_SERVER_ENV=monitor npm run dev",
"distribute": "cross-env EGG_SERVER_ENV=distribute npm run dev",
"lylocal": "cross-env EGG_SERVER_ENV=lylocal npm run dev",
"alpha": "cross-env EGG_SERVER_ENV=alpha npm run dev"
"alpha": "cross-env EGG_SERVER_ENV=alpha npm run dev",
"stable": "cross-env EGG_SERVER_ENV=stable npm run dev"
},
"dependencies": {
"@types/underscore": "^1.11.3",