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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. package/dist/config/config.default.js +4 -1
  2. package/dist/controller/gateway/PublicApiController.js +3 -11
  3. package/dist/libs/crud-pro/services/CrudProExecuteSqlService.js +4 -4
  4. package/dist/models/SystemEntities.d.ts +0 -22
  5. package/dist/models/SystemEntities.js +1 -14
  6. package/dist/models/bizmodels.d.ts +19 -1
  7. package/dist/models/bizmodels.js +15 -1
  8. package/dist/service/EnumInfoService.js +3 -9
  9. package/dist/service/UserSessionService.js +4 -7
  10. package/dist/service/base/cache/CacheServiceFactory.d.ts +3 -5
  11. package/dist/service/base/cache/CacheServiceFactory.js +24 -13
  12. package/dist/service/base/cache/CtxCache.d.ts +2 -3
  13. package/dist/service/base/cache/CtxCache.js +1 -2
  14. package/dist/service/base/cache/DiskCache.d.ts +6 -11
  15. package/dist/service/base/cache/DiskCache.js +10 -17
  16. package/dist/service/base/cache/MemoryCache.d.ts +3 -9
  17. package/dist/service/base/cache/MemoryCache.js +6 -14
  18. package/dist/service/base/cache/RedisCache.d.ts +3 -9
  19. package/dist/service/base/cache/RedisCache.js +6 -14
  20. package/dist/service/crudstd/CrudStdService.js +3 -11
  21. package/dist/service/curd/CurdMixByAccountService.d.ts +4 -0
  22. package/dist/service/curd/CurdMixByAccountService.js +50 -12
  23. package/dist/service/curd/CurdMixByDictService.js +4 -8
  24. package/dist/service/curd/CurdMixByLinkToCustomService.js +2 -7
  25. package/dist/service/curd/CurdMixBySysConfigService.js +4 -8
  26. package/dist/service/curd/CurdMixByWorkbenchService.js +3 -9
  27. package/package.json +1 -1
  28. package/src/config/config.default.ts +4 -1
  29. package/src/controller/gateway/PublicApiController.ts +2 -14
  30. package/src/libs/crud-pro/services/CrudProExecuteSqlService.ts +7 -5
  31. package/src/models/SystemEntities.ts +1 -30
  32. package/src/models/WorkbenchInfoTools.ts +3 -2
  33. package/src/models/bizmodels.ts +25 -3
  34. package/src/service/EnumInfoService.ts +12 -18
  35. package/src/service/UserSessionService.ts +13 -18
  36. package/src/service/base/cache/CacheServiceFactory.ts +47 -38
  37. package/src/service/base/cache/CtxCache.ts +2 -4
  38. package/src/service/base/cache/DiskCache.ts +15 -20
  39. package/src/service/base/cache/MemoryCache.ts +8 -14
  40. package/src/service/base/cache/RedisCache.ts +8 -15
  41. package/src/service/crudstd/CrudStdService.ts +19 -31
  42. package/src/service/curd/CurdMixByAccountService.ts +62 -14
  43. package/src/service/curd/CurdMixByDictService.ts +6 -11
  44. package/src/service/curd/CurdMixByLinkToCustomService.ts +1 -8
  45. package/src/service/curd/CurdMixBySysConfigService.ts +8 -15
  46. package/src/service/curd/CurdMixByWorkbenchService.ts +3 -10
package/src/service/curd/CurdMixByWorkbenchService.ts CHANGED
@@ -10,14 +10,12 @@ import { ColumnRelation } from '@/libs/crud-pro/interfaces';
10
10
  import { MixinUtils } from '@/libs/crud-pro/utils/MixinUtils';
11
11
  import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
12
12
  import { CacheServiceFactory } from '../base/cache/CacheServiceFactory';
13
- import { CacheLevelEnum, CacheNameEnum } from '@/models/SystemEntities';
13
+ import { CacheNameEnum} from "@/models/bizmodels";
14
14
 
15
15
  const workbenchMixUtils = new CrudMixUtils(RelatedType.workbenchBasic);
16
16
 
17
17
  const TMP_CTX_KEY = _.uniqueId('CurdMixByWorkbenchService');
18
18
 
19
- const DEFAULT_CACHE_LEVEL = CacheLevelEnum.MEMORY;
20
- const DEFAULT_CACHE_SECOND = 60 * 5;
21
19
 
22
20
  @Provide()
23
21
  export class CurdMixByWorkbenchService implements IExecuteContextHandler {
@@ -30,13 +28,9 @@ export class CurdMixByWorkbenchService implements IExecuteContextHandler {
30
28
  @Inject()
31
29
  private cacheServiceFactory: CacheServiceFactory;
32
30
 
33
- private async loadWorkbenchListMap() {
31
+ private async loadWorkbenchListMap(): Promise<Map<string, any>> {
34
32
  const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
35
- const { curdMixByCommonCacheLevel, curdMixByCommonCacheSecond } = this.ctx.workbenchInfoTools.getWorkbenchConfig() || {};
36
-
37
- const workbenchListMap = await this.cacheServiceFactory.getJsonObjectCache({
38
- cacheLevel: curdMixByCommonCacheLevel || DEFAULT_CACHE_LEVEL,
39
- cacheSecond: curdMixByCommonCacheSecond || DEFAULT_CACHE_SECOND,
33
+ return await this.cacheServiceFactory.getJsonObjectCache({
40
34
  cacheKey: 'loadWorkbenchListMap',
41
35
  refreshCache: false,
42
36
  cacheName: CacheNameEnum.CurdMixByWorkbench,
@@ -55,7 +49,6 @@ export class CurdMixByWorkbenchService implements IExecuteContextHandler {
55
49
  return MixinUtils.toNewMap(workbenchList, (obj: any) => obj.workbench_code);
56
50
  },
57
51
  });
58
- return workbenchListMap;
59
52
  }
60
53
 
61
54
  async handleExecuteContextPrepare(executeContext: HandleExecuteContextType) {