jj.js 0.7.5 → 0.8.1

package/lib/controller.js

@@ -1,35 +1,35 @@
-const Middleware = require('./middleware');
-
-class Controller extends Middleware
-{
-    // 赋值模版数据
-    $assign(name, value) {
-        this.$view.assign(name, value);
-        return this;
-    }
-
-    // 获取模版数据
-    $data(name) {
-        return this.$view.data(name);
-    }
-
-    // 直接文件输出
-    async $load(template) {
-        const content = await this.$view.load(template);
-        this.$show(content);
-    }
-
-    // 渲染内容输出
-    async $render(data) {
-        const content = await this.$view.render(data);
-        this.$show(content);
-    }
-
-    // 渲染文件输出
-    async $fetch(template) {
-        const content = await this.$view.fetch(template);
-        this.$show(content);
-    }
-}
-
+const Middleware = require('./middleware');
+
+class Controller extends Middleware
+{
+    // 赋值模版数据
+    $assign(name, value) {
+        this.$view.assign(name, value);
+        return this;
+    }
+
+    // 获取模版数据
+    $data(name) {
+        return this.$view.data(name);
+    }
+
+    // 直接文件输出
+    async $load(template) {
+        const content = await this.$view.load(template);
+        this.$show(content);
+    }
+
+    // 渲染内容输出
+    async $render(data) {
+        const content = await this.$view.render(data);
+        this.$show(content);
+    }
+
+    // 渲染文件输出
+    async $fetch(template) {
+        const content = await this.$view.fetch(template);
+        this.$show(content);
+    }
+}
+
 module.exports = Controller;

package/lib/ctx.js

@@ -1,51 +1,51 @@
-const loader = require('./loader');
-
-const Ctx = new Proxy(class {}, {
-        construct() {
-            return new Proxy({__proto__: arguments[2].prototype}, {
-                get: (target, prop, receiver) => {
-                    if(prop in target || typeof prop == 'symbol' || prop == 'inspect') {
-                        return Reflect.get(target, prop, receiver);
-                    }
-                    if(prop == '$' || prop == '_') {
-                        return target.ctx && target.ctx[prop]
-                            || prop == '$' && (target.$ || (target.$ = loader('../'))) && target.$
-                            || undefined;
-                    }
-                    if(prop.slice(0, 1) != '$') {
-                        return undefined;
-                    }
-                    const pp = prop.slice(1);
-                    const ctx = target.ctx;
-                    if(ctx && ctx._) {
-                        const _ = ctx._;
-                        const APP = ctx.APP;
-                        const COMMON = _.config.app.common_app;
-                        if(_[APP][prop] === undefined) {
-                            if(_[APP][pp] && _[COMMON] && _[COMMON][pp]) {
-                                _[APP][prop] = new Proxy({}, {
-                                    get: (...args) => {
-                                        return _[APP][pp][args[1]] || _[COMMON][pp][args[1]];
-                                    }
-                                });
-                            } else if(_[APP][pp]) {
-                                _[APP][prop] = _[APP][pp];
-                            } else if(_[COMMON] && _[COMMON][pp]) {
-                                _[APP][prop] = _[COMMON][pp];
-                            } else {
-                                _[APP][prop] = null;
-                            }
-                            if(~['view', 'response'].indexOf(pp) && _[APP][prop] && _[APP][prop].__node && !_[APP][prop].__node.isClass && ctx.$ && ctx.$[pp]) {
-                                _[APP][prop] = ctx.$[pp];
-                            }
-                        }
-                        return _[APP][prop] || _[pp] || (ctx.$ && ctx.$[pp]) || undefined;
-                    } else {
-                        return (target.$ || (target.$ = loader('../'))) && target.$[pp];
-                    }
-                }
-            });
-        }
-});
-
+const loader = require('./loader');
+
+const Ctx = new Proxy(class {}, {
+        construct() {
+            return new Proxy({__proto__: arguments[2].prototype}, {
+                get: (target, prop, receiver) => {
+                    if(prop in target || typeof prop == 'symbol' || prop == 'inspect') {
+                        return Reflect.get(target, prop, receiver);
+                    }
+                    if(prop == '$' || prop == '_') {
+                        return target.ctx && target.ctx[prop]
+                            || prop == '$' && (target.$ || (target.$ = loader('../'))) && target.$
+                            || undefined;
+                    }
+                    if(prop.slice(0, 1) != '$') {
+                        return undefined;
+                    }
+                    const pp = prop.slice(1);
+                    const ctx = target.ctx;
+                    if(ctx && ctx._) {
+                        const _ = ctx._;
+                        const APP = ctx.APP;
+                        const COMMON = _.config.app.common_app;
+                        if(_[APP][prop] === undefined) {
+                            if(_[APP][pp] && _[COMMON] && _[COMMON][pp]) {
+                                _[APP][prop] = new Proxy({}, {
+                                    get: (...args) => {
+                                        return _[APP][pp][args[1]] || _[COMMON][pp][args[1]];
+                                    }
+                                });
+                            } else if(_[APP][pp]) {
+                                _[APP][prop] = _[APP][pp];
+                            } else if(_[COMMON] && _[COMMON][pp]) {
+                                _[APP][prop] = _[COMMON][pp];
+                            } else {
+                                _[APP][prop] = null;
+                            }
+                            if(~['view', 'response'].indexOf(pp) && _[APP][prop] && _[APP][prop].__node && !_[APP][prop].__node.isClass && ctx.$ && ctx.$[pp]) {
+                                _[APP][prop] = ctx.$[pp];
+                            }
+                        }
+                        return _[APP][prop] || _[pp] || (ctx.$ && ctx.$[pp]) || undefined;
+                    } else {
+                        return (target.$ || (target.$ = loader('../'))) && target.$[pp];
+                    }
+                }
+            });
+        }
+});
+
 module.exports = Ctx;

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;
         }
