doomiwork 3.7.12 → 4.0.1

package/core/database/mysqlbase.js

@@ -1,11 +1,10 @@
 /*
 * MySql 封装 （简单，应该尚未完善）
 */
-//var mysql = require('mysql');
-const apiResult = require('../actionresult');
-const logHelper = require('doomi-helper').logHelper;
-const PoolManager = require('./poolmanager')
 const mysql = require('mysql');
+const apiResult = require('../actionresult');
+// const logHelper = require('doomi-helper').logHelper;
+const { createDatabasePool } = require('./poolmanager')
 const executeSqlWithConnection = Symbol("executeSqlWithConnection");
 class Database {
     /**
@@ -13,10 +12,14 @@ class Database {
      * @param {*} connectionstring 
      */
     constructor(connectionstring) {
-        //c.connect = connectionstring;
-        this.pool = PoolManager.createDatabasePool(connectionstring);
-        //mysql.createPool(appsetting.getConnection(connectionstring || 'dev'));
-        this.logger = logHelper.getInstance().getLogger("framework");
+        this.pool = createDatabasePool(connectionstring);
+    }
+
+    /**
+     * @param {{ trace: (arg0: string, arg1: any, arg2: string, arg3: any) => void; error: (arg0: string, arg1: any) => void; }} logUtility
+     */
+    set logger(logUtility){
+        this.logger = logUtility;//logHelper.getInstance().getLogger("framework");
     }
     /**
      * 防Sql注入进行编码
@@ -65,7 +68,7 @@ class Database {
      * @returns 
      */
     getConnection() {
-        return new Promise((success, failed) => {
+        return new Promise((success) => {
             if (!this.pool) {
                 return success(null);
             }
@@ -81,7 +84,7 @@ class Database {
      * @param {*} parameters  参数
      */
     executeSql(sqlCommand, parameters, conn, autoclose = true) {
-        let logger = this.logger;
+        // let logger = this.logger;
         // let that = this;
         if (conn) {
             return this[executeSqlWithConnection](sqlCommand, parameters, conn, autoclose)
@@ -93,7 +96,7 @@ class Database {
             ///创建出数据库连接，准备执行
             this.pool.getConnection(async (err, connection) => {
                 if (err) {
-                    logger.error("Database Connected Failed :" + err);
+                    // if (logger) logger.error("Database Connected Failed :" + err);
                     return success(apiResult.DB_CONNECTED_FAILED);
                 }
                 let sqlResult = await this[executeSqlWithConnection](sqlCommand, parameters, connection, autoclose)
@@ -111,11 +114,12 @@ class Database {
     [executeSqlWithConnection](sqlCommand, parameters, conn, autoclose = true) {
         if (!conn) return Promise.resolve(apiResult.DB_CONNECTED_FAILED);
         return new Promise((success) => {
-            this.logger.trace("SqlCommand:", sqlCommand, "Parameters:", parameters);
+            // this.logger.trace("SqlCommand:", sqlCommand, "Parameters:", parameters);
             return conn.query(sqlCommand, parameters, (err, rows) => {
                 if (autoclose) conn.release();
                 if (err) {
-                    this.logger.error("Database Query Error :" + err, sqlCommand);
+                    // this.logger.error("Database Query Error :" + err, sqlCommand);
+                    console.log('数据库操作错误', err, sqlCommand)
                     this.logError(null, '数据库操作错误:' + err + sqlCommand)
                     return success(Object.assign(apiResult.DB_EXECUTE_FAILED, { errmessage:'数据库操作错误'}));// err.message }));
                 }

package/core/database/poolmanager.js

@@ -1,17 +1,15 @@
 const mysql = require('mysql');
 const appsetting = require('../../configuration/appsetting').getCurrentApp();
-class PoolManager{
-    /**
-     * 创建和管理数据库链接池
-     * @param {*} connect 
-     */
-    static createDatabasePool(connect){
-        if (PoolManager[connect]!=null){
-            return PoolManager[connect];
-        }
-        const pool = mysql.createPool(appsetting.getConnection(connect || 'dev'));
-        PoolManager[connect] = pool;
-        return pool;
+/**
+ * 创建和管理数据库链接池
+ * @param {*} connect 
+ */
+let PoolManager = {};
+module.exports.createDatabasePool=(connect)=>{
+    if (PoolManager[connect]!=null){
+        return PoolManager[connect];
     }
-}
-module.exports = PoolManager;
+    const pool = mysql.createPool(appsetting.getConnection(connect || 'dev'));
+    PoolManager[connect] = pool;
+    return pool;
+}

package/core/doomiwork.js

@@ -2,38 +2,53 @@
     Doomisoft框架入口类
     自动加载配置与routerConfig中的路由配置
 */
-const router = require('../configuration/routerconfig').getInstance();
+const { loadController } = require('../configuration/routerconfig')
 const config = require('../configuration/appsetting').getCurrentApp();
-const Interceptor = require('./Interceptor');
-const fs          = require('fs')
-const path      = require('path')
-const {redisHelper,logHelper} = require('doomi-helper');
+const fs = require('fs');
+const path = require('path')
+// const {redisHelper,logHelper} = require('doomi-helper');
 class Doomiwork { 
-    static startWork(application) {
-        const startupRoot = process.cwd();
+    static startWork(application,option) {
+        // const startupRoot = process.cwd();
         ///将configuration对象放置于app对象中.所有的controller都可以使用
         application.config = config;
         ///启动redis进行缓存
         ////为每个controller注入同一个redis实例
-        if (config.getSetting("redis",false)===true){
-            application.redis =  redisHelper.getInstance();
+        if (config.getSetting("redis", false) === true && option.redis){
+            application.redis = option.redis;// redisHelper.getInstance();
         }
         ////记录用户行为的日志记录器
-        const logHandler = config.getSetting("logaction", null)
-        if (logHandler){
-            let actionLogger = path.join(startupRoot, logHandler);
-            if (actionLogger && fs.existsSync(actionLogger)) {
-                const logInstance = require(actionLogger);
-                application.actionLogger = new logInstance();
-            }
+        // const logHandler = config.getSetting("logaction", null)
+        // if (logHandler){
+        //     let actionLogger = path.join(startupRoot, logHandler);
+        //     if (actionLogger && fs.existsSync(actionLogger)) {
+        //         const logInstance = require(actionLogger);
+        //         application.actionLogger = new logInstance();
+        //     }
+        // }
+        ///用户操作日志记录
+        if(config.getSetting("logaction", false)===true && option.logaction){
+            application.actionLogger = option.logaction;
+        }
+        ///日志记录器
+        if (config.getSetting("logger", false) === true && option.logger) {
+            application.logger = option.logger;// redisHelper.getInstance();
         }
-        
-        application.logger =  logHelper.getInstance().getLogger("framework");
-        
+        //application.logger =  logHelper.getInstance().getLogger("framework");
         /**全局所有请求拦截器 */
-        application.use('/',Interceptor.handleRequest);
+        application.use('/',(req,res,next)=>{
+            req.user = req.headers;
+            return next();
+        });
         /** 加载所有的控制器 */
-        router.loadController(application)
+        if (!option.routes){
+            const roterfile = path.join(process.cwd(), 'routerconfig.json');
+            ///将配置中的所有需要加载的controller文件都加载出来
+            if (fs.existsSync(roterfile)){
+                option.routes = require(roterfile)
+            }
+        }
+        loadController(application, option.routes)
         Doomiwork.app = application;
     }
     /**

package/index.js

@@ -7,4 +7,6 @@ exports = module.exports = {
   tokenHelper:require('./utilities/tokenutility'),
   constants:require('./core/enumconst'),
 }
- 
+
+
+///last version 3.7.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doomiwork",
-  "version": "3.7.12",
+  "version": "4.0.1",
   "description": "doomisoft nodejs web framework",
   "main": "index.js",
   "scripts": {
@@ -14,10 +14,10 @@
   "author": "stephen.shen",
   "license": "ISC",
   "dependencies": {
-    "doomi-helper": "^2.3.1",
     "express": "^4.17.1",
     "moment": "^2.29.1",
     "mysql": "^2.18.1",
-    "node-uuid": "^1.4.8"
+    "node-uuid": "^1.4.8",
+    "node-xlsx": "^0.23.0"
   }
 }

package/utilities/excelutility.js

@@ -0,0 +1,139 @@
+const xlsx = require('node-xlsx');
+const fs = require('fs');
+const path = require('path');
+const uuid = require('node-uuid');
+class ExcelUtility {
+    constructor() {
+        this.exportFolder = path.join(process.cwd(), '/public/excel/');
+        let configfile = path.join(process.cwd(), 'excelconfig.json');
+        if (fs.existsSync(configfile))
+            this.excelConfig = require(configfile);
+        else
+            this.excelConfig = {};
+    }
+    static getInstance() {
+        if (!ExcelUtility.instance) ExcelUtility.instance = new ExcelUtility();
+        return ExcelUtility.instance;
+    }
+    ///读取Excel的内容
+    readExcel(fileName) {
+        //读取文件内容
+        const obj = xlsx.parse(fileName);//__dirname+'/test.xlsx');
+        const excelObj = obj[0].data;
+        console.log(excelObj);
+        return excelObj;
+    }
+    ///写Excel文件
+    createExcelBuffer(data, fileName, workSheetName) {
+        var sheetName = 'sheet1';
+        if (workSheetName == null) sheetName = workSheetName;
+        var buffer = xlsx.build([{ name: 'sheet1', data: data }]);
+
+        res.set({
+            "Content-type": "application/octet-stream",
+            "Content-Disposition": "attachment;filename=" + encodeURI(fileName)
+        });
+        fReadStream = fs.createReadStream(buffer);
+        fReadStream.on("data", (chunk) => res.write(chunk, "binary"));
+        fReadStream.on("end", function () {
+            res.end();
+        });
+    }
+    ///写Excel文件
+    async writeExcel(data, workSheetName) {
+        let sheetName = 'sheet1';
+        if (workSheetName == null) sheetName = workSheetName;
+        try {
+            let randomFile = uuid.v4() + '.xlsx';
+            let fileName = path.resolve(this.exportFolder, randomFile);
+            let _saveDir = path.dirname(fileName);
+            ///创建本地文件夹
+            if (!fs.existsSync(_saveDir)) {
+                if (!this.mkdirsSync(_saveDir)) {
+                    return { success: false, errorcode: 1, errmessage: 'create folder failed!' };
+                }
+            };
+            const buffer = xlsx.build([{ name: workSheetName, data: data }]);
+            fs.writeFileSync(fileName, buffer, { 'flag': 'w' });
+            return { successed: true, fileName: randomFile };
+        }
+        catch (err) {
+            return { successed: false, errorcode: 1, errmessage: err };
+        }
+    }
+    ///导出记录集到Excel，写入
+    ///dataRow :记录集
+    ///exportConfig : 导出的映射配置,如没有则将dataRow直接导出
+    ///workSheetName : 导出的Excel 文件 WorkSheet名
+    async recordset2ExcelFile(dataRow, exportConfig, readyDataFunc) {
+        let _instance = this;
+        //var setting = exportConfig ? excelConfig[exportConfig] : null;
+        let setting = exportConfig ? _instance.excelConfig[exportConfig] : null;
+        let dataBuffer = [],worksheetName = "sheet1", fieldKey = [], titleRow = [];
+        if (setting != null) {
+            worksheetName = setting.worksheet == null ? "sheet1" : setting.worksheet;
+            ////第一行导出标题行
+            setting.columns.forEach((field) => {
+                var dataOption = { type: 'title', config: exportConfig, title: field.title, field: field.name };
+                if (readyDataFunc != null && typeof (readyDataFunc) == "function")
+                    dataOption = readyDataFunc(dataOption)
+                titleRow.push(dataOption.title);
+                fieldKey.push(dataOption.field);
+            });
+        }
+        else if (dataRow.length > 0) {
+            var firstRow = dataRow[0];
+            Object.keys(firstRow).forEach(key => {
+                var dataOption = { type: 'title', config: null, title: key, field: key };
+                if (readyDataFunc != null && typeof (readyDataFunc) == "function")
+                    dataOption = readyDataFunc(dataOption)
+                titleRow.push(dataOption.title);
+                fieldKey.push(dataOption.field);
+            });
+        }
+        if (titleRow.length > 0) {
+            dataBuffer.push(titleRow);
+            dataRow.forEach((rowItem) => {
+                var dataRow = [];
+                fieldKey.forEach((field) => {
+                    var dataOption = { type: 'data', config: exportConfig, field: field, data: rowItem, value: rowItem[field] };
+                    if (readyDataFunc != null && typeof (readyDataFunc) == "function")
+                        dataOption = readyDataFunc(dataOption)
+                    dataRow.push(dataOption.value);
+                });
+                dataBuffer.push(dataRow);
+            })
+        }
+        var result = await _instance.writeExcel(dataBuffer, worksheetName);
+        return result;
+    }
+
+    /**
+     * 递归创建多级目录
+     * @param {*} dirpath 
+     * @param {*} mode 
+     * @returns 
+     */
+    mkdirsSync(dirpath, mode) {
+        if (!fs.existsSync(dirpath)) {
+            var pathtmp;
+            var splitPath = dirpath.split(path.sep);
+            for (var nLoop = 0; nLoop < splitPath.length; nLoop++) {
+                var dirname = splitPath[nLoop];
+                if (dirname.length == 0) {
+                    pathtmp = "/";
+                    continue;
+                }
+                if (pathtmp)
+                    pathtmp = path.join(pathtmp, dirname);
+                else
+                    pathtmp = dirname;
+                if (!fs.existsSync(pathtmp)) {
+                    fs.mkdirSync(pathtmp, mode)
+                }
+            }
+        }
+        return true;
+    }
+}
+exports = module.exports = ExcelUtility;

package/utilities/keywordparse.js

@@ -4,50 +4,95 @@
  */
 const uuid        = require('node-uuid'); 
 const moment      = require('moment')
-class KeywordParse
-{
-    /*
-    * 从上下文 解析关键字
-    * 或者已固定的方式解析关键字
-    */
-    static parseKeyValue(req,str) {
-        if (!str) return str;
-        const strItems = str.split('.');
-        if (strItems.length===1)
-        {
-            switch(str.toLowerCase()){
-                case "userid()": 
-                    if (req.user && req.user.id) return req.user.id;
-                    return uuid.v4(); //return req.session.user.id; 
-                case "uuid()" : return uuid.v4();
-                case "appid()" :  
-                    if (req.user && req.user.id) return req.user.appid; 
-                    return null;
-                case "orgid()" :  
-                    if (req.user && req.user.id) return req.user.orgnizations; 
-                    return null;
-                case "now()": return moment().format('YYYY-MM-DD HH:mm:ss');
-                case "null()": return null;
-                default: return (req.body && req.body[str])||(req.query && req.query[str]);
-            }
+/*
+* 从上下文 解析关键字
+* 或者已固定的方式解析关键字
+*/
+module.exports.parseKeyValue=(req,str)=>{
+    if (!str) return str;
+    const strItems = str.split('.');
+    if (strItems.length===1)
+    {
+        switch(str.toLowerCase()){
+            case "userid()": 
+                if (req.user && req.user.id) return req.user.id;
+                return uuid.v4(); 
+            case "uuid()" : return uuid.v4();
+            case "appid()" :  
+                if (req.user && req.user.appid) return req.user.appid; 
+                return null;
+            case "orgid()" :  
+                if (req.user && req.user.id) return req.user.orgnizations; 
+                return null;
+            case "now()": return moment().format('YYYY-MM-DD HH:mm:ss');
+            case "null()": return null;
+            default: return (req.body && req.body[str])||(req.query && req.query[str]);
         }
-        else
+    }
+    else
+    {
+        let collection;
+        if (strItems[0]=="" || strItems[1]=="") return str;
+        switch(strItems[0].toLowerCase())
         {
-            let collection;
-            if (strItems[0]=="" || strItems[1]=="") return str;
-            switch(strItems[0].toLowerCase())
-            {
-                case "query" :      collection = req.query; break;
-                case "form":        collection = req.body;break;
-                case "params":      collection = req.params; break;
-                case "value": return strItems[1];
-                case "headers":     collection = req.headers; break; 
-                case "user":        collection = req.user || {}; break; 
-                default: collection = req.body; break;
-            }
-            if (collection) return collection[strItems[1]];
-            return '';
+            case "query" :      collection = req.query; break;
+            case "form":        collection = req.body;break;
+            case "params":      collection = req.params; break;
+            case "value": return strItems[1];
+            case "headers":     collection = req.headers; break; 
+            case "user":        collection = req.user || {}; break; 
+            default: collection = req.body; break;
         }
+        if (collection) return collection[strItems[1]];
+        return '';
+    }
+}
+
+/**
+ * 校验参数的类型
+ * @param {*} value 数值
+ * @param {*} dataType 校验的类型
+ * @param {*} defaultValue 如果不满足，则返回默认的
+ * @returns 
+ */
+module.exports.validatorParamsType=(value, dataType, defaultValue = null)=> {
+    if (!value || !dataType) return value;
+    switch (dataType.toLowerCase()) {
+        case 'guid':       ///限制长度为36位的GUID
+            if (value.length != 36 || value.split('-').length != 5) return defaultValue;
+            break;
+        case 'number':   ///限制为数字
+            if (isNaN(value)) return defaultValue;
+            break;
+        case 'date':       ///限制为日期，格式输出为YYYY-MM-DD
+            let date = Date.parse(value);
+            if (isNaN(date)) return defaultValue;
+            return moment(date).format('YYYY-MM-DD');
+        case 'datetime':   ///限制为包含时间的日期
+            let datetime = Date.parse(value);
+            if (isNaN(datetime)) return defaultValue;
+            return datetime;
     }
+    return value;
 }
-exports = module.exports=KeywordParse;
+
+/**
+ * 将原始值format后输出
+ * @param {*} value 123
+ * @param {*} format ${value}
+ * @returns 
+ */
+module.exports.formatValue = (value, format)=> {
+    if (!format) return value;
+    return format.replace(/\${value}/ig,value)
+    // let formatItem = format.split('|');
+    // let coll = {};
+    // formatItem.forEach(item => {
+    //     if (item == '') return;
+    //     var itemValues = item.split(':');
+    //     if (itemValues.length != 2) return;
+    //     coll[itemValues[keyIndex]] = itemValues[1 - keyIndex];
+    // })
+    // //let jsonFormat =JSON.parse('{'+format+'}');
+    // return coll[value];
+}