npm_microservice 1.0.18 → 1.0.19

package/dist/service.js

@@ -7,8 +7,8 @@ var __commonJS = (cb, mod) => function __require() {
 var require_config = __commonJS({
   "src/config.js"(exports2, module2) {
     require("dotenv").config({ quiet: true, override: true });
-    var Redis = require("ioredis");
-    var redis = new Redis({
+    var Redis2 = require("ioredis");
+    var redis = new Redis2({
       host: process.env.REDIS_HOST || "128.199.195.180",
       port: process.env.REDIS_PORT || 6379,
       password: process.env.REDIS_PASSWORD || "WZyB5Z7BRRgvrzuGzRwB"
@@ -178,13 +178,74 @@ var require_config = __commonJS({
   }
 });
 
+// src/services/CacheService.js
+var require_CacheService = __commonJS({
+  "src/services/CacheService.js"(exports2, module2) {
+    var qs = require("qs");
+    var CacheService = class {
+      isCache = false;
+      // bật/tắt cache mặc định
+      service = null;
+      // nhớ gán ở subclass
+      module = null;
+      // module
+      configService = "gateway";
+      // module
+      timeCache = 3600;
+      // cache 60p
+      redis = null;
+      constructor() {
+        this.redis = new Redis();
+      }
+      buildCacheKeyUrl(path, params = {}) {
+        const q = qs.stringify(params, { arrayFormat: "brackets", encode: true });
+        const full = `${path}${q ? "?" + q : ""}`;
+        return `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.urls:${full}`;
+      }
+      // Lấy cache theo id
+      async getCacheByKey(key) {
+        const data = await this.redis.get(key);
+        return data ? JSON.parse(data) : null;
+      }
+      // Lấy cache theo id
+      async getCacheById(id) {
+        if (!this.isCache || !this.redis) return null;
+        const key = `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.id:${id}`;
+        const data = await this.redis.get(key);
+        return data ? JSON.parse(data) : null;
+      }
+      // Lấy cache theo nhiều ids
+      async getCacheByIds(ids = []) {
+        if (!this.isCache || !this.redis) return [];
+        const keys = ids.map(
+          (id) => `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.id:${id}`
+        );
+        const results = await this.redis.mget(keys);
+        return results.map((r) => r ? JSON.parse(r) : null);
+      }
+      // Set cache
+      async setCache(key, value, ttl = this.timeCache) {
+        if (!this.isCache || !this.redis) return;
+        await this.redis.set(key, JSON.stringify(value), "EX", ttl);
+      }
+      // Ví dụ set cache theo id
+      async setCacheById(id, value, ttl) {
+        const key = `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.id:${id}`;
+        await this.setCache(key, value, ttl);
+      }
+    };
+    module2.exports = CacheService;
+  }
+});
+
 // src/services/BaseService.js
 var require_BaseService = __commonJS({
   "src/services/BaseService.js"(exports2, module2) {
     var axios = require("axios");
     var qs = require("qs");
     var { API_MICROSERVICE_TOKEN, CONFIG_REDIS } = require_config();
-    var BaseService = class {
+    var CacheService = require_CacheService();
+    var BaseService = class extends CacheService {
       baseUrl = "";
       headers = {};
       isCache = false;
@@ -196,6 +257,7 @@ var require_BaseService = __commonJS({
       constructor(baseUrl = "", defaultHeaders = {}) {
         this.baseUrl = baseUrl;
         this.setHeader(defaultHeaders);
+        this.redis = CONFIG_REDIS;
         this.http = axios.create({
           baseURL: this.baseUrl,
           headers: this.headers,
@@ -221,23 +283,14 @@ var require_BaseService = __commonJS({
         };
         return this;
       }
-      buildCacheKey(path, params = {}) {
-        const q = qs.stringify(params, { arrayFormat: "brackets", encode: true });
-        const full = `${path}${q ? "?" + q : ""}`;
-        const service = this.service || "unknown";
-        return `gateway.${service}.urls:${full}`;
-      }
-      async request(method, url, options = {}, cacheKey = null, cacheOption = {}) {
+      async request(method, url, options = {}, cacheKey2 = null, cacheOption = {}) {
         var _a, _b;
         const isGet = method.toLowerCase() === "get";
         const enableCache = cacheOption.isCache ?? this.isCache;
         if (isGet && enableCache) {
-          cacheKey = cacheKey || this.buildCacheKey(url, options.params);
-          const cached = await CONFIG_REDIS.get(cacheKey);
-          if (cached) {
-            console.log(`[CACHE HIT] ${cacheKey}`);
-            return JSON.parse(cached);
-          }
+          cacheKey2 = cacheKey2 || this.buildCacheKeyUrl(url, options.params);
+          const cached = await this.getCacheByKey(cacheKey2);
+          if (cached) return JSON.parse(cached);
         }
         try {
           if (isGet) {
@@ -252,10 +305,10 @@ var require_BaseService = __commonJS({
           });
           const data = res.data;
           if (isGet && enableCache) {
-            cacheKey = cacheKey || this.buildCacheKey(url, options.params);
+            cacheKey2 = cacheKey2 || this.buildCacheKeyUrl(url, options.params);
             const ttl = cacheOption.timeCache || this.timeCache;
-            await CONFIG_REDIS.set(cacheKey, JSON.stringify(data), "EX", ttl);
-            console.log(`[CACHE SET] ${cacheKey} - TTL ${ttl}s`);
+            await CONFIG_REDIS.set(cacheKey2, JSON.stringify(data), "EX", ttl);
+            console.log(`[CACHE SET] ${cacheKey2} - TTL ${ttl}s`);
           }
           const duration = (Date.now() - startTime) / 1e3;
           if (duration > 5) {
@@ -310,7 +363,7 @@ var require_BaseService = __commonJS({
       }
       async detail(id, cacheOption = {}) {
         const enableCache = cacheOption.isCache ?? this.isCache;
-        const cacheKey = enableCache ? `gateway.${this.service}.${id}` : null;
+        if (enableCache && this.getCacheById(id)) return this.getCacheById(id);
         return this.request(
           "get",
           `${this.baseUrl}/${id}`,
@@ -395,7 +448,7 @@ var require_BannerService = __commonJS({
     var BannerService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.App.BannerService);
-        this.service = "App.BannerService";
+        this.service = "AppBannerService";
         this.isCache = true;
       }
     };
@@ -411,7 +464,7 @@ var require_CategoryService = __commonJS({
     var CategoryService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.App.CategoryService);
-        this.service = "App.CategoryService";
+        this.service = "AppCategoryService";
         this.isCache = true;
       }
     };
@@ -508,7 +561,7 @@ var require_AppTestService = __commonJS({
     var AppTestService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.App.AppTestService);
-        this.service = "app_test";
+        this.service = "AppTestService";
       }
       async category(filter = {}) {
         this.service = "app_category";
@@ -517,7 +570,7 @@ var require_AppTestService = __commonJS({
       }
       async count(filter = {}) {
         let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/app/tests/count";
-        this.service = "app_tests";
+        this.service = "AppTestService";
         return this.request("get", url, { params: filter });
       }
       // có thể thêm method riêng cho user nếu cần
@@ -637,10 +690,10 @@ var require_TicketService = __commonJS({
         this.service = "ticket-topics";
         return this.request("get", url);
       }
-      // async close(params) {
-      //   const url = `${CONFIG_ROUTER_SERVICE.BASE_URL}/call-center/ticket/${params.ticket_id}/close`;
-      //   return this.request("post", url, { data: params });
-      // }
+      async close(params) {
+        const url = `${CONFIG_ROUTER_SERVICE.BASE_URL}/call-center/ticket/${params.ticket_id}/close`;
+        return this.request("post", url, { data: params });
+      }
       async create(params) {
         const url = `${CONFIG_ROUTER_SERVICE.BASE_URL}/call-center/ticket`;
         return this.request("post", url, { data: params });
@@ -722,19 +775,22 @@ var require_ContactsService = __commonJS({
         this.service = "contacts";
       }
       async findEmailOrPhone(input) {
-        const options = { limit: 1 };
-        let query = {};
+        let filter = {};
         if (/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(input)) {
-          query = { emailphone: input };
+          filter = { emailphone: input };
         } else {
           const normalizedPhone = input.replace(/^0/, "+84");
-          query = { emailphone: normalizedPhone };
+          filter = { emailphone: normalizedPhone };
         }
-        return await this.all(query);
+        return await this.all({ filter });
       }
-      async sendOtp(params) {
+      async sendOtp(data) {
         let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/lms/contact-request";
-        return this.request("post", url, params);
+        return this.request("post", url, { data });
+      }
+      async getContactRequestDetail(id) {
+        let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/lms/contact-request/" + id;
+        return this.request("get", url);
       }
       // có thể thêm method riêng cho user nếu cần
     };
@@ -1624,7 +1680,7 @@ var require_AlbumService = __commonJS({
     var AlbumService = class extends BaseService {
       constructor() {
         super(CONFIG_ROUTER_SERVICE.Lms.AlbumService);
-        this.service = "Lms.AlbumService";
+        this.service = "albumService";
         this.isCache = false;
       }
       async category(filter = {}) {
@@ -1780,14 +1836,14 @@ var require_DocumentService2 = __commonJS({
         this.service = "document_categories";
         return this.request("get", url, { params: filter });
       }
-      async favorite(filter = {}) {
+      async favorite(data = {}) {
         let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/lms/student-documents";
         this.service = "student_documents";
-        return this.request("post", url, { params: filter });
+        return this.request("post", url, { data });
       }
-      async view(id, params) {
+      async view(id, data) {
         const url = `${CONFIG_ROUTER_SERVICE.BASE_URL}/lms/documents/${id}/view`;
-        return this.request("post", url, params);
+        return this.request("post", url, data);
       }
       async count(filter = {}) {
         let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/lms/documents/count";
@@ -2037,9 +2093,9 @@ var require_NotificationService = __commonJS({
         this.service = "notifications";
         return this.request("get", url, { params });
       }
-      async read(id, params) {
+      async read(id, data) {
         const url = CONFIG_ROUTER_SERVICE.BASE_URL + `/notification/app/is_read/${id}`;
-        return this.request("post", url, params);
+        return this.request("post", url, { data });
       }
       async getDetailNotiContact(id) {
         const url = `${CONFIG_ROUTER_SERVICE.BASE_URL}/notification/notification_contact/${id}`;
@@ -2056,13 +2112,13 @@ var require_NotificationService = __commonJS({
         this.service = "devices";
         return this.request("get", url, { params });
       }
-      async createMail(params) {
+      async createMail(data) {
         let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/notification/type/mail";
-        return this.request("post", url, params);
+        return this.request("post", url, { data });
       }
-      async createSms(params) {
+      async createSms(data) {
         let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/notification/type/sms";
-        return this.request("post", url, params);
+        return this.request("post", url, { data });
       }
       // có thể thêm method riêng cho user nếu cần
     };
@@ -2378,9 +2434,9 @@ var require_CommentService = __commonJS({
         let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/support/likes/count";
         return this.request("get", url, { params: filter });
       }
-      async likes(params) {
+      async likes(data) {
         const url = `${CONFIG_ROUTER_SERVICE.BASE_URL}/support/likes`;
-        return this.request("post", url, { data: params });
+        return this.request("post", url, { data });
       }
       async getComment(filter = {}) {
         let url = CONFIG_ROUTER_SERVICE.BASE_URL + "/support/comment/render_comment";

package/dist/services/BaseService.js

@@ -7,8 +7,8 @@ var __commonJS = (cb, mod) => function __require() {
 var require_config = __commonJS({
   "src/config.js"(exports2, module2) {
     require("dotenv").config({ quiet: true, override: true });
-    var Redis = require("ioredis");
-    var redis = new Redis({
+    var Redis2 = require("ioredis");
+    var redis = new Redis2({
       host: process.env.REDIS_HOST || "128.199.195.180",
       port: process.env.REDIS_PORT || 6379,
       password: process.env.REDIS_PASSWORD || "WZyB5Z7BRRgvrzuGzRwB"
@@ -178,11 +178,72 @@ var require_config = __commonJS({
   }
 });
 
+// src/services/CacheService.js
+var require_CacheService = __commonJS({
+  "src/services/CacheService.js"(exports2, module2) {
+    var qs2 = require("qs");
+    var CacheService2 = class {
+      isCache = false;
+      // bật/tắt cache mặc định
+      service = null;
+      // nhớ gán ở subclass
+      module = null;
+      // module
+      configService = "gateway";
+      // module
+      timeCache = 3600;
+      // cache 60p
+      redis = null;
+      constructor() {
+        this.redis = new Redis();
+      }
+      buildCacheKeyUrl(path, params = {}) {
+        const q = qs2.stringify(params, { arrayFormat: "brackets", encode: true });
+        const full = `${path}${q ? "?" + q : ""}`;
+        return `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.urls:${full}`;
+      }
+      // Lấy cache theo id
+      async getCacheByKey(key) {
+        const data = await this.redis.get(key);
+        return data ? JSON.parse(data) : null;
+      }
+      // Lấy cache theo id
+      async getCacheById(id) {
+        if (!this.isCache || !this.redis) return null;
+        const key = `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.id:${id}`;
+        const data = await this.redis.get(key);
+        return data ? JSON.parse(data) : null;
+      }
+      // Lấy cache theo nhiều ids
+      async getCacheByIds(ids = []) {
+        if (!this.isCache || !this.redis) return [];
+        const keys = ids.map(
+          (id) => `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.id:${id}`
+        );
+        const results = await this.redis.mget(keys);
+        return results.map((r) => r ? JSON.parse(r) : null);
+      }
+      // Set cache
+      async setCache(key, value, ttl = this.timeCache) {
+        if (!this.isCache || !this.redis) return;
+        await this.redis.set(key, JSON.stringify(value), "EX", ttl);
+      }
+      // Ví dụ set cache theo id
+      async setCacheById(id, value, ttl) {
+        const key = `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.id:${id}`;
+        await this.setCache(key, value, ttl);
+      }
+    };
+    module2.exports = CacheService2;
+  }
+});
+
 // src/services/BaseService.js
 var axios = require("axios");
 var qs = require("qs");
 var { API_MICROSERVICE_TOKEN, CONFIG_REDIS } = require_config();
-var BaseService = class {
+var CacheService = require_CacheService();
+var BaseService = class extends CacheService {
   baseUrl = "";
   headers = {};
   isCache = false;
@@ -194,6 +255,7 @@ var BaseService = class {
   constructor(baseUrl = "", defaultHeaders = {}) {
     this.baseUrl = baseUrl;
     this.setHeader(defaultHeaders);
+    this.redis = CONFIG_REDIS;
     this.http = axios.create({
       baseURL: this.baseUrl,
       headers: this.headers,
@@ -219,23 +281,14 @@ var BaseService = class {
     };
     return this;
   }
-  buildCacheKey(path, params = {}) {
-    const q = qs.stringify(params, { arrayFormat: "brackets", encode: true });
-    const full = `${path}${q ? "?" + q : ""}`;
-    const service = this.service || "unknown";
-    return `gateway.${service}.urls:${full}`;
-  }
-  async request(method, url, options = {}, cacheKey = null, cacheOption = {}) {
+  async request(method, url, options = {}, cacheKey2 = null, cacheOption = {}) {
     var _a, _b;
     const isGet = method.toLowerCase() === "get";
     const enableCache = cacheOption.isCache ?? this.isCache;
     if (isGet && enableCache) {
-      cacheKey = cacheKey || this.buildCacheKey(url, options.params);
-      const cached = await CONFIG_REDIS.get(cacheKey);
-      if (cached) {
-        console.log(`[CACHE HIT] ${cacheKey}`);
-        return JSON.parse(cached);
-      }
+      cacheKey2 = cacheKey2 || this.buildCacheKeyUrl(url, options.params);
+      const cached = await this.getCacheByKey(cacheKey2);
+      if (cached) return JSON.parse(cached);
     }
     try {
       if (isGet) {
@@ -250,10 +303,10 @@ var BaseService = class {
       });
       const data = res.data;
       if (isGet && enableCache) {
-        cacheKey = cacheKey || this.buildCacheKey(url, options.params);
+        cacheKey2 = cacheKey2 || this.buildCacheKeyUrl(url, options.params);
         const ttl = cacheOption.timeCache || this.timeCache;
-        await CONFIG_REDIS.set(cacheKey, JSON.stringify(data), "EX", ttl);
-        console.log(`[CACHE SET] ${cacheKey} - TTL ${ttl}s`);
+        await CONFIG_REDIS.set(cacheKey2, JSON.stringify(data), "EX", ttl);
+        console.log(`[CACHE SET] ${cacheKey2} - TTL ${ttl}s`);
       }
       const duration = (Date.now() - startTime) / 1e3;
       if (duration > 5) {
@@ -308,7 +361,7 @@ var BaseService = class {
   }
   async detail(id, cacheOption = {}) {
     const enableCache = cacheOption.isCache ?? this.isCache;
-    const cacheKey = enableCache ? `gateway.${this.service}.${id}` : null;
+    if (enableCache && this.getCacheById(id)) return this.getCacheById(id);
     return this.request(
       "get",
       `${this.baseUrl}/${id}`,

package/dist/services/CacheService.js

@@ -0,0 +1,55 @@
+// src/services/CacheService.js
+var qs = require("qs");
+var CacheService = class {
+  isCache = false;
+  // bật/tắt cache mặc định
+  service = null;
+  // nhớ gán ở subclass
+  module = null;
+  // module
+  configService = "gateway";
+  // module
+  timeCache = 3600;
+  // cache 60p
+  redis = null;
+  constructor() {
+    this.redis = new Redis();
+  }
+  buildCacheKeyUrl(path, params = {}) {
+    const q = qs.stringify(params, { arrayFormat: "brackets", encode: true });
+    const full = `${path}${q ? "?" + q : ""}`;
+    return `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.urls:${full}`;
+  }
+  // Lấy cache theo id
+  async getCacheByKey(key) {
+    const data = await this.redis.get(key);
+    return data ? JSON.parse(data) : null;
+  }
+  // Lấy cache theo id
+  async getCacheById(id) {
+    if (!this.isCache || !this.redis) return null;
+    const key = `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.id:${id}`;
+    const data = await this.redis.get(key);
+    return data ? JSON.parse(data) : null;
+  }
+  // Lấy cache theo nhiều ids
+  async getCacheByIds(ids = []) {
+    if (!this.isCache || !this.redis) return [];
+    const keys = ids.map(
+      (id) => `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.id:${id}`
+    );
+    const results = await this.redis.mget(keys);
+    return results.map((r) => r ? JSON.parse(r) : null);
+  }
+  // Set cache
+  async setCache(key, value, ttl = this.timeCache) {
+    if (!this.isCache || !this.redis) return;
+    await this.redis.set(key, JSON.stringify(value), "EX", ttl);
+  }
+  // Ví dụ set cache theo id
+  async setCacheById(id, value, ttl) {
+    const key = `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.id:${id}`;
+    await this.setCache(key, value, ttl);
+  }
+};
+module.exports = CacheService;

package/dist/services/SettingService.js

@@ -7,8 +7,8 @@ var __commonJS = (cb, mod) => function __require() {
 var require_config = __commonJS({
   "src/config.js"(exports2, module2) {
     require("dotenv").config({ quiet: true, override: true });
-    var Redis = require("ioredis");
-    var redis = new Redis({
+    var Redis2 = require("ioredis");
+    var redis = new Redis2({
       host: process.env.REDIS_HOST || "128.199.195.180",
       port: process.env.REDIS_PORT || 6379,
       password: process.env.REDIS_PASSWORD || "WZyB5Z7BRRgvrzuGzRwB"
@@ -178,13 +178,74 @@ var require_config = __commonJS({
   }
 });
 
+// src/services/CacheService.js
+var require_CacheService = __commonJS({
+  "src/services/CacheService.js"(exports2, module2) {
+    var qs = require("qs");
+    var CacheService = class {
+      isCache = false;
+      // bật/tắt cache mặc định
+      service = null;
+      // nhớ gán ở subclass
+      module = null;
+      // module
+      configService = "gateway";
+      // module
+      timeCache = 3600;
+      // cache 60p
+      redis = null;
+      constructor() {
+        this.redis = new Redis();
+      }
+      buildCacheKeyUrl(path, params = {}) {
+        const q = qs.stringify(params, { arrayFormat: "brackets", encode: true });
+        const full = `${path}${q ? "?" + q : ""}`;
+        return `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.urls:${full}`;
+      }
+      // Lấy cache theo id
+      async getCacheByKey(key) {
+        const data = await this.redis.get(key);
+        return data ? JSON.parse(data) : null;
+      }
+      // Lấy cache theo id
+      async getCacheById(id) {
+        if (!this.isCache || !this.redis) return null;
+        const key = `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.id:${id}`;
+        const data = await this.redis.get(key);
+        return data ? JSON.parse(data) : null;
+      }
+      // Lấy cache theo nhiều ids
+      async getCacheByIds(ids = []) {
+        if (!this.isCache || !this.redis) return [];
+        const keys = ids.map(
+          (id) => `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.id:${id}`
+        );
+        const results = await this.redis.mget(keys);
+        return results.map((r) => r ? JSON.parse(r) : null);
+      }
+      // Set cache
+      async setCache(key, value, ttl = this.timeCache) {
+        if (!this.isCache || !this.redis) return;
+        await this.redis.set(key, JSON.stringify(value), "EX", ttl);
+      }
+      // Ví dụ set cache theo id
+      async setCacheById(id, value, ttl) {
+        const key = `${this.configService}.${this.service || "unknown"}.${this.module || "unknown"}.id:${id}`;
+        await this.setCache(key, value, ttl);
+      }
+    };
+    module2.exports = CacheService;
+  }
+});
+
 // src/services/BaseService.js
 var require_BaseService = __commonJS({
   "src/services/BaseService.js"(exports2, module2) {
     var axios = require("axios");
     var qs = require("qs");
     var { API_MICROSERVICE_TOKEN: API_MICROSERVICE_TOKEN2, CONFIG_REDIS } = require_config();
-    var BaseService2 = class {
+    var CacheService = require_CacheService();
+    var BaseService2 = class extends CacheService {
       baseUrl = "";
       headers = {};
       isCache = false;
@@ -196,6 +257,7 @@ var require_BaseService = __commonJS({
       constructor(baseUrl = "", defaultHeaders = {}) {
         this.baseUrl = baseUrl;
         this.setHeader(defaultHeaders);
+        this.redis = CONFIG_REDIS;
         this.http = axios.create({
           baseURL: this.baseUrl,
           headers: this.headers,
@@ -221,23 +283,14 @@ var require_BaseService = __commonJS({
         };
         return this;
       }
-      buildCacheKey(path, params = {}) {
-        const q = qs.stringify(params, { arrayFormat: "brackets", encode: true });
-        const full = `${path}${q ? "?" + q : ""}`;
-        const service = this.service || "unknown";
-        return `gateway.${service}.urls:${full}`;
-      }
-      async request(method, url, options = {}, cacheKey = null, cacheOption = {}) {
+      async request(method, url, options = {}, cacheKey2 = null, cacheOption = {}) {
         var _a, _b;
         const isGet = method.toLowerCase() === "get";
         const enableCache = cacheOption.isCache ?? this.isCache;
         if (isGet && enableCache) {
-          cacheKey = cacheKey || this.buildCacheKey(url, options.params);
-          const cached = await CONFIG_REDIS.get(cacheKey);
-          if (cached) {
-            console.log(`[CACHE HIT] ${cacheKey}`);
-            return JSON.parse(cached);
-          }
+          cacheKey2 = cacheKey2 || this.buildCacheKeyUrl(url, options.params);
+          const cached = await this.getCacheByKey(cacheKey2);
+          if (cached) return JSON.parse(cached);
         }
         try {
           if (isGet) {
@@ -252,10 +305,10 @@ var require_BaseService = __commonJS({
           });
           const data = res.data;
           if (isGet && enableCache) {
-            cacheKey = cacheKey || this.buildCacheKey(url, options.params);
+            cacheKey2 = cacheKey2 || this.buildCacheKeyUrl(url, options.params);
             const ttl = cacheOption.timeCache || this.timeCache;
-            await CONFIG_REDIS.set(cacheKey, JSON.stringify(data), "EX", ttl);
-            console.log(`[CACHE SET] ${cacheKey} - TTL ${ttl}s`);
+            await CONFIG_REDIS.set(cacheKey2, JSON.stringify(data), "EX", ttl);
+            console.log(`[CACHE SET] ${cacheKey2} - TTL ${ttl}s`);
           }
           const duration = (Date.now() - startTime) / 1e3;
           if (duration > 5) {
@@ -310,7 +363,7 @@ var require_BaseService = __commonJS({
       }
       async detail(id, cacheOption = {}) {
         const enableCache = cacheOption.isCache ?? this.isCache;
-        const cacheKey = enableCache ? `gateway.${this.service}.${id}` : null;
+        if (enableCache && this.getCacheById(id)) return this.getCacheById(id);
         return this.request(
           "get",
           `${this.baseUrl}/${id}`,