Merge branch 'develop' into release/1.0
Showing
2 changed files
with
4 additions
and
2 deletions
@@ -17,8 +17,8 @@ const path = require('path'); | @@ -17,8 +17,8 @@ const path = require('path'); | ||
17 | const bodyParser = require('body-parser'); | 17 | const bodyParser = require('body-parser'); |
18 | const cookieParser = require('cookie-parser'); | 18 | const cookieParser = require('cookie-parser'); |
19 | const favicon = require('serve-favicon'); | 19 | const favicon = require('serve-favicon'); |
20 | -const session = require('yoho-express-session'); | ||
21 | -const memcached = require('yoho-connect-memcached'); | 20 | +const session = require('express-session'); |
21 | +const memcached = require('connect-memcached'); | ||
22 | const hbs = require('express-handlebars'); | 22 | const hbs = require('express-handlebars'); |
23 | const pkg = require('./package.json'); | 23 | const pkg = require('./package.json'); |
24 | 24 |
@@ -33,9 +33,11 @@ | @@ -33,9 +33,11 @@ | ||
33 | "dependencies": { | 33 | "dependencies": { |
34 | "bluebird": "^3.4.0", | 34 | "bluebird": "^3.4.0", |
35 | "body-parser": "^1.15.0", | 35 | "body-parser": "^1.15.0", |
36 | + "connect-memcached": "^0.2.0", | ||
36 | "cookie-parser": "^1.4.3", | 37 | "cookie-parser": "^1.4.3", |
37 | "express": "^4.13.1", | 38 | "express": "^4.13.1", |
38 | "express-handlebars": "^3.0.0", | 39 | "express-handlebars": "^3.0.0", |
40 | + "express-session": "^1.13.0", | ||
39 | "influxdb-winston": "^1.0.1", | 41 | "influxdb-winston": "^1.0.1", |
40 | "lodash": "^4.13.1", | 42 | "lodash": "^4.13.1", |
41 | "md5": "^2.1.0", | 43 | "md5": "^2.1.0", |
-
Please register or login to post a comment