support ajax cache

@@ -17,12 +17,9 @@ app.on('mount', function(parent) {
     delete parent.locals.settings; // 不继承父 App 的设置
     delete parent.locals.settings; // 不继承父 App 的设置
     Object.assign(app.locals, parent.locals);
     Object.assign(app.locals, parent.locals);
 });
 });
-app.set('views', path.join(__dirname, 'views/action'));
 app.use(global.yoho.hbs({
 app.use(global.yoho.hbs({
     extname: '.hbs',
     extname: '.hbs',
-    defaultLayout: 'layout',
-    layoutsDir: doraemon,
-    partialsDir: path.join(__dirname, 'views/partial', `${doraemon}/partial`),
+    partialsDir: path.join(__dirname, 'views/partial'),
     views: path.join(__dirname, 'views/action'),
     views: path.join(__dirname, 'views/action'),
     helpers: Object.assign({}, global.yoho.helpers, helpers)
     helpers: Object.assign({}, global.yoho.helpers, helpers)
 }));
 }));

@@ -3,12 +3,10 @@
 
 
 const path = require('path');
 const path = require('path');
 const cachePage = require('../../config/cache');
 const cachePage = require('../../config/cache');
+const logger = global.yoho.logger;
 
 
 module.exports = () => {
 module.exports = () => {
     return (req, res, next) => {
     return (req, res, next) => {
-        if (req.get('X-Requested-With') === 'XMLHttpRequest') {
-            res.set('Cache-Control', 'no-cache');
-        }
 
 
         function onRender() {
         function onRender() {
             let route = req.route ? req.route.path : '';
             let route = req.route ? req.route.path : '';
@@ -17,6 +15,8 @@ module.exports = () => {
 
 
             req.app.set('etag', false);
             req.app.set('etag', false);
 
 
+            logger.debug(`route: ${key}   cache = ${cachePage[key]}`);
+
             // 如果存在cache配置，并且业务代码中没有设置
             // 如果存在cache配置，并且业务代码中没有设置
             if (cachePage[key] && res.get('Cache-Control') !== 'no-cache') {
             if (cachePage[key] && res.get('Cache-Control') !== 'no-cache') {
                 res.set({
                 res.set({
@@ -24,6 +24,8 @@ module.exports = () => {
                 });
                 });
                 res.removeHeader('Pragma');
                 res.removeHeader('Pragma');
                 res.removeHeader('Expires');
                 res.removeHeader('Expires');
+            } else if (req.get('X-Requested-With') === 'XMLHttpRequest') {
+                res.set('Cache-Control', 'no-cache');
             } else {
             } else {
                 res.set({
                 res.set({
                     'Cache-Control': 'no-cache',
                     'Cache-Control': 'no-cache',