midway-fatcms 0.0.1-beta.67 → 0.0.1-beta.68

package/dist/config/config.default.js

@@ -153,7 +153,10 @@ exports.default = (appInfo) => {
          */
         fatcmsCache: {
             diskCacheDir: (0, path_1.join)((0, os_1.tmpdir)(), 'fatcms-disk-cache'),
-            keyPrefix: 'fv1:',
+            cacheConfig: {
+                UserSessionBySessionId: { cacheLevel: 'REDIS', cacheSecond: 3600 * 24 * 30 },
+                UserSessionByAsyncTaskId: { cacheLevel: 'REDIS', cacheSecond: 3600 },
+            }
         },
         // 用户会话保持时间，单位秒
         fatcmsUserSessionKeepTimeSecond: 3600 * 24 * 30,

package/dist/controller/gateway/PublicApiController.js

@@ -23,9 +23,7 @@ const SystemPerm_1 = require("../../models/SystemPerm");
 const keys_2 = require("../../libs/crud-pro/models/keys");
 const CacheServiceFactory_1 = require("../../service/base/cache/CacheServiceFactory");
 const md5 = require("md5");
-const SystemEntities_1 = require("../../models/SystemEntities");
-const DEFAULT_CACHE_LEVEL = SystemEntities_1.CacheLevelEnum.MEMORY;
-const DEFAULT_CACHE_SECOND = 60 * 5;
+const bizmodels_1 = require("../../models/bizmodels");
 /**
  * 公开的API，无需鉴权，所有人可以直接访问
  */
@@ -54,12 +52,9 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
         if (!workbenchMenuCode) {
             return common_dto_1.CommonResult.errorRes('param workbenchMenuCode is null');
         }
-        const { publicApiMenuCacheLevel, publicApiMenuCacheSecond } = this.ctx.workbenchInfoTools.getWorkbenchConfig();
         const mapResult = await this.cacheServiceFactory.getJsonObjectCache({
-            cacheLevel: publicApiMenuCacheLevel || DEFAULT_CACHE_LEVEL,
             cacheKey: "" + workbenchMenuCode,
-            cacheSecond: publicApiMenuCacheSecond || DEFAULT_CACHE_SECOND,
-            cacheName: SystemEntities_1.CacheNameEnum.GetWorkbenchMenu,
+            cacheName: bizmodels_1.CacheNameEnum.GetWorkbenchMenu,
             getter: async () => {
                 const workbenchMenuCodeStr = '' + workbenchMenuCode;
                 const workbenchMenuCodeArray = workbenchMenuCodeStr.split(',');
@@ -110,14 +105,11 @@ let PublicApiController = class PublicApiController extends BaseApiController_1.
             }
             return null;
         };
-        const { publicApiNavPageInfoCacheLevel, publicApiNavPageInfoCacheSecond } = this.ctx.workbenchInfoTools.getWorkbenchConfig();
         const getOne = async (condition, tableName, key) => {
             const cacheKey = md5(tableName + ':' + JSON.stringify(condition) + ":" + key);
             const oneData = await this.cacheServiceFactory.getJsonObjectCache({
-                cacheLevel: publicApiNavPageInfoCacheLevel || DEFAULT_CACHE_LEVEL,
-                cacheSecond: publicApiNavPageInfoCacheSecond || DEFAULT_CACHE_SECOND,
                 cacheKey,
-                cacheName: SystemEntities_1.CacheNameEnum.GetNavPageInfo,
+                cacheName: bizmodels_1.CacheNameEnum.GetNavPageInfo,
                 getter: async () => {
                     return await getOneImpl(condition, tableName);
                 },

package/dist/libs/crud-pro/services/CrudProExecuteSqlService.js

@@ -26,7 +26,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
         }
     }
     async executeSqlCfgModel(sqlCfgModel) {
-        this.logger.info('executeSqlCfgModel1', sqlCfgModel.executeSql, sqlCfgModel.executeSqlArgs);
+        this.logger.info('[CrudProExecuteSqlService] executeSqlCfgModel_before', sqlCfgModel.executeSql, sqlCfgModel.executeSqlArgs);
         const exeCtx = this.getExecuteContext();
         const connection = await this.getTxConnectionBySqlCfg(sqlCfgModel);
         const executeSqlArgs = this.handleExecuteSqlArgsByResModel(exeCtx, sqlCfgModel.executeSqlArgs || []);
@@ -35,22 +35,22 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
             // import { PoolClient } from 'pg';
             const pgClient = connection;
             const pgSql = (0, convertPgSql_1.replaceQuestionMarks)(sqlCfgModel.executeSql);
-            this.logger.debug('[CrudProExecuteSqlService]executeSqlCfgModel_postgres', pgSql, executeSqlArgs, sqlCfgModel.resPicker);
             queryRes = await pgClient.query({
                 text: pgSql,
                 values: executeSqlArgs || [],
             });
+            this.logger.debug('[CrudProExecuteSqlService] executeSqlCfgModel_postgres', pgSql, executeSqlArgs, sqlCfgModel.resPicker);
         }
         else if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
             // SQLServer
             const mssql = (0, convertMsSql_1.replaceQuestionMarksForMssql)(sqlCfgModel.executeSql);
-            this.logger.debug('[CrudProExecuteSqlService]executeSqlCfgModel_sqlserver', mssql, executeSqlArgs, sqlCfgModel.resPicker);
             queryRes = await connection.query(mssql, executeSqlArgs);
+            this.logger.debug('[CrudProExecuteSqlService] executeSqlCfgModel_sqlserver', mssql, executeSqlArgs, sqlCfgModel.resPicker);
         }
         else {
             // MYSQL
-            this.logger.debug('[CrudProExecuteSqlService]executeSqlCfgModel_mysql', sqlCfgModel.executeSql, executeSqlArgs, sqlCfgModel.resPicker);
             queryRes = await connection.query(sqlCfgModel.executeSql, executeSqlArgs);
+            this.logger.debug('[CrudProExecuteSqlService] executeSqlCfgModel_mysql', sqlCfgModel.executeSql, executeSqlArgs, sqlCfgModel.resPicker);
         }
         const sqlRes = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, sqlCfgModel.sqlDbType);
         const resObject = this.toQueryResByResPicker(sqlRes, queryRes, sqlCfgModel);

package/dist/models/SystemEntities.d.ts

@@ -110,30 +110,8 @@ export declare enum CacheLevelEnum {
     REDIS = "REDIS",
     DISK = "DISK"
 }
-export declare enum CacheNameEnum {
-    CurdMixByDict = "CurdMixByDict",
-    CurdMixByLinkToCustom = "CurdMixByLinkToCustom",
-    CurdMixBySysConfig = "CurdMixBySysConfig",
-    CurdMixByWorkbench = "CurdMixByWorkbench",
-    GetParsedCrudStdAppInfo = "GetParsedCrudStdAppInfo",
-    GetWorkbenchMenu = "GetWorkbenchMenu",
-    GetNavPageInfo = "GetNavPageInfo",
-    GetEnumInfoByCode = "GetEnumInfoByCode",
-    UserSessionBySessionId = "UserSessionBySessionId",
-    UserSessionByAsyncTaskId = "UserSessionByAsyncTaskId"
-}
 export interface IWorkbenchConfig {
     nodeApiWhiteEnable?: boolean;
     nodeApiWhiteList?: string[];
     nodeApiWhitePrefix?: string[];
-    crudStdAppInfoCacheLevel?: CacheLevelEnum;
-    crudStdAppInfoCacheSecond?: number;
-    publicApiNavPageInfoCacheLevel?: CacheLevelEnum;
-    publicApiNavPageInfoCacheSecond?: number;
-    publicApiMenuCacheLevel?: CacheLevelEnum;
-    publicApiMenuCacheSecond?: number;
-    queryEnumInfoCacheLevel?: CacheLevelEnum;
-    queryEnumInfoCacheSecond?: number;
-    curdMixByCommonCacheLevel?: CacheLevelEnum;
-    curdMixByCommonCacheSecond?: number;
 }

package/dist/models/SystemEntities.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CacheNameEnum = exports.CacheLevelEnum = exports.ProxyUserContextEnum = void 0;
+exports.CacheLevelEnum = exports.ProxyUserContextEnum = void 0;
 var ProxyUserContextEnum;
 (function (ProxyUserContextEnum) {
     ProxyUserContextEnum[ProxyUserContextEnum["NO_PASS"] = 0] = "NO_PASS";
@@ -15,16 +15,3 @@ var CacheLevelEnum;
     CacheLevelEnum["REDIS"] = "REDIS";
     CacheLevelEnum["DISK"] = "DISK";
 })(CacheLevelEnum = exports.CacheLevelEnum || (exports.CacheLevelEnum = {}));
-var CacheNameEnum;
-(function (CacheNameEnum) {
-    CacheNameEnum["CurdMixByDict"] = "CurdMixByDict";
-    CacheNameEnum["CurdMixByLinkToCustom"] = "CurdMixByLinkToCustom";
-    CacheNameEnum["CurdMixBySysConfig"] = "CurdMixBySysConfig";
-    CacheNameEnum["CurdMixByWorkbench"] = "CurdMixByWorkbench";
-    CacheNameEnum["GetParsedCrudStdAppInfo"] = "GetParsedCrudStdAppInfo";
-    CacheNameEnum["GetWorkbenchMenu"] = "GetWorkbenchMenu";
-    CacheNameEnum["GetNavPageInfo"] = "GetNavPageInfo";
-    CacheNameEnum["GetEnumInfoByCode"] = "GetEnumInfoByCode";
-    CacheNameEnum["UserSessionBySessionId"] = "UserSessionBySessionId";
-    CacheNameEnum["UserSessionByAsyncTaskId"] = "UserSessionByAsyncTaskId";
-})(CacheNameEnum = exports.CacheNameEnum || (exports.CacheNameEnum = {}));

package/dist/models/bizmodels.d.ts

@@ -1,4 +1,5 @@
 import { IRequestCfgModel, IVisitor } from '../libs/crud-pro/interfaces';
+import { CacheLevelEnum } from "../models/SystemEntities";
 /**
  * 实体表公共字段
  */
@@ -107,7 +108,24 @@ export interface ICacheService {
     setJsonObject(key: string, obj: any, cacheSecond?: number): Promise<any>;
     removeItem(key: string): Promise<any>;
 }
+export declare enum CacheNameEnum {
+    CurdMixByAccount = "CurdMixByAccount",
+    CurdMixByDict = "CurdMixByDict",
+    CurdMixByLinkToCustom = "CurdMixByLinkToCustom",
+    CurdMixBySysConfig = "CurdMixBySysConfig",
+    CurdMixByWorkbench = "CurdMixByWorkbench",
+    GetParsedCrudStdAppInfo = "GetParsedCrudStdAppInfo",
+    GetWorkbenchMenu = "GetWorkbenchMenu",
+    GetNavPageInfo = "GetNavPageInfo",
+    GetEnumInfoByCode = "GetEnumInfoByCode",
+    UserSessionBySessionId = "UserSessionBySessionId",
+    UserSessionByAsyncTaskId = "UserSessionByAsyncTaskId"
+}
+export interface IWorkbenchConfigCacheLevel {
+    cacheLevel: CacheLevelEnum;
+    cacheSecond: number;
+}
 export interface IfatcmsCacheConfig {
     diskCacheDir: string;
-    keyPrefix: string;
+    cacheConfig?: Record<CacheNameEnum, IWorkbenchConfigCacheLevel>;
 }

package/dist/models/bizmodels.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StdCrudExportInputParamsAppType = exports.FILE_GET_TYPES = exports.CTX_WORKBENCH_CODE = exports.CTX_VISITOR_ACCOUNT_TYPE = exports.CTX_VISITOR_NICKNAME = exports.CTX_VISITOR_AVATAR = exports.CTX_VISITOR_ID = exports.PermRole = exports.PermFunc = exports.UploadCategoryType = exports.AccessType = void 0;
+exports.CacheNameEnum = exports.StdCrudExportInputParamsAppType = exports.FILE_GET_TYPES = exports.CTX_WORKBENCH_CODE = exports.CTX_VISITOR_ACCOUNT_TYPE = exports.CTX_VISITOR_NICKNAME = exports.CTX_VISITOR_AVATAR = exports.CTX_VISITOR_ID = exports.PermRole = exports.PermFunc = exports.UploadCategoryType = exports.AccessType = void 0;
 var AccessType;
 (function (AccessType) {
     AccessType["owner"] = "owner";
@@ -37,3 +37,17 @@ var StdCrudExportInputParamsAppType;
     StdCrudExportInputParamsAppType["STD_CRUD"] = "STD_CRUD";
     StdCrudExportInputParamsAppType["INNER_HTTP"] = "INNER_HTTP";
 })(StdCrudExportInputParamsAppType = exports.StdCrudExportInputParamsAppType || (exports.StdCrudExportInputParamsAppType = {}));
+var CacheNameEnum;
+(function (CacheNameEnum) {
+    CacheNameEnum["CurdMixByAccount"] = "CurdMixByAccount";
+    CacheNameEnum["CurdMixByDict"] = "CurdMixByDict";
+    CacheNameEnum["CurdMixByLinkToCustom"] = "CurdMixByLinkToCustom";
+    CacheNameEnum["CurdMixBySysConfig"] = "CurdMixBySysConfig";
+    CacheNameEnum["CurdMixByWorkbench"] = "CurdMixByWorkbench";
+    CacheNameEnum["GetParsedCrudStdAppInfo"] = "GetParsedCrudStdAppInfo";
+    CacheNameEnum["GetWorkbenchMenu"] = "GetWorkbenchMenu";
+    CacheNameEnum["GetNavPageInfo"] = "GetNavPageInfo";
+    CacheNameEnum["GetEnumInfoByCode"] = "GetEnumInfoByCode";
+    CacheNameEnum["UserSessionBySessionId"] = "UserSessionBySessionId";
+    CacheNameEnum["UserSessionByAsyncTaskId"] = "UserSessionByAsyncTaskId";
+})(CacheNameEnum = exports.CacheNameEnum || (exports.CacheNameEnum = {}));

package/dist/service/EnumInfoService.js

@@ -19,26 +19,21 @@ const parseConfig_1 = require("../libs/utils/parseConfig");
 const CurdMixByLinkToCustomService_1 = require("./curd/CurdMixByLinkToCustomService");
 const global_config_1 = require("../libs/global-config/global-config");
 const CacheServiceFactory_1 = require("./base/cache/CacheServiceFactory");
-const SystemEntities_1 = require("../models/SystemEntities");
+const bizmodels_1 = require("../models/bizmodels");
 function filterEmpty(e) {
     return e.label && typeof e.value !== 'undefined';
 }
-const DEFAULT_CACHE_LEVEL = SystemEntities_1.CacheLevelEnum.MEMORY;
-const DEFAULT_CACHE_SECOND = 60 * 5;
 let EnumInfoService = class EnumInfoService {
     async queryEnumInfo(codeList, refreshCache) {
-        const { queryEnumInfoCacheLevel, queryEnumInfoCacheSecond } = this.ctx.workbenchInfoTools.getWorkbenchConfig() || {};
         const getEnumInfoByCode = async (type, code) => {
             if (type === CurdMixUtils_1.RelatedType.linkToCustom) {
                 return await this.queryEnumInfoByLinkToCustom(code);
             }
             const cacheKey = `${type}@@${code}`;
-            const emums = refreshCache ? null : await this.cacheServiceFactory.getJsonObjectCache({
-                cacheLevel: queryEnumInfoCacheLevel || DEFAULT_CACHE_LEVEL,
-                cacheSecond: queryEnumInfoCacheSecond || DEFAULT_CACHE_SECOND,
+            return await this.cacheServiceFactory.getJsonObjectCache({
                 cacheKey,
                 refreshCache,
-                cacheName: SystemEntities_1.CacheNameEnum.GetEnumInfoByCode,
+                cacheName: bizmodels_1.CacheNameEnum.GetEnumInfoByCode,
                 getter: async () => {
                     if (type === CurdMixUtils_1.RelatedType.sysCfgEnum) {
                         return await this.queryEnumInfoBySysCfgEnum(code);
@@ -49,7 +44,6 @@ let EnumInfoService = class EnumInfoService {
                     return [];
                 },
             });
-            return emums;
         };
         const result = [];
         for (let i = 0; i < codeList.length; i++) {

package/dist/service/UserSessionService.js

@@ -19,7 +19,7 @@ const keys_1 = require("../libs/crud-pro/models/keys");
 const SystemTables_1 = require("../models/SystemTables");
 const global_config_1 = require("../libs/global-config/global-config");
 const CacheServiceFactory_1 = require("./base/cache/CacheServiceFactory");
-const SystemEntities_1 = require("../models/SystemEntities");
+const bizmodels_1 = require("../models/bizmodels");
 function pickUserAvatar(avatar) {
     if (!avatar) {
         return null;
@@ -62,7 +62,7 @@ let UserSessionService = class UserSessionService {
      * @returns
      */
     getUserSessionCacheService() {
-        return this.cacheServiceFactory.getCacheService(SystemEntities_1.CacheLevelEnum.REDIS, SystemEntities_1.CacheNameEnum.UserSessionBySessionId);
+        return this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.UserSessionBySessionId);
     }
     /**
      * 保存用户会话信息。
@@ -121,14 +121,11 @@ let UserSessionService = class UserSessionService {
             }
             return (0, functions_1.parseJsonObject)(asyncTaskObj.created_user_session);
         };
-        const sessionInfo1 = await this.cacheServiceFactory.getJsonObjectCache({
-            cacheLevel: SystemEntities_1.CacheLevelEnum.REDIS,
-            cacheName: SystemEntities_1.CacheNameEnum.UserSessionByAsyncTaskId,
+        return await this.cacheServiceFactory.getJsonObjectCache({
+            cacheName: bizmodels_1.CacheNameEnum.UserSessionByAsyncTaskId,
             cacheKey: taskSessionCacheKey,
-            cacheSecond: 3600,
             getter: loadSessionInfo,
         });
-        return sessionInfo1;
     }
     /**
      * 专门给中间件点调用的

package/dist/service/base/cache/CacheServiceFactory.d.ts

@@ -1,12 +1,9 @@
 import { Context } from '@midwayjs/koa';
-import { ICacheService } from '../../../models/bizmodels';
-import { CacheLevelEnum, CacheNameEnum } from '../../../models/SystemEntities';
+import { CacheNameEnum, ICacheService } from '../../../models/bizmodels';
 import { RedisService } from '@midwayjs/redis';
 interface IGetJsonObjectCacheParam {
-    cacheLevel: CacheLevelEnum;
     cacheName: CacheNameEnum;
     cacheKey: string;
-    cacheSecond: number;
     refreshCache?: boolean;
     getter: () => Promise<any>;
 }
@@ -14,7 +11,8 @@ export declare class CacheServiceFactory {
     protected ctx: Context;
     private fatcmsCache;
     protected redisService: RedisService;
-    getCacheService(cacheLevelEnum: CacheLevelEnum, cacheName: CacheNameEnum): ICacheService;
+    private getCacheService;
+    getCacheServiceByName(cacheName: CacheNameEnum): ICacheService;
     getJsonObjectCache(param: IGetJsonObjectCacheParam): Promise<any>;
 }
 export {};

package/dist/service/base/cache/CacheServiceFactory.js

@@ -18,33 +18,44 @@ const RedisCache_1 = require("./RedisCache");
 const DiskCache_1 = require("./DiskCache");
 const MemoryCache_1 = require("./MemoryCache");
 const NoneCache_1 = require("./NoneCache");
+const defaultCacheConfig = {
+    cacheLevel: SystemEntities_1.CacheLevelEnum.MEMORY,
+    cacheSecond: 60 * 5
+};
 let CacheServiceFactory = class CacheServiceFactory {
-    getCacheService(cacheLevelEnum, cacheName) {
+    getCacheService(cacheLevelEnum, cacheName, cacheSecond) {
         switch (cacheLevelEnum) {
             case SystemEntities_1.CacheLevelEnum.CONTEXT:
                 return new CtxCache_1.CtxCache(this.ctx, cacheName);
             case SystemEntities_1.CacheLevelEnum.REDIS:
-                return new RedisCache_1.RedisCache(this.ctx, cacheName, this.redisService);
+                return new RedisCache_1.RedisCache(this.ctx, cacheName, this.redisService, cacheSecond);
             case SystemEntities_1.CacheLevelEnum.DISK:
-                return new DiskCache_1.FatcmsBaseDiskCache(this.ctx, cacheName, this.fatcmsCache);
+                return new DiskCache_1.DiskCache(this.ctx, cacheName, this.fatcmsCache, cacheSecond);
             case SystemEntities_1.CacheLevelEnum.MEMORY:
-                return new MemoryCache_1.MemoryCache(this.ctx, cacheName);
+                return new MemoryCache_1.MemoryCache(this.ctx, cacheName, cacheSecond);
+            case SystemEntities_1.CacheLevelEnum.NONE:
+                return new NoneCache_1.NoneCache(this.ctx, cacheName);
             default:
                 return new NoneCache_1.NoneCache(this.ctx, cacheName);
         }
     }
-    async getJsonObjectCache(param) {
-        let { cacheLevel, cacheName, cacheKey, cacheSecond, refreshCache, getter } = param;
-        if (!cacheSecond || typeof cacheSecond !== 'number') {
-            console.error('[CacheServiceFactory#getJsonObjectCache] cacheSecond is not number, use default value 60, ' + JSON.stringify(param));
-            cacheSecond = 60;
+    getCacheServiceByName(cacheName) {
+        var _a;
+        const cacheConfig = (((_a = this.fatcmsCache) === null || _a === void 0 ? void 0 : _a.cacheConfig) || {});
+        if (cacheConfig[cacheName]) {
+            const { cacheLevel, cacheSecond } = Object.assign({}, defaultCacheConfig, cacheConfig[cacheName]);
+            return this.getCacheService(cacheLevel, cacheName, cacheSecond);
         }
-        const realCacheKey = this.fatcmsCache.keyPrefix + cacheKey;
-        const cacheService = this.getCacheService(cacheLevel, cacheName);
-        let obj = cacheService.getJsonObject(realCacheKey);
+        const { cacheLevel, cacheSecond } = defaultCacheConfig;
+        return this.getCacheService(cacheLevel, cacheName, cacheSecond);
+    }
+    async getJsonObjectCache(param) {
+        const { cacheName, cacheKey, refreshCache, getter } = param;
+        const cacheService = this.getCacheServiceByName(cacheName);
+        let obj = await cacheService.getJsonObject(cacheKey);
         if (!obj || refreshCache === true) {
             obj = await getter();
-            cacheService.setJsonObject(realCacheKey, obj, cacheSecond);
+            await cacheService.setJsonObject(cacheKey, obj);
         }
         return obj;
     }

package/dist/service/base/cache/CtxCache.d.ts

@@ -1,5 +1,5 @@
 import { ICacheService } from '../../../models/bizmodels';
-import { CacheNameEnum } from '../../../models/SystemEntities';
+import { CacheNameEnum } from "../../../models/bizmodels";
 import { Context } from '@midwayjs/koa';
 export declare class CtxCache implements ICacheService {
     private ctx;
@@ -11,9 +11,8 @@ export declare class CtxCache implements ICacheService {
      * 设置缓存对象
      * @param key
      * @param obj
-     * @param expireSecond 过期时间，单位秒
      * @returns
      */
-    setJsonObject(key: string, obj: any, expireSecond?: number): Promise<any>;
+    setJsonObject(key: string, obj: any): Promise<any>;
     removeItem(key: string): Promise<any>;
 }

package/dist/service/base/cache/CtxCache.js

@@ -23,10 +23,9 @@ class CtxCache {
      * 设置缓存对象
      * @param key
      * @param obj
-     * @param expireSecond 过期时间，单位秒
      * @returns
      */
-    async setJsonObject(key, obj, expireSecond) {
+    async setJsonObject(key, obj) {
         const cacheMap = this.getCacheMap();
         cacheMap.set(key, obj);
     }

package/dist/service/base/cache/DiskCache.d.ts

@@ -1,24 +1,19 @@
 import { Context } from '@midwayjs/koa';
 import { ICacheService, IfatcmsCacheConfig } from '../../../models/bizmodels';
-export declare class FatcmsBaseDiskCache implements ICacheService {
+export declare class DiskCache implements ICacheService {
     protected ctx: Context;
     protected cacheName: string;
     private fatcmsCache;
-    constructor(ctx: Context, cacheName: string, fatcmsCache: IfatcmsCacheConfig);
+    private cacheSecond;
+    constructor(ctx: Context, cacheName: string, fatcmsCache: IfatcmsCacheConfig, cacheSecond: number);
     /**
      * 获取缓存文件路径
      * @param key
-     * @returns
+     * @param checkDirExist
+     * @private
      */
     private getCacheFilePath;
     getJsonObject(key: string): Promise<any>;
-    /**
-     * 设置缓存对象
-     * @param key
-     * @param obj
-     * @param expireSecond 过期时间，单位秒
-     * @returns
-     */
-    setJsonObject(key: string, obj: any, expireSecond?: number): Promise<any>;
+    setJsonObject(key: string, obj: any, cacheSecond0?: number): Promise<any>;
     removeItem(key: string): Promise<any>;
 }

package/dist/service/base/cache/DiskCache.js

@@ -1,21 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FatcmsBaseDiskCache = void 0;
+exports.DiskCache = void 0;
 const md5 = require("md5");
 const fs = require("fs/promises");
 const fs2 = require("fs");
 const path = require("path");
 const functions_1 = require("../../../libs/utils/functions");
-class FatcmsBaseDiskCache {
-    constructor(ctx, cacheName, fatcmsCache) {
+class DiskCache {
+    constructor(ctx, cacheName, fatcmsCache, cacheSecond) {
         this.ctx = ctx;
         this.cacheName = cacheName;
         this.fatcmsCache = fatcmsCache;
+        this.cacheSecond = cacheSecond;
     }
     /**
      * 获取缓存文件路径
      * @param key
-     * @returns
+     * @param checkDirExist
+     * @private
      */
     async getCacheFilePath(key, checkDirExist = true) {
         const cacheDir0 = this.fatcmsCache.diskCacheDir;
@@ -42,21 +44,12 @@ class FatcmsBaseDiskCache {
             return null;
         }
     }
-    /**
-     * 设置缓存对象
-     * @param key
-     * @param obj
-     * @param expireSecond 过期时间，单位秒
-     * @returns
-     */
-    async setJsonObject(key, obj, expireSecond) {
-        if (!expireSecond) {
-            expireSecond = 60;
-        }
+    async setJsonObject(key, obj, cacheSecond0) {
+        const cacheSecond = cacheSecond0 || this.cacheSecond || 60;
         const str = JSON.stringify({
             data: obj,
             key,
-            expireAt: Date.now() + expireSecond * 1000,
+            expireAt: Date.now() + cacheSecond * 1000,
         });
         const cacheFilePath = await this.getCacheFilePath(key);
         try {
@@ -78,4 +71,4 @@ class FatcmsBaseDiskCache {
         }
     }
 }
-exports.FatcmsBaseDiskCache = FatcmsBaseDiskCache;
+exports.DiskCache = DiskCache;

package/dist/service/base/cache/MemoryCache.d.ts

@@ -3,16 +3,10 @@ import { ICacheService } from '../../../models/bizmodels';
 export declare class MemoryCache implements ICacheService {
     protected ctx: Context;
     protected cacheName: string;
-    constructor(ctx: Context, cacheName: string);
+    protected cacheSecond: number;
+    constructor(ctx: Context, cacheName: string, cacheSecond: number);
     private getLruCache;
     getJsonObject(key: string): Promise<any>;
-    /**
-     * 设置缓存对象
-     * @param key
-     * @param obj
-     * @param expireSecond 过期时间，单位秒
-     * @returns
-     */
-    setJsonObject(key: string, obj: any, expireSecond?: number): Promise<any>;
+    setJsonObject(key: string, obj: any, cacheSecond0: number): Promise<any>;
     removeItem(key: string): Promise<any>;
 }

package/dist/service/base/cache/MemoryCache.js

@@ -4,14 +4,15 @@ exports.MemoryCache = void 0;
 const lru_cache_1 = require("lru-cache");
 const LRU_CACHE_MAP = new Map();
 class MemoryCache {
-    constructor(ctx, cacheName) {
+    constructor(ctx, cacheName, cacheSecond) {
         this.ctx = ctx;
         this.cacheName = cacheName;
+        this.cacheSecond = cacheSecond;
     }
     getLruCache() {
         if (!LRU_CACHE_MAP.has(this.cacheName)) {
             const lruCache = new lru_cache_1.LRUCache({
-                max: 500,
+                max: 2000,
                 ttl: 1000 * 60 * 60 * 24,
                 ttlAutopurge: true,
             });
@@ -32,22 +33,13 @@ class MemoryCache {
             return null;
         }
     }
-    /**
-     * 设置缓存对象
-     * @param key
-     * @param obj
-     * @param expireSecond 过期时间，单位秒
-     * @returns
-     */
-    async setJsonObject(key, obj, expireSecond) {
+    async setJsonObject(key, obj, cacheSecond0) {
+        const cacheSecond = cacheSecond0 || this.cacheSecond || 60;
         const lruCache = this.getLruCache();
-        if (!expireSecond) {
-            expireSecond = 60;
-        }
         const saveObj = {
             data: obj,
             key,
-            expireAt: Date.now() + expireSecond * 1000,
+            expireAt: Date.now() + cacheSecond * 1000,
         };
         lruCache.set(key, saveObj);
         return true;

package/dist/service/base/cache/RedisCache.d.ts

@@ -5,16 +5,10 @@ export declare class RedisCache implements ICacheService {
     protected ctx: Context;
     protected cacheName: string;
     protected redisService: RedisService;
-    constructor(ctx: Context, cacheName: string, redisService: RedisService);
+    protected cacheSecond: number;
+    constructor(ctx: Context, cacheName: string, redisService: RedisService, cacheSecond: number);
     private getCacheKey;
     getJsonObject(key: string): Promise<any>;
-    /**
-     * 设置缓存对象
-     * @param key
-     * @param obj
-     * @param expireSecond 过期时间，单位秒
-     * @returns
-     */
-    setJsonObject(key: string, obj: any, expireSecond?: number): Promise<any>;
+    setJsonObject(key: string, obj: any, cacheSecond0?: number): Promise<any>;
     removeItem(key: string): Promise<any>;
 }

package/dist/service/base/cache/RedisCache.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RedisCache = void 0;
 const functions_1 = require("../../../libs/utils/functions");
 class RedisCache {
-    constructor(ctx, cacheName, redisService) {
+    constructor(ctx, cacheName, redisService, cacheSecond) {
         this.ctx = ctx;
         this.cacheName = cacheName;
         this.redisService = redisService;
+        this.cacheSecond = cacheSecond;
     }
     getCacheKey(key) {
         return `${this.cacheName}${key}`;
@@ -16,24 +17,15 @@ class RedisCache {
         const str = await this.redisService.get(cacheKey);
         return (0, functions_1.parseJsonObject)(str);
     }
-    /**
-     * 设置缓存对象
-     * @param key
-     * @param obj
-     * @param expireSecond 过期时间，单位秒
-     * @returns
-     */
-    async setJsonObject(key, obj, expireSecond) {
+    async setJsonObject(key, obj, cacheSecond0) {
+        const cacheSecond = cacheSecond0 || this.cacheSecond || 60;
         const cacheKey = this.getCacheKey(key);
-        if (!expireSecond) {
-            expireSecond = 60;
-        }
         const str = JSON.stringify(obj);
-        return this.redisService.set(cacheKey, str, 'EX', expireSecond);
+        return this.redisService.set(cacheKey, str, 'EX', cacheSecond);
     }
     async removeItem(key) {
         const cacheKey = this.getCacheKey(key);
-        return await this.redisService.del(cacheKey);
+        return this.redisService.del(cacheKey);
     }
 }
 exports.RedisCache = RedisCache;