@@ -560,6 +556,17 @@ class Db extends Context
             this._options.getSql = false;
             return this.format(this._queryStr, params);
         }
+
+        if(this._options.cache_time) {
+            const cache_time = this._options.cache_time;
+            const cache_key = md5(this.format(this._queryStr, params));
+            if(this.getCache(cache_key)) {
+                return this.getCache(cache_key);
+            }
+            const result = await this.query(this._queryStr, params);
+            this.setCache(cache_key, result, cache_time);
+            return result;
+        }
         return await this.query(this._queryStr, params, reset);
     }
 
@@ -741,7 +748,7 @@ class Db extends Context
         Db.cache.set(key, data, cache_time);
     }
 
-    deleteCache(key) {console.log('deleteCache', key);
+    deleteCache(key) {
         Db.cache.delete(key);
     }
 }

package/lib/loader.js

@@ -1,80 +1,80 @@
-const fs = require('fs');
-const pt = require('path');
-const isClass = require('is-class');
-const {isFileSync, isDirSync} = require('./utils/fs');
-
-const nodeType = {};
-
-function loader(dir='./', ...args) {
-    const node = {};
-    const info = new Map();
-    info.set(node, {
-        path: pt.isAbsolute(dir) ? pt.join(dir, './') : pt.join(pt.dirname(module.parent.filename), dir, './'),
-        nodeType: 'dir',
-        isClass: false
-    });
-    return creatLoader(node);
-
-    function creatLoader(node) {
-        return new Proxy(node, {
-            get: (node, prop, receiver) => {
-                if(prop in node || typeof prop == 'symbol' || prop == 'inspect') {
-                    return Reflect.get(node, prop, receiver);
-                }
-                const nodeInfo = info.get(node);
-                if(nodeInfo.isClass) {
-                    if(!nodeInfo.instance) {
-                        nodeInfo.instance = new node(...args);
-                    }
-                    return prop in nodeInfo.instance ? nodeInfo.instance[prop] : (prop == '__node' ? nodeInfo : nodeInfo.instance[prop]);
-                } else if(prop == '__node') {
-                    return nodeInfo;
-                }
-
-                let _node = {};
-                const _nodePath = nodeInfo.path + prop + '/';
-                const _nodeFile = nodeInfo.path + prop + '.js';
-                if(!nodeType[_nodePath]) {
-                    if(isFileSync(_nodeFile)) {
-                        nodeType[_nodePath] = 'file';
-                    } else if(isDirSync(_nodePath)) {
-                        nodeType[_nodePath] = 'dir';
-                    } else{
-                        nodeType[_nodePath] = 'none';
-                    }
-                }
-                if(nodeType[_nodePath] == 'file') {
-                    _node = require(_nodeFile);
-                } else if(nodeType[_nodePath] != 'dir') {
-                    node[prop] = undefined;
-                    return node[prop];
-                }
-                info.set(_node, {
-                    path: _nodePath,
-                    nodeType: nodeType[_nodePath],
-                    isClass: isClass(_node)
-                });
-                node[prop] = creatLoader(_node);
-                return node[prop];
-            },
-            set: (_node, prop, value) => {
-                if(prop in node) {
-                    node[prop] = value;
-                    return true;
-                }
-                const nodeInfo = info.get(_node);
-                if(nodeInfo.isClass) {
-                    if(!nodeInfo.instance) {
-                        nodeInfo.instance = new node(...args);
-                    }
-                    nodeInfo.instance[prop] = value;
-                    return true;
-                }
-                node[prop] = value;
-                return true;
-            }
-        });
-    }
-}
-
+const fs = require('fs');
+const pt = require('path');
+const isClass = require('is-class');
+const {isFileSync, isDirSync} = require('./utils/fs');
+
+const nodeType = {};
+
+function loader(dir='./', ...args) {
+    const node = {};
+    const info = new Map();
+    info.set(node, {
+        path: pt.isAbsolute(dir) ? pt.join(dir, './') : pt.join(pt.dirname(module.parent.filename), dir, './'),
+        nodeType: 'dir',
+        isClass: false
+    });
+    return creatLoader(node);
+
+    function creatLoader(node) {
+        return new Proxy(node, {
+            get: (node, prop, receiver) => {
+                if(prop in node || typeof prop == 'symbol' || prop == 'inspect') {
+                    return Reflect.get(node, prop, receiver);
+                }
+                const nodeInfo = info.get(node);
+                if(nodeInfo.isClass) {
+                    if(!nodeInfo.instance) {
+                        nodeInfo.instance = new node(...args);
+                    }
+                    return prop in nodeInfo.instance ? nodeInfo.instance[prop] : (prop == '__node' ? nodeInfo : nodeInfo.instance[prop]);
+                } else if(prop == '__node') {
+                    return nodeInfo;
+                }
+
+                let _node = {};
+                const _nodePath = nodeInfo.path + prop + '/';
+                const _nodeFile = nodeInfo.path + prop + '.js';
+                if(!nodeType[_nodePath]) {
+                    if(isFileSync(_nodeFile)) {
+                        nodeType[_nodePath] = 'file';
+                    } else if(isDirSync(_nodePath)) {
+                        nodeType[_nodePath] = 'dir';
+                    } else{
+                        nodeType[_nodePath] = 'none';
+                    }
+                }
+                if(nodeType[_nodePath] == 'file') {
+                    _node = require(_nodeFile);
+                } else if(nodeType[_nodePath] != 'dir') {
+                    node[prop] = undefined;
+                    return node[prop];
+                }
+                info.set(_node, {
+                    path: _nodePath,
+                    nodeType: nodeType[_nodePath],
+                    isClass: isClass(_node)
+                });
+                node[prop] = creatLoader(_node);
+                return node[prop];
+            },
+            set: (_node, prop, value) => {
+                if(prop in node) {
+                    node[prop] = value;
+                    return true;
+                }
+                const nodeInfo = info.get(_node);
+                if(nodeInfo.isClass) {
+                    if(!nodeInfo.instance) {
+                        nodeInfo.instance = new node(...args);
+                    }
+                    nodeInfo.instance[prop] = value;
+                    return true;
+                }
+                node[prop] = value;
+                return true;
+            }
+        });
+    }
+}
+
 module.exports = loader;

