xzwebx-httpfilter 2.4.1 → 2.4.3

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/xzwebx-httpfilter.iml" filepath="$PROJECT_DIR$/.idea/xzwebx-httpfilter.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/xzwebx-httpfilter.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/HttpFilter.js

@@ -122,6 +122,8 @@ class http {
             return res.Msg({codeKey: 'CLT_ERR', msg: ['WEBX_ERR_URL']})
         }
     
+        req.moduleInfo = module
+        res.moduleInfo = module
         req.interfaceInfo = this.ModuleInterfaceMap[module.id][subUri][req.method.toLowerCase()]
         res.interfaceInfo = this.ModuleInterfaceMap[module.id][subUri][req.method.toLowerCase()]
         return next()
@@ -132,73 +134,60 @@ class http {
     }
     checkReq(req, res, next) {
         let reqMsgId = req.interfaceInfo.reqMsgId
-        if (!reqMsgId) {
+        if (!reqMsgId || !this.FieldMap[reqMsgId]) {
             return next()
         }
-    
-        let retMsgData = this.cycleCheckParams(this.FieldMap[reqMsgId], req.body)
-        if (retMsgData) {
-            return res.Msg({codeKey: 'CLT_ERR', msg: retMsgData})
+
+        for (let fieldName in this.FieldMap[reqMsgId]) {
+            let retMsgData = this.cycleCheckParams(this.FieldMap[reqMsgId][fieldName], req.body)
+            if (retMsgData) {
+                return res.Msg({codeKey: 'CLT_ERR', msg: retMsgData})
+            }
         }
-    
+
         return next()
     }
     cycleCheckParams(msgFieldMap, data) {
-        let retMsgData = null
-    
         if (!msgFieldMap) {
             return null
         }
-    
-        let fCfgItem = null
-        let isRoot = true
-        if (msgFieldMap['__FieldCfg']) {
-            isRoot = false
-            fCfgItem = msgFieldMap['__FieldCfg']
+
+        let fCfgItem = msgFieldMap['__FieldCfg']
+        if (!fCfgItem) {
+            return null
         }
-    
+
+        let retMsgData = null
+        if (fCfgItem.fieldType == 'STR') {
+            retMsgData = this.isStringOk(fCfgItem, data)
+        } else if (fCfgItem.fieldType == 'INT') {
+            retMsgData = this.isIntOk(fCfgItem, data)
+        } else if (fCfgItem.fieldType == 'OBJ') {
+            retMsgData = this.isObjOk(fCfgItem, data)
+        } else if (fCfgItem.fieldType == 'LIST') {
+            retMsgData = this.isListOk(fCfgItem, data)
+        }
+
+        if (retMsgData) {
+            return retMsgData
+        }
+
         for (let fieldName in msgFieldMap) {
-            if (isRoot) {
-                fCfgItem = msgFieldMap[fieldName]['__FieldCfg']
-            }
-    
-            if (fCfgItem.fieldType == 'STR') {
-                retMsgData = this.isStringOk(fCfgItem, data)
-            } else if (fCfgItem.fieldType == 'INT') {
-                retMsgData = this.isIntOk(fCfgItem, data)
-            } else if (fCfgItem.fieldType == 'OBJ') {
-                retMsgData = this.isObjOk(fCfgItem, data)
-            } else if (fCfgItem.fieldType == 'LIST') {
-                retMsgData = this.isListOk(fCfgItem, data)
-            }
-    
-            if (retMsgData) {
-                return retMsgData
-            }
-    
-            if (fieldName == '__FieldCfg') {
+            if (fieldName === '__FieldCfg') {
                 continue
             }
             let fatherFieldType = fCfgItem.fieldType
-            if (fatherFieldType == 'LIST' || (fatherFieldType == 'OBJ' && fCfgItem.keyType == 'VOBJ')) {
-                if (isRoot) {
-                    retMsgData = this.cycleCheckParams(msgFieldMap[fieldName], data)
-                } else {
-                    for (let idx in data) {
-                        retMsgData = this.cycleCheckParams(msgFieldMap[fieldName], data[idx])
-                        if (retMsgData) {
-                            return retMsgData
-                        }
+            if (fCfgItem.fieldType === 'LIST' || (fCfgItem.fieldType === 'OBJ' && msgFieldMap[fieldName]['__FieldCfg'].keyType === 'VSTR')) {
+                for (let idx in data) {
+                    retMsgData = this.cycleCheckParams(msgFieldMap[fieldName], data[idx])
+                    if (retMsgData) {
+                        return retMsgData
                     }
                 }
             } else {
-                if (isRoot) {
-                    retMsgData = this.cycleCheckParams(msgFieldMap[fieldName], data)
-                } else {
-                    retMsgData = this.cycleCheckParams(msgFieldMap[fieldName], data[fieldName])
-                }
+                retMsgData = this.cycleCheckParams(msgFieldMap[fieldName], data[fieldName])
             }
-    
+
             if (retMsgData) {
                 return retMsgData
             }
@@ -532,11 +521,14 @@ function response(params) {
     if (p.IsCheckedRes &&
         this.interfaceInfo &&
         this.interfaceInfo.rspMsgId &&
-        params.codeKey == 'SUCC') {
-        let retMsgData = p.cycleCheckParams(p.FieldMap[this.interfaceInfo.rspMsgId], params.data)
-        if (retMsgData) {
-            params.codeKey = 'SVC_ERR'
-            params.msg = retMsgData
+        p.FieldMap[this.interfaceInfo.rspMsgId] &&
+        params.codeKey === 'SUCC') {
+        for (let fieldName in p.FieldMap[this.interfaceInfo.rspMsgId]) {
+            let retMsgData = p.cycleCheckParams(p.FieldMap[this.interfaceInfo.rspMsgId][fieldName], params.data)
+            if (retMsgData) {
+                params.codeKey = 'SVC_ERR'
+                params.msg = retMsgData
+            }
         }
     }
     let code = ''

package/package.json

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