doomiwork 2.7.1 → 2.9.1

package/core/database/poolmanager.js

@@ -1,4 +1,4 @@
-var mysql = require('mysql');
+const mysql = require('mysql');
 const appsetting = require('../../configuration/appsetting').getCurrentApp();
 class PoolManager{
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doomiwork",
-  "version": "2.7.1",
+  "version": "2.9.1",
   "description": "doomisoft nodejs web framework",
   "main": "index.js",
   "scripts": {
@@ -13,7 +13,7 @@
   "author": "stephen.shen",
   "license": "ISC",
   "dependencies": {
-    "doomi-helper": "^2.1.2",
+    "doomi-helper": "^2.3.1",
     "express": "^4.17.1",
     "moment": "^2.29.1",
     "mysql": "^2.18.1",

package/utilities/keywordparse.js

@@ -2,8 +2,8 @@
 /**
  * 解析上下文中对应dataconfig文件中的一些变量解析
  */
-var uuid        = require('node-uuid'); 
-var moment      = require('moment')
+const uuid        = require('node-uuid'); 
+const moment      = require('moment')
 class KeywordParse
 {
     /*
@@ -12,8 +12,8 @@ class KeywordParse
     */
     static parseKeyValue(req,str) {
         if (!str) return str;
-        var strItems = str.split('.');
-        if (strItems.length==1)
+        const strItems = str.split('.');
+        if (strItems.length===1)
         {
             switch(str.toLowerCase()){
                 case "userid()": 
@@ -33,7 +33,7 @@ class KeywordParse
         }
         else
         {
-            var collection;
+            const collection;
             if (strItems[0]=="" || strItems[1]=="") return str;
             switch(strItems[0].toLowerCase())
             {

package/utilities/requestparser.js

@@ -1,6 +1,7 @@
-var utility = require('doomi-helper').commonHelper
-var keyParse = require('./keywordparse');
+const utility = require('doomi-helper').commonHelper
+const keyParse = require('./keywordparse');
 const dataconfig = require('../configuration/dataconfig').getCurrent();
+const mysql = require('mysql');
 class RequestParser {
     /*
     * 根据对应列表的配置(dataConfig.list.search),从请求上下文中获取用户进行搜索的参数信息
@@ -9,7 +10,7 @@ class RequestParser {
         let paraCopy = option || {};
         if (!paraCopy.request || !paraCopy.refer) return '';
         if (!paraCopy.valueFrom) paraCopy.valueFrom = "all";
-        var request = paraCopy.request;
+        const request = paraCopy.request;
         let retSearch = "";
         paraCopy.refer.forEach(element=> {
             retSearch = retSearch+this.parseAndReplaceSql(request, element.pattern,false);
@@ -22,14 +23,17 @@ class RequestParser {
     static parseAndReplaceSql(req,sql,allowNull=true){
         if (!sql) return '';
         ///定义正则准备查找sql中的特定关键字
-        var matched=sql.match(/@.*?@/g);
+        const matched=sql.match(/@.*?@/g);
         if (!matched || matched.length<=0) return sql;
         var parseKeyWordIsNull = false;
         matched.forEach(ele=>{
-            var matchValue = ele.substring(1,ele.length-1);
+            let matchValue = ele.substring(1,ele.length-1);
             if (matchValue.indexOf(' ')>=0 || matchValue.indexOf(':')>=0 || matchValue.indexOf('=')>=0) return;
-            var keyValue =utility.ifNull(keyParse.parseKeyValue(req,ele.substring(1,ele.length-1)),'');
+            let keyValue =utility.ifNull(keyParse.parseKeyValue(req,ele.substring(1,ele.length-1)),'');
             if(keyValue=='') parseKeyWordIsNull = true;
+            keyValue = mysql.escape(keyValue)
+            //keyValue = keyValue.replace(/'/g, "''")
+            keyValue = keyValue.substr(1, a.length - 2)
             sql=sql.replace(ele,keyValue);
         });
         if (!allowNull && parseKeyWordIsNull) return '';
@@ -48,9 +52,9 @@ class RequestParser {
     * 如Page ,PageSize , Sort 等等
     */
     static getListInfo(req,cfgType=0,dao) {
-        let dataKey = utility.ifNull(req.dataKey, req.query.datakey);
+        const dataKey = utility.ifNull(req.dataKey, req.query.datakey);
         ///确认是否是需要导出Excel
-        let export2Excel =(req.query.exportexcel+"").toLowerCase()==="true";
+        const export2Excel =(req.query.exportexcel+"").toLowerCase()==="true";
         req.page = req.query.page || req.body.page|| 1;
         req.pageSize = req.query.rows || req.body.rows || 2000;
         req.sort = req.query.sort || req.body.sort;
@@ -96,6 +100,7 @@ class RequestParser {
                                     ';SELECT FOUND_ROWS() AS total;';
                 /*** 如果存在汇总列的sql，则把SQL放置在最末尾 */
                 if(countsql){
+                    req.countSql = true;
                     req.listSql+= this.appendSearchCondition2Count(
                         this.parseAndReplaceSql(req,countsql),
                         req.searchCondition)+';'

package/utilities/tokenutility.js

@@ -2,17 +2,16 @@
  * 后台路由授权访问的Token验证
  */
 const cache     =  require('doomi-helper').redisHelper.getInstance();
-const logger    =  require('doomi-helper').logHelper.getInstance().getLogger('framework');
 class TokenUtility {
     static setToken(token, tokenObject, expire) {
         if (typeof tokenObject != "string") tokenObject = JSON.stringify(tokenObject);
-        logger.trace('TokenUtility: set token ',tokenObject)
+        // logger.trace('TokenUtility: set token ',tokenObject)
         return cache.set(token, tokenObject, expire);
     }
     ///从缓存中获取用户
     static getToken(token,isObject=true) {
         return cache.get(token).then(result => {
-            logger.trace('TokenUtility getToken : ',result)
+            // logger.trace('TokenUtility getToken : ',result)
             if (!result) return result;
             var value = isObject?JSON.parse(result):result;
             return value;

package/utilities/transferutility.js

@@ -1,5 +1,5 @@
 const { commonHelper, stringHelper } = require('doomi-helper');
-var keyParse = require('./keywordparse');
+const keyParse = require('./keywordparse');
 ///值类型转换
 class ViewHelper {
     /*
@@ -38,8 +38,8 @@ class ViewHelper {
     * 从请求上下文中获取数值，用于新增或修改
     */
     static transferMapping2Name(req, fieldConfig, doWhat) {
-        var model = {};
-        var tmpModel = {};
+        let model = {};
+        let tmpModel = {};
         // var ingoreKey = req.query.ingoreNullKey != null && req.query.ingoreNullKey == 'true';
         if (fieldConfig && Array.isArray(fieldConfig)) {
             for (const element of fieldConfig){
@@ -65,10 +65,15 @@ class ViewHelper {
                     else
                         postValue = null;
                 }
+                if (!postValue && element.default) postValue = element.default;
                 ///不允许为空值
                 if (element.required === true && !postValue) {
                     return { successed: false, errcode: 5, errmsg: '请填写必填字段内容', name: element.mapping }
                 }
+                //空值则不替换或不设置该字段
+                if (!postValue && element.ignorenull===true){
+                    continue;
+                }
                 //验证值的类型是否正确，主要验证是否数字
                 if(element.type){
                     switch (element.type.toLowerCase()){