doomiwork 2.6.5 → 2.8.0

package/configuration/appsetting.js

@@ -27,7 +27,8 @@ class appsetting{
      * @param {*} defaultValue 
      */
     getSetting (settingKey,defaultValue) {
-       let item= this.settingjson.appsetting[settingKey];
+        if (!this.settingjson || !this.settingjson.appsetting) return defaultValue;
+       const item= this.settingjson.appsetting[settingKey];
        return utility.ifNull(item,defaultValue);
     }
     getSection(sectionName){

package/core/controller.js

@@ -261,8 +261,14 @@ class controller {
         ///提交的权限设置
         if (this._daoModel.hasPermissionControl){
             let param = {}
-            if (req.body.managepermission) param.managepermission =  JSON.parse(req.body.managepermission);
-            if (req.body.consumepermission) param.consumepermission = JSON.parse(req.body.consumepermission);
+            if (req.body.managepermission) 
+                param.managepermission =  JSON.parse(req.body.managepermission);
+            else
+                param.managepermission= {};
+            if (req.body.consumepermission) 
+                param.consumepermission = JSON.parse(req.body.consumepermission);
+            else
+                param.consumepermission = {}
             this._daoModel.saveDataPermissionSetting(primaryKey, param)
         }
         this.logUserAction(req,this._daoModel.getBusiness(),1,0);
@@ -301,8 +307,14 @@ class controller {
             ///提交的权限设置
             if (this._daoModel.hasPermissionControl) {
                 let param = {}
-                if (req.body.managepermission) param.managepermission = JSON.parse(req.body.managepermission);
-                if (req.body.consumepermission) param.consumepermission = JSON.parse(req.body.consumepermission);
+                if (req.body.managepermission) 
+                    param.managepermission = JSON.parse(req.body.managepermission);
+                else
+                    param.managepermission = {}
+                if (req.body.consumepermission) 
+                    param.consumepermission = JSON.parse(req.body.consumepermission);
+                else
+                    param.consumepermission = {}
                 this._daoModel.saveDataPermissionSetting(id, param)
             }
             this.logUserAction(req,this._daoModel.getBusiness(),3,0);
@@ -329,7 +341,7 @@ class controller {
             return result;
         }
         this.logUserAction(req,this._daoModel.getBusiness(),2,0);
-        return { successed: true, id: id };
+        return { successed: true, id: id, count: result.rows.affectedRows };
     }
 }
 exports = module.exports = controller;

package/core/database/daoBase.js

@@ -191,7 +191,9 @@ class mysqlDao extends dao{
     }
 
     async saveDataPermissionSetting(id,permissionParam){
-        if (!this.hasPermissionControl || !permissionParam) {return Promise.resolve({successed:true})};
+        if (!this.hasPermissionControl || !permissionParam) {
+            return Promise.resolve({successed:true})
+        };
         const sqlCommand = `
         replace into vmv3_data_permission(
             data_type,
@@ -242,7 +244,6 @@ class mysqlDao extends dao{
                 '${mItem.usertext || ''}'
             )`)
         }
-        console.log('permission sql', subItem.join(','))
         return this.executeSql(sqlCommand+subItem.join(','));
     }
     /**

package/core/doomiwork.js

@@ -10,7 +10,7 @@ const path      = require('path')
 const {redisHelper,logHelper} = require('doomi-helper');
 class Doomiwork { 
     static startWork(application) {
-        let startupRoot = process.cwd();
+        const startupRoot = process.cwd();
         ///将configuration对象放置于app对象中.所有的controller都可以使用
         application.config = config;
         ///启动redis进行缓存
@@ -19,11 +19,15 @@ class Doomiwork {
             application.redis =  redisHelper.getInstance();
         }
         ////记录用户行为的日志记录器
-        let actionLogger =path.join(startupRoot,config.getSetting("logaction",''));
-        if (actionLogger && fs.existsSync(actionLogger)) {
-            var 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();
+            }
+        }
+        
         application.logger =  logHelper.getInstance().getLogger("framework");
         
         /**全局所有请求拦截器 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doomiwork",
-  "version": "2.6.5",
+  "version": "2.8.0",
   "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",