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

@@ -7,7 +7,6 @@
 
 
 const config = require('./config/common');
 const config = require('./config/common');
 
 
-
 // use one apm
 // use one apm
 if (config.useOneapm) {
 if (config.useOneapm) {
     require('oneapm');
     require('oneapm');
@@ -20,16 +19,12 @@ const cookieParser = require('cookie-parser');
 const favicon = require('serve-favicon');
 const favicon = require('serve-favicon');
 const session = require('express-session');
 const session = require('express-session');
 const memcached = require('connect-memcached');
 const memcached = require('connect-memcached');
-const _ = require('lodash');
+const hbs = require('express-handlebars');
 const pkg = require('./package.json');
 const pkg = require('./package.json');
-const cookie = require('./library/cookie');
 
 
 const app = express();
 const app = express();
 const MemcachedStore = memcached(session);
 const MemcachedStore = memcached(session);
 
 
-const setChannel = require('./doraemon/middleware/set-channel');
-
-
 // 向模板注入变量
 // 向模板注入变量
 app.locals.devEnv = app.get('env') === 'development';
 app.locals.devEnv = app.get('env') === 'development';
 app.locals.version = pkg.version;
 app.locals.version = pkg.version;
@@ -37,8 +32,15 @@ app.locals.version = pkg.version;
 // 指定libray目录
 // 指定libray目录
 global.library = path.resolve('./library/');
 global.library = path.resolve('./library/');
 
 
-
 app.set('view engine', '.hbs');
 app.set('view engine', '.hbs');
+app.set('views', './doraemon/views');
+app.engine('.hbs', hbs({
+    extname: '.hbs',
+    defaultLayout: 'layout',
+    layoutsDir: './doraemon/views',
+    partialsDir: './doraemon/views/partial',
+    helpers: require(`${global.library}/helpers`)
+}));
 
 
 app.use(favicon(path.join(__dirname, '/public/favicon.ico')));
 app.use(favicon(path.join(__dirname, '/public/favicon.ico')));
 app.use(express.static(path.join(__dirname, 'public')));
 app.use(express.static(path.join(__dirname, 'public')));
@@ -65,35 +67,35 @@ app.use(session({
     })
     })
 }));
 }));
 
 
-
-// req和res绑定yoho对象，用于传递全局数据, 如req.yoho.channel等
 app.use((req, res, next) => {
 app.use((req, res, next) => {
-    req.yoho = {};
-    res.yoho = {};
-    next();
-});
+    req.user = {}; // 全局的用户数据
+    req.yoho = {}; // req和res绑定yoho对象，用于传递全局数据, 如req.yoho.channel等
 
 
-app.use((req, res, next) => {
-    req.user = {};
-
-    // 从 PHP 写的 SESSION 中获取到当前登录用户的 UID
-    if (req.session && _.isNumber(req.session._LOGIN_UID)) {
-        req.user.uid = req.session._LOGIN_UID;
-    }
-
-    // session 没有读取到的时候，从 cookie 读取 UID
-    if (!req.user.uid && req.cookies._UID) {
-        req.user.uid = cookie.getUid(req);
-    }
     next();
     next();
 });
 });
 
 
+const logger = require('./library/logger');
+const user = require('./doraemon/middleware/user');
+const setChannel = require('./doraemon/middleware/set-channel');
+const errorHanlder = require('./doraemon/middleware/error-hanlder');
+
+// YOHO 前置中间件
+app.use(user());
 app.use(setChannel());
 app.use(setChannel());
 
 
 // dispatcher
 // dispatcher
-require('./dispatch')(app);
+try {
+    require('./dispatch')(app);
+
+    app.all('*', errorHanlder.notFound()); // 404
+
+    // YOHO 后置中间件
+    app.use(errorHanlder.serverError());
+} catch (err) {
+    logger.error(err);
+}
 
 
 // listener
 // listener
 app.listen(config.port, function() {
 app.listen(config.port, function() {
-    console.log('yohobuy start');
+    logger.info('yohobuy start');
 });
 });

+/**
+ * 404 错误
+ * @return {[type]}
+ */
+exports.notFound = () => {
+    return (req, res) => {
+        if (req.xhr) {
+            return res.status(404).json({
+                code: 404,
+                message: '页面不存在'
+            });
+        }
+        return res.render('error/404');
+    };
+};
+
+/**
+ * 服务器错误
+ * @return {[type]}
+ */
+exports.serverError = () => {
+    return (err, req, res, next) => {
+        if (!res.headersSent) {
+            if (req.xhr) {
+                return res.status(500).json({
+                    code: 500,
+                    message: '服务器错误'
+                });
+            }
+
+            return res.render('error/500', err);
+        }
+        next(err);
+    };
+};

@@ -19,7 +19,6 @@ module.exports = () => {
             });
             });
 
 
             req.yoho.channel = channel;
             req.yoho.channel = channel;
-            res.yoho.channel = channel;
         }
         }
 
 
         next();
         next();

+const _ = require('lodash');
+const cookie = require('../../library/cookie');
+
+module.exports = () => {
+    return (req, res, next) => {
+        // 从 SESSION 中获取到当前登录用户的 UID
+        if (req.session && _.isNumber(req.session._LOGIN_UID)) {
+            req.user.uid = req.session._LOGIN_UID;
+        }
+
+        // session 没有读取到的时候，从 cookie 读取 UID
+        if (!req.user.uid && req.cookies._UID) {
+            req.user.uid = cookie.getUid(req);
+        }
+
+        next();
+    };
+};

+404

+500