jj.js 0.7.6 → 0.8.2

package/lib/db.js

@@ -106,7 +106,6 @@ class Db extends Context
                 try {
                     await fun();
                     await this.commit();
-                    resolve('事务执行成功！');
                 } catch(e) {
                     await this.rollback();
                     throw e;
@@ -450,10 +449,7 @@ class Db extends Context
         return result;
     }
 
-    async pagination(page, page_size, pagination) {
-        if(typeof page == 'object' || typeof page == 'function') {
-            [page, pagination] = [pagination, page];
-        }
+    async pagination({page, page_size, pagination} = {}) {
         if(!pagination) {
             pagination = this.$pagination.__node.isClass ? this.$pagination : this.$.pagination;
         }

package/lib/router.js

@@ -1,7 +1,6 @@
 const router = require('@koa/router')();
 const {app: cfg_app, routes: cfg_routes} = require('./config');
 const {toLine} = require('./utils/str');
-const Logger = require('./logger');
 const run = require('./run');
 
 // 注册用户路由
@@ -27,21 +26,19 @@ if (cfg_routes) {
             ctx.APP = paths[2] || cfg_app.default_app;
             ctx.CONTROLLER = paths[1] || cfg_app.default_controller;
             ctx.ACTION = paths[0] || cfg_app.default_action;
-            Logger.debug(`Router: {APP: ${ctx.APP}, CONTROLLER: ${ctx.CONTROLLER}, ACTION: ${ctx.ACTION}}`);
             await run(ctx, next, item.type);
         });
     }
 }
 
 // 注册系统路由
-router.all(cfg_app.app_multi ? '/:app?/:controller?/:action?' : '/:controller?/:action?', async (ctx, next) => {
-    ctx.APP = ctx.params.app || cfg_app.default_app;
-    ctx.CONTROLLER = ctx.params.controller || cfg_app.default_controller;
-    ctx.ACTION = ctx.params.action || cfg_app.default_action;
-    delete ctx.params.app;
-    delete ctx.params.controller;
-    delete ctx.params.action;
-    Logger.debug(`Router: {APP: ${ctx.APP}, CONTROLLER: ${ctx.CONTROLLER}, ACTION: ${ctx.ACTION}}`);
+router.all(cfg_app.app_multi ? '/:APP?/:CONTROLLER?/:ACTION?' : '/:CONTROLLER?/:ACTION?', async (ctx, next) => {
+    ctx.APP = ctx.params.APP || cfg_app.default_app;
+    ctx.CONTROLLER = ctx.params.CONTROLLER || cfg_app.default_controller;
+    ctx.ACTION = ctx.params.ACTION || cfg_app.default_action;
+    delete ctx.params.APP;
+    delete ctx.params.CONTROLLER;
+    delete ctx.params.ACTION;
     await run(ctx, next);
 });
 

package/lib/run.js

@@ -4,8 +4,13 @@ const {readFile} = require('./utils/fs');
 const {toHump} = require('./utils/str');
 const {app: cfg_app, view: cfg_view, db, page, log, cache, cookie, tpl} = require('./config');
 const compose = require('koa-compose');
+const Logger = require('./logger');
 
 async function run(ctx, next, control_type=cfg_app.controller_folder) {
+    Logger.debug(ctx.request);
+    Logger.debug(`Router: {APP: '${ctx.APP}', CONTROLLER: '${ctx.CONTROLLER}', ACTION: '${ctx.ACTION}'}`);
+    Logger.debug('Params/Get/Post:', ctx.params, ctx.query, ctx.request.body);
+    
     // 设置根加载器
     ctx.$ = loader('./', ctx);
     ctx._ = loader(cfg_app.base_dir, ctx);
@@ -95,7 +100,7 @@ async function run(ctx, next, control_type=cfg_app.controller_folder) {
                     }
                     const Middleware = ctx._[APP]['middleware'][MIDDLEWARE];
                     if(!Middleware || typeof Middleware != 'function') {
-                        throw new Errorw(`中间件文件:${APP}/middleware/${MIDDLEWARE}不存在！`);
+                        throw new Error(`中间件文件:${APP}/middleware/${MIDDLEWARE}不存在！`);
                     }
                     const $middleware = new Middleware(ctx, next);
                     if(!$middleware[METHOD] || typeof $middleware[METHOD] != 'function') {

package/lib/view.js

@@ -14,10 +14,7 @@ class View extends Context
     
     // 加载文件
     async load(template) {
-        const file_name = this.parsePath(template);
-        if(!isFileSync(file_name)) {
-            throw new Error(`文件不存在(${file_name})`);
-        }
+        const file_name = this.parseTplName(template);
         return await readFile(file_name);
     }
 
@@ -28,10 +25,7 @@ class View extends Context
 
     // 渲染文件
     async fetch(template) {
-        const file_name = this.parsePath(template);
-        if(!isFileSync(file_name)) {
-            throw new Error(`文件不存在(${file_name})`);
-        }
+        const file_name = this.parseTplName(template);
         return await this._engine(file_name, this._data || {});
     }
 
@@ -52,18 +46,36 @@ class View extends Context
     }
 
     //解析模板地址
-    parsePath(template=this.ctx.ACTION) {
+    parsePath(template=this.ctx.ACTION, view_folder, view_depr) {
+        !view_folder && (view_folder = cfg_view.view_folder);
+        !view_depr && (view_depr = cfg_view.view_depr);
         let view_file = template;
+
         if(view_file.indexOf('/') !== 0) {
             const temp = view_file.replace(/^\/|\/$/g, '').split('/').reverse().map(u => toLine(u));
             if(temp.length <= 3) {
-                view_file = `${temp[2] || this.ctx.APP}/${cfg_view.view_folder}/${temp[1] || this.ctx.CONTROLLER}${cfg_view.view_depr}${temp[0]}`;
+                view_file = `${temp[2] || this.ctx.APP}/${view_folder}/${temp[1] || this.ctx.CONTROLLER}${view_depr}${temp[0]}`;
             }
         }
         path.extname(view_file) || (view_file += cfg_view.view_ext);
         return path.join(this.$config.app.base_dir, view_file);
     }
 
+    //解析模板名字
+    parseTplName(template) {
+        let file_name = this.parsePath(template, this._folder, this._depr);
+        let is_file = isFileSync(file_name);
+        if(!is_file && (this._folder || this._depr)) {
+            file_name = this.parsePath(template);
+            is_file = isFileSync(file_name);
+        }
+        if(!is_file) {
+            file_name = this.parsePath(template, this._folder, this._depr);
+            throw new Error(`文件不存在(${file_name})`);
+        }
+        return file_name;
+    }
+
     // 设置模版引擎
     setEngine(engine) {
         this._engine = typeof engine == 'string' ? require(engine) : engine;
@@ -86,6 +98,18 @@ class View extends Context
         }
         return this;
     }
+
+    //设置模版目录
+    setFolder(view_folder) {
+        this._folder = view_folder;
+        return this;
+    }
+
+    //设置文件分割符
+    setDepr(view_depr) {
+        this._depr = view_depr;
+        return this;
+    }
 }
 
 module.exports = View;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jj.js",
-  "version": "0.7.6",
+  "version": "0.8.2",
   "description": "A simple and lightweight MVC framework built on nodejs+koa2",
   "main": "jj.js",
   "scripts": {