Merge branch 'master' into feature/backend

# Conflicts: # game-server/app/servers/connector/handler/entryHandler.ts # game-server/app/servers/role/handler/itemHandler.ts # shared/consts/constModules/sysConst.ts # shared/pubUtils/util.ts # web-server/app.ts # web-server/app/service/Auth.ts
2021-12-14 18:08:44 +08:00
parent fbd19a5c4c dd7cf449d6
commit d4722c4099
98 changed files with 10245 additions and 4858 deletions
@@ -46,6 +46,7 @@
    "reflect-metadata": "^0.1.13",
    "request": "^2.88.2",
    "request-promise": "^4.2.6",
+    "thinkingdata-node": "^1.2.2",
    "underscore": "^1.13.1"
  },
  "devDependencies": {