package/lib/model.js

@@ -16,8 +16,9 @@ class Model extends Context
 
     async save(data, condition = {}) {
         if(data[this.pk] || Object.keys(condition).length) {
-            if(data[this.pk] && !condition[this.pk]) {
+            if(data[this.pk]) {
                 condition[this.pk] = data[this.pk];
+                delete data[this.pk];
             }
             return await this.db.allowField().update(data, condition);
         }

package/lib/response.js

@@ -57,6 +57,7 @@ class Response extends Context
 
     isAjax() {
         return this.ctx.headers['x-requested-with'] && this.ctx.headers['x-requested-with'].toLowerCase() == 'xmlhttprequest'
+            || this.ctx.request.type.toLowerCase() == 'application/json'
             || this.ctx.query.is_ajax
             || this.ctx.request.body && this.ctx.request.body.is_ajax
             ? true : false;

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/upload.js

@@ -32,13 +32,13 @@ class Upload extends Context
             savename = utils.date.format('YYYY/mmdd/') + utils.md5(new Date().getTime() + Math.random().toString(36).substr(2));
         }
         if(!pt.extname(savename)) {
-            savename += pt.extname(this._file.name);
+            savename += pt.extname(this._file.originalFilename);
         }
 
         try {
             const filePath = pt.join(this.$config.app.base_dir, dir, savename);
             await utils.fs.mkdirs(pt.dirname(filePath));
-            const reader = fs.createReadStream(this._file.path);
+            const reader = fs.createReadStream(this._file.filepath);
             const writer = fs.createWriteStream(filePath);
             reader.pipe(writer);
             await new Promise((resolve, reject) => {
@@ -54,9 +54,9 @@ class Upload extends Context
                 extname: pt.extname(savename).slice(1),
                 savename,
                 filepath: filePath,
-                name: this._file.name,
+                name: this._file.originalFilename,
                 size: this._file.size,
-                type: this._file.type,
+                mimetype: this._file.mimetype,
                 hash: this._file.hash
             };
         } catch(e) {
@@ -108,7 +108,7 @@ class Upload extends Context
         if(typeof ext == 'string') {
             ext = ext.split(',');
         }
-        if(!~ext.indexOf(pt.extname(this._file.name).slice(1).toLowerCase())) {
+        if(!~ext.indexOf(pt.extname(this._file.originalFilename).slice(1).toLowerCase())) {
             return false;
         }
         return true;
@@ -118,18 +118,17 @@ class Upload extends Context
         if(typeof type == 'string') {
             type = type.split(',');
         }
-        if(!~type.indexOf(this._file.type.toLowerCase())) {
+        if(!~type.indexOf(this._file.mimetype.toLowerCase())) {
             return false;
         }
         return true;
     }
 
-    // 此判断方法无效
     checkImg() {
-        const fileExt = pt.extname(this._file.name).slice(1).toLowerCase();
-        const fileType = this._file.type.toLowerCase().split('/');
-        const exts = ['gif', 'png', 'jpeg', 'webp', 'ico', 'bmp', 'svg', 'jpg'];
-        const mimes = ['gif', 'png', 'jpeg', 'webp', 'x-icon', 'bmp', 'svg+xml'];
+        const fileExt = pt.extname(this._file.originalFilename).slice(1).toLowerCase();
+        const fileType = this._file.mimetype.toLowerCase().split('/');
+        const exts = ['gif', 'png', 'jpeg', 'webp', 'ico', 'bmp', 'svg', 'jpg', 'tiff'];
+        const mimes = ['gif', 'png', 'jpeg', 'webp', 'x-icon', 'bmp', 'svg+xml', 'tiff'];
         if(~exts.indexOf(fileExt) && (fileType[0] != 'image' || !~mimes.indexOf(fileType[1]))) {
             return false;
         }

package/lib/view.js

@@ -56,8 +56,10 @@ class View extends Context
         let view_file = template;
         if(view_file.indexOf('/') !== 0) {
             const temp = view_file.replace(/^\/|\/$/g, '').split('/').reverse().map(u => toLine(u));
+            const folder = this._folder;
+            const depr = this._depr;
             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}/${folder || cfg_view.view_folder}/${temp[1] || this.ctx.CONTROLLER}${depr || cfg_view.view_depr}${temp[0]}`;
             }
         }
         path.extname(view_file) || (view_file += cfg_view.view_ext);
@@ -86,6 +88,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,34 +1,34 @@
-{
-  "name": "jj.js",
-  "version": "0.7.5",
-  "description": "A simple and lightweight MVC framework built on nodejs+koa2",
-  "main": "jj.js",
-  "scripts": {
-    "test": "node test/test.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/yafoo/jj.js.git"
-  },
-  "keywords": [
-    "mvc",
-    "koa",
-    "node"
-  ],
-  "author": "yafoo",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/yafoo/jj.js/issues"
-  },
-  "homepage": "https://github.com/yafoo/jj.js#readme",
-  "dependencies": {
-    "@koa/router": "^10.1.1",
-    "art-template": "^4.13.2",
-    "escape-html": "^1.0.3",
-    "is-class": "0.0.9",
-    "koa": "^2.13.4",
-    "koa-body": "^5.0.0",
-    "koa-static": "^5.0.0",
-    "mysql": "^2.18.1"
-  }
-}
+{
+  "name": "jj.js",
+  "version": "0.8.1",
+  "description": "A simple and lightweight MVC framework built on nodejs+koa2",
+  "main": "jj.js",
+  "scripts": {
+    "test": "node test/test.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/yafoo/jj.js.git"
+  },
+  "keywords": [
+    "mvc",
+    "koa",
+    "node"
+  ],
+  "author": "yafoo",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/yafoo/jj.js/issues"
+  },
+  "homepage": "https://github.com/yafoo/jj.js#readme",
+  "dependencies": {
+    "@koa/router": "^10.1.1",
+    "art-template": "^4.13.2",
+    "escape-html": "^1.0.3",
+    "is-class": "0.0.9",
+    "koa": "^2.13.4",
+    "koa-body": "^5.0.0",
+    "koa-static": "^5.0.0",
+    "mysql": "^2.18.1"
+  }
+}