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

Conflicts:
	game-server/startGameServer.sh
	web-server/package.json

web-server/package.json

@@ -22,7 +22,6 @@
     "clean": "ets clean"
   },
   "dependencies": {
-    "@typegoose/typegoose": "^7.3.4",
     "csprng": "^0.1.2",
     "egg": "^2.6.1",
     "egg-alinode": "^2.0.1",
@@ -35,7 +34,6 @@
   },
   "devDependencies": {
     "@types/mocha": "^2.2.40",
-    "@types/mongoose": "^5.7.36",
     "@types/node": "^7.0.12",
     "@types/supertest": "^2.0.0",
     "autod": "^3.0.1",