Merge remote-tracking branch 'origin/feature/captcha' into feature/captcha

@@ -27,7 +27,10 @@ const favicon = require('serve-favicon');
 const _ = require('lodash');
 const fp = require('lodash/fp');
 
-const session = require('client-sessions');
+const CookieSession = require('client-sessions');
+const MemcachedSession = require('yoho-express-session');
+const memcached = require('connect-memcached');
+const MemcachedStore = memcached(MemcachedSession);
 const pkg = require('./package.json');
 const app = express();
 const helpers = global.yoho.helpers;
@@ -67,14 +70,60 @@ app.use(bodyParser.urlencoded({extended: false}));
 app.use(cookieParser());
 app.use(compression());
 
-app.use(session({
-    requestKey: 'session',
+app.use(MemcachedSession({
+    proxy: true,
+    resave: false,
+    saveUninitialized: true,
+    unset: 'destroy',
+    secret: '82dd7e724f2c6870472c89dfa43cf48d',
+    name: 'yohobuy_session',
+    cookie: {
+        domain: 'yohobuy.com',
+        httpOnly: false
+    },
+    store: new MemcachedStore({
+        hosts: config.memcache.session,
+        prefix: 'yohobuy_session:',
+        reconnect: 5000,
+        timeout: 1000,
+        retries: 0
+    })
+}));
+
+app.use(CookieSession({
+    requestKey: 'session2',
     cookieName: 'yohobuy_session_cookie',
     secret: '82dd7e724f2c6870472c89dfa43cf48d',
     domain: config.cookieDomain
 }));
 
 app.use((req, res, next) => {
+    if (req.session) {
+        let sessionKeys = Object.keys(req.session || {});
+        let backSessionKeys = Object.keys(req.session2.sessionBack || {});
+
+        if (backSessionKeys.length > sessionKeys.length) {
+            let differences = _.difference(backSessionKeys, sessionKeys);
+            _.forEach(differences, d => {
+                req.session[d] = req.session2.sessionBack[d];
+            });
+        }
+        req.session2.sessionBack = req.session;
+    } else {
+        req.session = new MemcachedSession.Session(req);
+        req.session = _.assign(req.session, req.session2.sessionBack);
+    }
+
+    if (typeof req.session.reset !== 'function') {
+        req.session.reset = function() {
+            req.session = null;
+            req.session2.reset();
+        };
+    }
+    next();
+});
+
+app.use((req, res, next) => {
     req.user = {}; // 全局的用户数据
     req.yoho = {}; // req和res绑定yoho对象，用于传递全局数据, 如req.yoho.channel等
 

@@ -13,7 +13,7 @@ const clientService = require('../models/client-service');
 /**
  * 在线客服客户端
  */
-const index = (req, res) => {
+const index = (req, res, next) => {
     let type = 2;
     let imgSize = '86x120';
     let encryptedUid = aes.encryptionUid(req.user.uid);
@@ -25,7 +25,7 @@ const index = (req, res) => {
     clientService.getClientData(type, encryptedUid, imgSize)
         .then(result => {
             res.render('client', Object.assign(data, result));
-        });
+        }).catch(next);
 };
 
 /**

@@ -38,9 +38,9 @@
     "cheerio": "^0.22.0",
     "client-sessions": "^0.7.0",
     "compression": "^1.6.2",
+    "connect-memcached": "^0.2.0",
     "connect-multiparty": "^2.0.0",
     "cookie-parser": "^1.4.3",
-    "cookie-session": "^1.2.0",
     "express": "^4.13.1",
     "lodash": "^4.13.1",
     "md5": "^2.1.0",
@@ -59,6 +59,7 @@
     "request-promise": "^3.0.0",
     "serve-favicon": "^2.3.0",
     "uuid": "^2.0.2",
+    "yoho-express-session": "^2.0.0",
     "yoho-node-lib": "0.2.2",
     "yoho-zookeeper": "^1.0.4"
   },