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

@@ -17,8 +17,8 @@ const path = require('path');
 const bodyParser = require('body-parser');
 const bodyParser = require('body-parser');
 const cookieParser = require('cookie-parser');
 const cookieParser = require('cookie-parser');
 const favicon = require('serve-favicon');
 const favicon = require('serve-favicon');
-const session = require('yoho-express-session');
-const memcached = require('yoho-connect-memcached');
+const session = require('express-session');
+const memcached = require('connect-memcached');
 const hbs = require('express-handlebars');
 const hbs = require('express-handlebars');
 const pkg = require('./package.json');
 const pkg = require('./package.json');
 
 
@@ -78,12 +78,14 @@ const logger = require('./library/logger');
 
 
 // dispatcher
 // dispatcher
 try {
 try {
+    const mobileCheck = require('./doraemon/middleware/mobile-check');
     const user = require('./doraemon/middleware/user');
     const user = require('./doraemon/middleware/user');
     const seo = require('./doraemon/middleware/seo');
     const seo = require('./doraemon/middleware/seo');
     const setYohoData = require('./doraemon/middleware/set-yoho-data');
     const setYohoData = require('./doraemon/middleware/set-yoho-data');
     const errorHanlder = require('./doraemon/middleware/error-handler');
     const errorHanlder = require('./doraemon/middleware/error-handler');
 
 
     // YOHO 前置中间件
     // YOHO 前置中间件
+    app.use(mobileCheck());
     app.use(setYohoData());
     app.use(setYohoData());
     app.use(user());
     app.use(user());
     app.use(seo());
     app.use(seo());

+/**
+ * 手机访问检测
+ */
+'use strict';
+module.exports = () => {
+    return (req, res, next) => {
+        let isMobile = /(nokia|iphone|android|ipad|motorola|^mot\-|softbank|foma|docomo|kddi|up\.browser|up\.link|htc|dopod|blazer|netfront|helio|hosin|huawei|novarra|CoolPad|webos|techfaith|palmsource|blackberry|alcatel|amoi|ktouch|nexian|samsung|^sam\-|s[cg]h|^lge|ericsson|philips|sagem|wellcom|bunjalloo|maui|symbian|smartphone|midp|wap|phone|windows ce|iemobile|^spice|^bird|^zte\-|longcos|pantech|gionee|^sie\-|portalmmm|jig\s browser|hiptop|^ucweb|^benq|haier|^lct|opera\s*mobi|opera\*mini|320x320|240x320|176x220)/i.test(req.get('user-agent')); // eslint-disable-line
+
+        if (isMobile) {
+            return res.redirect(`//m.yohobuy.com${req.url}`);
+        }
+        next();
+    };
+};

@@ -33,9 +33,11 @@
   "dependencies": {
   "dependencies": {
     "bluebird": "^3.4.0",
     "bluebird": "^3.4.0",
     "body-parser": "^1.15.0",
     "body-parser": "^1.15.0",
+    "connect-memcached": "^0.2.0",
     "cookie-parser": "^1.4.3",
     "cookie-parser": "^1.4.3",
     "express": "^4.13.1",
     "express": "^4.13.1",
     "express-handlebars": "^3.0.0",
     "express-handlebars": "^3.0.0",
+    "express-session": "^1.13.0",
     "influxdb-winston": "^1.0.1",
     "influxdb-winston": "^1.0.1",
     "lodash": "^4.13.1",
     "lodash": "^4.13.1",
     "md5": "^2.1.0",
     "md5": "^2.1.0",