Merge remote-tracking branch 'origin/release/5.1' into release/5.1

+/**
+ * 最近浏览controller
+ * @author: xuqi<qi.xu@yoho.cn>
+ * @date: 2016/10/11
+ */
+
+'use strict';
+
+const rvModel = require('../models/recent-view');
+
+const index = (req, res, next) => {
+
+    let limit = req.query.limit;
+
+    let browserSkn = decodeURIComponent(req.cookie._browseskn);
+
+    // 拆解skn并去除最后一个多余的,
+    let skn = browserSkn ? browserSkn.replace(/\-[\d]+\,/g, ',').slice(0, -1) : '';
+
+    if (!skn) {
+        res.jsonp({
+            code: 200,
+            data: [],
+            message: 'User info'
+        });
+    } else {
+        rvModel.index(skn, limit).then(data => {
+            res.jsonp(data);
+        }).catch(next);
+    }
+
+};
+
+module.exports = {
+    index
+};

+/**
+ * sub app common
+ * @author: xuqi<qi.xu@yoho.cn>
+ * @date: 2016/10/11
+ */
+
+var express = require('express'),
+    path = require('path'),
+    hbs = require('express-handlebars');
+
+var app = express();
+
+// set view engin
+var doraemon = path.join(__dirname, '../../doraemon/views'); // parent view root
+
+app.on('mount', function(parent) {
+    delete parent.locals.settings; // 不继承父 App 的设置
+    Object.assign(app.locals, parent.locals);
+});
+
+app.set('views', path.join(__dirname, 'views/action'));
+app.engine('.hbs', hbs({
+    extname: '.hbs',
+    defaultLayout: 'layout',
+    layoutsDir: doraemon,
+    partialsDir: [path.join(__dirname, 'views/partial'), `${doraemon}/partial`],
+    helpers: global.yoho.helpers
+}));
+
+// router
+app.use(require('./router'));
+
+module.exports = app;

+/**
+ * recent view model
+ * @author: xuqi<qi.xu@yoho.cn>
+ * @date: 2016/10/11
+ */
+
+'use strict';
+
+const _ = require('lodash');
+const api = global.yoho.API;
+const helper = global.yoho.helpers;
+
+const index = (skn, limit) => {
+
+    return api.get('', {
+        method: 'h5.product.batch',
+        productSkn: skn,
+        limit: limit
+    }).then(result => {
+
+        if (result.code === 200) {
+            let data = [];
+            let historyProduct = result.data.product_list;
+
+            _.forEach(historyProduct, hp => {
+                let mp = hp.market_price;
+                let sp = hp.sales_price;
+
+                data.push({
+                    market_price: mp === sp ? '' : `¥${helper.round(mp, 2)}`,
+                    price: `¥${helper.round(sp, 2)}`,
+                    product_name: hp.product_name,
+                    url: helper.urlFormat(
+                        `/product/pro_${hp.product_id}_${hp.goods_id}/${hp.cn_alphabet}.html`, '', 'item'),
+                    pic_url: helper.image(hp.default_images, 150, 200, 2, 70)
+                });
+            });
+
+            return {
+                code: 200,
+                data: data,
+                message: result.message
+            };
+        } else {
+
+            // get list error
+            return {
+                code: result.code,
+                message: result.message,
+                data: []
+            };
+        }
+    });
+};
+
+module.exports = {
+    index
+};

+/**
+ * router of sub app common
+ * @author: xuqi<qi.xu@yoho.cn>
+ * @date: 2016/10/11
+ */
+
+'use strict';
+
+const router = require('express').Router(); // eslint-disable-line
+const cRoot = './controllers';
+
+const rvCtrl = require(`${cRoot}/recent-view`);
+
+router.get('/recentReview', rvCtrl.index); // 最近浏览
+
+module.exports = router;

@@ -7,6 +7,7 @@
 module.exports = app => {
 
     // 公共服务
+    app.use('/common', require('./apps/common'));
 
     // 业务模块
     app.use(require('./apps/channel')); // 频道页