jj.js 0.20.0 → 1.0.0-rc.2

package/lib/db.js

@@ -10,6 +10,7 @@ const Context = require('./context');
  * @typedef {import('../types').OkPacket} OkPacket
  * @typedef {import('../types').RowData} RowData
  * @typedef {import('../types').ListData} ListData
+ * @typedef {import('../types').PaginateResult} PaginateResult
  * @typedef {import('../types').FieldInfo} FieldInfo
  * @typedef {import('../types').Link} Link
  * @typedef {import('../types').Operator} Operator
@@ -50,10 +51,6 @@ class Db extends Context
          * @type {string}
          */
         this._queryStr = '';
-        /**
-         * @type {Map<string, string[]>}
-         */
-        this._tableField = new Map();
         /**
          * @type {SqlInstance} sql实例
          */
@@ -64,6 +61,8 @@ class Db extends Context
          */
         this.sql = '';
 
+        /** @type {Promise<*>|null} */
+        this._connectPromise = null;
         this.connect(options);
     }
 
@@ -99,17 +98,21 @@ class Db extends Context
      * @returns {this}
      */
     connect(config='default') {
-        this._config = typeof config === 'string' ? cfg_db[config] : config;
+        this._config = typeof config === 'string' ? (cfg_db[config] || config) : config;
+        if(!this._config || typeof this._config !== 'object') {
+            throw new Error(`DbError: 数据库配置 "${config}" 不存在`);
+        }
         this.reset();
 
         if(this._config.connect) {
             this._sql = this._config.connect(this._config);
+            this._connectPromise = Promise.resolve(this);
         } else {
             const sqltype = this._config.type;
             /** @class {Sql} */
             const Sql = require(`./db/${sqltype}.js`);
             this._sql = new Sql(this.ctx, this._$logger);
-            this._sql.connect(this._config);
+            this._connectPromise = this._sql.connect(this._config).then(() => this);
         }
         
         return this;
@@ -165,6 +168,7 @@ class Db extends Context
         params !== false && reset !== false && this.reset();
         params || (params = []);
         
+        await this._connectPromise;
         return await this._sql.query(sql, params);
     }
 
@@ -538,7 +542,7 @@ class Db extends Context
      * @param {number} [param0.page] - 页码，可通过page方法配置，默认从默认分页类获取
      * @param {number} [param0.page_size] - 每页行数，可通过page方法配置，默认从config配置获取
      * @param {PaginationInstance} [param0.pagination] - 分页类实例，为空时使用默认分页类
-     * @returns {Promise<[ListData, PaginationInstance]>} - [ListData, PaginationInstance]
+     * @returns {Promise<PaginateResult>} - [ListData, PaginationInstance]
      */
     async paginate({page, page_size, pagination} = {}) {
         !page && (page = this._options.page.page);
@@ -698,9 +702,10 @@ class Db extends Context
             const cache_time = this._options.cache_time;
             const cache_key = md5(this._sql.format(this._queryStr, params));
             if(this._$cache.get(cache_key)) {
+                this.reset();
                 return this._$cache.get(cache_key);
             }
-            const result = await this.query(this._queryStr, params);
+            const result = await this.query(this._queryStr, params, reset);
             this._$cache.set(cache_key, result, cache_time);
             return result;
         }
@@ -714,21 +719,33 @@ class Db extends Context
      * @returns {Promise<FieldInfo[]>}
      */
     async tableInfo(table) {
-        const get_sql = this._options.getSql;
-        this._options.getSql = false;
-        const table_info = await this.table(table)._sql.tableInfo(this._parseTable());
-        this._options.getSql = get_sql;
+        table && this.table(table);
+        const tableName = this._parseTable();
+        if(this._options.cache_time) {
+            const cache_time = this._options.cache_time;
+            const cache_key = 'table_info:' + tableName;
+            if(this._$cache.get(cache_key)) {
+                this.reset();
+                return this._$cache.get(cache_key);
+            }
+            const result = await this._sql.tableInfo(tableName);
+            this._$cache.set(cache_key, result, cache_time);
+            return result;
+        }
+        const table_info = await this._sql.tableInfo(tableName)
+        this.reset();
         return table_info;
     }
 
     /**
      * 获取数据表字段
      * @public
-     * @param {string} [table] - 表名字
+     * @param {string} [table] - 表名字，会替换通过table方法传入的表名字
+     * @param {number} [cache_time=60] - 缓存时间，默认60秒
      * @returns {Promise<string[]>}
      */
