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

package/src/service/curd/CurdMixByLinkToCustomService.ts

@@ -11,7 +11,7 @@ import { Exceptions } from '@/libs/crud-pro/exceptions';
 import { parseDatabaseName } from '@/libs/crud-pro/utils/DatabaseName';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 import { IRequestCfgModel2 } from '@/models/bizmodels';
-import { CacheLevelEnum, CacheNameEnum } from '@/models/SystemEntities';
+import { CacheNameEnum} from "@/models/bizmodels";
 import { CacheServiceFactory } from '../base/cache/CacheServiceFactory';
 import * as md5 from 'md5';
 
@@ -19,10 +19,6 @@ const linkToCustomMixUtils = new CrudMixUtils(RelatedType.linkToCustom);
 const TMP_CTX_KEY = _.uniqueId('CurdMixByLinkToCustomService');
 
 
-const DEFAULT_CACHE_LEVEL = CacheLevelEnum.MEMORY;
-const DEFAULT_CACHE_SECOND = 60 * 5;
-
-
 function toMapObject(rows: any[], fieldsArr: string[]): Map<string, any> {
   const valueKey = fieldsArr[0];
   const labelKey = fieldsArr[1];
@@ -98,11 +94,8 @@ export class CurdMixByLinkToCustomService implements IExecuteContextHandler {
   }
 
   public async queryInfoByLinkToCustom(code: string): Promise<Map<string, any>> {
-    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: CacheNameEnum.CurdMixByLinkToCustom,
       getter: async () => {
         return await this.queryInfoByLinkToCustomImpl(code);

package/src/service/curd/CurdMixBySysConfigService.ts

@@ -11,17 +11,12 @@ import { ColumnRelation } from '@/libs/crud-pro/interfaces';
 import { parseConfigContentToEnumInfo } from '@/libs/utils/parseConfig';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 import { CacheServiceFactory } from '../base/cache/CacheServiceFactory';
-import { CacheLevelEnum, CacheNameEnum } from '@/models/SystemEntities';
+import { CacheNameEnum} from "@/models/bizmodels";
 
 const dictMixUtils = new CrudMixUtils(RelatedType.sysCfgEnum);
 
 const TMP_CTX_KEY = _.uniqueId('CurdMixBySysConfigService');
 
-const DEFAULT_CACHE_LEVEL = CacheLevelEnum.MEMORY;
-const DEFAULT_CACHE_SECOND = 60 * 5;
-
-
-
 
 @Provide()
 export class CurdMixBySysConfigService implements IExecuteContextHandler {
@@ -35,15 +30,13 @@ export class CurdMixBySysConfigService implements IExecuteContextHandler {
 
 
   private async getFromCache(code: string): Promise<any> {
-    const { curdMixByCommonCacheLevel } = this.ctx.workbenchInfoTools.getWorkbenchConfig();
-    const cacheService = this.cacheServiceFactory.getCacheService(curdMixByCommonCacheLevel || DEFAULT_CACHE_LEVEL, CacheNameEnum.CurdMixBySysConfig);
+    const cacheService = this.cacheServiceFactory.getCacheServiceByName(CacheNameEnum.CurdMixBySysConfig);
     return cacheService.getJsonObject(code);
   }
 
   private async setToCache(code: string, value: any): Promise<any> {
-    const { curdMixByCommonCacheLevel, curdMixByCommonCacheSecond } = this.ctx.workbenchInfoTools.getWorkbenchConfig();
-    const cacheService = this.cacheServiceFactory.getCacheService(curdMixByCommonCacheLevel || DEFAULT_CACHE_LEVEL, CacheNameEnum.CurdMixBySysConfig);
-    return cacheService.setJsonObject(code, value, curdMixByCommonCacheSecond || DEFAULT_CACHE_SECOND);
+    const cacheService = this.cacheServiceFactory.getCacheServiceByName(CacheNameEnum.CurdMixBySysConfig);
+    return cacheService.setJsonObject(code, value);
   }
 
 
@@ -63,10 +56,10 @@ export class CurdMixBySysConfigService implements IExecuteContextHandler {
       return Object.values(resultRowMap);
     }
 
-    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    const {SystemDbName, SystemDbType} = GLOBAL_STATIC_CONFIG.getConfig();
     const res1 = await this.curdProService.executeCrudByCfg(
       {
-        condition: { config_code: { $in: notCachedCodes } },
+        condition: {config_code: {$in: notCachedCodes}},
       },
       {
         sqlTable: SystemTables.sys_configs,
@@ -79,12 +72,12 @@ export class CurdMixBySysConfigService implements IExecuteContextHandler {
     if (Array.isArray(rows) && rows.length > 0) {
       for (let i = 0; i < rows.length; i++) {
         const row = rows[i];
-        const { config_code } = row;
+        const {config_code} = row;
         await this.setToCache(config_code, row);
         resultRowMap[config_code] = row;
       }
     }
-return Object.values(resultRowMap)
+    return Object.values(resultRowMap)
   }
 
   async handleExecuteContextPrepare(executeContext: HandleExecuteContextType) {

package/src/service/curd/CurdMixByWorkbenchService.ts

@@ -10,14 +10,12 @@ import { ColumnRelation } from '@/libs/crud-pro/interfaces';
 import { MixinUtils } from '@/libs/crud-pro/utils/MixinUtils';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 import { CacheServiceFactory } from '../base/cache/CacheServiceFactory';
-import { CacheLevelEnum, CacheNameEnum } from '@/models/SystemEntities';
+import { CacheNameEnum} from "@/models/bizmodels";
 
 const workbenchMixUtils = new CrudMixUtils(RelatedType.workbenchBasic);
 
 const TMP_CTX_KEY = _.uniqueId('CurdMixByWorkbenchService');
 
-const DEFAULT_CACHE_LEVEL = CacheLevelEnum.MEMORY;
-const DEFAULT_CACHE_SECOND = 60 * 5;
 
 @Provide()
 export class CurdMixByWorkbenchService implements IExecuteContextHandler {
@@ -30,13 +28,9 @@ export class CurdMixByWorkbenchService implements IExecuteContextHandler {
   @Inject()
   private cacheServiceFactory: CacheServiceFactory;
 
-  private async loadWorkbenchListMap() {
+  private async loadWorkbenchListMap(): Promise<Map<string, any>> {
     const { SystemDbName, SystemDbType } = 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: CacheNameEnum.CurdMixByWorkbench,
@@ -55,7 +49,6 @@ export class CurdMixByWorkbenchService implements IExecuteContextHandler {
         return MixinUtils.toNewMap(workbenchList, (obj: any) => obj.workbench_code);
       },
     });
-    return workbenchListMap;
   }
 
   async handleExecuteContextPrepare(executeContext: HandleExecuteContextType) {

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

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

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

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