midway-fatcms 0.0.16 → 0.0.17

package/dist/schedule/scheduleNames.d.ts

@@ -2,10 +2,12 @@ declare const INNER_SCHEDULE_INTERVAL: {
     cacheRefreshHubScheduleService: number;
     visitStatService: number;
     asyncTaskRunnerService: number;
+    bizMemCacheService: number;
 };
 declare const INNER_SCHEDULE_NAMES: {
     cacheRefreshHubScheduleService: string;
     visitStatService: string;
     asyncTaskRunnerService: string;
+    bizMemCacheService: string;
 };
 export { INNER_SCHEDULE_INTERVAL, INNER_SCHEDULE_NAMES };

package/dist/schedule/scheduleNames.js

@@ -4,12 +4,14 @@ exports.INNER_SCHEDULE_NAMES = exports.INNER_SCHEDULE_INTERVAL = void 0;
 const INNER_SCHEDULE_INTERVAL = {
     cacheRefreshHubScheduleService: 10 * 60 * 1000,
     visitStatService: 10 * 60 * 1000,
-    asyncTaskRunnerService: 1000, // 1s可以执行
+    asyncTaskRunnerService: 1000,
+    bizMemCacheService: 1000,
 };
 exports.INNER_SCHEDULE_INTERVAL = INNER_SCHEDULE_INTERVAL;
 const INNER_SCHEDULE_NAMES = {
     cacheRefreshHubScheduleService: 'cacheRefreshHubScheduleService',
     visitStatService: 'visitStatService',
     asyncTaskRunnerService: 'asyncTaskRunnerService',
+    bizMemCacheService: 'bizMemCacheService',
 };
 exports.INNER_SCHEDULE_NAMES = INNER_SCHEDULE_NAMES;

package/dist/service/SysAppService.d.ts

@@ -1,15 +1,12 @@
 import { BaseService } from './base/BaseService';
 export declare class SysAppService extends BaseService {
-    private curdProService;
-    private cacheServiceFactory;
-    private get sysAppDao();
-    private get sysAppPageDao();
     getSysAppPageOne({ page_path, workbench_code }: {
         page_path: string;
         workbench_code: string;
     }): Promise<Record<string, any>>;
     getSysAppOne(app_code: string): Promise<Record<string, any>>;
     deletePrivateField(parsedAppInfo: any): any;
-    removeSysAppOneCache(app_code: string): Promise<any>;
+    removeSysAppOneCache(app_code: string): Promise<void>;
+    removeSysAppPageCache(): Promise<void>;
     removeSysAppCacheByCondition({ condition }: any): Promise<void>;
 }

package/dist/service/SysAppService.js

@@ -5,70 +5,31 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var SysAppService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SysAppService = void 0;
 const core_1 = require("@midwayjs/core");
-const SystemTables_1 = require("../models/SystemTables");
 const BaseService_1 = require("./base/BaseService");
