Authored by 陈峰

回复engine

@@ -16,7 +16,6 @@ const path = require('path'); @@ -16,7 +16,6 @@ const path = require('path');
16 const bodyParser = require('body-parser'); 16 const bodyParser = require('body-parser');
17 const cookieParser = require('cookie-parser'); 17 const cookieParser = require('cookie-parser');
18 const favicon = require('serve-favicon'); 18 const favicon = require('serve-favicon');
19 -const uuid = require('uuid');  
20 19
21 const pkg = require('./package.json'); 20 const pkg = require('./package.json');
22 const session = require('cookie-session'); 21 const session = require('cookie-session');
@@ -67,12 +66,6 @@ app.use((req, res, next) => { @@ -67,12 +66,6 @@ app.use((req, res, next) => {
67 req.user = {}; // 全局的用户数据 66 req.user = {}; // 全局的用户数据
68 req.yoho = {}; // req和res绑定yoho对象,用于传递全局数据, 如req.yoho.channel等 67 req.yoho = {}; // req和res绑定yoho对象,用于传递全局数据, 如req.yoho.channel等
69 68
70 - if (!req.session.id) {  
71 - req.session.id = uuid.v4();  
72 - }  
73 -  
74 - req.sessionID = req.session.id;  
75 -  
76 next(); 69 next();
77 }); 70 });
78 71
@@ -80,7 +73,6 @@ app.use((req, res, next) => { @@ -80,7 +73,6 @@ app.use((req, res, next) => {
80 try { 73 try {
81 const user = require('./doraemon/middleware/user'); 74 const user = require('./doraemon/middleware/user');
82 const subDomain = require('./doraemon/middleware/sub-domain'); 75 const subDomain = require('./doraemon/middleware/sub-domain');
83 - const itemNameHandler = require('./doraemon/middleware/item-name-handler');  
84 const setYohoData = require('./doraemon/middleware/set-yoho-data'); 76 const setYohoData = require('./doraemon/middleware/set-yoho-data');
85 const errorHanlder = require('./doraemon/middleware/error-handler'); 77 const errorHanlder = require('./doraemon/middleware/error-handler');
86 const setPageInfo = require('./doraemon/middleware/set-pageinfo'); 78 const setPageInfo = require('./doraemon/middleware/set-pageinfo');
@@ -89,7 +81,6 @@ try { @@ -89,7 +81,6 @@ try {
89 81
90 // YOHO 前置中间件 82 // YOHO 前置中间件
91 app.use(subDomain()); 83 app.use(subDomain());
92 - app.use(itemNameHandler);  
93 app.use(setYohoData()); 84 app.use(setYohoData());
94 app.use(user()); 85 app.use(user());
95 app.use(seo()); 86 app.use(seo());
@@ -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.engine('.hbs', hbs({ 21 +app.use(global.yoho.hbs({
22 extname: '.hbs', 22 extname: '.hbs',
23 defaultLayout: 'layout', 23 defaultLayout: 'layout',
24 layoutsDir: doraemon, 24 layoutsDir: doraemon,