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

package/dist/index.d.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/dist/index.js

@@ -72,7 +72,7 @@ __exportStar(require("./service/anyapi/AnyApiSandboxService"), exports);
 __exportStar(require("./service/anyapi/AnyApiService"), exports);
 __exportStar(require("./service/base/ApiBaseService"), exports);
 __exportStar(require("./service/base/BaseService"), exports);
-__exportStar(require("./service/base/cache/FatcmsBaseRedisCache"), exports);
+__exportStar(require("./service/base/cache/CacheServiceFactory"), exports);
 __exportStar(require("./service/crudstd/CrudStdActionService"), exports);
 __exportStar(require("./service/crudstd/CrudStdRelationService"), exports);
 __exportStar(require("./service/crudstd/CrudStdService"), exports);

package/dist/models/bizmodels.d.ts

@@ -102,7 +102,7 @@ export interface IStdCrudExportInputParams {
     primaryKey: any;
     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>;

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

@@ -1,5 +1,5 @@
 import { Context } from '@midwayjs/koa';
-import { ICacheServiceBase } from '../../../models/bizmodels';
+import { ICacheService } from '../../../models/bizmodels';
 import { CacheLevelEnum, CacheNameEnum } from '../../../models/SystemEntities';
 import { RedisService } from '@midwayjs/redis';
 interface IGetJsonObjectCacheParam {
@@ -14,7 +14,7 @@ export declare class CacheServiceFactory {
     protected ctx: Context;
     private fatcmsCache;
     protected redisService: RedisService;
-    getCacheService(cacheLevelEnum: CacheLevelEnum, cacheName: CacheNameEnum): ICacheServiceBase;
+    getCacheService(cacheLevelEnum: CacheLevelEnum, cacheName: CacheNameEnum): ICacheService;
     getJsonObjectCache(param: IGetJsonObjectCacheParam): Promise<any>;
 }
 export {};

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

@@ -13,24 +13,24 @@ exports.CacheServiceFactory = void 0;
 const core_1 = require("@midwayjs/core");
 const SystemEntities_1 = require("../../../models/SystemEntities");
 const redis_1 = require("@midwayjs/redis");
-const FatcmsBaseCtxCache_1 = require("./FatcmsBaseCtxCache");
-const FatcmsBaseRedisCache_1 = require("./FatcmsBaseRedisCache");
-const FatcmsBaseDiskCache_1 = require("./FatcmsBaseDiskCache");
-const FatcmsBaseMemoryCache_1 = require("./FatcmsBaseMemoryCache");
-const FatcmsBaseNoneCache_1 = require("./FatcmsBaseNoneCache");
+const CtxCache_1 = require("./CtxCache");
+const RedisCache_1 = require("./RedisCache");
+const DiskCache_1 = require("./DiskCache");
+const MemoryCache_1 = require("./MemoryCache");
+const NoneCache_1 = require("./NoneCache");
 let CacheServiceFactory = class CacheServiceFactory {
     getCacheService(cacheLevelEnum, cacheName) {
         switch (cacheLevelEnum) {
             case SystemEntities_1.CacheLevelEnum.CONTEXT:
-                return new FatcmsBaseCtxCache_1.FatcmsBaseCtxCache(this.ctx, cacheName);
+                return new CtxCache_1.CtxCache(this.ctx, cacheName);
             case SystemEntities_1.CacheLevelEnum.REDIS:
-                return new FatcmsBaseRedisCache_1.FatcmsBaseRedisCache(this.ctx, cacheName, this.redisService);
+                return new RedisCache_1.RedisCache(this.ctx, cacheName, this.redisService);
             case SystemEntities_1.CacheLevelEnum.DISK:
-                return new FatcmsBaseDiskCache_1.FatcmsBaseDiskCache(this.ctx, cacheName, this.fatcmsCache);
+                return new DiskCache_1.FatcmsBaseDiskCache(this.ctx, cacheName, this.fatcmsCache);
             case SystemEntities_1.CacheLevelEnum.MEMORY:
-                return new FatcmsBaseMemoryCache_1.FatcmsBaseMemoryCache(this.ctx, cacheName);
+                return new MemoryCache_1.MemoryCache(this.ctx, cacheName);
             default:
-                return new FatcmsBaseNoneCache_1.FatcmsBaseNoneCache(this.ctx, cacheName);
+                return new NoneCache_1.NoneCache(this.ctx, cacheName);
         }
     }
     async getJsonObjectCache(param) {

package/dist/service/base/cache/{FatcmsBaseCtxCache.d.ts → CtxCache.d.ts}

@@ -1,7 +1,7 @@
-import { ICacheServiceBase } from '../../../models/bizmodels';
+import { ICacheService } from '../../../models/bizmodels';
 import { CacheNameEnum } from '../../../models/SystemEntities';
 import { Context } from '@midwayjs/koa';
-export declare class FatcmsBaseCtxCache implements ICacheServiceBase {
+export declare class CtxCache implements ICacheService {
     private ctx;
     private cacheName;
     constructor(ctx: Context, cacheName: CacheNameEnum);

package/dist/service/base/cache/{FatcmsBaseCtxCache.js → CtxCache.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FatcmsBaseCtxCache = void 0;
-class FatcmsBaseCtxCache {
+exports.CtxCache = void 0;
+class CtxCache {
     constructor(ctx, cacheName) {
         this.ctx = ctx;
         this.cacheName = cacheName;
@@ -35,4 +35,4 @@ class FatcmsBaseCtxCache {
         cacheMap.delete(key);
     }
 }
-exports.FatcmsBaseCtxCache = FatcmsBaseCtxCache;
+exports.CtxCache = CtxCache;

package/dist/service/base/cache/{FatcmsBaseDiskCache.d.ts → DiskCache.d.ts}

@@ -1,6 +1,6 @@
 import { Context } from '@midwayjs/koa';
-import { ICacheServiceBase, IfatcmsCacheConfig } from '../../../models/bizmodels';
-export declare class FatcmsBaseDiskCache implements ICacheServiceBase {
+import { ICacheService, IfatcmsCacheConfig } from '../../../models/bizmodels';
+export declare class FatcmsBaseDiskCache implements ICacheService {
     protected ctx: Context;
     protected cacheName: string;
     private fatcmsCache;

package/dist/service/base/cache/{FatcmsBaseMemoryCache.d.ts → MemoryCache.d.ts}

@@ -1,6 +1,6 @@
 import { Context } from '@midwayjs/koa';
-import { ICacheServiceBase } from '../../../models/bizmodels';
-export declare class FatcmsBaseMemoryCache implements ICacheServiceBase {
+import { ICacheService } from '../../../models/bizmodels';
+export declare class MemoryCache implements ICacheService {
     protected ctx: Context;
     protected cacheName: string;
     constructor(ctx: Context, cacheName: string);

package/dist/service/base/cache/{FatcmsBaseMemoryCache.js → MemoryCache.js}

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FatcmsBaseMemoryCache = void 0;
+exports.MemoryCache = void 0;
 const lru_cache_1 = require("lru-cache");
 const LRU_CACHE_MAP = new Map();
-class FatcmsBaseMemoryCache {
+class MemoryCache {
     constructor(ctx, cacheName) {
         this.ctx = ctx;
         this.cacheName = cacheName;
@@ -63,4 +63,4 @@ class FatcmsBaseMemoryCache {
         }
     }
 }
-exports.FatcmsBaseMemoryCache = FatcmsBaseMemoryCache;
+exports.MemoryCache = MemoryCache;

package/dist/service/base/cache/{FatcmsBaseNoneCache.d.ts → NoneCache.d.ts}

@@ -1,6 +1,6 @@
-import { ICacheServiceBase } from '../../../models/bizmodels';
+import { ICacheService } from '../../../models/bizmodels';
 import { Context } from '@midwayjs/koa';
-export declare class FatcmsBaseNoneCache implements ICacheServiceBase {
+export declare class NoneCache implements ICacheService {
     protected ctx: Context;
     protected cacheName: string;
     constructor(ctx: Context, cacheName: string);

package/dist/service/base/cache/{FatcmsBaseNoneCache.js → NoneCache.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FatcmsBaseNoneCache = void 0;
-class FatcmsBaseNoneCache {
+exports.NoneCache = void 0;
+class NoneCache {
     constructor(ctx, cacheName) {
         this.ctx = ctx;
         this.cacheName = cacheName;
@@ -16,4 +16,4 @@ class FatcmsBaseNoneCache {
         return true;
     }
 }
-exports.FatcmsBaseNoneCache = FatcmsBaseNoneCache;
+exports.NoneCache = NoneCache;

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

@@ -1,7 +1,7 @@
 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;

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

@@ -1,8 +1,8 @@
 "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 {
+class RedisCache {
     constructor(ctx, cacheName, redisService) {
         this.ctx = ctx;
         this.cacheName = cacheName;
@@ -36,4 +36,4 @@ class FatcmsBaseRedisCache {
         return await this.redisService.del(cacheKey);
     }
 }
-exports.FatcmsBaseRedisCache = FatcmsBaseRedisCache;
+exports.RedisCache = RedisCache;

package/package.json

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

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/models/bizmodels.ts

@@ -126,7 +126,7 @@ 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>;

package/src/service/UserSessionService.ts

@@ -9,7 +9,7 @@ import { SystemTables } from '@/models/SystemTables';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 import { CacheServiceFactory } from './base/cache/CacheServiceFactory';
 import { CacheLevelEnum, CacheNameEnum } from '@/models/SystemEntities';
-import { ICacheServiceBase } from '@/models/bizmodels';
+import { ICacheService } from '@/models/bizmodels';
 
 function pickUserAvatar(avatar: any): string {
   if (!avatar) {
@@ -70,7 +70,7 @@ export class UserSessionService {
    * 获取用户会话缓存服务
    * @returns
    */
-  private getUserSessionCacheService(): ICacheServiceBase {
+  private getUserSessionCacheService(): ICacheService {
     return this.cacheServiceFactory.getCacheService(CacheLevelEnum.REDIS, CacheNameEnum.UserSessionBySessionId);
   }
 

package/src/service/base/cache/CacheServiceFactory.ts

@@ -1,13 +1,13 @@
 import { Inject, Provide, Config } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
-import { ICacheServiceBase, IfatcmsCacheConfig } from '@/models/bizmodels';
+import { ICacheService, IfatcmsCacheConfig } from '@/models/bizmodels';
 import { CacheLevelEnum, CacheNameEnum } from '@/models/SystemEntities';
 import { RedisService } from '@midwayjs/redis';
-import { FatcmsBaseCtxCache } from './FatcmsBaseCtxCache';
-import { FatcmsBaseRedisCache } from './FatcmsBaseRedisCache';
-import { FatcmsBaseDiskCache } from './FatcmsBaseDiskCache';
-import { FatcmsBaseMemoryCache } from './FatcmsBaseMemoryCache';
-import { FatcmsBaseNoneCache } from './FatcmsBaseNoneCache';
+import { CtxCache } from './CtxCache';
+import { RedisCache } from './RedisCache';
+import { FatcmsBaseDiskCache } from './DiskCache';
+import { MemoryCache } from './MemoryCache';
+import { NoneCache } from './NoneCache';
 
 interface IGetJsonObjectCacheParam {
     cacheLevel: CacheLevelEnum;
@@ -29,18 +29,18 @@ export class CacheServiceFactory {
     @Inject()
     protected redisService: RedisService;
 
-    public getCacheService(cacheLevelEnum: CacheLevelEnum, cacheName: CacheNameEnum): ICacheServiceBase {
+    public getCacheService(cacheLevelEnum: CacheLevelEnum, cacheName: CacheNameEnum): ICacheService {
         switch (cacheLevelEnum) {
             case CacheLevelEnum.CONTEXT:
-                return new FatcmsBaseCtxCache(this.ctx, cacheName);
+                return new CtxCache(this.ctx, cacheName);
             case CacheLevelEnum.REDIS:
-                return new FatcmsBaseRedisCache(this.ctx, cacheName, this.redisService);
+                return new RedisCache(this.ctx, cacheName, this.redisService);
             case CacheLevelEnum.DISK:
                 return new FatcmsBaseDiskCache(this.ctx, cacheName, this.fatcmsCache);
             case CacheLevelEnum.MEMORY:
-                return new FatcmsBaseMemoryCache(this.ctx, cacheName);
+                return new MemoryCache(this.ctx, cacheName);
             default:
-                return new FatcmsBaseNoneCache(this.ctx, cacheName);
+                return new NoneCache(this.ctx, cacheName);
         }
     }
 

package/src/service/base/cache/{FatcmsBaseCtxCache.ts → CtxCache.ts}

@@ -1,10 +1,10 @@
-import { ICacheServiceBase } from '@/models/bizmodels';
+import { ICacheService } from '@/models/bizmodels';
 import { CacheNameEnum } from '@/models/SystemEntities';
 import { Context } from '@midwayjs/koa';
 
 
 
-export class FatcmsBaseCtxCache implements ICacheServiceBase {
+export class CtxCache implements ICacheService {
     private ctx: Context;
     private cacheName: CacheNameEnum;
 

package/src/service/base/cache/{FatcmsBaseDiskCache.ts → DiskCache.ts}

@@ -3,11 +3,11 @@ import * as md5 from 'md5';
 import * as fs from 'fs/promises';
 import * as fs2 from 'fs';
 import * as path from 'path';
-import { parseJsonObject } from '../../../libs/utils/functions';
-import { ICacheServiceBase, IfatcmsCacheConfig } from '@/models/bizmodels';
+import { parseJsonObject } from '@/libs/utils/functions';
+import { ICacheService, IfatcmsCacheConfig } from '@/models/bizmodels';
 
 
-export class FatcmsBaseDiskCache implements ICacheServiceBase {
+export class FatcmsBaseDiskCache implements ICacheService {
     protected ctx: Context;
     protected cacheName: string;
     private fatcmsCache: IfatcmsCacheConfig;
@@ -30,7 +30,7 @@ export class FatcmsBaseDiskCache implements ICacheServiceBase {
         if (checkDirExist) {
             const isDirExist = await fs2.promises.access(cacheDir).then(() => true, () => false);
             if (!isDirExist) {
-                await fs2.promises.mkdir(cacheDir, { recursive: true });    
+                await fs2.promises.mkdir(cacheDir, { recursive: true });
             }
         }
         return path.join(cacheDir, `${md5(key)}.json`);

package/src/service/base/cache/{FatcmsBaseMemoryCache.ts → MemoryCache.ts}

@@ -1,13 +1,13 @@
 import { Context } from '@midwayjs/koa';
 import { LRUCache } from 'lru-cache';
-import { ICacheServiceBase } from '@/models/bizmodels';
+import { ICacheService } from '@/models/bizmodels';
 
 
 
 const LRU_CACHE_MAP = new Map<string, LRUCache<string, any>>();
 
 
-export class FatcmsBaseMemoryCache implements ICacheServiceBase {
+export class MemoryCache implements ICacheService {
     protected ctx: Context;
     protected cacheName: string;
 

package/src/service/base/cache/{FatcmsBaseNoneCache.ts → NoneCache.ts}

@@ -1,10 +1,10 @@
-import { ICacheServiceBase } from '@/models/bizmodels';
+import { ICacheService } from '@/models/bizmodels';
 import { Context } from '@midwayjs/koa';
 
-export class FatcmsBaseNoneCache implements ICacheServiceBase {
+export class NoneCache implements ICacheService {
     protected ctx: Context;
     protected cacheName: string;
-   
+
     constructor(ctx: Context, cacheName: string) {
         this.ctx = ctx;
         this.cacheName = cacheName;

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

@@ -1,10 +1,10 @@
 import { Context } from '@midwayjs/koa';
 import { RedisService } from '@midwayjs/redis';
-import { parseJsonObject } from '../../../libs/utils/functions';
-import { ICacheServiceBase } from '@/models/bizmodels';
+import { parseJsonObject } from '@/libs/utils/functions';
+import { ICacheService } from '@/models/bizmodels';
 
 
-export class FatcmsBaseRedisCache implements ICacheServiceBase {
+export class RedisCache implements ICacheService {
   protected ctx: Context;
   protected cacheName: string;
   protected redisService: RedisService;