jj.js 0.8.4 → 0.8.7

package/README.md

@@ -105,7 +105,6 @@ node server.js
 - **public**：静态资源目录，主要存放css文件、js文件、图片等静态资源。在`./config/app.js`中通过`static_dir`参数可以设置或更改静态目录名字，为空时，则关闭静态访问（系统不会加载静态资源访问的逻辑，最大节省内容，也即所谓的轻量）
 - **server.js**：应用入口文件，名字可以任意改。
 
-> 
 ### 系统类库
 
 ```javascript
@@ -146,13 +145,13 @@ module.exports = Index;
 
 - 在控制器中，前缀为`$`字符的属性为特殊属性，框架首先会检测本类中即`this`实例中是否有`$db`属性，有的话，会直接调用。如果没有，会检测本类文件所在应用目录即`./app/`目录下，是否用`db`目录或文件，如果有，则`$db`即代表那个目录或文件，`this.$db.table`会继续在db目录下寻找table目录或文件。如果`db`目录或文件不存在，框架会在应用根目录`./`下找，是否有`db`目录或文件，如果有，和上面一样。如果还不存在，框架会在jj.js框架`lib`目录下找`db`文件或目录，而框架`lib`中有`db.js`文件，至此，`this.$db`成功访问到框架`db`类。
 
-- 如果将`this.$db`赋值为给一个变量，`const db = this.$db;`，得到的将是一个`db` Class类，可以进行new操作，`const db = this.$db; const db1 = new this.$db(); const db2 = new this.$db();`创建多个实例。
+- 如果将`this.$db`赋值为给一个变量，`const db = this.$db;`，得到的将是一个`db` Class类，可以进行new操作，`const db = this.$db; const db1 = new db(this.ctx, options); const db2 = new this.$db(this.ctx, options);`创建多个实例。
 
 - 但上面演示代码并没有new一个实例，而是直接调用`db`类的`table()`方法，这正是框架的智能之处。当调用`this.$db.table('user')`时，框架首先会检测db类是否有`table`静态属性，有的话会直接调用。没有，则会自动new一个`db`实例，而且这个实例是个单例，然后调用此`db`实例的`table`方法，`table('user')`设置数据表名后返回实例本身，然后紧接着调用`find()`方法，读取用户ID为1的数据。
 
 > 注意：虽然系统加载很复杂， 但是基于node的常驻内存特性，上面的文件路径判断，处理一次就会被缓存下来，在下个生命周期不用重复判断，节省性能。
 
-> 关于单例：通过`this.$xxx`调用的类实例，在单个生命周期内是单例，即不管调用几次，都是用的同一个实例，这样非常节省内存开销。如果有多个db实例需求，可以用上面的方法，自己`new`创建。
+> 关于单例：通过`this.$xxx`调用的类实例，在单个生命周期内是单例，即不管调用几次，都是用的同一个实例，这样非常节省内存开销。如果有多个db实例需求，可以用上面的方法，自己`new`创建，自己创建时注意第一个参数需传入ctx，否则部分类库使用会出现异常。
 
 > 生命周期：应用生命周期以url访问为单位，一次url访问到访问结束，是一个独立的生命周期，在这个周期内自动生成的单实例都是共用的。
 
@@ -300,9 +299,13 @@ module.exports = Index;
 
 ### Db数据库类
 
-> 方法：**async startTrans(async fun)** 开启事务
+> 方法：**connect(options)** 连接数据库
 
-异步方法，如果fun不为空，并且是函数，则开启事务后，会自动执行此函数，并提交事务，不用再手工提交或回滚事务。
+> 方法：**async close()** 关闭数据库连接
+
+> 方法：**async startTrans(fun)** 开启事务
+
+异步方法，如果`fun`不为空，并且是函数，则开启事务后，会自动执行此函数，并提交事务，不用再手工提交或回滚事务。`fun`为异步函数。
 
 > 方法：**async commit()** 提交事务
 
@@ -853,7 +856,7 @@ module.exports = self;
 ```javascript
 routes = [
     {url: '/', path: 'app/index/index2'}, // 访问'/'，会定位到app应用的index控制的index2方法
-    {url: '/article/:id.html', path: 'app/article/article', name: 'article'}, // 访问'/article/123.html'，会定位到app应用的article控制的article方法；通过this.ctx.parrams.id可以获取到参数id；通过article可以反编译网址，执行this.$url.build(':article', {id: 123}); 生成'/article/123.html'
+    {url: '/article/:id.html', path: 'app/article/article', name: 'article'}, // 访问'/article/123.html'，会定位到app应用的article控制的article方法；通过this.ctx.params.id可以获取到参数id；通过article可以反编译网址，执行this.$url.build(':article', {id: 123}); 生成'/article/123.html'
     {url: '/admin', path: 'app/admin/check', type: 'middleware'}, // 访问'/admin'，会定位到app应用的admin中间件的check方法
     {url: '/about', path: 'app/about/index', type: 'view'}, // 访问'/about'，会定位到app应用的view模板目录about目录下的index.htm文件，并直接输出文件内容
     {url: '/:cate/list_:page.html', path: 'cate/cate', name: 'cate_page'}, // 多参数分页示例
@@ -862,7 +865,7 @@ routes = [
 
 module.exports = routes;
 ```
-> 注意：本路由配置示例前两条规则为常规用法，后面的非常规用法，不建议使用。如果是但应用模式，可以去掉path参数里的app。
+> 注意：本路由配置示例前两条规则为常规用法，后面的非常规用法，不建议使用。如果是单应用模式，可以去掉path参数里的app。
 
 ### 应用入口文件
 

package/lib/db.js

@@ -11,7 +11,7 @@ const nest = new Map();
 
 class Db extends Context
 {
-    constructor(ctx) {
+    constructor(ctx, options) {
         ctx = ctx || {};
         super(ctx);
         this._config = null;
@@ -19,7 +19,7 @@ class Db extends Context
         this._options = {};
         this._queryStr = '';
         this._tableField = {};
-        this.connect();
+        this.connect(options);
     }
 
     reset() {
@@ -62,22 +62,21 @@ class Db extends Context
         return this;
     }
 
-    close() {
-        if(pool.has(this._config)) {
-            pool.get(this._config).end(err => {
+    async close() {
+        return new Promise((resolve, reject) => {
+            pool.has(this._config) && pool.get(this._config).end(err => {
                 if(err) {
-                    const message = '连接池销毁失败：' + err['message'];
+                    const message = '连接池销毁失败：' + err.message;
                     this.$logger.sql(message);
                     this.$logger.error(message);
-                    throw new Error(message);
+                    reject(new Error('DbError: ' + message));
                 } else {
                     pool.delete(this._config);
                     this.$logger.sql(`连接池销毁成功：{poolTotal: ${pool.size}}`);
+                    resolve(this);
                 }
             });
-            
-        }
-        return this;
+        });
     }
 
     release(conn) {
@@ -95,10 +94,10 @@ class Db extends Context
         return new Promise((resolve, reject) => {
             p.getConnection((err, connection) => {
                 if(err) {
-                    const message = '获取数据库连接失败：' + err['message'];
+                    const message = '获取数据库连接失败：' + err.message;
                     this.$logger.sql(message);
                     this.$logger.error(message);
-                    reject(new Error(message));
+                    reject(new Error('DbError: ' + message));
                 } else {
                     this.$logger.sql(`获取数据库连接：{limit: ${p.config.connectionLimit}, all: ${p._allConnections.length}, acquiring: ${p._acquiringConnections.length}, free: ${p._freeConnections.length}, queue: ${p._connectionQueue.length}}`);
                     resolve(connection);
@@ -134,10 +133,10 @@ class Db extends Context
         return new Promise((resolve, reject) => {
             conn.beginTransaction(async (err) => {
                 if(err) {
-                    const message = '开启事务失败：' + err['message'];
+                    const message = '开启事务失败：' + err.message;
                     this.$logger.sql(message);
                     this.$logger.error(message);
-                    reject(new Error(message));
+                    reject(new Error('DbError: ' + message));
                 } else {
                     const message = '开启事务成功！';
                     this.$logger.sql(message);
@@ -195,11 +194,11 @@ class Db extends Context
         return new Promise((resolve, reject) => {
             conn.commit((err) => {
                 if(err) {
-                    const message = '事务提交失败：' + err['message'];
+                    const message = '事务提交失败：' + err.message;
                     this.$logger.sql(message);
                     this.$logger.error(message);
                     this.rollback();
-                    reject(new Error(message));
+                    reject(new Error('DbError: ' + message));
                 } else {
                     trans.delete(this.ctx);
                     const message = '事务提交成功！';
@@ -220,10 +219,10 @@ class Db extends Context
         return new Promise((resolve, reject) => {
             conn.query(sql, params, (err, data) => {
                 if(err) {
-                    const message = '数据操作失败，SQL：' + this.format(sql, params) + '（' + err['message'] + '）';
+                    const message = '数据操作失败，' + err.message + "\r\nSQL：" + this.format(sql, params);
                     this.$logger.sql(message);
                     this.$logger.error(message);
-                    reject(new Error(message));
+                    reject(new Error('DbError: ' + message));
                 } else {
                     this.$logger.sql('数据操作成功，SQL：' + this.format(sql, params));
                     resolve(data);
@@ -506,7 +505,7 @@ class Db extends Context
         if(!where[0]) {
             const message = 'update方法必须传入where参数';
             this.$logger.sql(message);
-            throw new Error(message);
+            throw new Error('DbError: ' + message);
         }
         params = params.concat(where[1]);
 
@@ -539,7 +538,7 @@ class Db extends Context
         if(!where[0]) {
             const message = 'delete方法必须传入where参数';
             this.$logger.sql(message);
-            throw new Error(message);
+            throw new Error('DbError: ' + message);
         }
         params = params.concat(where[1]);
 

package/lib/loader.js

@@ -1,4 +1,3 @@
-const fs = require('fs');
 const pt = require('path');
 const isClass = require('is-class');
 const {isFileSync, isDirSync} = require('./utils/fs');

package/lib/router.js

@@ -9,7 +9,7 @@ if (cfg_routes) {
     for(let item of cfg_routes){
         item.method || (item.method = 'all');
         if(!~methods.indexOf(item.method)) {
-            throw new Error(`未知路由方法：${item.method}`);
+            throw new Error(`RouteError: 未知路由方法：${item.method}`);
         }
         if(typeof item.path === 'function'){
             router[item.method](item.url, item.path);

package/lib/run.js

@@ -7,9 +7,13 @@ 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);
+    if(cfg_app.app_debug) {
+        Logger.debug(ctx.request);
+        Logger.debug(`Router(${control_type}): {APP: '${ctx.APP}', CONTROLLER: '${ctx.CONTROLLER}', ACTION: '${ctx.ACTION}'}`);
+        Object.keys(ctx.params).length && Logger.debug({Params: ctx.params});
+        Object.keys(ctx.query).length && Logger.debug({Get: ctx.query});
+        Object.keys(ctx.request.body || {}).length && Logger.debug({Post: ctx.request.body});
+    }
     
     // 设置根加载器
     ctx.$ = loader('./', ctx);
@@ -25,21 +29,21 @@ async function run(ctx, next, control_type=cfg_app.controller_folder) {
     ctx._.config.tpl = tpl;
 
     // 应用、控制器、方法名字验证
-    if (~ctx.APP.indexOf('.') || ~ctx.CONTROLLER.indexOf('.') || ~ctx.ACTION.indexOf('.')) {
-        throw new Error(`应用、控制器或方法名字不合法！`);
+    if(~ctx.APP.indexOf('.') || ~ctx.CONTROLLER.indexOf('.') || ~ctx.ACTION.indexOf('.')) {
+        throw new Error(`RunError: 应用、控制器或方法名字不合法！`);
     }
 
-    if (ctx.APP[0] == '_' || ctx.APP[0] == '$' || !ctx._[ctx.APP]) {
+    if(ctx.APP[0] == '_' || ctx.APP[0] == '$' || !ctx._[ctx.APP]) {
         if(cfg_app.app_debug) {
-            throw new Error(`应用:${ctx.APP}不存在！`);
+            throw new Error(`RunError: 应用:${ctx.APP}不存在！`);
         } else {
             return false;
         }
     }
 
-    if (!ctx._[ctx.APP][control_type]) {
+    if(!ctx._[ctx.APP][control_type]) {
         if(cfg_app.app_debug) {
-            throw new Error(`目录:${ctx.APP}/${control_type}不存在！`);
+            throw new Error(`RunError: 目录:${ctx.APP}/${control_type}不存在！`);
         } else {
             return false;
         }
@@ -49,7 +53,7 @@ async function run(ctx, next, control_type=cfg_app.controller_folder) {
     if(control_type == cfg_view.view_folder) {
         const content = await readFile(path.join(ctx._[ctx.APP][control_type].__node.path, ctx.CONTROLLER + cfg_view.view_depr + ctx.ACTION + cfg_view.view_ext));
         if(!content) {
-            throw new Error(`模板文件:${ctx.APP}/${control_type}/${ctx.CONTROLLER + cfg_view.view_depr + ctx.ACTION + cfg_view.view_ext}不存在！`);
+            throw new Error(`RunError: 模板文件:${ctx.APP}/${control_type}/${ctx.CONTROLLER + cfg_view.view_depr + ctx.ACTION + cfg_view.view_ext}不存在！`);
         }
         ctx.body = content;
         return;
@@ -58,22 +62,22 @@ async function run(ctx, next, control_type=cfg_app.controller_folder) {
     // 控制器
     const Controller = ctx._[ctx.APP][control_type][ctx.CONTROLLER] || ctx._[ctx.APP][control_type]['empty'];
 
-    if (ctx.CONTROLLER[0] == '_' || ctx.CONTROLLER[0] == '$' || typeof Controller != 'function') {
+    if(ctx.CONTROLLER[0] == '_' || ctx.CONTROLLER[0] == '$' || typeof Controller != 'function') {
         if(cfg_app.app_debug) {
-            throw new Error(`class文件:${ctx.APP}/${control_type}/${ctx.CONTROLLER}不存在！`);
+            throw new Error(`RunError: class文件:${ctx.APP}/${control_type}/${ctx.CONTROLLER}不存在！`);
         } else {
             return false;
         }
     }
 
     // 控制器实例
-    $controller = new Controller(ctx, next);
+    const $controller = new Controller(ctx, next);
     const humpAction = toHump(ctx.ACTION);
     const action = typeof $controller[humpAction] == 'function' ? humpAction : 'empty';
 
-    if (ctx.ACTION[0] == '_' || ctx.ACTION[0] == '$' || typeof $controller[action] != 'function') {
+    if(ctx.ACTION[0] == '_' || ctx.ACTION[0] == '$' || typeof $controller[action] != 'function') {
         if(cfg_app.app_debug) {
-            throw new Error(`class方法:${ctx.APP}/${control_type}/${ctx.CONTROLLER}/${humpAction}不存在！`);
+            throw new Error(`RunError: class方法:${ctx.APP}/${control_type}/${ctx.CONTROLLER}/${humpAction}不存在！`);
         } else {
             return false;
         }
@@ -93,18 +97,18 @@ async function run(ctx, next, control_type=cfg_app.controller_folder) {
                 return stack.concat(async (ctx, next) => {
                     const [METHOD = action, MIDDLEWARE = ctx.CONTROLLER, APP = ctx.APP] = middle.middleware.split('/').reverse();
                     if(!ctx._[APP]) {
-                        throw new Error(`中间件应用:${APP}不存在！`);
+                        throw new Error(`RunError: 中间件应用:${APP}不存在！`);
                     }
                     if(!ctx._[APP]['middleware']) {
-                        throw new Error(`中间件目录:${APP}/middleware不存在！`);
+                        throw new Error(`RunError: 中间件目录:${APP}/middleware不存在！`);
                     }
                     const Middleware = ctx._[APP]['middleware'][MIDDLEWARE];
                     if(!Middleware || typeof Middleware != 'function') {
-                        throw new Error(`中间件文件:${APP}/middleware/${MIDDLEWARE}不存在！`);
+                        throw new Error(`RunError: 中间件文件:${APP}/middleware/${MIDDLEWARE}不存在！`);
                     }
                     const $middleware = new Middleware(ctx, next);
                     if(!$middleware[METHOD] || typeof $middleware[METHOD] != 'function') {
-                        throw new Error(`中间件方法:${APP}/middleware/${MIDDLEWARE}/${METHOD}不存在！`);
+                        throw new Error(`RunError: 中间件方法:${APP}/middleware/${MIDDLEWARE}/${METHOD}不存在！`);
                     }
 
                     // 执行中间件方法

package/lib/url.js

@@ -12,7 +12,7 @@ const {toLine} = require('./utils/str');
 class Url extends Context
 {
     build(url='', vars, ext='', domain='') {
-        if(typeof vars != 'object') {
+        if(vars && typeof vars != 'object') {
             [vars, ext, domain] = [{}, vars, ext];
         }
         const query = {...vars};
@@ -56,6 +56,7 @@ class Url extends Context
 
         if(~url.indexOf(':')) {
             url = url.replace(/\:([^./]+)/g, (match, key) => {
+                key = key.split('(')[0];
                 if(key in query) {
                     const value = query[key];
                     delete query[key];

package/lib/utils/error.js

@@ -1,29 +1,33 @@
+const fs = require('./fs.js');
+
 function parseError(err) {
-    let stack = err.stack;
-    stack = stack.replace(/(\r\n)|(\n)/g, '#split#');
-    stack = stack.split('#split#');
-    let msg = err.name;
+    let msg = err.message;
+    let stack = err.stack.replace(/(\r\n)/g, "\n").split("\n");
+
     if(err.name == 'TemplateError') {
-        msg = stack.pop();
+        msg = 'TemplateError: ' + stack.pop();
+        stack = [stack.shift().replace('TemplateError:', "at")];
     } else {
-        msg = stack.shift();
+        stack = stack.filter(text => {return /^    at /.test(text);});
     }
-    let file_info = stack[0].split(' ').slice(-1)[0].replace(/(\()|(\))/g, '').split(':');
+
+    const file_info = stack[0].split(' ').slice(-1)[0].replace(/(\()|(\))/g, '').split(':');
     const column = parseInt(file_info.pop());
     const row = parseInt(file_info.pop());
     const file_path = file_info.join(':');
     let begin = row - 10;
     let end = row + 10;
+    let nth = 0;
     let code = '';
     if(begin < 0) {
         end -= begin;
         begin = 0;
     }
-    if(file_path == 'anonymous') {
+    if(file_path == 'anonymous' || !file_path || !fs.isFileSync(file_path)) {
         code = stack;
     } else {
         code = require('fs').readFileSync(file_path);
-        code = code.toString().split("\n");
+        code = code.toString().replace(/(\r\n)/g, "\n").split("\n");
         if(begin < 0) {
             end -= begin;
             begin = 0;
@@ -36,9 +40,6 @@ function parseError(err) {
             begin = 0;
         }
         code = code.slice(begin, end);
-        if(err.name == 'TemplateError') {
-            stack = [stack[0]];
-        }
         nth = row - begin;
     }
     

package/lib/view.js

@@ -71,7 +71,7 @@ class View extends Context
         }
         if(!is_file) {
             file_name = this.parsePath(template, this._folder, this._depr);
-            throw new Error(`文件不存在(${file_name})`);
+            throw new Error(`ViewError: 文件不存在(${file_name})`);
         }
         return file_name;
     }

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "jj.js",
-  "version": "0.8.4",
+  "version": "0.8.7",
   "description": "A simple and lightweight MVC framework built on nodejs+koa2",
   "main": "jj.js",
   "scripts": {
-    "test": "node test/test.js"
   },
   "repository": {
     "type": "git",

package/test/app/controller/index.js

@@ -1,250 +0,0 @@
-//const {Controller} = require('jj.js');
-const {Controller, Db, Cache, Pagination, Logger, Url, Cookie} = require('../../../jj.js');
-
-class Index extends Controller
-{
-    constructor(...args) {
-        super(...args);
-        this.middleware = ['middle', {middleware: 'auth', accept: 'middleTest'}];
-    }
-
-    async index() {
-        const link_list = [
-            {title: '输出字符串内容', url: this.$url.build('show_str')},
-            {title: '加载文件显示', url: this.$url.build('load_file')},
-            {title: '中间件测试', url: this.$url.build('middle_test')},
-            {title: '数据库测试，需要先配置数据库文件', url: this.$url.build('mysql')},
-            {title: '缓存测试', url: this.$url.build('cache')},
-            {title: '日志测试', url: this.$url.build('log')},
-            {title: '路由直接输出', url: this.$url.build(':show')},
-            {title: '路由到模板文件直接输出', url: this.$url.build('template')},
-            {title: '路由到中间件（不建议这种用法）', url: this.$url.build('middleware')},
-            {title: '路由到自定义控制器层', url: this.$url.build(':diy')},
-            {title: '不继承系统控制器', url: this.$url.build('not_extend_sys_controller/index')},
-            {title: '分页测试', url: this.$url.build('/pagination')},
-            {title: 'url生成测试', url: this.$url.build('url')},
-            {title: 'Cookie测试', url: this.$url.build('cookie')},
-            {title: 'Context测试', url: this.$url.build('context')},
-            {title: 'Exception测试', url: this.$url.build('exception')},
-            {title: '成功提示', url: this.$url.build('success')},
-            {title: '错误提示', url: this.$url.build('error')},
-            {title: '302跳转', url: this.$url.build('redirect')},
-            {title: 'show object', url: this.$url.build('show')},
-        ];
-
-        this.$assign('title', 'jj.js - 一个简单轻量级Node.js MVC框架');
-        this.$assign('link_list', link_list);
-        await this.$fetch();
-    }
-
-    async showStr() {
-        this.$show(`<!doctype html>
-            <html>
-            <head>
-                <meta charset="utf-8">
-                <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-                <title>jj.js</title>
-                <link rel="stylesheet" href="/static/lit.css">
-                <style>.c{max-width:48em;}</style>
-            </head>
-            <body style="margin:0;">
-                <div class="c">
-                    <h1>jj.js</h1>
-                    <hr>
-                    <div>控制器输出字符串。</div>
-                    <hr>
-                    <div>
-                        <a class="btn" href="javascript:history.go(-1);" style="display: inline-block;">返回</a>
-                    </div>
-                </div>
-            </body>
-            </html>`);
-    }
-
-    async loadFile() {
-        let readme = await this.$view.load('/../README.md');
-        readme = readme.replace('</p>', '</p><hr>');
-        this.$assign('content', readme);
-        await this.$fetch('view');
-    }
-
-    async middleTest() {
-        this.$assign('content', '请查看控制台输出！');
-        await this.$fetch('view');
-    }
-
-    async cache() {
-        const cache = this.$cache;
-        Logger.info(Cache === cache, Cache.get === cache.get, Cache.get() === cache.get());
-        Logger.info('---------------------------');
-        Logger.info(JSON.stringify(Cache.get()), JSON.stringify(cache.get()));
-        const key1_value = Cache.get('key1');
-        Cache.set('key1', key1_value ? key1_value+1 : 1, 10000);
-        cache.set('key2', key1_value ? key1_value+100 : 100, 10000);
-        Logger.info('---------------------------');
-        Logger.info(JSON.stringify(Cache.get()), JSON.stringify(cache.get()));
-
-        this.$assign('content', '请查看控制台输出！');
-        await this.$fetch('view');
-    }
-
-    async log() {
-        this.$logger.info('logger.info');
-        Logger.error('logger.error');
-        Logger.warning('logger.warning');
-        Logger.debug('logger.debug');
-        Logger.sql('logger.sql');
-        Logger.http('logger.http');
-        Logger.log('logger.log');
-        Logger.log('logger.diy', 'diy');
-        Logger.info(1, 2, 3);
-
-        // 自定义handle
-        Logger.setHandle(function(msg, level) {
-            console.log(`[${level}] [${msg}]`)
-        });
-        Logger.info('自定义handle');
-
-        //重置系统handle
-        Logger.setHandle();
-        Logger.info('重置系统handle');
-
-        this.$assign('content', '请查看控制台输出！');
-        await this.$fetch('view');
-    }
-
-    async pagination() {
-        let html = new Pagination(this.ctx).init({key_origin: 'params', url_index: '/pagination', url_page: '/pagination/list_${page}.html'}).total(200).render();
-
-        const css = `<style>
-            .page{display:flex;}
-            .page li{list-style:none;margin:5px;}
-            .page li a{display:block;padding:5px 10px;border:1px solid blue;text-decoration:none;color:inherit;}
-            .page li.active a,.page li:hover a{background-color:blue;color:#fff;}
-        </style>`;
-        html += css;
-
-        const page2 = this.$pagination.my_pagination.render(200);
-        html += page2;
-
-        this.$assign('content', html);
-        await this.$fetch('view');
-    }
-
-    async url() {
-        const url =  new Url(this.ctx);
-        const arr = [];
-        arr.push(url.build());
-        arr.push(url.build('cate', '/'));
-        arr.push(url.build('index/cate', '.html'));
-        arr.push(url.build('index/index/cate', '.html'));
-        arr.push(url.build('app/index/index/cate', '.html'));
-        arr.push(url.build('/app/index/index/cate', '.html'));
-        arr.push(url.build('test', {var: 'test', var2: 'test2'}, '.html'));
-        arr.push(url.build('test?var3=vvv', {var: 'test', var2: 'test2'}, '.html'));
-        arr.push(url.build('test?var=vvv', {var: 'test', var2: 'test2'}, '.html'));
-        arr.push(url.build('index/cate#'));
-        arr.push(url.build('index/cate#', {var: 'test', var2: 'test2'}, '.html'));
-        arr.push(url.build('test?var=vvv#bbb', {var: 'test', var2: 'test2'}, '.html'));
-        arr.push(url.build(':test', {var1: 'test', var2: 'test2', var3: 'test3'}, '.html'));
-        arr.push(url.build(':diy'));
-        arr.push(url.build(':show'));
-        arr.push(url.build('showStr'));
-        arr.push(url.build('index/loadFile'));
-
-        this.$assign('content', arr.join('<br>'));
-        await this.$fetch('view');
-    }
-
-    async cookie() {
-        const cookie = new Cookie(this.ctx);
-        let value = cookie.get('cookie_test');
-        if(!value) {
-            value = 1;
-        } else {
-            value = parseInt(value) + 1;
-        }
-        cookie.set('cookie_test', value);
-        cookie.set('cookie_test2', 'value2', {maxAge: 1000 * 3600});
-        cookie.set('cookie_test3', 'value3', {expires: new Date('2020-07-06')});
-
-        this.$assign('content', `cookie_value: ${value}`);
-        await this.$fetch('view');
-    }
-
-    async context() {
-        this.$logger.info(JSON.stringify(this.$controller.__node)); // 自动定位到当前应用controller目录
-        this.$logger.info(JSON.stringify(this.$diy.__node)); // 自动定位到当前应用diy目录
-        this.$logger.info(JSON.stringify(this.$logic.__node)); // 自动定位到公共应用logic目录
-        this.$logger.info(JSON.stringify(this.$app.__node)); // 自动定位到当前应用根目录
-        this.$logger.info(JSON.stringify(this.$url.__node)); // 自动定位到系统类库url文件
-        this.$logger.info(JSON.stringify(this.$utils.__node)); // 自动定位到系统类库utils目录
-        this.$logger.info(JSON.stringify(this.$.__node)); // 强制定位到系统类库目录
-        this.$logger.info(JSON.stringify(this._.__node)); // 强制定位到项目根目录
-        this.$assign('content', '请查看控制台输出！');
-        await this.$fetch('view');
-    }
-
-    async exception() {
-        // throw new Error('异常测试');
-        this.$response.exception(new Error('异常测试'));
-    }
-
-    async success() {
-        this.$success();
-    }
-
-    async error() {
-        this.$error();
-    }
-
-    async redirect() {
-        this.$redirect('/');
-    }
-
-    async show() {
-        this.$show({data: 'object'});
-    }
-
-    async mysql() {
-        const db = new Db(this.ctx);
-
-        await db.startTrans();
-        await db.startTrans();
-        await db.startTrans();
-        await db.commit();
-        await db.commit();
-        await db.commit();
-
-        await this.$db.startTrans();
-        await this.$db.startTrans();
-        await this.$db.startTrans();
-        await this.$db.commit();
-        await this.$db.commit();
-        await this.$db.commit();
-
-        this.$assign('content', '请查看控制台输出！');
-        await this.$fetch('view');
-
-        // const list = await db.table('article a').field('a.title, a.id, a.click, c.c_name').join('cate c', 'c.id=a.cate_id').where({'a.click': ['in', '102,201'], source: ['=', 'me', 'or']}).where({add_time: 2, update_time: 0}, 'or').where({add_time: ['>=', 0], update_time: 0}).group('add_time').having('add_time>1').order('a.id', 'desc').limit(0, 10).select();
-
-        // const Arc = require('../model/article');
-        // const model_article = new Arc(this.ctx);
-        // const [list2, list3, list4] = await Promise.all([
-        //     model_article.db.find(),
-        //     this.$model.article.db.find(),
-        //     this.$model.article.db.page(2, 3).select()
-        // ]);
-        //const list2 = model_article.db.find();
-        //const list3 = this.ctx.$app.model.article.db.find();
-        //const list4 = this.ctx.$app.model.article.db.page(2, 3).select();
-        //const data = {"cate_id":2,"user_id":0,"title":"测试文章","writer":"雨思","source":"me","source_link":"","click":200,"keywords":"测试,文章","description":"这是一篇测试文章","content":"测试文章测试'文章测试文章内容"};
-        //const data2 = {"cate_id":2,"user_id":0,"title":"rtrtrt","writer":"雨思","source":"me","source_link":"","click":200,"keywords":"测试,文章","description":"这是一篇测试文章","content":"test'cccccc"};
-        //Logger.info(await model_article.db.table('article').getSql().insert(data));
-        
-
-        //this.ctx.body = {list, list2, list3, list4};
-    }
-}
-
-module.exports = Index;

package/test/app/controller/not_extend_sys_controller.js

@@ -1,32 +0,0 @@
-class NotExtendSysController
-{
-    constructor(ctx) {
-        this.ctx = ctx;
-    }
-
-    async index() {
-        this.ctx.body = `<!doctype html>
-        <html>
-        <head>
-            <meta charset="utf-8">
-            <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-            <title>jj.js</title>
-            <link rel="stylesheet" href="/static/lit.css">
-            <style>.c{max-width:48em;}</style>
-        </head>
-        <body style="margin:0;">
-            <div class="c">
-                <h1>jj.js</h1>
-                <hr>
-                <div>不继承系统控制器。</div>
-                <hr>
-                <div>
-                    <a class="btn" href="javascript:history.go(-1);" style="display: inline-block;">返回</a>
-                </div>
-            </div>
-        </body>
-        </html>`;
-    }
-}
-
-module.exports = NotExtendSysController;

package/test/app/diy/diy_controller.js

@@ -1,16 +0,0 @@
-const {Controller, Logger} = require('../../../jj.js');
-
-class DiyController extends Controller
-{
-    async _init() {
-        Logger.info('_init');
-    }
-
-    async index() {
-        this.$assign('url_str', ':diy');
-        this.$assign('content', '自定义控制器层！');
-        await this.$fetch('index/view');
-    }
-}
-
-module.exports = DiyController;

package/test/app/middleware/index.js

@@ -1,19 +0,0 @@
-//const {Middleware} = require('jj.js');
-const {Middleware, Logger} = require('../../../jj.js');
-
-class Index extends Middleware
-{
-    async middle() {
-        Logger.info('中间件：输出之前');
-        await this.$next();
-        Logger.info('中间件：输出之后');
-    }
-
-    async auth() {
-        Logger.info('auth：在这里验证登录');
-        await this.$next();
-        Logger.info('auth：业务完成时调用');
-    }
-}
-
-module.exports = Index;

package/test/app/middleware/middle1.js

@@ -1,42 +0,0 @@
-const {Logger} = require('../../../jj.js');
-
-module.exports = class {
-    constructor(ctx, next) {
-        this.ctx = ctx;
-        this.$next = next;
-    }
-
-    async test() {
-        Logger.info('middle1 test start');
-        this.ctx.body = `<!doctype html>
-        <html>
-        <head>
-            <meta charset="utf-8">
-            <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-            <title>jj.js</title>
-            <link rel="stylesheet" href="/static/lit.css">
-            <style>.c{max-width:48em;}</style>
-        </head>
-        <body style="margin:0;">
-            <div class="c">
-                <h1>jj.js</h1>
-                <hr>
-                <div>路由到中间件，中间件输出内容，实际应用中不建议这种操作。</div>
-                <hr>
-                <div>
-                    <a class="btn" href="javascript:history.go(-1);" style="display: inline-block;">返回</a>
-                </div>
-            </div>
-        </body>
-        </html>`;
-
-        // 执行$next，将继续向下匹配路由
-        //await this.$next();
-    }
-
-    async end() {
-        Logger.info('middle1 end');
-        await this.$next();
-        Logger.info('middle1 end await');
-    }
-}

package/test/app/middleware/middle2.js

@@ -1,18 +0,0 @@
-const {Logger} = require('../../../jj.js');
-
-module.exports = class {
-    constructor(ctx, next) {
-        this.ctx = ctx;
-        this.$next = next;
-    }
-
-    async start() {
-        Logger.info('middle2 start');
-        await this.$next();
-        Logger.info('middle2 start await');
-    }
-
-    async end() {
-        Logger.info('middle2 end');
-    }
-}

package/test/app/model/article.js

@@ -1,9 +0,0 @@
-//const {Model} = require('jj.js');
-const {Model} = require('../../../jj.js');
-
-class Article extends Model
-{
-    
-}
-
-module.exports = Article;

package/test/app/pagination/my_pagination.js

@@ -1,11 +0,0 @@
-//const {Pagination} = require('jj.js');
-const {Pagination} = require('../../../jj.js');
-
-class MyPagination extends Pagination
-{
-    init(opts) {
-        super.init(opts);
-    }
-}
-
-module.exports = MyPagination;

package/test/app/view/index_hello.htm

@@ -1,21 +0,0 @@
-{{extend './layout.htm'}}
-{{block 'title'}}
-    <title>{{title}}</title>
-{{/block}}
-{{block 'content'}}
-<div class="c">
-    {{@content}}
-    <ul>
-        <li>{{url()}}</li>
-        <li>{{url('cate', '/')}}</li>
-        <li>{{url('cate/cate', '.html')}}</li>
-        <li>{{url('cate/index/cate', '.html')}}</li>
-        <li>{{url('test', {var: 'test', var2: 'test2'}, '.html')}}</li>
-        <li>{{url('test?var3=vvv', {var: 'test', var2: 'test2'}, '.html', 'http://www.baidu.com')}}</li>
-        <li>{{url('test?var=vvv', {var: 'test', var2: 'test2'}, '.html')}}</li>
-        <li>{{url('index/cate#')}}</li>
-        <li>{{url('test?var=vvv#bbb', {var: 'test', var2: 'test2'}, '.html')}}</li>
-        <li>{{url(':name', {var: 'test', var2: 'test2', var3: 'test3'}, '.html')}}</li>
-    </ul>
-</div>
-{{/block}}

package/test/app/view/index_index.htm

@@ -1,18 +0,0 @@
-{{extend './layout.htm'}}
-{{block 'title'}}
-    <title>{{title}}</title>
-{{/block}}
-{{block 'content'}}
-<div class="c">
-    <h1>jj.js</h1>
-    <hr>
-    <div>本页地址：{{url()}}</div>
-    <hr>
-    <div>功能测试，部分功能需在控制台查看输出。</div>
-    <ul>
-        {{each link_list}}
-        <li><a href="{{$value.url}}">{{$value.title}}</a></li>
-        {{/each}}
-    </ul>
-</div>
-{{/block}}

package/test/app/view/index_template.htm

@@ -1,21 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>jj.js</title>
-    <link rel="stylesheet" href="/static/lit.css">
-    <style>.c{max-width:48em;}</style>
-</head>
-<body style="margin:0;">
-    <div class="c">
-        <h1>jj.js</h1>
-        <hr>
-        <div>路由直接输出模版文件内容。</div>
-        <hr>
-        <div>
-            <a class="btn" href="javascript:history.go(-1);" style="display: inline-block;">返回</a>
-        </div>
-    </div>
-</body>
-</html>

package/test/app/view/index_view.htm

@@ -1,17 +0,0 @@
-{{extend './layout.htm'}}
-{{block 'title'}}
-    <title>{{title}}</title>
-{{/block}}
-{{block 'content'}}
-<div class="c">
-    <h1>jj.js</h1>
-    <hr>
-    <div>本页地址：{{url(url_str)}}</div>
-    <hr>
-    {{@content}}
-    <hr>
-    <div>
-        <a class="btn" href="javascript:history.go(-1);" style="display: inline-block;">返回</a>
-    </div>
-</div>
-{{/block}}

package/test/app/view/layout.htm

@@ -1,14 +0,0 @@
-<!doctype html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    {{block 'title'}}<title>jj.js</title>{{/block}}
-    {{block 'css'}}<link rel="stylesheet" href="/static/lit.css">
-    <style>.c{max-width:48em;}</style>{{/block}}
-</head>
-<body style="margin:0;">
-    {{block 'content'}}{{/block}}
-    {{block 'js'}}{{/block}}
-</body>
-</html>

package/test/config/app.js

@@ -1,17 +0,0 @@
-const app = {
-    app_debug: true, //调试模式
-    app_multi: false, //是否开启多应用
-
-    default_app: 'app', //默认应用
-    default_controller: 'index', //默认控制器
-    default_action: 'index', //默认方法
-
-    common_app: 'common', //公共应用，存放公共模型及逻辑
-    controller_folder: 'controller', //控制器目录名
-
-    static_dir: './public', //静态文件目录，相对于应用根目录，为空或false时，关闭静态访问
-
-    koa_body: null //koa-body配置参数，为''、null、false时，关闭koa-body
-}
-
-module.exports = app;

package/test/config/routes.js

@@ -1,33 +0,0 @@
-routes = [
-    {url: '/hello/', path: 'index/hello', method: 'get', type: 'middleware'},
-    {url: '/show', path: async (ctx, next) => {ctx.body = `<!doctype html>
-    <html>
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-        <title>jj.js</title>
-        <link rel="stylesheet" href="/static/lit.css">
-        <style>.c{max-width:48em;}</style>
-    </head>
-    <body style="margin:0;">
-        <div class="c">
-            <h1>jj.js</h1>
-            <hr>
-            <div>路由直接输出内容。</div>
-            <hr>
-            <div>
-                <a class="btn" href="javascript:history.go(-1);" style="display: inline-block;">返回</a>
-            </div>
-        </div>
-    </body>
-    </html>`;}, method: 'get', name: 'show'},
-    {url: '/index/template', path: '/index/template', type: 'view'},
-    {url: '/index/middleware', path: 'middle1/test', type: 'middleware'},
-    {url: '/diy', path: 'diy_controller/index', type: 'diy', name: 'diy'},
-    {url: '/pagination', path: 'index/pagination', method: 'get'},
-    {url: '/pagination/list_:page.html(.*)', path: 'index/pagination', method: 'get'},
-    {url: '/file', path: 'index/index', method: 'get', type: 'view'},
-    {url: '/test/:var1/:var2/:var3', path: 'index/index', method: 'get', name: 'test'},
-];
-
-module.exports = routes;

package/test/config/view.js

@@ -1,5 +0,0 @@
-const view = {
-    view_depr: '_', // 模版文件名分割符，'/'代表二级目录
-}
-
-module.exports = view;

package/test/public/static/lit.css

@@ -1 +0,0 @@
-*+*{box-sizing:border-box;margin:.5em 0}@media(min-width:35em){.col{display:table-cell}.\31{width:5%}.\33{width:22%}.\34{width:30%}.\35{width:40%}.\32{width:15%}.row{display:table;border-spacing:1em 0}}.row,.w-100{width:100%}.card:focus,hr{outline:0;border:solid #fa0}.card,pre{padding:1em;border:solid #eee}.btn:hover,a:hover{opacity:.6}.c{max-width:60em;padding:1em;margin:auto;font:1em/1.6 nunito}h6{font:300 1em nunito}h5{font:300 1.2em nunito}h3{font:300 2em nunito}h4{font:300 1.5em nunito}h2{font:300 2.2em nunito}h1{font:300 2.5em nunito}a{color:#fa0;text-decoration:none}.btn.primary{color:#fff;background:#fa0;border:solid #fa0}pre{overflow:auto}td,th{padding:1em;text-align:left;border-bottom:solid #eee}.btn{cursor:pointer;padding:1em;letter-spacing:.1em;text-transform:uppercase;background:#fff;border:solid;font:.7em nunito}

package/test/test.js

@@ -1,7 +0,0 @@
-//const {app} = require('jj.js');
-const {app, Logger} = require('../jj.js');
-
-//server
-app.run(3000, '0.0.0.0', function(err){
-    !err && Logger.info('http server is ready on 3000');
-});