@azteam/express 1.2.151 → 1.2.152

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@azteam/express",
-    "version": "1.2.151",
+    "version": "1.2.152",
     "description": "",
     "main": "src/index.js",
     "repository": {
@@ -27,7 +27,7 @@
         "@azteam/error": "latest",
         "@azteam/http-client": "latest",
         "@azteam/rabbitmq-async": "latest",
-        "@azteam/redis-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",
@@ -41,6 +41,7 @@
         "fastest-validator": "1.8.0",
         "helmet": "3.21.2",
         "jsonwebtoken": "8.2.1",
+        "lodash": "4.17.21",
         "method-override": "3.0.0",
         "morgan": "1.10.0",
         "socket.io": "4.4.1",

package/src/Server.js

@@ -241,7 +241,7 @@ class Server {
                 };
 
                 if (this.redis && this.cache) {
-                    this.redis.set(this.cache.key, resData, this.ttl);
+                    this.redis.set(this.cache.key, resData, this.cache.ttl);
                 }
 
                 return this.json(resData);

package/src/middleware/cacheMiddleware.js

@@ -1,14 +1,32 @@
-export default function(key, ttl = 5) {
+import _ from 'lodash';
+
+export default function(key, options = {}) {
+    options = {
+        ttl: 5,
+        limitPage: 5,
+        ...options
+    };
     return async function(req, res, next) {
         const {redis} = req;
         if (redis) {
+            if (options.query) {
+                key += _.get(req, options.query);
+            }
+            if (req.paginate) ;
+            {
+                if (req.paginate.page <= options.limitPage) {
+                    key += `page${req.paginate.page}`;
+                } else {
+                    return next();
+                }
+            }
             const cacheData = await redis.get(key);
             if (cacheData) {
                 return res.json(cacheData);
             } else {
                 res.cache = {
                     key,
-                    ttl
+                    ttl: options.ttl
                 };
             }
         }