Merge branch 'qCloud' of git.yoho.cn:fe/yohobuywap-node into qCloud

@@ -16,7 +16,6 @@ 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 uuid = require('uuid');
 
 
 const pkg = require('./package.json');
 const pkg = require('./package.json');
 const session = require('cookie-session');
 const session = require('cookie-session');
@@ -67,12 +66,6 @@ app.use((req, res, next) => {
     req.user = {}; // 全局的用户数据
     req.user = {}; // 全局的用户数据
     req.yoho = {}; // req和res绑定yoho对象，用于传递全局数据, 如req.yoho.channel等
     req.yoho = {}; // req和res绑定yoho对象，用于传递全局数据, 如req.yoho.channel等
 
 
-    if (!req.session.id) {
-        req.session.id = uuid.v4();
-    }
-
-    req.sessionID = req.session.id;
-
     next();
     next();
 });
 });
 
 
@@ -80,7 +73,6 @@ app.use((req, res, next) => {
 try {
 try {
     const user = require('./doraemon/middleware/user');
     const user = require('./doraemon/middleware/user');
     const subDomain = require('./doraemon/middleware/sub-domain');
     const subDomain = require('./doraemon/middleware/sub-domain');
-    const itemNameHandler = require('./doraemon/middleware/item-name-handler');
     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');
     const setPageInfo = require('./doraemon/middleware/set-pageinfo');
     const setPageInfo = require('./doraemon/middleware/set-pageinfo');
@@ -89,7 +81,6 @@ try {
 
 
     // YOHO 前置中间件
     // YOHO 前置中间件
     app.use(subDomain());
     app.use(subDomain());
-    app.use(itemNameHandler);
     app.use(setYohoData());
     app.use(setYohoData());
     app.use(user());
     app.use(user());
     app.use(seo());
     app.use(seo());

@@ -17,10 +17,10 @@ module.exports = {
     siteUrl: '//m.yohobuy.com',
     siteUrl: '//m.yohobuy.com',
     assetUrl: '//localhost:5001',
     assetUrl: '//localhost:5001',
     domains: {
     domains: {
-        api: 'http://api.yoho.cn/',
-        service: 'http://service.yoho.cn/',
-        liveApi: 'http://api.live.yoho.cn/',
-        singleApi: 'http://single.yoho.cn/'
+        api: 'http://api.yoho.yohoops.org/',
+            service: 'http://service.yoho.yohoops.org/',
+            liveApi: 'http://api.live.yoho.cn/',
+            singleApi: 'http://single.yoho.cn/'
 
 
         // api: 'http://api-test1.yohops.com:9999/',
         // api: 'http://api-test1.yohops.com:9999/',
         // service: 'http://service-test1.yohops.com:9999/',
         // service: 'http://service-test1.yohops.com:9999/',
@@ -70,7 +70,7 @@ module.exports = {
             port: 4444 // influxdb port
             port: 4444 // influxdb port
         },
         },
         console: {
         console: {
-            level: isProduction ? 'error' : 'info',
+            level: 'error',
             colorize: 'all',
             colorize: 'all',
             prettyPrint: true
             prettyPrint: true
         }
         }