midway-fatcms 0.0.1-beta.1 → 0.0.1-beta.10

package/src/index.ts

@@ -30,10 +30,6 @@ export * from './controller/manage/SysConfigMangeApi';
 export * from './controller/manage/SystemInfoManageApi';
 export * from './controller/manage/UserAccountManageApi';
 export * from './controller/manage/WorkbenchMangeApi';
-export * from './controller/medstatistic/MedAdminController';
-export * from './controller/medstatistic/MedClientController';
-export * from './controller/medstatistic/MedMessageService';
-export * from './controller/medstatistic/MedScoreService';
 export * from './controller/myinfo/AuthController';
 export * from './controller/myinfo/MyInfoController';
 export * from './controller/render/AppRenderController';
@@ -43,6 +39,7 @@ export * from './filter/notfound.filter';
 export * from './middleware/forbidden.middleware';
 export * from './middleware/global.middleware';
 export * from './middleware/tx.middleware';
+export * from './middleware/permission.middleware';
 export * from './service/AuthService';
 export * from './service/EnumInfoService';
 export * from './service/FileCenterService';
@@ -68,3 +65,35 @@ export * from './service/curd/CurdMixService';
 export * from './service/curd/CurdProService';
 export * from './service/proxyapi/ProxyApiLoadService';
 export * from './service/proxyapi/ProxyApiService';
+export * from './models/userSession';
+export * from './models/bizmodels';
+export * from './models/SystemEntities';
+export * from './models/SystemPerm';
+export * from './models/contextLogger';
+export * from './models/devops';
+export * from './models/SystemTables';
+
+
+export * from './libs/utils/common-dto';
+export * from './libs/utils/crypto-utils';
+export * from './libs/utils/fatcms-request';
+export * from './libs/utils/functions';
+export * from './libs/utils/ordernum-utils';
+export * from './libs/utils/parseConfig';
+
+export * from './libs/crud-pro/CrudPro';
+export * from './libs/crud-pro/defaultConfigs';
+export * from './libs/crud-pro/exceptions';
+export * from './libs/crud-pro/interfaces';
+
+export * from './libs/crud-pro/models/ExecuteContext';
+export * from './libs/crud-pro/models/FuncContext';
+export * from './libs/crud-pro/models/RequestModel';
+export * from './libs/crud-pro/models/SqlCfgModel';
+export * from './libs/crud-pro/models/Transaction';
+export * from './libs/crud-pro/models/keys';
+export * from './libs/crud-pro/models/ExecuteContextFunc';
+export * from './libs/crud-pro/models/RequestCfgModel';
+export * from './libs/crud-pro/models/SqlSegArg';
+
+export * from './libs/global-config/global-config';

package/src/libs/global-config/global-config.ts

@@ -0,0 +1,72 @@
+import { SqlDbType } from '../crud-pro/models/keys';
+
+interface IGlobalStaticConfig {
+  /**
+   * CrudStd: 业务系统自定义的修改cfgModel
+   * @param reqJson
+   * @param cfgModel
+   * @param appInfo
+   * @param ctx
+   */
+  bizUpdateCfgModelForCrudStd(reqJson: any, cfgModel: any, appInfo: any, ctx: any): Promise<any>;
+
+  /**
+   * CrudMtd: 业务系统自定义的修改cfgModel
+   * @param reqJson
+   * @param cfgModel
+   * @param methodInfo
+   * @param ctx
+   */
+  bizUpdateCfgModelForCrudMtd(reqJson: any, cfgModel: any, methodInfo: any, ctx: any): Promise<any>;
+
+
+  /**
+   * 生成用户的账号ID，业务系统可以生成类似工号的ID
+   * @param userSubmitData 
+   */
+  generateUserAccountId(userSubmitData: any): Promise<string>;
+
+
+  /**
+   * 将业务系统表中的userId映射为fatcms的UserAccountId
+   * @param bizTableUserId 业余系统表中的UserId
+   */
+  toFatcmsUserAccountId(bizTableUserId: any): string;
+
+  SystemDbName: string;
+  SystemDbType: SqlDbType;
+}
+
+const noop = () => {
+  return Promise.resolve();
+};
+
+class GlobalStaticConfig {
+  private configObject: IGlobalStaticConfig;
+  constructor() {
+    this.configObject = {
+      bizUpdateCfgModelForCrudStd: noop,
+      bizUpdateCfgModelForCrudMtd: noop,
+      generateUserAccountId: null,
+      toFatcmsUserAccountId: (bizTableUserId: any) => {
+        return bizTableUserId;
+      },
+      SystemDbName: 'fatcms',
+      SystemDbType: SqlDbType.mysql,
+    };
+  }
+  public getConfig(): IGlobalStaticConfig {
+    return this.configObject as IGlobalStaticConfig;
+  }
+
+  public setConfig(configObject: any) {
+    if (!configObject || typeof configObject !== 'object') {
+      throw new Error('参数configObject不能为空');
+    }
+    Object.assign(this.configObject, configObject);
+  }
+}
+
+const GLOBAL_STATIC_CONFIG = new GlobalStaticConfig();
+
+export { GLOBAL_STATIC_CONFIG };