-const CurdProService_1 = require("./curd/CurdProService");
-const global_config_1 = require("../libs/global-config/global-config");
-const CacheServiceFactory_1 = require("../service/base/cache/CacheServiceFactory");
-const bizmodels_1 = require("../models/bizmodels");
-let SysAppService = SysAppService_1 = class SysAppService extends BaseService_1.BaseService {
-    get sysAppDao() {
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        return this.curdProService.getQuickCrud({
-            sqlDatabase: SystemDbName,
-            sqlDbType: SystemDbType,
-            sqlTable: SystemTables_1.SystemTables.sys_app,
-        });
-    }
-    get sysAppPageDao() {
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        return this.curdProService.getQuickCrud({
-            sqlDatabase: SystemDbName,
-            sqlDbType: SystemDbType,
-            sqlTable: SystemTables_1.SystemTables.sys_app_page,
-        });
-    }
+const BizMemCacheStore_1 = require("../service/base/bizmemcache/BizMemCacheStore");
+const BizMemCacheTypes_1 = require("../service/base/bizmemcache/BizMemCacheTypes");
+let SysAppService = class SysAppService extends BaseService_1.BaseService {
     async getSysAppPageOne({ page_path, workbench_code }) {
+        var _a;
         if (!page_path || typeof page_path !== 'string') {
             throw new Error('[getSysAppPageOne] page_path required');
         }
         if (!workbench_code || typeof workbench_code !== 'string') {
             throw new Error('[getSysAppPageOne] workbench_code required');
         }
-        return await this.cacheServiceFactory.getJsonObjectCache({
-            cacheKey: `${workbench_code}#${page_path}`,
-            cacheName: bizmodels_1.CacheNameEnum.GetSysAppPageOne,
-            getter: async (ctx) => {
-                const service = await ctx.requestContext.getAsync(SysAppService_1);
-                const res = await service.sysAppPageDao.findOne({
-                    condition: { page_path, workbench_code, deleted_at: 0 }
-                });
-                return res.row;
-            },
-        });
+        const sysAppPageMap = ((_a = BizMemCacheStore_1.bizMemCacheStore.getSysAppPage()) === null || _a === void 0 ? void 0 : _a.sysAppPageMap) || {};
+        return sysAppPageMap[(0, BizMemCacheTypes_1.buildSysAppPageCacheKey)(workbench_code, page_path)];
     }
     async getSysAppOne(app_code) {
+        var _a;
         if (!app_code || typeof app_code !== 'string') {
             throw new Error('[getSysAppOne] app_code required');
         }
-        return await this.cacheServiceFactory.getJsonObjectCache({
-            cacheKey: app_code,
-            cacheName: bizmodels_1.CacheNameEnum.GetSysAppOne,
-            getter: async (ctx) => {
-                const service = await ctx.requestContext.getAsync(SysAppService_1);
-                const res = await service.sysAppDao.findOne({
-                    condition: { app_code, deleted_at: 0 }
-                });
-                return res.row;
-            },
-        });
+        const sysAppCodeMap = ((_a = BizMemCacheStore_1.bizMemCacheStore.getSysApp()) === null || _a === void 0 ? void 0 : _a.sysAppCodeMap) || {};
+        return sysAppCodeMap[app_code];
     }
     deletePrivateField(parsedAppInfo) {
         if (!parsedAppInfo) {
@@ -89,34 +50,19 @@ let SysAppService = SysAppService_1 = class SysAppService extends BaseService_1.
         if (!app_code || typeof app_code !== 'string') {
             throw new Error('[removeSysAppOneCache] app_code required');
         }
-        return await this.cacheServiceFactory.removeItemCache({
-            cacheKey: app_code,
-            cacheName: bizmodels_1.CacheNameEnum.GetSysAppOne
-        });
+        await BizMemCacheStore_1.bizMemCacheStore.markDirty('sysAppCacheObj', this.redisService);
+    }
+    async removeSysAppPageCache() {
+        await BizMemCacheStore_1.bizMemCacheStore.markDirty('sysAppPageCacheObj', this.redisService);
     }
     async removeSysAppCacheByCondition({ condition }) {
         if (!condition) {
             throw new Error('[removeSysAppCacheByCondition] condition required');
         }
-        const res = await this.sysAppDao.findList({
-            condition: { ...condition, deleted_at: 0 },
-            columns: ['id', 'app_code']
-        });
-        const appList = res.rows;
-        for (const app of appList) {
-            await this.removeSysAppOneCache(app.app_code);
-        }
+        await BizMemCacheStore_1.bizMemCacheStore.markDirty('sysAppCacheObj', this.redisService);
     }
 };
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CurdProService_1.CurdProService)
-], SysAppService.prototype, "curdProService", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
-], SysAppService.prototype, "cacheServiceFactory", void 0);
-SysAppService = SysAppService_1 = __decorate([
+SysAppService = __decorate([
     (0, core_1.Provide)()
 ], SysAppService);
 exports.SysAppService = SysAppService;

package/dist/service/SysConfigService.d.ts

@@ -1,10 +1,5 @@
-import { Context } from '@midwayjs/koa';
 import { BaseService } from './base/BaseService';
 export declare class SysConfigService extends BaseService {
-    ctx: Context;
-    private curdProService;
-    private cacheServiceFactory;
-    private get sysConfigsDao();
     getSysConfigOne(config_code: string): Promise<Record<string, any>>;
-    removeSysConfigOneCache(config_code: string): Promise<any>;
+    removeSysConfigOneCache(config_code: string): Promise<void>;
 }

package/dist/service/SysConfigService.js

@@ -5,67 +5,28 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var SysConfigService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SysConfigService = void 0;
 const core_1 = require("@midwayjs/core");
-const SystemTables_1 = require("../models/SystemTables");
 const BaseService_1 = require("./base/BaseService");
-const CurdProService_1 = require("./curd/CurdProService");
-const global_config_1 = require("../libs/global-config/global-config");
-const bizmodels_1 = require("../models/bizmodels");
-const CacheServiceFactory_1 = require("../service/base/cache/CacheServiceFactory");
-let SysConfigService = SysConfigService_1 = class SysConfigService extends BaseService_1.BaseService {
-    get sysConfigsDao() {
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        return this.curdProService.getQuickCrud({
-            sqlDatabase: SystemDbName,
-            sqlDbType: SystemDbType,
-            sqlTable: SystemTables_1.SystemTables.sys_configs,
-        });
-    }
+const BizMemCacheStore_1 = require("../service/base/bizmemcache/BizMemCacheStore");
+let SysConfigService = class SysConfigService extends BaseService_1.BaseService {
     async getSysConfigOne(config_code) {
+        var _a;
         if (!config_code || typeof config_code !== 'string') {
             throw new Error('[getSysAppOne] config_code required');
         }
-        return await this.cacheServiceFactory.getJsonObjectCache({
-            cacheKey: config_code,
-            cacheName: bizmodels_1.CacheNameEnum.GetSysConfigOne,
-            getter: async (ctx) => {
-                const service = await ctx.requestContext.getAsync(SysConfigService_1);
-                const res = await service.sysConfigsDao.findOne({
-                    condition: { config_code, deleted_at: 0 }
-                });
-                return res.row;
-            },
-        });
+        const sysConfigCodeMap = ((_a = BizMemCacheStore_1.bizMemCacheStore.getSysConfig()) === null || _a === void 0 ? void 0 : _a.sysConfigCodeMap) || {};
+        return sysConfigCodeMap[config_code];
     }
     async removeSysConfigOneCache(config_code) {
         if (!config_code || typeof config_code !== 'string') {
             throw new Error('[removeSysConfigOneCache] config_code required');
         }
-        return await this.cacheServiceFactory.removeItemCache({
-            cacheKey: config_code,
-            cacheName: bizmodels_1.CacheNameEnum.GetSysConfigOne,
-        });
+        await BizMemCacheStore_1.bizMemCacheStore.markDirty('sysConfgCacheObj', this.redisService);
     }
 };
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", Object)
-], SysConfigService.prototype, "ctx", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CurdProService_1.CurdProService)
-], SysConfigService.prototype, "curdProService", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
-], SysConfigService.prototype, "cacheServiceFactory", void 0);
-SysConfigService = SysConfigService_1 = __decorate([
+SysConfigService = __decorate([
     (0, core_1.Provide)()
 ], SysConfigService);
 exports.SysConfigService = SysConfigService;

package/dist/service/SysDictDataService.d.ts

@@ -1,9 +1,6 @@
 import { BaseService } from './base/BaseService';
 export declare class SysDictDataService extends BaseService {
-    private curdProService;
-    private cacheServiceFactory;
-    private get sys_data_dict_item();
     getDataDictItemsByDictCode(dict_code: string): Promise<any[]>;
-    removeCacheByDictItemId(dict_item_id: string): Promise<any>;
-    removeCacheByDictCode(dict_code: string): Promise<any>;
+    removeCacheByDictItemId(dict_item_id: string): Promise<void>;
+    removeCacheByDictCode(dict_code: string): Promise<void>;
 }

package/dist/service/SysDictDataService.js

@@ -5,80 +5,34 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var SysDictDataService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SysDictDataService = void 0;
 const core_1 = require("@midwayjs/core");
-const SystemTables_1 = require("../models/SystemTables");
 const BaseService_1 = require("./base/BaseService");
-const CurdProService_1 = require("./curd/CurdProService");
-const global_config_1 = require("../libs/global-config/global-config");
-const CacheServiceFactory_1 = require("../service/base/cache/CacheServiceFactory");
-const bizmodels_1 = require("../models/bizmodels");
-let SysDictDataService = SysDictDataService_1 = class SysDictDataService extends BaseService_1.BaseService {
-    get sys_data_dict_item() {
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        return this.curdProService.getQuickCrud({
-            sqlDatabase: SystemDbName,
-            sqlDbType: SystemDbType,
-            sqlTable: SystemTables_1.SystemTables.sys_data_dict_item,
-        });
-    }
-    // private get sys_data_dict(){
-    //   const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
-    //   return this.curdProService.getQuickCrud({
-    //     sqlDatabase: SystemDbName,
-    //     sqlDbType: SystemDbType,
-    //     sqlTable: SystemTables.sys_data_dict,
-    //   })
-    // }
+const BizMemCacheStore_1 = require("../service/base/bizmemcache/BizMemCacheStore");
+let SysDictDataService = class SysDictDataService extends BaseService_1.BaseService {
     async getDataDictItemsByDictCode(dict_code) {
+        var _a;
         if (!dict_code || typeof dict_code !== 'string') {
-            throw new Error('[getDataDictItemsByDictCode] page_path required');
+            throw new Error('[getDataDictItemsByDictCode] dict_code required');
         }
-        return await this.cacheServiceFactory.getJsonObjectCache({
-            cacheKey: dict_code,
-            cacheName: bizmodels_1.CacheNameEnum.GetDataDictItemsByDictCode,
-            getter: async (ctx) => {
-                const service = await ctx.requestContext.getAsync(SysDictDataService_1);
-                const res = await service.sys_data_dict_item.findList({
-                    condition: { dict_code, status: 1, deleted_at: 0 }
-                });
-                return res.rows;
-            },
-        });
+        const dictCodeMap = ((_a = BizMemCacheStore_1.bizMemCacheStore.getDataDictItem()) === null || _a === void 0 ? void 0 : _a.dictCodeMap) || {};
+        return dictCodeMap[dict_code] || [];
     }
     async removeCacheByDictItemId(dict_item_id) {
-        const res = await this.sys_data_dict_item.findOne({ condition: { id: dict_item_id } });
-        const dictItemObj = res.row;
-        return this.removeCacheByDictCode(dictItemObj['dict_code']);
+        if (!dict_item_id) {
+            throw new Error('[removeCacheByDictItemId] dict_item_id required');
+        }
+        await BizMemCacheStore_1.bizMemCacheStore.markDirty('dataDictItemCacheObj', this.redisService);
     }
-    // public async removeCacheByDictId(dict_id: string) {
-    //   const dictObj = await this.sys_data_dict.getUniqueOne({condition: {id: dict_id}});
-    //   return this.removeCacheByDictCode(dictObj['dict_code']);
-    // }
     async removeCacheByDictCode(dict_code) {
         if (!dict_code || typeof dict_code !== 'string') {
-            throw new Error('[removeSysAppOneCache] app_code required');
+            throw new Error('[removeCacheByDictCode] dict_code required');
         }
-        return await this.cacheServiceFactory.removeItemCache({
-            cacheKey: dict_code,
-            cacheName: bizmodels_1.CacheNameEnum.GetDataDictItemsByDictCode
-        });
+        await BizMemCacheStore_1.bizMemCacheStore.markDirty('dataDictItemCacheObj', this.redisService);
     }
 };
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CurdProService_1.CurdProService)
-], SysDictDataService.prototype, "curdProService", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
-], SysDictDataService.prototype, "cacheServiceFactory", void 0);
-SysDictDataService = SysDictDataService_1 = __decorate([
+SysDictDataService = __decorate([
     (0, core_1.Provide)()
 ], SysDictDataService);
 exports.SysDictDataService = SysDictDataService;

package/dist/service/SysMenuService.d.ts

@@ -38,14 +38,11 @@ interface SysMenus {
     status: number;
 }
 export declare class SysMenuService extends BaseService {
-    private curdProService;
-    private cacheServiceFactory;
-    private get sys_menus_table();
     /**
      * 获取所有菜单列表
      * @returns
      */
     getCachedMenusList(): Promise<SysMenus[]>;
-    removeSysMenuCache(): Promise<any>;
+    removeSysMenuCache(): Promise<void>;
 }
 export {};

package/dist/service/SysMenuService.js

@@ -5,61 +5,25 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-var SysMenuService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SysMenuService = void 0;
 const core_1 = require("@midwayjs/core");
-const SystemTables_1 = require("../models/SystemTables");
 const BaseService_1 = require("./base/BaseService");
-const CurdProService_1 = require("./curd/CurdProService");
-const global_config_1 = require("../libs/global-config/global-config");
-const CacheServiceFactory_1 = require("../service/base/cache/CacheServiceFactory");
-const bizmodels_1 = require("../models/bizmodels");
-let SysMenuService = SysMenuService_1 = class SysMenuService extends BaseService_1.BaseService {
-    get sys_menus_table() {
-        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-        return this.curdProService.getQuickCrud({
-            sqlDatabase: SystemDbName,
-            sqlDbType: SystemDbType,
-            sqlTable: SystemTables_1.SystemTables.sys_menus,
-        });
-    }
+const BizMemCacheStore_1 = require("../service/base/bizmemcache/BizMemCacheStore");
+let SysMenuService = class SysMenuService extends BaseService_1.BaseService {
     /**
      * 获取所有菜单列表
      * @returns
      */
     async getCachedMenusList() {
-        return await this.cacheServiceFactory.getJsonObjectCache({
-            cacheKey: bizmodels_1.CacheNameEnum.GetSysMenusList,
-            cacheName: bizmodels_1.CacheNameEnum.GetSysMenusList,
-            getter: async (ctx) => {
-                const service = await ctx.requestContext.getAsync(SysMenuService_1);
-                const res = await service.sys_menus_table.findList({
-                    condition: { deleted_at: 0 }
-                });
-                return res.rows;
-            },
-        });
+        var _a;
+        return ((_a = BizMemCacheStore_1.bizMemCacheStore.getSysMenu()) === null || _a === void 0 ? void 0 : _a.sysMenuList) || [];
     }
     async removeSysMenuCache() {
-        return await this.cacheServiceFactory.removeItemCache({
-            cacheKey: bizmodels_1.CacheNameEnum.GetSysMenusList,
-            cacheName: bizmodels_1.CacheNameEnum.GetSysMenusList,
-        });
+        await BizMemCacheStore_1.bizMemCacheStore.markDirty('sysMenuCacheObj', this.redisService);
     }
 };
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CurdProService_1.CurdProService)
-], SysMenuService.prototype, "curdProService", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
-], SysMenuService.prototype, "cacheServiceFactory", void 0);
-SysMenuService = SysMenuService_1 = __decorate([
+SysMenuService = __decorate([
     (0, core_1.Provide)()
 ], SysMenuService);
 exports.SysMenuService = SysMenuService;

package/dist/service/WorkbenchService.d.ts

@@ -1,14 +1,10 @@
 import { Context } from '@midwayjs/koa';
 import { BaseService } from './base/BaseService';
 import { IWorkbenchEntity } from '../models/SystemEntities';
-import { IScheduleService } from '../interface';
-export declare class WorkbenchService extends BaseService implements IScheduleService {
+export declare class WorkbenchService extends BaseService {
     ctx: Context;
-    private curdProService;
-    private cacheServiceFactory;
     private fatcmsTargetWorkbenchCode;
     clearCache(): Promise<void>;
-    runBySchedule(): Promise<void>;
     private getWorkbenchCachedObj;
     /**
      * 获取所有站点列表

package/dist/service/WorkbenchService.js

@@ -8,81 +8,38 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var WorkbenchService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkbenchService = void 0;
 const core_1 = require("@midwayjs/core");
-const keys_1 = require("../libs/crud-pro/models/keys");
-const SystemTables_1 = require("../models/SystemTables");
 const BaseService_1 = require("./base/BaseService");
-const CurdProService_1 = require("./curd/CurdProService");
 const exceptions_1 = require("../libs/crud-pro/exceptions");
 const functions_1 = require("../libs/utils/functions");
 const fatcms_request_1 = require("../libs/utils/fatcms-request");
-const MixinUtils_1 = require("../libs/crud-pro/utils/MixinUtils");
-const global_config_1 = require("../libs/global-config/global-config");
 const AsyncTaskModel_1 = require("../models/AsyncTaskModel");
 const format_url_1 = require("../libs/utils/format-url");
-const CacheServiceFactory_1 = require("../service/base/cache/CacheServiceFactory");
-const bizmodels_1 = require("../models/bizmodels");
-let WorkbenchService = WorkbenchService_1 = class WorkbenchService extends BaseService_1.BaseService {
+const BizMemCacheStore_1 = require("../service/base/bizmemcache/BizMemCacheStore");
+let WorkbenchService = class WorkbenchService extends BaseService_1.BaseService {
     async clearCache() {
-        await this.cacheServiceFactory.removeItemCache({
-            cacheKey: bizmodels_1.CacheNameEnum.CurdMixByWorkbench,
-            cacheName: bizmodels_1.CacheNameEnum.CurdMixByWorkbench,
-        });
-        await this.cacheServiceFactory.removeItemCache({
-            cacheKey: bizmodels_1.CacheNameEnum.GetWorkbenchCachedObj,
-            cacheName: bizmodels_1.CacheNameEnum.GetWorkbenchCachedObj,
-        });
-        await this.getWorkbenchCachedObj(true);
+        await BizMemCacheStore_1.bizMemCacheStore.markDirty('workbenchCachedObj', this.redisService);
     }
-    async runBySchedule() {
-        await this.getWorkbenchCachedObj(true);
-    }
-    async getWorkbenchCachedObj(isForceRefresh) {
-        return this.cacheServiceFactory.getJsonObjectCache({
-            cacheKey: bizmodels_1.CacheNameEnum.GetWorkbenchCachedObj,
-            cacheName: bizmodels_1.CacheNameEnum.GetWorkbenchCachedObj,
-            refreshCache: isForceRefresh,
-            getter: async (ctx) => {
-                const service = await ctx.requestContext.getAsync(WorkbenchService_1);
-                const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
-                const reqJson = { condition: { deleted_at: 0 }, pageSize: 1000, limit: 1000 };
-                const res = await service.curdProService.executeCrudByCfg(reqJson, {
-                    sqlTable: SystemTables_1.SystemTables.sys_workbench,
-                    sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-                    sqlDatabase: SystemDbName,
-                    sqlDbType: SystemDbType,
-                });
-                const listData = res.getResRows();
-                const domainMap1 = MixinUtils_1.MixinUtils.toMap(listData, (e) => e.workbench_domain); // 主域名。其他两个域名。
-                const domainMap2 = MixinUtils_1.MixinUtils.toMap(listData, (e) => e.workbench_domain2);
-                const domainMap3 = MixinUtils_1.MixinUtils.toMap(listData, (e) => e.workbench_domain3);
-                const domainMap = { ...domainMap1, ...domainMap2, ...domainMap3 };
-                const cacheObj = {
-                    workbenchList: listData,
-                    workbenchDomainMap: domainMap
-                };
-                return cacheObj;
-            },
-        });
+    getWorkbenchCachedObj() {
+        return BizMemCacheStore_1.bizMemCacheStore.getWorkbench();
     }
     /**
      * 获取所有站点列表
      * @returns
      */
     async getAllWorkbenchInfoList() {
-        const cachedObj = await this.getWorkbenchCachedObj();
-        return cachedObj.workbenchList;
+        const cachedObj = this.getWorkbenchCachedObj();
+        return (cachedObj === null || cachedObj === void 0 ? void 0 : cachedObj.workbenchList) || [];
     }
     /**
      * 获取所有站点列表，以map的形式返回。其中key为站点域名，value为站点信息
      * @returns
      */
     async getAllWorkbenchInfoMap() {
-        const cachedObj = await this.getWorkbenchCachedObj();
-        return cachedObj.workbenchDomainMap;
+        const cachedObj = this.getWorkbenchCachedObj();
+        return (cachedObj === null || cachedObj === void 0 ? void 0 : cachedObj.workbenchDomainMap) || {};
     }
     /**
      * 检查站点编码是否匹配
@@ -233,19 +190,11 @@ __decorate([
     (0, core_1.Inject)(),
     __metadata("design:type", Object)
 ], WorkbenchService.prototype, "ctx", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CurdProService_1.CurdProService)
-], WorkbenchService.prototype, "curdProService", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", CacheServiceFactory_1.CacheServiceFactory)
-], WorkbenchService.prototype, "cacheServiceFactory", void 0);
 __decorate([
     (0, core_1.Config)('fatcmsTargetWorkbenchCode'),
     __metadata("design:type", String)
 ], WorkbenchService.prototype, "fatcmsTargetWorkbenchCode", void 0);
-WorkbenchService = WorkbenchService_1 = __decorate([
+WorkbenchService = __decorate([
     (0, core_1.Provide)()
 ], WorkbenchService);
 exports.WorkbenchService = WorkbenchService;

package/dist/service/anyapi/AnyApiService.d.ts

@@ -8,7 +8,7 @@ export declare class AnyApiService extends ApiBaseService {
     protected workbenchService: WorkbenchService;
     executeAnyApiMethod(methodCode: string, headers: any, body: any, query: any): Promise<any>;
     private getAnyApiMethod;
-    private _getAnyApiMethod;
+    private loadAnyApiMethodFromDb;
     /**
      * 构造参数
      * @param anyApi

package/dist/service/anyapi/AnyApiService.js

@@ -13,7 +13,6 @@ exports.AnyApiService = void 0;
 const core_1 = require("@midwayjs/core");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const SystemTables_1 = require("../../models/SystemTables");
-const lru_cache_1 = require("lru-cache");
 const devops_1 = require("../../models/devops");
 const CurdMixService_1 = require("../curd/CurdMixService");
 const AnyApiSandboxService_1 = require("./AnyApiSandboxService");
@@ -24,11 +23,7 @@ const WorkbenchService_1 = require("../WorkbenchService");
 const ValidateUtils_1 = require("../../libs/crud-pro/utils/ValidateUtils");
 const ApiBaseService_1 = require("../base/ApiBaseService");
 const global_config_1 = require("../../libs/global-config/global-config");
-const lruCache = new lru_cache_1.LRUCache({
-    max: 500,
-    ttl: 1000 * 60,
-    ttlAutopurge: true,
-});
+const BizMemCacheStore_1 = require("../../service/base/bizmemcache/BizMemCacheStore");
 let AnyApiService = class AnyApiService extends ApiBaseService_1.ApiBaseService {
     async executeAnyApiMethod(methodCode, headers, body, query) {
         const anyApi = await this.getAnyApiMethod(methodCode);
@@ -53,19 +48,14 @@ let AnyApiService = class AnyApiService extends ApiBaseService_1.ApiBaseService
         return funcRes;
     }
     async getAnyApiMethod(methodCode) {
-        // 开发环境，不使用缓存
+        var _a;
         if (this.isEnableDebug()) {
-            return this._getAnyApiMethod(methodCode);
-        }
-        // 线上环境可以使用缓存
-        let anyApi = lruCache.get(methodCode);
-        if (!anyApi) {
-            anyApi = await this._getAnyApiMethod(methodCode);
-            lruCache.set(methodCode, anyApi);
+            return this.loadAnyApiMethodFromDb(methodCode);
         }
-        return anyApi;
+        const sysAnyApiMethodMap = ((_a = BizMemCacheStore_1.bizMemCacheStore.getSysAnyApi()) === null || _a === void 0 ? void 0 : _a.sysAnyApiMethodMap) || {};
+        return sysAnyApiMethodMap[methodCode] || null;
     }
-    async _getAnyApiMethod(methodCode) {
+    async loadAnyApiMethodFromDb(methodCode) {
         const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const res = await this.curdMixService.executeCrudByCfg({ condition: { method: methodCode, deleted_at: 0 } }, {
             sqlTable: SystemTables_1.SystemTables.sys_anyapi,