Authored by 郭成尧

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

@@ -18,7 +18,7 @@ app.on('mount', function(parent) { @@ -18,7 +18,7 @@ app.on('mount', function(parent) {
18 Object.assign(app.locals, parent.locals); 18 Object.assign(app.locals, parent.locals);
19 }); 19 });
20 20
21 -app.use(global.yoho.hbs({ 21 +app.engine('.hbs', hbs({
22 extname: '.hbs', 22 extname: '.hbs',
23 defaultLayout: 'layout', 23 defaultLayout: 'layout',
24 layoutsDir: doraemon, 24 layoutsDir: doraemon,
@@ -17,10 +17,10 @@ module.exports = { @@ -17,10 +17,10 @@ module.exports = {
17 siteUrl: '//m.yohobuy.com', 17 siteUrl: '//m.yohobuy.com',
18 assetUrl: '//localhost:5001', 18 assetUrl: '//localhost:5001',
19 domains: { 19 domains: {
20 - api: 'http://api.yoho.cn/', 20 + api: 'http://api.yoho.cn/',
21 service: 'http://service.yoho.cn/', 21 service: 'http://service.yoho.cn/',
22 liveApi: 'http://api.live.yoho.cn/', 22 liveApi: 'http://api.live.yoho.cn/',
23 - singleApi: 'http://single.yoho.cn/' 23 + singleApi: 'http://single.yoho.cn/'
24 24
25 // api: 'http://api-test1.yohops.com:9999/', 25 // api: 'http://api-test1.yohops.com:9999/',
26 // service: 'http://service-test1.yohops.com:9999/', 26 // service: 'http://service-test1.yohops.com:9999/',
@@ -70,7 +70,7 @@ module.exports = { @@ -70,7 +70,7 @@ module.exports = {
70 port: 4444 // influxdb port 70 port: 4444 // influxdb port
71 }, 71 },
72 console: { 72 console: {
73 - level: 'info', 73 + level: isProduction ? 'error' : 'info',
74 colorize: 'all', 74 colorize: 'all',
75 prettyPrint: true 75 prettyPrint: true
76 } 76 }