package/src/models/SystemTables.ts

@@ -1,5 +1,3 @@
-import {SqlDbType} from "../libs/crud-pro/models/keys";
-
 export const SystemTables = {
   sys_workbench: 'sys_workbench',
   sys_user_account: 'sys_user_account',
@@ -24,7 +22,5 @@ export const SystemTables = {
   sys_visit_stats: 'sys_visit_stats',
 };
 
-export const SystemDbName = 'fatcms';
-export const SystemDbType = SqlDbType.mysql;
 
 export const SystemDevOpsWorkbench = 'devops';

package/src/service/AuthService.ts

@@ -5,12 +5,13 @@ import { CurdMixService } from './curd/CurdMixService';
 import * as md5 from 'md5';
 import { UserAccountService } from './UserAccountService';
 import { createUniqueId } from '../libs/utils/functions';
-import {IConsumerUserInfo, ISessionInfo, SYS_ACCOUNT_TYPE} from '../models/userSession';
-import {SystemDbName, SystemDbType, SystemTables} from '../models/SystemTables';
+import { IConsumerUserInfo, ISessionInfo, SYS_ACCOUNT_TYPE } from '../models/userSession';
+import { SystemTables } from '../models/SystemTables';
 import { UserSessionService } from './UserSessionService';
 import { CommonResult } from '../libs/utils/common-dto';
 import { isEnableSuperAdmin } from "../libs/utils/fatcms-request";
-import {CommonException} from "../libs/crud-pro/exceptions";
+import { CommonException } from "../libs/crud-pro/exceptions";
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 @Provide()
 export class AuthService {
@@ -94,7 +95,7 @@ export class AuthService {
       nickName: consumerUserInfo.nickName,
       avatar: consumerUserInfo.avatar,
       roleCodes: [],
-      functionCodes:[],
+      functionCodes: [],
       loginName: consumerUserInfo.loginName,
       sessionId,
       accountId: consumerUserInfo.accountId,
@@ -141,7 +142,7 @@ export class AuthService {
       sessionId,
       accountId,
       workbenchCode,
-      accountType: SYS_ACCOUNT_TYPE
+      accountType: SYS_ACCOUNT_TYPE,
     };
 
     await this.userSessionService.saveUserSession(sessionInfo);
@@ -203,6 +204,8 @@ export class AuthService {
    * @private
    */
   private async queryUserRoleCodeList(accountId: string): Promise<string[]> {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const res = await this.curdMixService.executeCrudByCfg(
       {
         condition: { account_id: accountId },
@@ -232,6 +235,8 @@ export class AuthService {
       return [];
     }
 
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const res = await this.curdMixService.executeCrudByCfg(
       {
         condition: { role_code: { $in: roleCodeList } },
@@ -259,7 +264,7 @@ export class AuthService {
     const oldSessionId = sessionInfo.sessionId;
 
     const sessionId = createUniqueId();
-    const newSessionInfo: ISessionInfo = {...sessionInfo, sessionId};
+    const newSessionInfo: ISessionInfo = { ...sessionInfo, sessionId };
 
     await this.userSessionService.saveUserSession(newSessionInfo);
 

package/src/service/EnumInfoService.ts

@@ -3,10 +3,11 @@ import {Context} from '@midwayjs/koa';
 import {KeysOfSimpleSQL} from '../libs/crud-pro/models/keys';
 import {CurdProService} from './curd/CurdProService';
 import {RelatedType} from './curd/CurdMixUtils';
-import {SystemDbName, SystemDbType, SystemTables} from '../models/SystemTables';
+import {SystemTables} from '../models/SystemTables';
 import {parseConfigContentToEnumInfo, IEnumInfo} from '../libs/utils/parseConfig';
 import {RedisCacheService} from "./base/RedisCacheService";
 import {CurdMixByLinkToCustomService} from "./curd/CurdMixByLinkToCustomService";
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 
 interface IQueryEnumInfo {
@@ -88,6 +89,8 @@ export class EnumInfoService {
   }
 
   private async queryEnumInfoBySysCfgEnum(code: string): Promise<IEnumInfo[]> {
+    const {SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    
     const res1 = await this.curdProService.executeCrudByCfg(
       {
         condition: { config_code: code },
@@ -109,6 +112,8 @@ export class EnumInfoService {
   }
 
   private async queryEnumInfoItemByDict(code: string): Promise<IEnumInfo[]> {
+    const {SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+    
     const res1 = await this.curdProService.executeCrudByCfg(
       {
         condition: { dict_code: code },

package/src/service/FileCenterService.ts

@@ -10,7 +10,7 @@ import { KeysOfSimpleSQL, KeysOfValidators } from '../libs/crud-pro/models/keys'
 import { AccessType, IEntityCommonInfo, UploadCategoryType } from '../models/bizmodels';
 import { IRequestCfgModel } from '../libs/crud-pro/interfaces';
 import { BaseService } from './base/BaseService';
-import {SystemDbName, SystemDbType} from '../models/SystemTables';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 function getSuffix(s: string): string {
   if (s) {
@@ -107,6 +107,8 @@ class FileDB {
   }
 
   async getFileInfo(fileKey: string): Promise<IFileInfo> {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const condition: any = { file_key: fileKey };
     const cfgModel: IRequestCfgModel = {
       sqlTable: 'sys_file',
@@ -123,6 +125,8 @@ class FileDB {
   }
 
   async saveFileInfo(fileInfo: IFileInfo) {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const cfgModel = {
       sqlTable: 'sys_file',
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_INSERT,
@@ -141,6 +145,7 @@ class FileDB {
   }
 
   async saveAssetsLog(fileInfo: IFileInfo) {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
     const cfgModel = {
       sqlTable: 'sys_assets_log',
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_INSERT,
@@ -151,6 +156,7 @@ class FileDB {
   }
 
   async deleteFileInfo(id: number) {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
     const cfgModel: IRequestCfgModel = {
       sqlTable: 'sys_file',
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_DELETE,
@@ -200,7 +206,7 @@ function toUploadOriginByReferer(referer: string): string {
       return 'doc-editor';
     }
     if (pathname.startsWith('/pages/devops/file-manage')) {
-      return  'file-manage';
+      return 'file-manage';
     }
   } catch (error) {
     console.error('toUploadOriginByReferer', error);

package/src/service/SysConfigService.ts

@@ -1,9 +1,10 @@
 import { Inject, Provide } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
-import { KeysOfSimpleSQL} from "../libs/crud-pro/models/keys";
-import {SystemDbName, SystemDbType, SystemTables} from "../models/SystemTables";
-import {BaseService} from "./base/BaseService";
-import {CurdProService} from "./curd/CurdProService";
+import { KeysOfSimpleSQL } from "../libs/crud-pro/models/keys";
+import { SystemTables } from "../models/SystemTables";
+import { BaseService } from "./base/BaseService";
+import { CurdProService } from "./curd/CurdProService";
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 @Provide()
 export class SysConfigService extends BaseService {
@@ -14,9 +15,12 @@ export class SysConfigService extends BaseService {
   private curdProService: CurdProService;
 
   async getSysConfigOne(config_code: string): Promise<any> {
-    if (!config_code){
+    if (!config_code) {
       throw new Error('[getSysConfigOne] config_code required');
     }
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const res1 = await this.curdProService.executeCrudByCfg(
       {
         condition: { config_code },

package/src/service/UserAccountService.ts

@@ -6,8 +6,9 @@ import { CurdMixService } from './curd/CurdMixService';
 import { createUniqueId } from '../libs/utils/functions';
 import { CommonException, Exceptions } from '../libs/crud-pro/exceptions';
 import { IRequestCfgModel, IRequestModel } from '../libs/crud-pro/interfaces';
-import {SystemDbName, SystemDbType, SystemTables} from '../models/SystemTables';
+import {SystemTables} from '../models/SystemTables';
 import { CommonResult } from '../libs/utils/common-dto';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 @Provide()
 export class UserAccountService {
@@ -21,6 +22,9 @@ export class UserAccountService {
    * @param loginName
    */
   public async queryUserAccountByLoginName(loginName: string) {
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const query = await this.curdMixService.executeCrudByCfg(
       {
         condition: { login_name: loginName },
@@ -47,6 +51,9 @@ export class UserAccountService {
       return [];
     }
 
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+
     const accountIds = accountIdList.map(userId => {
       return `${userId}`;
     });
@@ -81,6 +88,9 @@ export class UserAccountService {
     if (!loginName) {
       throw new CommonException(Exceptions.OTHER_EXCEPTION, 'loginName不存在');
     }
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    
     const pwd_salt = createUniqueId();
     const pwd_md5 = md5(unsaltedPwd + pwd_salt);
     const res1 = await this.curdMixService.executeCrudByCfg(

package/src/service/VisitStatService.ts

@@ -3,10 +3,11 @@ import {Context} from '@midwayjs/koa';
 import {IScheduleService} from '../interface';
 import {BaseService} from "./base/BaseService";
 import {CurdProService} from "./curd/CurdProService";
-import {SystemDbName, SystemDbType, SystemTables} from "../models/SystemTables";
+import { SystemTables} from "../models/SystemTables";
 import {KeysOfSimpleSQL} from "../libs/crud-pro/models/keys";
 import {FILE_GET_TYPES} from "../models/bizmodels";
 import {CommonResult} from "../libs/utils/common-dto";
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 
 // 3天 的秒数
@@ -35,6 +36,9 @@ export class VisitStatService extends BaseService implements IScheduleService {
 
 
   async flushVisitStatToDB():  Promise<any>   {
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     //  统计昨天的数据。
     const stat_date = new Date(Date.now() - 24 * 3600 * 1000).toISOString().split('T')[0];
 

package/src/service/WorkbenchService.ts

@@ -1,7 +1,7 @@
 import { Inject, Provide } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { KeysOfSimpleSQL } from '../libs/crud-pro/models/keys';
-import {SystemDbName, SystemDbType, SystemTables} from '../models/SystemTables';
+import { SystemTables} from '../models/SystemTables';
 import { BaseService } from './base/BaseService';
 // import { LRUCache } from 'lru-cache';
 import { CurdProService } from './curd/CurdProService';
@@ -11,6 +11,7 @@ import { IWorkbenchEntity } from '../models/SystemEntities';
 import { IScheduleService } from '../interface';
 import { getDebugWorkbenchCode } from '../libs/utils/fatcms-request';
 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,
@@ -42,6 +43,10 @@ export class WorkbenchService extends BaseService implements IScheduleService {
   }
 
   public async getAllWorkbenchInfoList(isForceRefresh?: boolean): Promise<IWorkbenchEntity[]> {
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+
     let listData = lruCache.get(CACHE_KEY_WORKBENCH_LIST);
     if (!listData || isForceRefresh === true) {
       const reqJson = { condition: {}, pageSize: 1000, limit: 1000 };

package/src/service/anyapi/AnyApiService.ts

@@ -1,7 +1,7 @@
 import { Inject, Provide } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
 import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables} from '../../models/SystemTables';
 import { LRUCache } from 'lru-cache';
 import { BizException } from '../../models/devops';
 import { CurdMixService } from '../curd/CurdMixService';
@@ -13,6 +13,7 @@ import { MixinUtils } from '../../libs/crud-pro/utils/MixinUtils';
 import { WorkbenchService } from '../WorkbenchService';
 import { validateByCfgString } from '../../libs/crud-pro/utils/ValidateUtils';
 import { API_BASE_TYPE, ApiBaseService } from '../base/ApiBaseService';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const lruCache = new LRUCache<string, any>({
   max: 500,
@@ -80,6 +81,8 @@ export class AnyApiService extends ApiBaseService {
   }
 
   private async _getAnyApiMethod(methodCode: string): Promise<ISysAnyApiEntity> {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const res = await this.curdMixService.executeCrudByCfg(
       { condition: { method: methodCode } },
       {

package/src/service/crudstd/CrudStdService.ts

@@ -7,12 +7,13 @@ import { parseJsonObject } from '../../libs/utils/functions';
 import { ICrudStdAppInfo, ICrudStdAppInfoForSettingKey } from '../../models/bizmodels';
 import { BizException } from '../../models/devops';
 import { ExecuteContext } from '../../libs/crud-pro/models/ExecuteContext';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables} from '../../models/SystemTables';
 import { CrudStdActionService } from './CrudStdActionService';
 import { CrudStdRelationService } from './CrudStdRelationService';
 import * as _ from 'lodash';
 import { ApiBaseService } from '../base/ApiBaseService';
 import {parseDatabaseName} from "../../libs/crud-pro/utils/DatabaseName";
+import { GLOBAL_STATIC_CONFIG } from '../../libs/global-config/global-config';
 
 export const SPECIAL_SETTING_KEY = {
   QUERY_LIST: 'QUERY_LIST',
@@ -67,6 +68,10 @@ export class CrudStdService extends ApiBaseService {
 
     // 根据用户配置，设置关联查询的数据信息。
     await this.crudStdRelationService.addCfgModelColumnsRelation(cfgModel, appInfo);
+
+    // 业务系统自定义的修改cfgModel
+    await GLOBAL_STATIC_CONFIG.getConfig().bizUpdateCfgModelForCrudStd(params, cfgModel, appInfo, this.ctx);
+
     return await this.curdMixService.executeCrudByCfg(params, cfgModel);
   }
 
@@ -133,6 +138,11 @@ export class CrudStdService extends ApiBaseService {
    * @private
    */
   private async getCrudStdAppInfo(appCode?: string) {
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+
+
     this.logInfo('getCrudStdAppInfo', appCode);
 
     const ss = {

package/src/service/curd/CurdMixByAccountService.ts

@@ -4,10 +4,11 @@ import * as _ from 'lodash';
 import { CurdProService } from './CurdProService';
 import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables } from '../../models/SystemTables';
 import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { ColumnRelation, IRequestCfgModel, IRequestModel } from '../../libs/crud-pro/interfaces';
 import { MixinUtils } from '../../libs/crud-pro/utils/MixinUtils';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const dictMixUtils = new CrudMixUtils(RelatedType.accountBasic);
 
@@ -22,6 +23,8 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
   protected curdProService: CurdProService;
 
   async handleExecuteContextPrepare(executeContext: ExecuteContext) {
+    const { SystemDbName, SystemDbType, toFatcmsUserAccountId } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const relations = dictMixUtils.pickColumnRelations(executeContext);
     if (!relations || relations.length === 0) {
       return;
@@ -30,10 +33,15 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
     const accountIds = new Set<string>();
     dictMixUtils.forEachRowAndColumnsRelation(executeContext, (row: any, columnRelation: ColumnRelation) => {
       const { sourceColumn } = columnRelation;
-      const accountId = _.get(row, sourceColumn);
-      if (accountId) {
-        accountIds.add(accountId);
+      if (sourceColumn) {
+        const accountId = _.get(row, sourceColumn);
+        if (accountId) {
+          const fatcmsUserAccountId = toFatcmsUserAccountId(accountId);
+          accountIds.add(fatcmsUserAccountId);
+          row['__fatcmsUserAccountId__'] = fatcmsUserAccountId;
+        }
       }
+
     });
 
     if (accountIds.size === 0) {
@@ -77,7 +85,7 @@ export class CurdMixByAccountService implements IExecuteContextHandler {
           { from: 'avatar', to: `${sourceColumn}_user.avatar` },
         ];
       }
-      dictMixUtils.copyColumnRelationToRowNoRelatedCode(row, userInfoMap, columnRelation);
+      dictMixUtils.copyUserInfoToRowNoRelatedCode(row, userInfoMap, columnRelation);
     });
   }
 }

package/src/service/curd/CurdMixByDictService.ts

@@ -3,12 +3,13 @@ import { Context } from '@midwayjs/koa';
 import { CurdProService } from './CurdProService';
 import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables} from '../../models/SystemTables';
 import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { MultiKeyMap } from '../../libs/crud-pro/utils/MultiKeyMap';
 import { ColumnRelation } from '../../libs/crud-pro/interfaces';
 import * as _ from 'lodash';
 import {RedisCacheService} from "../base/RedisCacheService";
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const TMP_CTX_KEY = _.uniqueId('CurdMixByDictService');
 
@@ -46,6 +47,11 @@ export class CurdMixByDictService implements IExecuteContextHandler {
   }
 
   private async getDictItemRows(codes: string[]) {
+
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+
+
     const noCacheCodes: string[] = [];
 
     // 从缓存里面取

package/src/service/curd/CurdMixBySysConfigService.ts

@@ -4,11 +4,12 @@ import { CurdProService } from './CurdProService';
 import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
 import * as _ from 'lodash';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables} from '../../models/SystemTables';
 import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
 import { MultiKeyMap } from '../../libs/crud-pro/utils/MultiKeyMap';
 import { ColumnRelation } from '../../libs/crud-pro/interfaces';
 import { parseConfigContentToEnumInfo } from "../../libs/utils/parseConfig";
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const dictMixUtils = new CrudMixUtils(RelatedType.sysCfgEnum);
 
@@ -25,6 +26,10 @@ export class CurdMixBySysConfigService implements IExecuteContextHandler {
   protected curdProService: CurdProService;
 
   async handleExecuteContextPrepare(executeContext: ExecuteContext) {
+    
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
+    
     const codes = dictMixUtils.pickColumnRelationCodes(executeContext);
     if (!codes || codes.length === 0) {
       return;

package/src/service/curd/CurdMixByWorkbenchService.ts

@@ -5,10 +5,11 @@ import { LRUCache } from 'lru-cache';
 import { CurdProService } from './CurdProService';
 import { ExecuteContext, IExecuteContextHandler } from '../../libs/crud-pro/models/ExecuteContext';
 import { CrudMixUtils, RelatedType } from './CurdMixUtils';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
+import { SystemTables } from '../../models/SystemTables';
 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,
@@ -29,6 +30,9 @@ export class CurdMixByWorkbenchService implements IExecuteContextHandler {
   protected curdProService: CurdProService;
 
   private async loadWorkbenchListMap() {
+    
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     let workbenchListMap = lruCache.get('workbenchListMap');
     if (!workbenchListMap) {
       const reqJson = {