xzwebx-httpfilter 2.2.2 → 2.2.4

package/HttpFilter.js

@@ -8,75 +8,15 @@ let ModuleMap = {}
 let ModuleInterfaceMap = {}
 let FieldMap = {}
 let IsCheckedRes = true
-async function response(req, res, next) {
-    let retData = {
-        codeKey: 'SUCC',
-        data: []
-    }
-    return res.Msg(retData)
-}
-function SetIsCheckedRes(isCheckedRes) {
-    if (isCheckedRes) {
-        IsCheckedRes = true
-    } else {
-        IsCheckedRes = false
-    }
-}
-function Init(language, resultCodeMap, tipsMap, moduleMap, moduleInterfaceMap, fieldMap) {
+let Fun = {}
+Fun.Init = function(language, resultCodeMap, tipsMap, moduleMap, moduleInterfaceMap, fieldMap) {
     ResultCodeMap = resultCodeMap
     TipsMap = tipsMap[language] || {}
     ModuleMap = moduleMap
     ModuleInterfaceMap = moduleInterfaceMap
     FieldMap = fieldMap
 }
-function MSG(params, rspMsgId) {
-    if (IsCheckedRes && this.interfaceInfo.rspMsgId) {
-        let retMsgData = cycleCheckParams(FieldMap[rspMsgId], params.data)
-        if (retMsgData) {
-            return MSG({codeKey: 'CLT_ERR', msg: retMsgData, data: params.data})
-        }
-    } else {
-        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
-            }
-        } 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]
-                }
-            }
-        }
-
-        return  this.send(
-            {
-                code: code,
-                msg: msg,
-                data: params.data
-            }
-        )
-    }
-}
-function SetRoutes(app, express, projectPath) {
+Fun.SetRoutes = function(app, express, projectPath) {
     for (let uri in ModuleMap) {
         let module = ModuleMap[uri]
         let router = express.Router()
@@ -101,8 +41,7 @@ function SetRoutes(app, express, projectPath) {
         app.use(ModuleMap[uri].uri, router)
     }
 }
-function CheckReq(req, res, next) {
-    res.Msg = MSG
+Fun.CheckUrl = function(req, res, next) {
     const baseUrlList = req.url.split('/')
     const subUri = baseUrlList[baseUrlList.length - 1]
     let baseUrl = ''
@@ -126,9 +65,12 @@ function CheckReq(req, res, next) {
         return res.Msg({codeKey: 'CLT_ERR', msg: ['WEBX_ERR_URL']})
     }
 
-    req['interfaceInfo'] = ModuleInterfaceMap[module.id][subUri][req.method.toLowerCase()]
-    res['interfaceInfo'] = ModuleInterfaceMap[module.id][subUri][req.method.toLowerCase()]
-    let reqMsgId = ModuleInterfaceMap[module.id][subUri][req.method.toLowerCase()].reqMsgId
+    req.interfaceInfo = ModuleInterfaceMap[module.id][subUri][req.method.toLowerCase()]
+    res.interfaceInfo = ModuleInterfaceMap[module.id][subUri][req.method.toLowerCase()]
+    return next()
+}
+Fun.CheckReq = function(req, res, next) {
+    let reqMsgId = req.interfaceInfo.reqMsgId
     if (!reqMsgId) {
         return next()
     }
@@ -140,6 +82,74 @@ function CheckReq(req, res, next) {
 
     return next()
 }
+Fun.SetMsg = function(req, res, next) {
+    res.Msg = MSG
+    return next()
+}
+Fun.SetIsCheckedRes = function(isCheckedRes) {
+    if (isCheckedRes) {
+        IsCheckedRes = true
+    } else {
+        IsCheckedRes = false
+    }
+}
+
+async function response(req, res, next) {
+    let retData = {
+        codeKey: 'SUCC',
+        data: []
+    }
+    return res.Msg(retData)
+}
+function MSG(params) {
+    if (IsCheckedRes &&
+        this.interfaceInfo.rspMsgId &&
+        params.codeKey == 'SUCC') {
+        let retMsgData = cycleCheckParams(FieldMap[this.interfaceInfo.rspMsgId], params.data)
+        if (retMsgData) {
+            params.codeKey = 'SVC_ERR'
+            params.msg = retMsgData
+        }
+    }
+    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
+        }
+    } 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]
+            }
+        }
+    }
+
+    return  this.send(
+        {
+            code: code,
+            msg: msg,
+            data: params.data
+        }
+    )
+}
 function cycleCheckParams(msgFieldMap, data) {
     let retMsgData = null
 
@@ -523,15 +533,4 @@ function IsListOk(fCfgItem, paramValue) {
 
     return null
 }
-
-function SetMsg(req, res, next) {
-    res.Msg = MSG
-    return next()
-}
-module.exports = {
-    Init: Init,
-    SetRoutes: SetRoutes,
-    CheckReq: CheckReq,
-    SetMsg: SetMsg,
-    SetIsCheckedRes: SetIsCheckedRes
-}
+module.exports = Fun

package/package.json

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