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

2
web-server/app/middleware/tokenParser.ts
View File

@@ -1,4 +1,4 @@
import { STATUS_TOKEN_ERR, STATUS_WRONG_PARMS } from './../../../shared/statusCode';
import { STATUS_TOKEN_ERR, STATUS_WRONG_PARMS } from '@consts/statusCode';
import { UserModel } from './../db/User';
module.exports = () => {