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

package/dist/service/base/cache/{FatcmsBaseRedisCache.d.ts → RedisCache.d.ts}

@@ -1,20 +1,14 @@
 import { Context } from '@midwayjs/koa';
 import { RedisService } from '@midwayjs/redis';
-import { ICacheServiceBase } from '../../../models/bizmodels';
-export declare class FatcmsBaseRedisCache implements ICacheServiceBase {
+import { ICacheService } from '../../../models/bizmodels';
+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/{FatcmsBaseRedisCache.js → RedisCache.js}

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FatcmsBaseRedisCache = void 0;
+exports.RedisCache = void 0;
 const functions_1 = require("../../../libs/utils/functions");
-class FatcmsBaseRedisCache {
-    constructor(ctx, cacheName, redisService) {
+class RedisCache {
+    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 FatcmsBaseRedisCache {
         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.FatcmsBaseRedisCache = FatcmsBaseRedisCache;
+exports.RedisCache = RedisCache;

package/dist/service/crudstd/CrudStdService.js

@@ -26,14 +26,12 @@ const DatabaseName_1 = require("../../libs/crud-pro/utils/DatabaseName");
 const global_config_1 = require("../../libs/global-config/global-config");
 const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
 const CacheServiceFactory_1 = require("../base/cache/CacheServiceFactory");
-const SystemEntities_1 = require("../../models/SystemEntities");
+const bizmodels_1 = require("../../models/bizmodels");
 exports.SPECIAL_SETTING_KEY = {
     QUERY_LIST: 'QUERY_LIST',
     QUERY_ONE: 'QUERY_ONE',
     KANBAN_VIEW_STATUS_UPDATE: 'KANBAN_VIEW_STATUS_UPDATE', // 看板视图中更新状态
 };
-const DEFAULT_CACHE_LEVEL = SystemEntities_1.CacheLevelEnum.MEMORY;
-const DEFAULT_CACHE_SECOND = 60 * 5;
 function isNotEmptyStr(str) {
     return typeof str === 'string' && str.trim().length > 0;
 }
@@ -237,19 +235,13 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
      * @private
      */
     async getParsedCrudStdAppInfo(appCode) {
-        const { crudStdAppInfoCacheLevel, crudStdAppInfoCacheSecond } = this.ctx.workbenchInfoTools.getWorkbenchConfig();
-        const cacheSecond = crudStdAppInfoCacheSecond || DEFAULT_CACHE_SECOND;
-        const cacheLevel = crudStdAppInfoCacheLevel || DEFAULT_CACHE_LEVEL;
-        let appInfo = await this.cacheServiceFactory.getJsonObjectCache({
-            cacheLevel,
+        return await this.cacheServiceFactory.getJsonObjectCache({
             cacheKey: appCode,
-            cacheSecond,
-            cacheName: SystemEntities_1.CacheNameEnum.GetParsedCrudStdAppInfo,
+            cacheName: bizmodels_1.CacheNameEnum.GetParsedCrudStdAppInfo,
             getter: async () => {
                 return await this.getParsedCrudStdAppInfoPrivate(appCode);
             },
         });
-        return appInfo;
     }
     /**
      * 查询APP信息

package/dist/service/curd/CurdMixByAccountService.d.ts

@@ -4,6 +4,10 @@ import { HandleExecuteContextType, IExecuteContextHandler } from '../../libs/cru
 export declare class CurdMixByAccountService implements IExecuteContextHandler {
     protected ctx: Context;
     protected curdProService: CurdProService;
+    private cacheServiceFactory;
     handleExecuteContextPrepare(executeContext: HandleExecuteContextType): Promise<void>;
+    private getFromCache;
+    private setToCache;
+    private queryUserAccountIdList;
     handleExecuteContext(executeContext: HandleExecuteContextType): Promise<void>;
 }

package/dist/service/curd/CurdMixByAccountService.js

@@ -18,12 +18,13 @@ const SystemTables_1 = require("../../models/SystemTables");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
 const global_config_1 = require("../../libs/global-config/global-config");
+const bizmodels_1 = require("../../models/bizmodels");
+const CacheServiceFactory_1 = require("../../service/base/cache/CacheServiceFactory");
 const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.accountBasic);
 const TMP_CTX_KEY = _.uniqueId('CurdMixByAccountService');
 const TMP_CTX_KEY2 = _.uniqueId('CurdMixByAccountService2');
 let CurdMixByAccountService = class CurdMixByAccountService {
     async handleExecuteContextPrepare(executeContext) {
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const relations = dictMixUtils.pickColumnRelations(executeContext);
         if (!relations || relations.length === 0) {
             return;
@@ -49,25 +50,58 @@ let CurdMixByAccountService = class CurdMixByAccountService {
         if (accountIds.size === 0) {
             return;
         }
-        const cfgModel = {
-            method: 'UserAccountService.queryAccountBasicInfoByIds',
-            sqlTable: SystemTables_1.SystemTables.sys_user_account,
-            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemDbName,
-            sqlDbType: SystemDbType,
-        };
+        const userInfos = await this.queryUserAccountIdList([...accountIds]);
+        executeContext[TMP_CTX_KEY] = MixinUtils_1.MixinUtils.toNewMap(userInfos, (obj) => obj.account_id);
+        executeContext[TMP_CTX_KEY2] = isArrayModeMap;
+    }
+    async getFromCache(code) {
+        const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.CurdMixByAccount);
+        return cacheService.getJsonObject(code);
+    }
+    async setToCache(code, value) {
+        const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.CurdMixByAccount);
+        return cacheService.setJsonObject(code, value);
+    }
+    async queryUserAccountIdList(accountIds) {
+        const resultRowMap = {};
+        for (let i = 0; i < accountIds.length; i++) {
+            const accountId = accountIds[i];
+            const row = await this.getFromCache(accountId);
+            if (row) {
+                resultRowMap[accountId] = row;
+            }
+        }
+        const notCachedCodes = accountIds.filter((accountId) => !resultRowMap[accountId]);
+        if (notCachedCodes.length === 0) {
+            return Object.values(resultRowMap);
+        }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const reqJson = {
             columns: ['nick_name', 'avatar', 'account_id'],
             condition: {
                 account_id: {
-                    $in: [...accountIds],
+                    $in: [...notCachedCodes],
                 },
             },
         };
+        const cfgModel = {
+            method: 'UserAccountService.queryAccountBasicInfoByIds',
+            sqlTable: SystemTables_1.SystemTables.sys_user_account,
+            sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
+            sqlDatabase: SystemDbName,
+            sqlDbType: SystemDbType,
+        };
         const res = await this.curdProService.executeCrudByCfg(reqJson, cfgModel);
-        const userInfos = res.getResRows();
-        executeContext[TMP_CTX_KEY] = MixinUtils_1.MixinUtils.toNewMap(userInfos, (obj) => obj.account_id);
-        executeContext[TMP_CTX_KEY2] = isArrayModeMap;
+        const rows = res.getResRows();
+        if (Array.isArray(rows) && rows.length > 0) {
+            for (let i = 0; i < rows.length; i++) {
+                const row = rows[i];
+                const { account_id } = row;
+                await this.setToCache(account_id, row);
+                resultRowMap[account_id] = row;
+            }
+        }
+        return Object.values(resultRowMap);
     }
     async handleExecuteContext(executeContext) {
         const userInfoMap = executeContext[TMP_CTX_KEY];
@@ -107,6 +141,10 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", CurdProService_1.CurdProService)
 ], CurdMixByAccountService.prototype, "curdProService", void 0);
+__decorate([
+    (0, core_1.Inject)(),
+    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
+], CurdMixByAccountService.prototype, "cacheServiceFactory", void 0);
 CurdMixByAccountService = __decorate([
     (0, core_1.Provide)()
 ], CurdMixByAccountService);

package/dist/service/curd/CurdMixByDictService.js

@@ -19,21 +19,17 @@ const keys_1 = require("../../libs/crud-pro/models/keys");
 const MultiKeyMap_1 = require("../../libs/crud-pro/utils/MultiKeyMap");
 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");
 const TMP_CTX_KEY = _.uniqueId('CurdMixByDictService');
 const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.dict);
-const DEFAULT_CACHE_LEVEL = SystemEntities_1.CacheLevelEnum.MEMORY;
-const DEFAULT_CACHE_SECOND = 60 * 5;
 let CurdMixByDictService = class CurdMixByDictService {
     async getFromCache(code) {
-        const { curdMixByCommonCacheLevel } = this.ctx.workbenchInfoTools.getWorkbenchConfig();
-        const cacheService = this.cacheServiceFactory.getCacheService(curdMixByCommonCacheLevel || DEFAULT_CACHE_LEVEL, SystemEntities_1.CacheNameEnum.CurdMixByDict);
+        const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.CurdMixByDict);
         return cacheService.getJsonObject(code);
     }
     async setToCache(code, value) {
-        const { curdMixByCommonCacheLevel, curdMixByCommonCacheSecond } = this.ctx.workbenchInfoTools.getWorkbenchConfig();
-        const cacheService = this.cacheServiceFactory.getCacheService(curdMixByCommonCacheLevel || DEFAULT_CACHE_LEVEL, SystemEntities_1.CacheNameEnum.CurdMixByDict);
-        return cacheService.setJsonObject(code, value, curdMixByCommonCacheSecond || DEFAULT_CACHE_SECOND);
+        const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.CurdMixByDict);
+        return cacheService.setJsonObject(code, value);
     }
     async handleExecuteContextPrepare(executeContext) {
         const codes = dictMixUtils.pickColumnRelationCodes(executeContext);

package/dist/service/curd/CurdMixByLinkToCustomService.js

@@ -19,13 +19,11 @@ const devops_1 = require("../../models/devops");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
 const DatabaseName_1 = require("../../libs/crud-pro/utils/DatabaseName");
 const global_config_1 = require("../../libs/global-config/global-config");
-const SystemEntities_1 = require("../../models/SystemEntities");
+const bizmodels_1 = require("../../models/bizmodels");
 const CacheServiceFactory_1 = require("../base/cache/CacheServiceFactory");
 const md5 = require("md5");
 const linkToCustomMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.linkToCustom);
 const TMP_CTX_KEY = _.uniqueId('CurdMixByLinkToCustomService');
-const DEFAULT_CACHE_LEVEL = SystemEntities_1.CacheLevelEnum.MEMORY;
-const DEFAULT_CACHE_SECOND = 60 * 5;
 function toMapObject(rows, fieldsArr) {
     const valueKey = fieldsArr[0];
     const labelKey = fieldsArr[1];
@@ -82,12 +80,9 @@ let CurdMixByLinkToCustomService = class CurdMixByLinkToCustomService {
         });
     }
     async queryInfoByLinkToCustom(code) {
-        const { curdMixByCommonCacheLevel, curdMixByCommonCacheSecond } = this.ctx.workbenchInfoTools.getWorkbenchConfig();
         return this.cacheServiceFactory.getJsonObjectCache({
-            cacheLevel: curdMixByCommonCacheLevel || DEFAULT_CACHE_LEVEL,
             cacheKey: md5(code),
-            cacheSecond: curdMixByCommonCacheSecond || DEFAULT_CACHE_SECOND,
-            cacheName: SystemEntities_1.CacheNameEnum.CurdMixByLinkToCustom,
+            cacheName: bizmodels_1.CacheNameEnum.CurdMixByLinkToCustom,
             getter: async () => {
                 return await this.queryInfoByLinkToCustomImpl(code);
             },

package/dist/service/curd/CurdMixBySysConfigService.js

@@ -20,21 +20,17 @@ const MultiKeyMap_1 = require("../../libs/crud-pro/utils/MultiKeyMap");
 const parseConfig_1 = require("../../libs/utils/parseConfig");
 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");
 const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.sysCfgEnum);
 const TMP_CTX_KEY = _.uniqueId('CurdMixBySysConfigService');
-const DEFAULT_CACHE_LEVEL = SystemEntities_1.CacheLevelEnum.MEMORY;
-const DEFAULT_CACHE_SECOND = 60 * 5;
 let CurdMixBySysConfigService = class CurdMixBySysConfigService {
     async getFromCache(code) {
-        const { curdMixByCommonCacheLevel } = this.ctx.workbenchInfoTools.getWorkbenchConfig();
-        const cacheService = this.cacheServiceFactory.getCacheService(curdMixByCommonCacheLevel || DEFAULT_CACHE_LEVEL, SystemEntities_1.CacheNameEnum.CurdMixBySysConfig);
+        const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.CurdMixBySysConfig);
         return cacheService.getJsonObject(code);
     }
     async setToCache(code, value) {
-        const { curdMixByCommonCacheLevel, curdMixByCommonCacheSecond } = this.ctx.workbenchInfoTools.getWorkbenchConfig();
-        const cacheService = this.cacheServiceFactory.getCacheService(curdMixByCommonCacheLevel || DEFAULT_CACHE_LEVEL, SystemEntities_1.CacheNameEnum.CurdMixBySysConfig);
-        return cacheService.setJsonObject(code, value, curdMixByCommonCacheSecond || DEFAULT_CACHE_SECOND);
+        const cacheService = this.cacheServiceFactory.getCacheServiceByName(bizmodels_1.CacheNameEnum.CurdMixBySysConfig);
+        return cacheService.setJsonObject(code, value);
     }
     async queryConfigRowsUseCache(codes) {
         const resultRowMap = {};

package/dist/service/curd/CurdMixByWorkbenchService.js

@@ -19,21 +19,16 @@ const keys_1 = require("../../libs/crud-pro/models/keys");
 const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
 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");
 const workbenchMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.workbenchBasic);
 const TMP_CTX_KEY = _.uniqueId('CurdMixByWorkbenchService');
-const DEFAULT_CACHE_LEVEL = SystemEntities_1.CacheLevelEnum.MEMORY;
-const DEFAULT_CACHE_SECOND = 60 * 5;
 let CurdMixByWorkbenchService = class CurdMixByWorkbenchService {
     async loadWorkbenchListMap() {
         const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        const { curdMixByCommonCacheLevel, curdMixByCommonCacheSecond } = this.ctx.workbenchInfoTools.getWorkbenchConfig() || {};
-        const workbenchListMap = await this.cacheServiceFactory.getJsonObjectCache({
-            cacheLevel: curdMixByCommonCacheLevel || DEFAULT_CACHE_LEVEL,
-            cacheSecond: curdMixByCommonCacheSecond || DEFAULT_CACHE_SECOND,
+        return await this.cacheServiceFactory.getJsonObjectCache({
             cacheKey: 'loadWorkbenchListMap',
             refreshCache: false,
-            cacheName: SystemEntities_1.CacheNameEnum.CurdMixByWorkbench,
+            cacheName: bizmodels_1.CacheNameEnum.CurdMixByWorkbench,
             getter: async () => {
                 const reqJson = {
                     columns: 'workbench_code,workbench_name,workbench_domain',
@@ -49,7 +44,6 @@ let CurdMixByWorkbenchService = class CurdMixByWorkbenchService {
                 return MixinUtils_1.MixinUtils.toNewMap(workbenchList, (obj) => obj.workbench_code);
             },
         });
-        return workbenchListMap;
     }
     async handleExecuteContextPrepare(executeContext) {
         const relations = workbenchMixUtils.pickColumnRelations(executeContext);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.1-beta.66",
+  "version": "0.0.1-beta.68",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",

package/src/config/config.default.ts

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

package/src/controller/gateway/PublicApiController.ts

@@ -11,12 +11,8 @@ import { WorkbenchService } from '@/service/WorkbenchService';
 import { SystemRoleCode } from '@/models/SystemPerm';
 import { KeysOfAuthType } from '@/libs/crud-pro/models/keys';
 import { CacheServiceFactory } from '@/service/base/cache/CacheServiceFactory';
-import md5 = require('md5');
-import { CacheLevelEnum, CacheNameEnum } from '@/models/SystemEntities';
-
-
-const DEFAULT_CACHE_LEVEL = CacheLevelEnum.MEMORY;
-const DEFAULT_CACHE_SECOND = 60 * 5;
+import * as md5 from 'md5';
+import { CacheNameEnum} from "@/models/bizmodels";
 
 
 /**
@@ -64,12 +60,8 @@ export class PublicApiController extends BaseApiController {
       return 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: CacheNameEnum.GetWorkbenchMenu,
       getter: async () => {
 
@@ -134,13 +126,9 @@ export class PublicApiController extends BaseApiController {
     };
 
 
-    const { publicApiNavPageInfoCacheLevel, publicApiNavPageInfoCacheSecond } = this.ctx.workbenchInfoTools.getWorkbenchConfig();
-
     const getOne = async (condition: any, tableName: string, key: string) => {
       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: CacheNameEnum.GetNavPageInfo,
         getter: async () => {

package/src/index.ts

@@ -54,7 +54,7 @@ export * from './service/anyapi/AnyApiSandboxService';
 export * from './service/anyapi/AnyApiService';
 export * from './service/base/ApiBaseService';
 export * from './service/base/BaseService';
-export * from './service/base/cache/FatcmsBaseRedisCache';
+export * from './service/base/cache/CacheServiceFactory';
 export * from './service/crudstd/CrudStdActionService';
 export * from './service/crudstd/CrudStdRelationService';
 export * from './service/crudstd/CrudStdService';

package/src/libs/crud-pro/services/CrudProExecuteSqlService.ts

@@ -29,7 +29,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
   }
 
   private async executeSqlCfgModel(sqlCfgModel: 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);
@@ -42,22 +42,24 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
 
       const pgClient: PoolClient = connection as any;
       const pgSql = 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 === SqlDbType.sqlserver) {
       // SQLServer
 
       const mssql = 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 = pickAndConvertRowsByMix(queryRes, sqlCfgModel.sqlDbType);

package/src/models/SystemEntities.ts

@@ -130,37 +130,8 @@ export enum CacheLevelEnum {
   DISK = 'DISK', // 磁盘缓存
 }
 
-export 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; // 零代码CRUD接口白名单开关. 默认： MEMORY
-  crudStdAppInfoCacheSecond?: number; // 零代码CRUD接口白名单缓存时间，单位：秒。 默认 5分钟
-
-  publicApiNavPageInfoCacheLevel?: CacheLevelEnum; // 公开API导航页缓存级别. 默认： MEMORY
-  publicApiNavPageInfoCacheSecond?: number; // 公开API导航页缓存时间，单位：秒。 默认 5分钟
-
-  publicApiMenuCacheLevel?: CacheLevelEnum; // 公开API菜单缓存级别. 默认： MEMORY
-  publicApiMenuCacheSecond?: number; // 公开API菜单缓存时间，单位：秒。 默认 5分钟 
-
-  queryEnumInfoCacheLevel?: CacheLevelEnum; // 查询枚举缓存级别. 默认： MEMORY
-  queryEnumInfoCacheSecond?: number; // 查询枚举缓存时间，单位：秒。 默认 5分钟
-
-  curdMixByCommonCacheLevel?: CacheLevelEnum; // CrudMixService 缓存级别. 默认： MEMORY
-  curdMixByCommonCacheSecond?: number; // CrudMixService 缓存时间，单位：秒。 默认 5分钟
-}
+}

package/src/models/WorkbenchInfoTools.ts

@@ -1,5 +1,6 @@
 import { parseJsonObject } from "@/libs/utils/functions";
-import { IWorkbenchConfig, IWorkbenchEntity } from "./SystemEntities";
+import { IWorkbenchConfig, IWorkbenchEntity} from "./SystemEntities";
+
 
 
 export class WorkbenchInfoTools {
@@ -13,6 +14,6 @@ export class WorkbenchInfoTools {
         }
         const configObj: IWorkbenchConfig = parseJsonObject(this.workbenchInfo?.config_content);
         this.parsedConfigContent = configObj || {};
-        return this.parsedConfigContent;    
+        return this.parsedConfigContent;
     }
 }

package/src/models/bizmodels.ts

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

package/src/service/EnumInfoService.ts

@@ -1,14 +1,14 @@
-import { Inject, Provide } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
-import { CurdProService } from './curd/CurdProService';
-import { RelatedType } from './curd/CurdMixUtils';
-import { SystemTables } from '@/models/SystemTables';
-import { parseConfigContentToEnumInfo, IEnumInfo } from '@/libs/utils/parseConfig';
-import { CurdMixByLinkToCustomService } from './curd/CurdMixByLinkToCustomService';
-import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
-import { CacheServiceFactory } from './base/cache/CacheServiceFactory';
-import { CacheLevelEnum, CacheNameEnum } from '@/models/SystemEntities';
+import {Inject, Provide} from '@midwayjs/core';
+import {Context} from '@midwayjs/koa';
+import {KeysOfSimpleSQL} from '@/libs/crud-pro/models/keys';
+import {CurdProService} from './curd/CurdProService';
+import {RelatedType} from './curd/CurdMixUtils';
+import {SystemTables} from '@/models/SystemTables';
+import {IEnumInfo, parseConfigContentToEnumInfo} from '@/libs/utils/parseConfig';
+import {CurdMixByLinkToCustomService} from './curd/CurdMixByLinkToCustomService';
+import {GLOBAL_STATIC_CONFIG} from '@/libs/global-config/global-config';
+import {CacheServiceFactory} from './base/cache/CacheServiceFactory';
+import { CacheNameEnum } from "@/models/bizmodels";
 
 interface IQueryEnumInfo {
   type: RelatedType;
@@ -24,8 +24,6 @@ function filterEmpty(e: IEnumInfo): boolean {
   return e.label && typeof e.value !== 'undefined';
 }
 
-const DEFAULT_CACHE_LEVEL = CacheLevelEnum.MEMORY;
-const DEFAULT_CACHE_SECOND = 60 * 5;
 
 
 @Provide()
@@ -42,7 +40,6 @@ export class EnumInfoService {
   private cacheServiceFactory: CacheServiceFactory;
 
   async queryEnumInfo(codeList: IQueryEnumInfo[], refreshCache: boolean): Promise<IQueryEnumResult[]> {
-    const { queryEnumInfoCacheLevel, queryEnumInfoCacheSecond } = this.ctx.workbenchInfoTools.getWorkbenchConfig() || {};
 
     const getEnumInfoByCode = async (type: RelatedType, code: string) => {
       if (type === RelatedType.linkToCustom) {
@@ -50,9 +47,7 @@ export class EnumInfoService {
       }
 
       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: CacheNameEnum.GetEnumInfoByCode,
@@ -65,7 +60,6 @@ export class EnumInfoService {
           return [];
         },
       });
-      return emums;
     };
 
     const result = [];