doomiwork 2.9.5 → 3.2.0

package/core/controller.js

@@ -29,7 +29,7 @@ class controller {
         this.actionLogger = application.actionLogger;
         ///需要数据访问实体的实例
         this._daoModel = dao?dao:new daoBase();
-        
+        this._daoModel.actionLogger = this.actionLogger;
         this._router = express.Router();
         ///实现的集成类中只需要去重写此方法
         this.initializeRouter(this);

package/core/database/mysqlbase.js

@@ -24,6 +24,18 @@ class Database {
     escape(value){
         return mysql.escape(value);
     }
+    /**
+     * 记录错误日志
+     */
+    logError(scene,error,user=null){
+        ///不需要记录错误日志
+        if (this.ingoreErrorLog === true || !this.actionLogger || typeof (this.actionLogger.logError)!=='function'){
+            return ;
+        }
+        ///如果没有传场景，则记录数据库的业务值
+        if (!scene) scene = this.constructor.name;
+        this.actionLogger.logError({ scene, error, user})
+    }
     /**
      * 不事务执行SQL命令
      * @param {*} sqlCommand 
@@ -31,13 +43,16 @@ class Database {
      */
     executeSql(sqlCommand, parameters) {
         let logger = this.logger;
+        let that = this;
         return new Promise((success, failed) => {
-            if (!this.pool) return failed(apiResult.DB_CONNECTED_FAILED);
+            if (!this.pool) {
+                return success(apiResult.DB_CONNECTED_FAILED);
+            }
             ///创建出数据库连接，准备执行
             this.pool.getConnection(function (err, connection) {
                 if (err) {
                     logger.error("Database Connected Failed :"+ err);
-                    return failed(apiResult.DB_CONNECTED_FAILED);
+                    return success(apiResult.DB_CONNECTED_FAILED);
                 }
                 else {
                     logger.trace("SqlCommand:", sqlCommand, "Parameters:", parameters);
@@ -45,6 +60,7 @@ class Database {
                         connection.release();
                         if (err) {
                             logger.error("Database Query Error :" + err, sqlCommand);
+                            that.logError(null, '数据库操作错误:' + err + sqlCommand)
                             return success(Object.assign(apiResult.DB_EXECUTE_FAILED, { errmessage: err.message }));
                         }
                         return success({ successed: true, rows: rows });//,fields:fields});
@@ -62,12 +78,12 @@ class Database {
     executeSqlWithTransaction(sqlCommand, parameters) {
         let logger = this.logger;
         return new Promise((success, failed) => {
-            if (!this.pool) return failed(apiResult.DB_CONNECTED_FAILED);
+            if (!this.pool) return success(apiResult.DB_CONNECTED_FAILED);
             ///创建出数据库连接，准备执行
             this.pool.getConnection(function (err, connection) {
                 if (err) {
                     logger.error("Database Connected Failed :"+ err);
-                    return failed(apiResult.DB_CONNECTED_FAILED);
+                    return success(apiResult.DB_CONNECTED_FAILED);
                 }
                 logger.trace("SqlCommand:", sqlCommand, "Parameters:", parameters);
                 ////开启事务保护

package/package.json

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

package/utilities/requestparser.js

@@ -59,9 +59,18 @@ class RequestParser {
         ///确认是否是需要导出Excel
         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.pageSize = req.query.rows || req.body.rows || 100;
         req.sort = req.query.sort || req.body.sort;
-
+        //防止注入式Sql
+        if (isNaN(req.pageSize)){
+            req.pageSize = 30;
+        }
+        //防止注入式Sql
+        if (isNaN(req.page)) {
+            req.page = 1;
+        }
+        ///最大允许获取100条数据
+        req.pageSize = Math.min(req.pageSize,100);
         req.order =req.sort? utility.ifNull((req.body.order == null ? req.query.order : req.body.order), ""):'';
         if (dataKey) {
             req.dataConfig = dataconfig.getConfig(dataKey,cfgType);