fix

@@ -27,10 +27,6 @@ const favicon = require('serve-favicon');
 const _ = require('lodash');
 const fp = require('lodash/fp');
 
-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;
@@ -87,37 +83,8 @@ app.use(bodyParser.urlencoded({extended: false}));
 app.use(cookieParser());
 app.use(compression());
 
-app.use(MemcachedSession({  // eslint-disable-line
-    proxy: true,
-    resave: false,
-    saveUninitialized: false,
-    unset: 'destroy',
-    secret: '82dd7e724f2c6870472c89dfa43cf48d',
-    name: 'yohobuy_session',
-    cookie: {
-        domain: config.cookieDomain,
-        httpOnly: false
-    },
-    store: new MemcachedStore({
-        hosts: config.memcache.session,
-        prefix: config.sessionMemcachedPrefix,
-        reconnect: 5000,
-        timeout: 1000,
-        retries: 0
-    })
-}));
-
-app.use(CookieSession({ // eslint-disable-line
-    requestKey: 'session2',
-    cookieName: 'yohobuy_session_cookie',
-    secret: '82dd7e724f2c6870472c89dfa43cf48d',
-    cookie: {
-        domain: config.cookieDomain,
-        ephemeral: true
-    }
-}));
-
-app.use(require('./doraemon/middleware/yohoSession')('session2'));
+// session 设置
+require('./doraemon/middleware/yohoSession')(app);
 
 app.use((req, res, next) => {
     req.user = {}; // 全局的用户数据

 const config = global.yoho.config;
-const session = require('yoho-express-session');
+const memcachedSession = require('yoho-express-session');
 const onHeaders = require('on-headers');
 const _ = require('lodash');
 const uuid = require('uuid');
 
+const cookieSession = require('client-sessions');
+const memcached = require('connect-memcached');
+const MemcachedStore = memcached(memcachedSession);
+
 /**
  * 该中间件主要把 express-session 和 client-session 集中起来处理，如果 memcached 出错了，使用 cookie session
- * @param backSession cookeSession 的键名
+ * @param opts.backSession cookeSession 的键名
  * @returns {function(*=, *=, *)}
  */
-module.exports = (backSession) => {
+function yohoSession(opts) {
     return (req, res, next) => {
         let notUseMemcached = _.get(req.app.locals.pc, 'session.removeMemcached', false);
 
+        opts.backSession = opts.backSession || 'session2';
+
         if (req.session && !notUseMemcached) {
             req.sessionError = false;
         } else {
@@ -21,8 +27,8 @@ module.exports = (backSession) => {
             req.sessionError = true;
 
             req.sessionID = uuid.v4();
-            req.session = new session.Session(req, req[backSession].sessionBack);
-            req.session.cookie = new session.Cookie({
+            req.session = new memcachedSession.Session(req, req[opts.backSession].sessionBack);
+            req.session.cookie = new memcachedSession.Cookie({
                 domain: config.cookieDomain,
                 httpOnly: false
             });
@@ -33,16 +39,54 @@ module.exports = (backSession) => {
             enumerable: false,
             value: function() {
                 req.session = null;
-                req[backSession].reset();
+                req[opts.backSession].reset();
             },
             writable: false
         });
 
         onHeaders(res, function() {
             // 备份数据
-            req[backSession].sessionBack = req.session;
+            req[opts.backSession].sessionBack = req.session;
         });
 
         next();
     };
+}
+
+module.exports = (app) => {
+    app.use(memcachedSession({  // eslint-disable-line
+        proxy: true,
+        resave: false,
+        saveUninitialized: false,
+        unset: 'destroy',
+        secret: '82dd7e724f2c6870472c89dfa43cf48d',
+        name: 'yohobuy_session',
+        cookie: {
+            domain: config.cookieDomain,
+            httpOnly: false
+        },
+        store: new MemcachedStore({
+            hosts: config.memcache.session,
+            prefix: config.sessionMemcachedPrefix,
+            reconnect: 5000,
+            timeout: 1000,
+            retries: 0
+        })
+    }));
+
+    app.use(cookieSession({ // eslint-disable-line
+        requestKey: 'session2',
+        cookieName: 'yohobuy_session_cookie',
+        secret: '82dd7e724f2c6870472c89dfa43cf48d',
+        cookie: {
+            domain: config.cookieDomain,
+            ephemeral: true
+        }
+    }));
+
+    app.use(yohoSession({
+        opts: 'session2'
+    }));
 };
+
+