Authored by 郭成尧

Merge branch 'master' into hotfix/release57

@@ -38,7 +38,7 @@ @@ -38,7 +38,7 @@
38 "lodash": "^4.17.4", 38 "lodash": "^4.17.4",
39 "memory-cache": "^0.1.6", 39 "memory-cache": "^0.1.6",
40 "moment": "^2.18.1", 40 "moment": "^2.18.1",
41 - "oneapm": "^2.0.0", 41 + "oneapm": "^1.2.20",
42 "passport": "^0.3.2", 42 "passport": "^0.3.2",
43 "passport-local": "^1.0.0", 43 "passport-local": "^1.0.0",
44 "passport-qq": "0.0.3", 44 "passport-qq": "0.0.3",