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

package/src/service/curd/CurdMixByWorkbenchService.ts

@@ -1,7 +1,6 @@
 import { Inject, Provide } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import * as _ from 'lodash';
-import { LRUCache } from 'lru-cache';
 import { CurdProService } from './CurdProService';
 import { HandleExecuteContextType, IExecuteContextHandler } from '@/libs/crud-pro/models/ExecuteContext';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
@@ -10,44 +9,52 @@ import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
 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';
-
-const lruCache = new LRUCache<string, any>({
-  max: 500,
-  ttl: 1000 * 60 * 5,
-  ttlAutopurge: true,
-});
+import { CacheServiceFactory } from '../base/cache/CacheServiceFactory';
+import { CacheLevelEnum, CacheNameEnum } from '@/models/SystemEntities';
 
 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 {
   @Inject()
-  ctx: Context;
+  protected ctx: Context;
 
   @Inject()
   protected curdProService: CurdProService;
 
+  @Inject()
+  private cacheServiceFactory: CacheServiceFactory;
+
   private async loadWorkbenchListMap() {
     const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    const { curdMixByCommonCacheLevel, curdMixByCommonCacheSecond } = this.ctx.workbenchInfoTools.getWorkbenchConfig() || {};
 
-    let workbenchListMap = lruCache.get('workbenchListMap');
-    if (!workbenchListMap) {
-      const reqJson = {
-        columns: 'workbench_code,workbench_name,workbench_domain',
-        condition: {},
-      };
-      const res = await this.curdProService.executeCrudByCfg(reqJson, {
-        sqlTable: SystemTables.sys_workbench,
-        sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-        sqlDatabase: SystemDbName,
-        sqlDbType: SystemDbType,
-      });
-      const workbenchList = res.getResRows();
-      workbenchListMap = MixinUtils.toNewMap(workbenchList, (obj: any) => obj.workbench_code);
-      lruCache.set('workbenchListMap', workbenchListMap);
-    }
+    const workbenchListMap = await this.cacheServiceFactory.getJsonObjectCache({
+      cacheLevel: curdMixByCommonCacheLevel || DEFAULT_CACHE_LEVEL,
+      cacheSecond: curdMixByCommonCacheSecond || DEFAULT_CACHE_SECOND,
+      cacheKey: 'loadWorkbenchListMap',
+      refreshCache: false,
+      cacheName: CacheNameEnum.CurdMixByWorkbench,
+      getter: async () => {
+        const reqJson = {
+          columns: 'workbench_code,workbench_name,workbench_domain',
+          condition: {},
+        };
+        const res = await this.curdProService.executeCrudByCfg(reqJson, {
+          sqlTable: SystemTables.sys_workbench,
+          sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
+          sqlDatabase: SystemDbName,
+          sqlDbType: SystemDbType,
+        });
+        const workbenchList = res.getResRows();
+        return MixinUtils.toNewMap(workbenchList, (obj: any) => obj.workbench_code);
+      },
+    });
     return workbenchListMap;
   }
 

package/src/service/proxyapi/WeightedRandom.ts

@@ -1,4 +1,4 @@
-import { IUpstreamItem } from '../../models/SystemEntities';
+import { IUpstreamItem } from '@/models/SystemEntities';
 
 class WeightedRandom {
   private readonly items: IUpstreamItem[];

package/src/service/proxyapi/WeightedRoundRobin.ts

@@ -1,4 +1,4 @@
-import { IUpstreamItem } from '../../models/SystemEntities';
+import { IUpstreamItem } from '@/models/SystemEntities';
 
 interface IUpstreamItemExt extends IUpstreamItem {
   currentWeight: number;

package/dist/service/base/RedisCacheService.js

@@ -1,57 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    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);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisCacheService = void 0;
-const core_1 = require("@midwayjs/core");
-const redis_1 = require("@midwayjs/redis");
-const oss_1 = require("@midwayjs/oss");
-const koa = require("@midwayjs/koa");
-const functions_1 = require("../../libs/utils/functions");
-let RedisCacheService = class RedisCacheService {
-    async getJsonObject(key) {
-        const str = await this.redisService.get(key);
-        return (0, functions_1.parseJsonObject)(str);
-    }
-    /**
-     * 设置缓存对象
-     * @param key
-     * @param obj
-     * @param expireSecond 过期时间，单位秒
-     * @returns
-     */
-    async setJsonObject(key, obj, expireSecond) {
-        const str = JSON.stringify(obj);
-        return this.redisService.set(key, str, 'EX', expireSecond);
-    }
-    async removeItem(key) {
-        return await this.redisService.del(key);
-    }
-};
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", Object)
-], RedisCacheService.prototype, "ctx", void 0);
-__decorate([
-    (0, core_1.App)(),
-    __metadata("design:type", Object)
-], RedisCacheService.prototype, "app", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", redis_1.RedisService)
-], RedisCacheService.prototype, "redisService", void 0);
-__decorate([
-    (0, core_1.Inject)(),
-    __metadata("design:type", oss_1.OSSServiceFactory)
-], RedisCacheService.prototype, "ossServiceFactory", void 0);
-RedisCacheService = __decorate([
-    (0, core_1.Provide)()
-], RedisCacheService);
-exports.RedisCacheService = RedisCacheService;

package/src/service/base/RedisCacheService.ts

@@ -1,42 +0,0 @@
-import { Inject, Provide, App } from '@midwayjs/core';
-import { Context } from '@midwayjs/koa';
-import { RedisService } from '@midwayjs/redis';
-import { OSSServiceFactory } from '@midwayjs/oss';
-import * as koa from '@midwayjs/koa';
-import { parseJsonObject } from '../../libs/utils/functions';
-
-@Provide()
-export class RedisCacheService {
-  @Inject()
-  protected ctx: Context;
-
-  @App()
-  protected app: koa.Application;
-
-  @Inject()
-  protected redisService: RedisService;
-
-  @Inject()
-  protected ossServiceFactory: OSSServiceFactory;
-
-  async getJsonObject(key: string): Promise<any> {
-    const str = await this.redisService.get(key);
-    return parseJsonObject(str);
-  }
-
-  /**
-   * 设置缓存对象
-   * @param key
-   * @param obj
-   * @param expireSecond 过期时间，单位秒
-   * @returns
-   */
-  async setJsonObject(key: string, obj: any, expireSecond: number): Promise<any> {
-    const str = JSON.stringify(obj);
-    return this.redisService.set(key, str, 'EX', expireSecond);
-  }
-
-  async removeItem(key: string): Promise<any> {
-    return await this.redisService.del(key);
-  }
-}