Authored by 刘传洋

Merge branch 'release/hbs' of http://git.yoho.cn/fe/yohobuy-node into release/hbs

@@ -14,6 +14,10 @@ const yohoLib = require('yoho-node-lib'); @@ -14,6 +14,10 @@ const yohoLib = require('yoho-node-lib');
14 // 全局注册library 14 // 全局注册library
15 yohoLib.global(config); 15 yohoLib.global(config);
16 16
  17 +const EventEmitter = require('events');
  18 +
  19 +EventEmitter.defaultMaxListeners = 100;
  20 +
17 const express = require('express'); 21 const express = require('express');
18 const compression = require('compression'); 22 const compression = require('compression');
19 const path = require('path'); 23 const path = require('path');
@@ -35,20 +35,13 @@ @@ -35,20 +35,13 @@
35 "body-parser": "^1.15.0", 35 "body-parser": "^1.15.0",
36 "captchapng": "0.0.1", 36 "captchapng": "0.0.1",
37 "compression": "^1.6.2", 37 "compression": "^1.6.2",
38 - "connect-memcached": "^0.2.0",  
39 "cookie-parser": "^1.4.3", 38 "cookie-parser": "^1.4.3",
40 "cookie-session": "^1.2.0", 39 "cookie-session": "^1.2.0",
41 "express": "^4.13.1", 40 "express": "^4.13.1",
42 - "express-handlebars": "^3.0.0",  
43 - "express-session": "^1.13.0",  
44 - "handlebars": "^4.0.5",  
45 - "influxdb-winston": "^1.0.1",  
46 "lodash": "^4.13.1", 41 "lodash": "^4.13.1",
47 "md5": "^2.1.0", 42 "md5": "^2.1.0",
48 - "memcached": "^2.2.2",  
49 "moment": "^2.14.1", 43 "moment": "^2.14.1",
50 "morgan": "^1.7.0", 44 "morgan": "^1.7.0",
51 - "oneapm": "^1.2.20",  
52 "passport": "^0.3.2", 45 "passport": "^0.3.2",
53 "passport-douban": "0.0.1", 46 "passport-douban": "0.0.1",
54 "passport-local": "^1.0.0", 47 "passport-local": "^1.0.0",
@@ -58,11 +51,8 @@ @@ -58,11 +51,8 @@
58 "passport-strategy": "1.x.x", 51 "passport-strategy": "1.x.x",
59 "passport-weixin": "^0.1.0", 52 "passport-weixin": "^0.1.0",
60 "request-ip": "^1.2.2", 53 "request-ip": "^1.2.2",
61 - "request-promise": "^3.0.0",  
62 "serve-favicon": "^2.3.0", 54 "serve-favicon": "^2.3.0",
63 "uuid": "^2.0.2", 55 "uuid": "^2.0.2",
64 - "winston": "^2.2.0",  
65 - "winston-daily-rotate-file": "^1.1.4",  
66 "yoho-node-lib": "0.1.28", 56 "yoho-node-lib": "0.1.28",
67 "yoho-zookeeper": "^1.0.3" 57 "yoho-zookeeper": "^1.0.3"
68 }, 58 },