doomiwork 4.1.0 → 4.1.2

package/configuration/appsetting.js

@@ -3,7 +3,9 @@ const fs            = require('fs');
 class appsetting{
     constructor(){
         let config = process.env.CONFIGFILE || 'configuration.json';
+        
         let configfile = path.join(process.cwd(), config);
+        console.log('configfile', configfile)
         if (!fs.existsSync(configfile)) {
             throw new Error('missing app configuration file')
         }

package/configuration/routerconfig.js

@@ -107,6 +107,7 @@ module.exports.loadController=(app, routes)=> {
         ///包含文件
         if (element.include) {
             let includeRouteJson = path.join(startupRoot, element.include);
+            console.log('includeRouteJson', includeRouteJson)
             ///如果包含文件存在，则加载这个文件里面的路由
             if (fs.existsSync(includeRouteJson)) {
                 this.loadController(app, require(includeRouteJson));
@@ -127,7 +128,8 @@ module.exports.loadController=(app, routes)=> {
             ////单个文件的加载
             if (modules.length > 0) {
                 for (const modulePath of modules) {
-                    if (app.logger) app.logger.trace('initlize controller [%s] for baseUrl [%s]', modulePath, baseUrl);
+                    //if (app.logger) app.logger.trace('initlize controller [%s] for baseUrl [%s]', modulePath, baseUrl);
+                    console.log('initlize controller [%s] for baseUrl [%s]', modulePath, baseUrl);
                     const controllModule = require(modulePath);
                     const controller = new controllModule(app);
                     app.use(baseUrl, controller.router);

package/core/controller.js

@@ -42,7 +42,7 @@ class controller {
     /**
      * 权限的业务sql过滤
      */
-    PermissonBusiness(req){
+    PermissonBusiness(_req){
         return null;
     }
    /**
@@ -227,11 +227,11 @@ class controller {
     /*
     * 获取详细记录的方法
     */
-    async getDataById(req, dataKey, sqlCommand) {
+    async getDataById(req, dataKey, sqlCommand,idValue) {
         if (this.logger) this.logger.trace("准备获取dataconfig文件中对应的 %s 详细数据",dataKey)
         const detailinfo = getDetailInfo(req, dataKey);
         if (!detailinfo) return { successed: false, errcode: -10, errmsg: `缺失${dataKey}对应的详情配置` };
-        let beforeData = await this.beforeAccessDB(req, sqlCommand || this._daoModel.getByIdSql(), req.params.id, "detail", this);
+        let beforeData = await this.beforeAccessDB(req, sqlCommand || this._daoModel.getByIdSql(), idValue ||req.params.id, "detail", this);
         ////如果返回Null,则表示不加载数据了
         if (beforeData.canceled===true) return { successed: false, errorcode: 1, errormessage: "操作已取消" };
         /////处理SQL中的一些定义符
@@ -362,7 +362,7 @@ class controller {
     */
     async delete(req, id, sqlCommand) {
         if (this.logger)  this.logger.trace("准备删除数据",id)
-        let beforeData = await this.beforeAccessDB(req, sqlCommand || this._daoModel.deleteSql(), id, "delete", this);
+        let beforeData = await this.beforeAccessDB(req, sqlCommand || this._daoModel.deleteSql(id), id, "delete", this);
         ////如果返回Null,则表示不加载数据了
         if (beforeData.canceled) return { successed: false, errorcode: 1, errormessage: "操作取消" };
         /////处理SQL中的一些定义符

package/core/database/daoBase.js

@@ -89,7 +89,7 @@ class mysqlDao extends dao{
     /**
      * 更改记录
      */
-    updateSql() { 
+    updateSql(id) { 
         return `update ${this.tableoption.tableName} set ? where ${this.tableoption.primaryKey}=? ${this.tableoption.forcefilter}`;
     }
     /**
@@ -101,16 +101,17 @@ class mysqlDao extends dao{
     /**
      * 删除记录
      */
-    deleteSql() { 
+    deleteSql(id) { 
+        const ids = (id + '').trim().split(',').map(x => '\'' + x + '\'');
         ////如果是逻辑删除，则只将记录的删除状态设置为1
         if(this.tableoption.logicDelete)  {
 
-            let sqlDelete = `update ${this.tableoption.tableName} set #DELETEBY# #DELETEDATE# ${this.tableoption.logicDeleteField || 'rec_isdeleted'} =1 where ${this.tableoption.primaryKey}=? ${this.tableoption.forcefilter}`; 
+            let sqlDelete = `update ${this.tableoption.tableName} set #DELETEBY# #DELETEDATE# ${this.tableoption.logicDeleteField || 'rec_isdeleted'} =1 where ${this.tableoption.primaryKey} in (?) ${this.tableoption.forcefilter}`; 
             sqlDelete = sqlDelete.replace('#DELETEBY#', this.tableoption.logDeleteBy?`${this.tableoption.logDeleteBy}=?,`:'')
             sqlDelete = sqlDelete.replace('#DELETEDATE#', this.tableoption.logDeleteDate ? `${this.tableoption.logDeleteDate}=now(),` : '');
             return sqlDelete;
         }
-        return `delete from ${this.tableoption.tableName} where ${this.tableoption.primaryKey}=? ${this.tableoption.forcefilter}`; 
+        return `delete from ${this.tableoption.tableName} where ${this.tableoption.primaryKey} in (?) ${this.tableoption.forcefilter}`; 
     }
 
     /**
@@ -128,10 +129,11 @@ class mysqlDao extends dao{
     async update(Sql, model, id) {return this.executeSql(Sql, [model, id]);}
     ///删除记录
     async delete(Sql, id,userid) { 
+        const ids = (id + '').trim().split(',').map(x => '\'' + x + '\'');
         if (this.tableoption.logicDelete && this.tableoption.logDeleteBy){
-            return this.executeSql(Sql, [userid,id]); 
+            return this.executeSql(Sql, [userid, ids.join(',')]); 
         }
-        return this.executeSql(Sql, id); 
+        return this.executeSql(Sql, ids.join(',')); 
         ///
         //return this.executeSql(Sql, id); 
         /*if (result.successed && this.tableoption.logicDelete && userid && (this.tableoption.logDeleteBy || this.tableoption.logDeleteDate)){

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doomiwork",
-  "version": "4.1.0",
+  "version": "4.1.2",
   "description": "doomisoft nodejs web framework",
   "main": "index.js",
   "scripts": {

package/utilities/requestparser.js

@@ -30,7 +30,7 @@ module.exports.getSearchCondition = (option) => {
     const request = paraCopy.request;
     let retSearch = [];
     paraCopy.refer.forEach(element => {
-        retSearch.push(this.parseTagInSql(request, element.pattern, false));
+        retSearch.push(this.parseTagInSql(request, element.pattern, false,true));
     });
     return retSearch.join('');
 }
@@ -42,7 +42,7 @@ module.exports.getSearchCondition = (option) => {
  * @param {*} allowNull 
  * @returns 
  */
-module.exports.parseTagInSql = (req, sql, allowNull = true) => {
+module.exports.parseTagInSql = (req, sql, allowNull = true,isSearch=false) => {
     if (!sql) return '';
     ///定义正则准备查找sql中的特定关键字
     const matched = sql.match(/@.*?@/g);
@@ -67,7 +67,7 @@ module.exports.parseTagInSql = (req, sql, allowNull = true) => {
         if (!keyValue) {
             parseKeyWordIsNull = true;
         } else if (typeof (keyValue) === 'string') {
-            keyValue = noQuoteProtect ? checkSqlInjection(mysql.escape(keyValue)) : mysql.escape(keyValue)
+            keyValue = noQuoteProtect || isSearch ? checkSqlInjection(mysql.escape(keyValue)) : mysql.escape(keyValue)
             keyValue = keyValue.substr(1, keyValue.length - 2);
             ///验证参数的格式合法性
             if (keyValue && validformat.length > 1) {
@@ -108,14 +108,14 @@ module.exports.getListInfo = (req, dataKey, cfgType = 0, dao) => {
     // 防止页面数据传入非数字
     if (!page || isNaN(page)) page = 1
     ///最大允许获取100条数据
-    pageSize = Math.min(pageSize, 100);
+    pageSize =Math.max(0,Math.min(pageSize, 10000));
     ///拼接排序的语句
     if (order && sort && ORDER_STRING.includes(order.toLowerCase())) sort = sort + ' ' + order
     //req.order =req.sort? utility.ifNull((req.body.order || req.query.order), ""):'';
     const dataConfig = dataconfig.getConfig(dataKey, cfgType);
     if (dataConfig && dataConfig.list) {
         req.dataConfig = dataConfig
-        let { sql, countsql, sqltype = 'sql', field, footer, search, sort: constsort } = dataConfig.list
+        let { sql, listsql, countsql, sqltype = 'sql', field, footer, search, sort: constsort } = dataConfig.list
         /**解析查询条件 */
         const searchCondition = this.getSearchCondition({ request: req, refer: search });
         /**排序方式 *///
@@ -134,7 +134,7 @@ module.exports.getListInfo = (req, dataKey, cfgType = 0, dao) => {
             sql = this.parseTagInSql(req, sql) +
                 ' ' + searchCondition + clientfilter +
                 (sort ? (' order by ' + sort) : '') +
-                (export2Excel ? '' : ' limit ' + Number(pageSize) + ' OFFSET ' + (Number(page) - 1) * Number(pageSize)) +
+                (export2Excel ? '' : ' limit ' + Number(pageSize) + ' OFFSET ' + (Math.max(Number(page), 1) - 1) * Number(pageSize)) +
                 /////在Sql中再放入获取总记录数的语句
                 ';SELECT FOUND_ROWS() AS total;';
             /*** 如果存在汇总列的sql，则把SQL放置在最末尾 */