@azteam/express 1.2.152 → 1.2.153

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.152",
+    "version": "1.2.153",
     "description": "",
     "main": "src/index.js",
     "repository": {
@@ -26,8 +26,6 @@
         "@azteam/crypto": "latest",
         "@azteam/error": "latest",
         "@azteam/http-client": "latest",
-        "@azteam/rabbitmq-async": "latest",
-        "@azteam/redis-async": "1.0.48",
         "@grpc/grpc-js": "1.6.7",
         "@grpc/proto-loader": "0.6.12",
         "body-parser": "1.19.0",

package/src/middleware/cacheMiddleware.js

@@ -1,31 +1,33 @@
 import _ from 'lodash';
+import qs from 'querystring';
 
 export default function(key, options = {}) {
     options = {
-        ttl: 5,
+        ttl: 300,
         limitPage: 5,
         ...options
     };
     return async function(req, res, next) {
         const {redis} = req;
         if (redis) {
+            let cacheKey = key;
+
             if (options.query) {
-                key += _.get(req, options.query);
+                cacheKey += `${cacheKey}:${_.get(req, options.query)}`;
             }
-            if (req.paginate) ;
-            {
-                if (req.paginate.page <= options.limitPage) {
-                    key += `page${req.paginate.page}`;
+            if (req.paginate) {
+                if (_.isEmpty(req.query) && req.paginate.page <= options.limitPage) {
+                    cacheKey = `${cacheKey}:${qs.stringify(req.paginate)}`;
                 } else {
                     return next();
                 }
             }
-            const cacheData = await redis.get(key);
+            const cacheData = await redis.get(cacheKey);
             if (cacheData) {
                 return res.json(cacheData);
             } else {
                 res.cache = {
-                    key,
+                    key: cacheKey,
                     ttl: options.ttl
                 };
             }