doomiwork 4.2.3 → 4.2.5

package/dist/index.js

@@ -245,24 +245,25 @@ function requireAppsetting () {
 	if (hasRequiredAppsetting) return appsetting.exports;
 	hasRequiredAppsetting = 1;
 	(function (module, exports) {
-		const path          = require$$1__default["default"];
-		const fs            = require$$0__default["default"];
-		class appsetting{
+		const path = require$$1__default["default"];
+		const fs = require$$0__default["default"];
+		class appsetting {
 		    static #instance;
 
-		    constructor(){
+		    constructor(baseFolder = process.cwd()) {
 		        if (appsetting.#instance) throw new Error('Use getCurrentApp() instead of new appsetting()');
 		        const config = process.env.CONFIGFILE || 'configuration.json';
-		        const configfile = path.join(process.cwd(), config);
+		        const configfile = path.join(baseFolder, config);
 		        if (!fs.existsSync(configfile)) throw new Error('missing app configuration file');
 		        this.settingjson = require(configfile);
+		        this.folder = baseFolder;
 		    }
 		    /**
 		     * 单例模式
 		     * @param {*} config
 		     */
-		    static getCurrentApp(){
-		        if (!appsetting.#instance) appsetting.#instance = new appsetting();
+		    static getCurrentApp(baseFolder = process.cwd()) {
+		        if (!appsetting.#instance) appsetting.#instance = new appsetting(baseFolder);
 		        return appsetting.#instance;
 		    }
 		    /**
@@ -270,18 +271,18 @@ function requireAppsetting () {
 		     * @param {*} settingKey 
 		     * @param {*} defaultValue 
 		     */
-		    getSetting (settingKey,defaultValue) {
+		    getSetting(settingKey, defaultValue) {
 		        if (!this.settingjson || !this.settingjson.appsetting) return defaultValue;
-		       const item= this.settingjson.appsetting[settingKey];
-		       return item??defaultValue;
+		        const item = this.settingjson.appsetting[settingKey];
+		        return item ?? defaultValue;
 		    }
-		    getSection(sectionName){
+		    getSection(sectionName) {
 		        return this.settingjson[sectionName];
 		    }
 		    /*
 		    * 获取配置文件中的数据库连接串
 		    */
-		    getConnection (connName) {
+		    getConnection(connName) {
 		        return this.settingjson.connections[connName];
 		    };
 		}
@@ -304,47 +305,44 @@ function requireDoomiwork () {
 		*/
 		const { loadController } = requireRouterconfig();
 		const DoomiApiResult = requireDoomiapiresult();
-		const config = requireAppsetting().getCurrentApp();
+		const config = requireAppsetting();
 		const fs = require$$0__default["default"];
 		const path = require$$1__default["default"];
 		class Doomiwork { 
+		    /**
+		     * 启动框架
+		     * @param {*} application  app对象
+		     * @param {*} option 启动的参数
+		     * @param {*} injector 
+		     */
 		    static startWork(application,option={}) {
-		        application.config = config;
+		        /// 默认的配置文件所在目录就是程序运行的根目录
+		        const ApplicationConfiguration = config.getCurrentApp(option.configfolder ?? process.cwd());
+		        application.config = ApplicationConfiguration;
 		        ///启动redis进行缓存
 		        ////为每个controller注入同一个redis实例
-		        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();
-		        //     }
-		        // }
+		        if (ApplicationConfiguration.getSetting("redis", false) === true && option.redis) application.redis = option.redis;// redisHelper.getInstance();
 		        ///用户操作日志记录
-		        if(config.getSetting("logaction", false)===true && option.logaction) application.actionLogger = option.logaction;
+		        if (ApplicationConfiguration.getSetting("logaction", false)===true && option.logaction) application.actionLogger = option.logaction;
 		        ///日志记录器
-		        if (config.getSetting("logger", false) === true && option.logger)  application.logger = option.logger;// redisHelper.getInstance();
+		        if (ApplicationConfiguration.getSetting("logger", false) === true && option.logger)  application.logger = option.logger;// redisHelper.getInstance();
 		        //application.logger =  logHelper.getInstance().getLogger("framework");
-		        /**全局所有请求拦截器 */
-		        application.use('/',(req,res,next)=>{
-		            req.user = req.headers;
-		            return next();
-		        });
+		        /**全局所有请求拦截器 默认将整个请求头都注入到req.user 中*/
+		        if (option.interceptorForUser !==false){
+		            application.use('/', (req, res, next) => {
+		                req.user = req.headers;
+		                return next();
+		            });
+		        }
 		        /**
 		         * 注册监控路由
 		         */
 		        if (!(option.monitor===false)) this.registerMonitorRouter(application);
 		        /** 加载所有的控制器 */
 		        if (!option.routes){
-		            const roterfile = path.join(process.cwd(), 'routerconfig.json');
+		            const roterfile = path.join(option.configfolder ?? process.cwd(), 'routerconfig.json');
 		            ///将配置中的所有需要加载的controller文件都加载出来
-		            if (fs.existsSync(roterfile)){
-		                option.routes = require(roterfile);
-		            }
+		            if (fs.existsSync(roterfile))option.routes = require(roterfile);
 		        }
 		        loadController(application, option.routes);
 		        Doomiwork.app = application;
@@ -932,13 +930,15 @@ function requireDataconfig () {
 	const path  = require$$1__default["default"];
 	class dataConfig
 	{
-	    constructor(){
-	        let configfile =    path.join(process.cwd(),'dataconfig.json');
-	        let comcfgfile =    path.join(process.cwd(),'simplecommon.json');
+	    static #instance;
+	    constructor(folder = process.cwd()){
+	        if (dataConfig.#instance) throw new Error('Use getCurrent() instead of new dataConfig()');
+	        let configfile = path.join(folder,'dataconfig.json');
+	        let comcfgfile = path.join(folder,'simplecommon.json');
 	        ////检查dataconfig.json文件是否存在，优先加载dataconfig.json
 	        if (!fs.existsSync(configfile)){
 	            ///如果json文件不存在，则加载后缀为js的文件
-	            configfile = path.join(process.cwd(),'dataconfig.js');
+	            configfile = path.join(folder,'dataconfig.js');
 	            if (!fs.existsSync(configfile)) 
 	                this.cache = {}; //throw new Error('missing app configuration file')
 	            else
@@ -949,13 +949,13 @@ function requireDataconfig () {
 	        if (fs.existsSync(comcfgfile)){
 	            this.commoncache = require(comcfgfile); 
 	        }else {
-	            comcfgfile =    path.join(process.cwd(),'simplecommon.js');
+	            comcfgfile = path.join(folder,'simplecommon.js');
 	            if (fs.existsSync(comcfgfile))
 	                this.commoncache = require(comcfgfile); 
 	            else
 	                this.commoncache = {};
 	        }
-	        
+	        this.folder = folder;
 	    }
 	    /*
 	    *根据名称获取到配置中的对应节
@@ -968,9 +968,9 @@ function requireDataconfig () {
 	     * 单例模式
 	     * @param {*} config 
 	     */
-	    static getCurrent(){
-	        if (!dataConfig.data) dataConfig.data = new dataConfig();
-	        return dataConfig.data;
+	    static getCurrent(folder = process.cwd()){
+	        if (!dataConfig.#instance) dataConfig.#instance = new dataConfig(folder);
+	        return dataConfig.#instance;
 	    }
 
 	    getDataConfig(itemName) {
@@ -992,7 +992,7 @@ function requireRequestparser () {
 	if (hasRequiredRequestparser) return requestparser;
 	hasRequiredRequestparser = 1;
 	const { parseKeyValue, validatorParamsType } = requireKeywordparse();
-	const dataconfig = requireDataconfig().getCurrent();
+	const dataconfig = requireDataconfig();
 	const mysql = require$$0__default$3["default"];
 	const ORDER_STRING = ['asc', 'desc'];
 	const FORBID_SQL_KEYWORD = /;|(--)|(\bWHERE\b)|(\bCASE\b)|(\bWHEN\b)|(\bSLEEP\b)|(\bSHOW\b)|(\bCOUNT\(\b)|(\bCREATE\b)|(\bCALL\b)|(\bBY\b)|(\bORDER\b)|(\bJOIN\b)|(\bUNION\b)|(\bFROM\b)|(\bSELECT\b)|(\bDROP\b)|(\bTRUNCATE\b)|(\bDELETE\b)|(\bUPDATE\b)|(\bINSERT\b)|(\bEXEC\b)|(\bEXECUTE\b)/gi;
@@ -1173,9 +1173,9 @@ function requireRequestparser () {
 	* 列表请求上下文中获取需要的信息
 	* 如Page ,PageSize , Sort 等等
 	*/
-	const getListInfo = (req, dataKey, cfgType = 0, dao) => {
-	    if (!dataKey) return null;
-	    const dataConfig = dataconfig.getConfig(dataKey, cfgType);
+	const getListInfo = (req, { key, folder, configtype = 0, dao }) => {
+	    if (!key) return null;
+	    const dataConfig = dataconfig.getCurrent(folder ?? process.cwd()).getConfig(key, configtype);
 	    if (!dataConfig?.list) return null;
 	    ///确认是否是需要导出Excel
 	    const export2Excel = (req.query.exportexcel + "").toLowerCase() === "true";
@@ -1232,9 +1232,9 @@ function requireRequestparser () {
 	* 详细页面请求上下文中获取需要的信息
 	* 如Page ,PageSize , Sort 等等
 	*/
-	const getDetailInfo = (req,dataKey) => {
-	    if (dataKey) {
-	        const dataConfig = dataconfig.getConfig(dataKey);
+	const getDetailInfo = (req,{key,folder}) => {
+	    if (key) {
+	        const dataConfig = dataconfig.getCurrent(folder ?? process.cwd()).getConfig(key);
 	        if (dataConfig && dataConfig.detail) {
 	            req.dataConfig = dataConfig;
 	            const { primary, field: fields, primaryIsAutoIncrease } = dataConfig.detail;
@@ -1316,7 +1316,7 @@ function requirePoolmanager () {
 	    if (PoolManager[connect]!=null){
 	        return PoolManager[connect];
 	    }
-	    const connectSection = appsetting.getSection(connect || 'dev');
+	    const connectSection = appsetting.getConnection(connect || 'dev');
 	    if (!connectSection) throw new Error('数据库连接配置不存在');
 	    const pool = mysql.createPool(connectSection);
 	    PoolManager[connect] = pool;
@@ -1984,20 +1984,19 @@ function requireController () {
 		    /*
 		    * 获取查询列表记录的方法
 		    */
-		    async getListData(req, dataKey, configFile = 0) {
-		        if (this.logger) this.logger.trace("准备获取dataconfig文件中对应的 %s list数据",dataKey);
-		        const listinfo = getListInfo(req, dataKey, configFile, this._daoModel);  //, ignorefilter==1
-		        if (!listinfo) return DoomiApiResult.fail(-10, `缺失${dataKey}对应的查询语句`);
-
+		    async getListData(req, key, configtype = 0) {
+		        if (this.logger) this.logger.trace("准备获取dataconfig文件中对应的 %s list数据", key);
+		        const listinfo = getListInfo(req, { key, folder: this.app.config.folder, configtype, dao:this._daoModel});  //, ignorefilter==1
+		        if (!listinfo) return DoomiApiResult.fail(-10, `缺失${key}对应的查询语句`);
 		        ////直接操作数据库之前，可由子类再次Handler
-		        let beforeData = await this.beforeAccessDB(req, listinfo.sql, listinfo.params, "list", this);
+		        const beforeData = await this.beforeAccessDB(req, listinfo.sql, listinfo.params, "list", this);
 		        ////如果返回Null,则表示不加载数据了
-		        if (beforeData.canceled === true) return DoomiApiResult.fail(1, '操作取消');
+		        if (beforeData.canceled) return DoomiApiResult.fail(1, '操作取消');
 		        ////操作数据库
-		        let result = await this._daoModel.loadData(beforeData.sql, beforeData.sqlParams);
+		        const result = await this._daoModel.loadData(beforeData.sql, beforeData.sqlParams);
 		        if(!result.successed) {
 		            ////失败也需要记录
-		            if (req.query.exportexcel==='true') this.logUserAction(req,this._daoModel.getBusiness(),5,-1);
+		            if (String(req.query.exportexcel).toLowerCase() === 'true') this.logUserAction(req,this._daoModel.getBusiness(),5,-1);
 		            return result;
 		        }
 		        ///从数据库中获取到了原始数据
@@ -2012,8 +2011,8 @@ function requireController () {
 		            }
 		            extra.total = await this.getListRecordCount(result);
 		            ///处理导出Excel
-		            if (req.query.exportexcel==='true') {
-		                const excelResult = await this.export2Excel(extra.rows, req.query.excelkey || dataKey);
+		            if (String(req.query.exportexcel).toLowerCase() === 'true') {
+		                const excelResult = await this.export2Excel(extra.rows, req.query.excelkey || key);
 		                this.logUserAction(req, this._daoModel.getBusiness(), 5, 0);
 		                return excelResult;
 		            }
@@ -2026,19 +2025,19 @@ function requireController () {
 		     * @param {*} data 
 		     */
 		    async getListRecordCount(result){
-		        if (result.rows && result.rows.length == 2 && result.rows[1].length) return result.rows[1][0].total;
+		        if (result && result.rows && result.rows.length == 2 && result.rows[1].length) return result.rows[1][0].total;
 		        return 0;
 		    }
 		    /*
 		    * 获取详细记录的方法
 		    */
-		    async getDataById(req, dataKey, sqlCommand,idValue) {
-		        if (this.logger) this.logger.trace("准备获取dataconfig文件中对应的 %s 详细数据",dataKey);
-		        const detailinfo = getDetailInfo(req, dataKey);
-		        if (!detailinfo) return DoomiApiResult.fail(-10, `缺失${dataKey}对应的详情配置`);
-		        const beforeData = await this.beforeAccessDB(req, sqlCommand || this._daoModel.getByIdSql(), idValue ||req.params.id, "detail", this);
+		    async getDataById(req, key, sqlCommand,dataUid) {
+		        if (this.logger) this.logger.trace("准备获取dataconfig文件中对应的 %s 详细数据", key);
+		        const detailinfo = getDetailInfo(req, { key,folder:this.app.config.folder });
+		        if (!detailinfo) return DoomiApiResult.fail(-10, `缺失${key}对应的详情配置`);
+		        const beforeData = await this.beforeAccessDB(req, sqlCommand || this._daoModel.getByIdSql(), dataUid ||req.params.id, "detail", this);
 		        ////如果返回Null,则表示不加载数据了
-		        if (beforeData.canceled===true) return DoomiApiResult.fail(1, '操作已取消');
+		        if (beforeData.canceled) return DoomiApiResult.fail(1, '操作已取消');
 		        /////处理SQL中的一些定义符
 		        const parseSql = parseTagInSql(req,beforeData.sql);
 		        ////操作数据库
@@ -2077,23 +2076,23 @@ function requireController () {
 		    /*
 		    * 新增实体记录的方法
 		    */
-		    async create(req, dataKey, sqlCommand) {
-		        if (this.logger) this.logger.trace("准备根据dataconfig文件中对应的 %s 配置插入数据",dataKey);
-		        let mapping = req.query.Mapping??true; //|| 'true'==='true' ;//commonHelper.ifNull(req.query.Mapping, true);
+		    async create(req, key, sqlCommand) {
+		        if (this.logger) this.logger.trace("准备根据dataconfig文件中对应的 %s 配置插入数据", key);
+		        const mapping = String(req.query.Mapping??true)===String(true); //|| 'true'==='true' ;//commonHelper.ifNull(req.query.Mapping, true);
 		        let detailinfo, resultItem = { successed: true, data: req.body };
 		        ///是否需要将data中的key-value值到配置文件中进行转换
-		        if (String(mapping) === String(true)) {
-		            detailinfo = getDetailInfo(req, dataKey);
-		            if (!detailinfo) return DoomiApiResult.fail(-10, `缺失${dataKey}对应的详情配置`);
+		        if (mapping) {
+		            detailinfo = getDetailInfo(req, { key,folder:this.app.config.folder });
+		            if (!detailinfo) return DoomiApiResult.fail(-10, `缺失${key}对应的详情配置`);
 		            resultItem = View2Data(req, detailinfo.fields, "create");
 		            ///如果转换的验证过程中出现错误，则返回
 		            if (!resultItem.successed) return resultItem;
 		        }
-		        let beforeData = await this.beforeAccessDB(req, sqlCommand || this._daoModel.insertSql(), resultItem.data, "create", this);
+		        const beforeData = await this.beforeAccessDB(req, sqlCommand || this._daoModel.insertSql(), resultItem.data, "create", this);
 		        ////如果返回Null,则表示不加载数据了
 		        if (beforeData.canceled) return DoomiApiResult.fail(1, '操作取消');
 		        if (this.logger) this.logger.trace("插入数据准备 : ",beforeData);
-		        let result = await this._daoModel.create(beforeData.sql, beforeData.sqlParams, req);
+		        const result = await this._daoModel.create(beforeData.sql, beforeData.sqlParams, req);
 		        if(!result.successed) {
 		            this.logUserAction(req,this._daoModel.getBusiness(),1,-1);
 		            return result;
@@ -2123,26 +2122,26 @@ function requireController () {
 		    /*
 		    * 修改实体记录的方法
 		    */
-		    async update(req, dataKey, sqlCommand, id) {
-		        if (this.logger)  this.logger.trace("准备根据dataconfig文件中对应的 %s 配置修改数据",dataKey);
-		        if (id == null) id = req.params.id;
-		        let mapping = req.query.Mapping??true;// commonHelper.ifNull(req.query.Mapping, true);
+		    async update(req, key, sqlCommand, id) {
+		        if (this.logger) this.logger.trace("准备根据dataconfig文件中对应的 %s 配置修改数据", key);
+		        id = id ?? req.params.id;
+		        const mapping = String(req.query.Mapping ?? true)===String(true);// commonHelper.ifNull(req.query.Mapping, true);
 		        let detailinfo, resultItem = { successed: true, data: req.body };
 		        ///是否需要将data中的key-value值到配置文件中进行转换
-		        if (String(mapping) === String(true)) {
-		            detailinfo = getDetailInfo(req, dataKey);
-		            if (!detailinfo) return DoomiApiResult.fail(-10, `缺失${dataKey}对应的详情配置`);
+		        if (mapping) {
+		            detailinfo = getDetailInfo(req, {key,folder:this.app.config.folder });
+		            if (!detailinfo) return DoomiApiResult.fail(-10, `缺失${key}对应的详情配置`);
 		            ///从Request中获取到用户提交的数据
 		            resultItem = View2Data(req, detailinfo.fields, "update");
 		        }
 		        ///如果不需要转换，则直接使用前端提交上来的值
-		        let beforeData = await this.beforeAccessDB(req, sqlCommand || this._daoModel.updateSql(), resultItem.data, "update", this);
+		        const beforeData = await this.beforeAccessDB(req, sqlCommand || this._daoModel.updateSql(), resultItem.data, "update", this);
 		        ////如果返回Null,则表示不加载数据了
 		        if (beforeData.canceled) return DoomiApiResult.fail(1, '操作取消');
 		        if (this.logger)  this.logger.trace("修改数据准备 : ",beforeData);
 		        /////处理SQL中的一些定义符
-		        let parseSql = parseTagInSql(req,beforeData.sql);
-		        let result = await this._daoModel.update(parseSql, beforeData.sqlParams, id);
+		        const parseSql = parseTagInSql(req,beforeData.sql);
+		        const result = await this._daoModel.update(parseSql, beforeData.sqlParams, id);
 		        if(!result.successed) {
 		            this.logUserAction(req,this._daoModel.getBusiness(),3,-1);
 		            return result;
@@ -2170,13 +2169,13 @@ function requireController () {
 		    */
 		    async delete(req, id, sqlCommand) {
 		        if (this.logger)  this.logger.trace("准备删除数据",id);
-		        let beforeData = await this.beforeAccessDB(req, sqlCommand || this._daoModel.deleteSql(id), id, "delete", this);
+		        const beforeData = await this.beforeAccessDB(req, sqlCommand || this._daoModel.deleteSql(id), id, "delete", this);
 		        ////如果返回Null,则表示不加载数据了
 		        if (beforeData.canceled) return DoomiApiResult.fail(1, '操作取消');
 		        /////处理SQL中的一些定义符
-		        let parseSql = parseTagInSql(req,beforeData.sql);
+		        const parseSql = parseTagInSql(req,beforeData.sql);
 		        ////操作数据库
-		        let result = await this._daoModel.delete(parseSql, beforeData.sqlParams,req.user?.id);
+		        const result = await this._daoModel.delete(parseSql, beforeData.sqlParams,req.user?.id);
 		        if(!result.successed) {
 		            this.logUserAction(req,this._daoModel.getBusiness(),2,-1);
 		            return result;