-    async tableField(table) {
-        const table_info = await this.tableInfo(table);
+    async tableField(table, cache_time = 60) {
+        const table_info = await this.withCache(cache_time).tableInfo(table);
         return table_info.map(item => item.Field);
     }
 
@@ -796,33 +813,46 @@ class Db extends Context
         /** @type {any[]} */
         const params = [];
         this._options.where.forEach(item => {
-            /** @type {Object.<string, any>} */
+            /** @type {Where} */
             const whereList = item[0];
             const whereLink = (item[1] && item[1].toLowerCase()) === 'or' ? 'or' : 'and';
             let whereChild = '';
-            Object.keys(whereList).forEach(field => {
-                const value = whereList[field];
+            Object.entries(whereList).forEach(([field, value]) => {
                 if(!~field.indexOf(')')) {
                     field = '`' + field.replace(/\./g, '`.`') + '`';
                 }
+                /** @type {Operator} */
                 let fieldLogic = '=';
                 let fieldValue = null;
                 let fieldLink = 'and';
                 if(value instanceof Array) {
-                    value[0] = value[0].toLowerCase();
-                    fieldLogic =  ~logic.indexOf(value[0]) ? value[0] : '=';
+                    // @ts-ignore
+                    fieldLogic = value[0].toLowerCase();
+                    if(!~logic.indexOf(fieldLogic)) {
+                        const message = 'DbError: 无效的where操作符 ' + value[0];
+                        throw new Error(message);
+                    }
                     fieldValue = value[1];
-                    fieldLink = (value[2] && value[2].toLowerCase()) === 'or' ? 'or' : 'and';
+                    fieldLink = (value[2] && value[2].toLowerCase()) === 'or' ? 'or' : 'and'; // Fixed: value[2] to fieldLink
                 } else {
                     fieldValue = value;
                 }
                 if(fieldLogic === 'exp') {
                     whereChild += (whereChild ? ` ${fieldLink} ` : '') + `${fieldValue}`;
+                    const expData = value[3] || (Array.isArray(value[2]) && value[2]) || (typeof value[2] == 'string' && !['or', 'and'].includes(value[2].toLowerCase()) ? value[2] : undefined);
+                    if(Array.isArray(expData)) {
+                        expData.forEach(data => {
+                            params.push(data);
+                        });
+                    } else if(expData !== undefined) {
+                        params.push(expData);
+                    }
                 } else {
                     whereChild += (whereChild ? ` ${fieldLink} ` : '') + `${field} ${fieldLogic} `;
                     if(~['in', 'not in'].indexOf(fieldLogic)) {
-                        whereChild += `(?)`;
-                        params.push(fieldValue);
+                        const inValues = Array.isArray(fieldValue) ? fieldValue : [fieldValue];
+                        whereChild += `(${inValues.map(() => '?').join(',')})`;
+                        inValues.forEach(v => params.push(v));
                     } else if(~['between', 'not between'].indexOf(fieldLogic)) {
                         whereChild += `? and ?`;
                         typeof fieldValue === 'string' && (fieldValue = fieldValue.split(','));
@@ -932,11 +962,9 @@ class Db extends Context
 
         let allowField = this._options.allowField;
         if(allowField === true) {
-            const table_name = this._options.prefix + this._table;
-            if(!this._tableField.get(table_name)) {
-                this._tableField.set(table_name, await this.tableField());
-            }
-            allowField = this._tableField.get(table_name) || [];
+            const _options = this._options;
+            allowField = await this.tableField();
+            this._options = _options;
         }
 
         Object.keys(this._options.data).forEach(key => {
@@ -997,12 +1025,14 @@ class Db extends Context
      * @returns {PaginationInstance}
      */
     get _$pagination() {
-        if(this.$pagination && this.$pagination.__ISCLASS__) {
-            this.__pagination = this.$pagination;
-        } else if(this.$ && this.$.pagination) {
-           this. __pagination = this.$.pagination;
-        } else {
-            this.__pagination = new (require('./pagination'))(this.ctx);
+        if(this.__pagination === null) {
+            if(this.$pagination && this.$pagination.__ISCLASS__) {
+                this.__pagination = this.$pagination;
+            } else if(this.$ && this.$.pagination) {
+                this.__pagination = this.$.pagination;
+            } else {
+                this.__pagination = new (require('./pagination'))(this.ctx);
+            }
         }
         return this.__pagination;
     }

package/lib/loader.js

@@ -1,7 +1,7 @@
 const pt = require('path');
 /** @type {function} */
 // @ts-ignore
-const isClass = require('is-class');
+const isClass = require('./utils/is-class');
 const {isFileSync, isDirSync} = require('./utils/fs');
 
 /**
@@ -13,10 +13,42 @@ const {isFileSync, isDirSync} = require('./utils/fs');
  */
 
 /**
+ * 节点类型缓存
  * @type {Map<string, NodeType>}
  */
 const typeStore = new Map();
 
+/**
+ * 获取节点类型
+ * @param {string} path - 节点路径，最后不带斜杠
+ * @returns {NodeType}
+ */
+const getNodeType = path => {
+    const _nodePath = path + pt.sep;
+    const _nodeFile = path + '.js';
+    const _nodeJson = path + '.json';
+    let _nodeType = typeStore.get(_nodePath);
+    if(_nodeType === undefined) {
+        _nodeType = isFileSync(_nodeFile) ? 'file' : isFileSync(_nodeJson) ? 'json' : isDirSync(_nodePath) ? 'dir' : '';
+        if(_nodeType == 'file' && isClass(require(_nodeFile))) {
+            _nodeType = 'class';
+        }
+        typeStore.set(_nodePath, _nodeType);
+    }
+    return _nodeType;
+}
+
+/**
+ * 
+ * @param {NodeType} type - 节点类型
+ * @param {string} path - 节点路径，最后不带斜杠
+ * @returns {object} - 节点
+ */
+const getNode = (type, path) => {
+    if(!type) return undefined;
+    return type == 'file' || type == 'class' ? require(path + '.js') : type == 'json' ? require(path + '.json') : {};
+}
+
 /**
  * nodejs模块（‌CommonJS）自动加载器
  * @param {string} path 根目录，需为绝对路径，最后不带斜杠
@@ -24,19 +56,15 @@ const typeStore = new Map();
  * @return {Node}
  */
 function loader(path, ...args) {
-    const dir = pt.normalize(path).replace(/[\/\\]+$/, '');
-    const dirPath = pt.join(dir, './');
-    /** @type {NodeType} */
-    let dirType = isFileSync(dir + '.js') ? 'file' : isFileSync(dir + '.json') ? 'json' : 'dir';
-    const node = dirType == 'dir' ? {} : require(dir);
-    
-    if(dirType == 'file' && isClass(node)) {
-        dirType = 'class';
-    }
+    const dirPath = pt.normalize(path).replace(/[\/\\]+$/, '');
+    const dirType = getNodeType(dirPath);
+    if(dirType == '') return undefined;
+    const node = getNode(dirType, dirPath);
+
     /** @type {Map<object, NodeInfo>} */
     const infoStore = new Map();
     infoStore.set(node, {
-        path: dirPath,
+        path: dirPath + pt.sep,
         type: dirType
     });
     return creatLoader(node);
@@ -54,8 +82,6 @@ function loader(path, ...args) {
                     return Reflect.get(node, prop, receiver);
                 }
 
-                /** @type {NodeInfo} */
-                // @ts-ignore
                 const nodeInfo = infoStore.get(node);
                 if(nodeInfo.type == 'class') {
                     if(!nodeInfo.instance) {
@@ -69,28 +95,13 @@ function loader(path, ...args) {
                     return false;
                 }
 
-                const _nodePath = nodeInfo.path + prop + pt.sep;
-                const _nodeFile = nodeInfo.path + prop + '.js';
-                const _nodeJson = nodeInfo.path + prop + '.json';
-                let _nodeType = typeStore.get(_nodePath);
-                if(_nodeType === undefined) {
-                    _nodeType = isFileSync(_nodeFile) ? 'file' : isFileSync(_nodeJson) ? 'json' : isDirSync(_nodePath) ? 'dir' : '';
-                    if(_nodeType == 'file' && isClass(require(_nodeFile))) {
-                        _nodeType = 'class';
-                    }
-                    typeStore.set(_nodePath, _nodeType);
-                }
-                let _node = {};
-                if(_nodeType == '') {
-                    return undefined; // 直接返回
-                } else if(_nodeType == 'file' || _nodeType == 'class') {
-                    _node = require(_nodeFile);
-                } else if(_nodeType == 'json') {
-                    _node = require(_nodeJson);
-                }
+                const _childPath = nodeInfo.path + prop;
+                const _childType = getNodeType(_childPath);
+                if(_childType == '') return undefined; // 直接返回
+                const _node = getNode(_childType, _childPath);
                 infoStore.set(_node, {
-                    path: _nodePath,
-                    type: _nodeType
+                    path: _childPath + pt.sep,
+                    type: _childType
                 });
                 // @ts-ignore
                 return node[prop] = creatLoader(_node); // 代理，并缓存
@@ -100,8 +111,6 @@ function loader(path, ...args) {
                     return Reflect.set(node, prop, value, receiver);
                 }
 
-                /** @type {NodeInfo} */
-                // @ts-ignore
                 const nodeInfo = infoStore.get(node);
                 if(nodeInfo.type == 'class') {
                     if(!nodeInfo.instance) {
@@ -112,9 +121,30 @@ function loader(path, ...args) {
                 }
 
                 return Reflect.set(node, prop, value, receiver);
-            }
+            },
+            has: (node, prop) => {
+                if(prop in node || typeof prop == 'symbol' || prop == 'inspect') {
+                    return prop in node;
+                }
+
+                const nodeInfo = infoStore.get(node);
+                if(nodeInfo.type == 'class') {
+                    if(!nodeInfo.instance) {
+                        nodeInfo.instance = new node(...args);
+                    }
+                    return prop in nodeInfo.instance;
+                } else if(nodeInfo.type == 'dir') {
+                    const _childPath = nodeInfo.path + prop;
+                    const _childType = getNodeType(_childPath);
+                    return _childType !== '';
+                }
+
+                return prop in node;
+            },
         });
     }
 }
 
+loader.clearPathCache = () => typeStore.clear();
+
 module.exports = loader;

package/lib/model.js

@@ -1,5 +1,5 @@
 const Context = require('./context');
-const {toLine} = require('./utils/str');
+const {toUnderScore} = require('./utils/internal');
 
 /**
  * @typedef {import('../types').DbConfigItem} DbConfigItem
@@ -29,7 +29,7 @@ class Model extends Context
          */
         // @ts-ignore
         this.connection = null;
-        this.table = toLine(this.constructor.name);
+        this.table = toUnderScore(this.constructor.name);
         this.pk = 'id';
         this._db;
     }

package/lib/mvc.js

@@ -1,7 +1,6 @@
 const path = require('path');
 const {readFile} = require('fs').promises;
-const {toHump} = require('./utils/str');
-const {validatePath} = require('./utils/validate');
+const {toCamelCase, pathToMiddlewareInfo} = require('./utils/internal');
 const config = require('./config');
 const {app: cfg_app, view: cfg_view} = config;
 const compose = require('koa-compose');
@@ -15,66 +14,40 @@ const storage = require('./storage');
  * @returns {Promise<void>}
  */
 async function mvc(ctx, next) {
-    const controller_folder = ctx.FOLDER || cfg_app.controller_folder;
+    const controller_folder = ctx.CONTROLLER_FOLDER || cfg_app.controller_folder;
 
     if(cfg_app.app_debug) {
-        Logger.http({Router: controller_folder, APP: ctx.APP, CONTROLLER: ctx.CONTROLLER, ACTION: ctx.ACTION});
+        Logger.http({Router: controller_folder, DEEP: ctx.DEEP, CONTROLLER: ctx.CONTROLLER, ACTION: ctx.ACTION});
         Object.keys(ctx.params).length && Logger.http('Params:', ctx.params);
         Object.keys(ctx.query).length && Logger.http('Get:', ctx.query);
         Object.keys(ctx.request.body || {}).length && Logger.http('Post:', ctx.request.body);
     }
-    
-    // 设置store
-    const store = storage.getStore();
-    store.APP = ctx.APP;
-    store.CONTROLLER = ctx.CONTROLLER;
-    store.ACTION = ctx.ACTION;
-    store.COMMON = cfg_app.common_app;
 
-    // 配置特殊处理
-    store._.config === undefined && (store._.config = {});
-    Object.entries(config).forEach(([key, value]) => {
-        store._.config[key] = value;
-    });
-
-    // 应用、控制器、方法名字验证
-    if(!validatePath(ctx.APP) || !validatePath(ctx.CONTROLLER) || !validatePath(ctx.ACTION)) {
-        // throw new Error(`RunError: 应用、控制器或方法名字不合法！`);
-        return;
-    }
-
-    if(ctx.APP[0] == '_' || ctx.APP[0] == '$' || !store._[ctx.APP]) {
-        if(cfg_app.app_debug) {
-            throw new Error(`RunError: 应用:${ctx.APP}不存在！`);
-        } else {
-            return;
+    const {$$} = storage.getStore();
+    const controllerPaths = [...ctx.DEEP.split('/').filter(Boolean), controller_folder];
+    const $node = controllerPaths.reduce((node, deep) => {
+        if(!node[deep]) {
+            throw new Error(`RunError: 目录:/app/${controllerPaths.join('/')}不存在！`);
         }
-    }
-
-    if(!store._[ctx.APP][controller_folder]) {
-        if(cfg_app.app_debug) {
-            throw new Error(`RunError: 目录:${ctx.APP}/${controller_folder}不存在！`);
-        } else {
-            return;
-        }
-    }
+        return node[deep];
+    }, $$);
 
     // 模版文件内容直接输出
     if(controller_folder == cfg_view.view_folder) {
-        const content = await readFile(path.join(cfg_app.base_dir, `${ctx.APP}/${controller_folder}`, ctx.CONTROLLER + cfg_view.view_depr + ctx.ACTION + cfg_view.view_ext));
+        const content = await readFile(path.join(cfg_app.base_dir, 'app', controllerPaths.join('/'), ctx.CONTROLLER + cfg_view.view_depr + ctx.ACTION + cfg_view.view_ext));
         if(!content) {
-            throw new Error(`RunError: 模板文件:${ctx.APP}/${controller_folder}/${ctx.CONTROLLER + cfg_view.view_depr + ctx.ACTION + cfg_view.view_ext}不存在！`);
+            throw new Error(`RunError: 模板文件:${controllerPaths.join('/')}/${ctx.CONTROLLER + cfg_view.view_depr + ctx.ACTION + cfg_view.view_ext}不存在！`);
         }
         ctx.body = content;
         return;
     }
 
     // 控制器
-    const Controller = store._[ctx.APP][controller_folder][ctx.CONTROLLER] || store._[ctx.APP][controller_folder]['_empty'];
+    const Controller = $node[ctx.CONTROLLER] || $node['_empty'];
 
-    if(ctx.CONTROLLER[0] == '_' || ctx.CONTROLLER[0] == '$' || typeof Controller != 'function') {
+    if(!Controller || typeof Controller != 'function') {
         if(cfg_app.app_debug) {
-            throw new Error(`RunError: class文件:${ctx.APP}/${controller_folder}/${ctx.CONTROLLER}不存在！`);
+            throw new Error(`RunError: 控制器文件:${controllerPaths.join('/')}/${ctx.CONTROLLER}不存在！`);
         } else {
             return;
         }
@@ -82,12 +55,12 @@ async function mvc(ctx, next) {
 
     // 控制器实例
     const $controller = new Controller(ctx, next);
-    const humpAction = toHump(ctx.ACTION);
-    const action = typeof $controller[humpAction] == 'function' && !$controller[humpAction].__ISCLASS__ ? humpAction : '_empty';
+    const camelCaseAction = toCamelCase(ctx.ACTION);
+    const action = typeof $controller[camelCaseAction] == 'function' && !$controller[camelCaseAction].__ISCLASS__ ? camelCaseAction : '_empty';
 
-    if(ctx.ACTION[0] == '_' || ctx.ACTION[0] == '$' || typeof $controller[action] != 'function') {
+    if(!$controller[action] || typeof $controller[action] != 'function') {
         if(cfg_app.app_debug) {
-            throw new Error(`RunError: class方法:${ctx.APP}/${controller_folder}/${ctx.CONTROLLER}/${humpAction}不存在！`);
+            throw new Error(`RunError: 控制器方法:${controllerPaths.join('/')}/${camelCaseAction}不存在！`);
         } else {
             return;
         }
@@ -98,32 +71,33 @@ async function mvc(ctx, next) {
         && $controller['middleware'].length > 0
         && $controller['middleware'].reduce((stack, middle) => {
                 typeof middle == 'string' && (middle = {middleware: middle});
-                if(Array.isArray(middle.except) ? ~middle.except.indexOf(action) : ~[middle.except].indexOf(action)) {
+                if(middle.except && (Array.isArray(middle.except) ? ~middle.except.indexOf(action) : ~middle.except.split(',').indexOf(action))) {
                     return stack;
                 }
-                if(middle.accept && (Array.isArray(middle.accept) ? !~middle.accept.indexOf(action) : !~[middle.accept].indexOf(action))) {
+                if(middle.accept && (Array.isArray(middle.accept) ? !~middle.accept.indexOf(action) : !~middle.accept.split(',').indexOf(action))) {
                     return stack;
                 }
                 // @ts-ignore
                 return stack.concat(async (ctx, next) => {
-                    const [METHOD = action, MIDDLEWARE = ctx.CONTROLLER, APP = ctx.APP] = middle.middleware.split('/').reverse();
-                    if(!store._[APP]) {
-                        throw new Error(`RunError: 中间件应用:${APP}不存在！`);
-                    }
-                    if(!store._[APP]['middleware']) {
-                        throw new Error(`RunError: 中间件目录:${APP}/middleware不存在！`);
-                    }
-                    const Middleware = store._[APP]['middleware'][MIDDLEWARE];
+                    const {DEEPS, MIDDLEWARE, ACTION} = pathToMiddlewareInfo(middle.middleware, ctx.DEEP, ctx.CONTROLLER, action);
+                    const middlewarePaths = [...DEEPS, cfg_app.middleware_folder];
+                    const $node = middlewarePaths.reduce((node, deep) => {
+                        if(!node[deep]) {
+                            throw new Error(`RunError: 中间件目录:/app/${middlewarePaths.join('/')}不存在！`);
+                        }
+                        return node[deep];
+                    }, $$);
+                    const Middleware = $node[MIDDLEWARE];
                     if(!Middleware || typeof Middleware != 'function') {
-                        throw new Error(`RunError: 中间件文件:${APP}/middleware/${MIDDLEWARE}不存在！`);
+                        throw new Error(`RunError: 中间件文件:/app/${middlewarePaths.join('/')}/${MIDDLEWARE}不存在！`);
                     }
                     const $middleware = new Middleware(ctx, next);
-                    if(!$middleware[METHOD] || typeof $middleware[METHOD] != 'function') {
-                        throw new Error(`RunError: 中间件方法:${APP}/middleware/${MIDDLEWARE}/${METHOD}不存在！`);
+                    if(!$middleware[ACTION] || typeof $middleware[ACTION] != 'function') {
+                        throw new Error(`RunError: 中间件方法:${middlewarePaths.join('/')}/${ACTION}不存在！`);
                     }
 
                     // 执行中间件方法
-                    await $middleware[METHOD]();
+                    await $middleware[ACTION]();
                 });
             }, [])
         || [];

package/lib/request.js

@@ -25,13 +25,14 @@ class Request extends Context
     }
 
     /**
-     * 智能获取请求数据
+     * 智能获取请求数据，优先级为：post > get > param
      * @param {string} key
      * @param {*} [default_value='']
      * @returns {*}
      */
     query(key, default_value='') {
-        return this.post(key) || this.get(key) || this.param(key) || default_value;
+        const value = this.post(key, undefined) || this.get(key, undefined) || this.param(key, undefined);
+        return this._getValue(value, default_value);
     }
 
     /**
@@ -41,7 +42,7 @@ class Request extends Context
      * @returns {*}
      */
     param(key, default_value='') {
-        return this._param[key] || default_value;
+        return this._getValue(this._param[key], default_value);
     }
 
     /**
@@ -51,7 +52,7 @@ class Request extends Context
      * @returns {*}
      */
     get(key, default_value='') {
-        return Array.isArray(this._get[key]) ? this._get[key][0] : this._get[key] || default_value;
+        return this._getValue(Array.isArray(this._get[key]) ? this._get[key].at(-1) : this._get[key], default_value);
     }
 
     /**
@@ -64,7 +65,7 @@ class Request extends Context
         if(!this.$config.app.koa_body && key !== 'is_ajax') {
             throw new Error('请先在app配置中开启koa_body');
         }
-        return this._post[key] || default_value;
+        return this._getValue(this._post[key], default_value);
     }
 
 
@@ -117,14 +118,6 @@ class Request extends Context
         return this.ctx.request.files || {};
     }
 
-    /**
-     * 获取请求应用名
-     * @returns {string}
-     */
-    app() {
-        return this.ctx.APP;
-    }
-
     /**
      * 获取请求控制器名
      * @returns {string}
@@ -141,6 +134,15 @@ class Request extends Context
         return this.ctx.ACTION;
     }
 
+    /**
+     * 获取客户端IP
+     * @returns {string}
+     */
+    ip() {
+        const forwarded = this.ctx.req.headers['x-forwarded-for'];
+        return forwarded ? (Array.isArray(forwarded) ? forwarded[0] : forwarded) : this.ctx.req.socket.remoteAddress || this.ctx.ip;
+    }
+
     /**
      * 获取请求url
      * @returns {string}
@@ -202,6 +204,16 @@ class Request extends Context
     headerAll() {
         return this.ctx.headers;
     }
+
+    /**
+     * @private
+     * @param {*} value
+     * @param {*} default_value
+     * @returns {*}
+     */
+    _getValue(value, default_value) {
+        return value === undefined ? default_value : typeof value === 'number' ? Number(value) : value;
+    }
 }
 
 module.exports = Request;

package/lib/response.js

@@ -101,7 +101,7 @@ class Response extends Context
      * @param {Error} err
      */
     exception(err) {
-        const escapeHtml = require('escape-html');
+        const escapeHtml = require('./utils/escape-html');
         const tplData = parseError(err);
         tplData.msg = escapeHtml(tplData.msg);
         // @ts-ignore