xzwebx-httpfilter 2.0.1 → 2.1.8

package/HttpFilter.js

@@ -7,57 +7,72 @@ let TipsMap = {}
 let ModuleMap = {}
 let ModuleInterfaceMap = {}
 let FieldMap = {}
+let IsCheckedRes = true
 async function response(req, res, next) {
     let retData = {
         codeKey: 'SVC_ERR',
         data: []
     }
     retData.codeKey = 'SUCC'
-    return res.send(res.Msg(retData))
+    return res.send(res.Msg(retData, req.GetRspMsgId()))
+}
+function SetIsCheckedRes(isCheckedRes) {
+    if (isCheckedRes) {
+        IsCheckedRes = true
+    } else {
+        IsCheckedRes = false
+    }
 }
 function Init(language, resultCodeMap, tipsMap, moduleMap, moduleInterfaceMap, fieldMap) {
     ResultCodeMap = resultCodeMap
-    TipsMap = tipsMap[language]
+    TipsMap = tipsMap[language] || {}
     ModuleMap = moduleMap
     ModuleInterfaceMap = moduleInterfaceMap
     FieldMap = fieldMap
 }
-function MSG(params) {
-    let code = ''
-    if (ResultCodeMap[params.codeKey]) {
-        code = ResultCodeMap[params.codeKey].rstCode
-    }
-
-    let msg = ''
-    if (!params.msg) {
-        if (TipsMap[params.codeKey]) {
-            msg = TipsMap[params.codeKey].tips
-        } else {
-            msg = ResultCodeMap[params.codeKey].codeDesc
+function MSG(params, rspMsgId) {
+    if (IsCheckedRes && rspMsgId) {
+        let retMsgData = cycleCheckParams(FieldMap[rspMsgId], params.data)
+        if (retMsgData) {
+            return MSG({codeKey: 'CLT_ERR', msg: retMsgData, data: params.data})
         }
     } else {
-        if (typeof params.msg == 'string') {
-            msg = params.msg
+        let code = ''
+        if (ResultCodeMap[params.codeKey]) {
+            code = ResultCodeMap[params.codeKey].rstCode
         }
 
-        if (typeof params.msg == 'object' && params.msg.length) {
-            if (TipsMap[params.msg[0]]) {
-                msg = TipsMap[params.msg[0]].tips
-                if (params.msg.length > 1) {
-                    for (let i = 1; i < params.msg.length; i++) {
-                        msg = Util.format(msg, params.msg[i])
+        let msg = ''
+        if (!params.msg) {
+            if (TipsMap[params.codeKey]) {
+                msg = TipsMap[params.codeKey].tips
+            } else {
+                msg = ResultCodeMap[params.codeKey].codeDesc
+            }
+        } else {
+            if (typeof params.msg == 'string') {
+                msg = params.msg
+            }
+
+            if (typeof params.msg == 'object' && params.msg.length) {
+                if (TipsMap[params.msg[0]]) {
+                    msg = TipsMap[params.msg[0]].tips
+                    if (params.msg.length > 1) {
+                        for (let i = 1; i < params.msg.length; i++) {
+                            msg = Util.format(msg, params.msg[i])
+                        }
                     }
+                } else {
+                    msg = params.msg[0]
                 }
-            } else {
-                msg = params.msg[0]
             }
         }
-    }
 
-    return {
-        code: code,
-        msg: msg,
-        data: params.data
+        return {
+            code: code,
+            msg: msg,
+            data: params.data
+        }
     }
 }
 function SetRoutes(app, express, projectPath) {
@@ -110,6 +125,11 @@ function CheckReq(req, res, next) {
         return res.send(res.Msg({codeKey: 'CLT_ERR', msg: ['WEBX_ERR_URL']}))
     }
 
+    req['__rspMsgId'] = ModuleInterfaceMap[module.id][subUri][req.method.toLowerCase()].rspMsgId || ''
+    req['GetRspMsgId'] = function() {
+        return req['__rspMsgId']
+    }
+
     req.headers['interfaceInfo'] = ModuleInterfaceMap[module.id][subUri][req.method.toLowerCase()]
     let reqMsgId = ModuleInterfaceMap[module.id][subUri][req.method.toLowerCase()].reqMsgId
     if (!reqMsgId) {
@@ -420,7 +440,7 @@ function IsObjOk(fCfgItem, paramValue) {
         return null
     }
 
-    if (!paramValue || paramValue.constructor != Object || !Object.keys(paramValue).length) {
+    if (!paramValue || typeof paramValue != 'object' || !Object.keys(paramValue).length || paramValue.length) {
         if (fCfgItem.nullTips) {
             return getCustomTips(fCfgItem.nullTips)
         }
@@ -470,7 +490,7 @@ function IsListOk(fCfgItem, paramValue) {
         return null
     }
 
-    if (!paramValue || paramValue.constructor != Array || !paramValue.length) {
+    if (!paramValue || typeof paramValue != 'object' || !paramValue.length) {
         if (fCfgItem.nullTips) {
             return getCustomTips(fCfgItem.nullTips)
         }
@@ -516,4 +536,5 @@ module.exports = {
     SetRoutes: SetRoutes,
     CheckReq: CheckReq,
     SetMsg: SetMsg,
+    SetIsCheckedRes: SetIsCheckedRes
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xzwebx-httpfilter",
-  "version": "2.0.1",
+  "version": "2.1.8",
   "main": "HttpFilter.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"