midway-fatcms 0.0.1-beta.5 → 0.0.1-beta.7

package/dist/index.js

@@ -109,3 +109,4 @@ __exportStar(require("./libs/crud-pro/models/keys"), exports);
 __exportStar(require("./libs/crud-pro/models/ExecuteContextFunc"), exports);
 __exportStar(require("./libs/crud-pro/models/RequestCfgModel"), exports);
 __exportStar(require("./libs/crud-pro/models/SqlSegArg"), exports);
+__exportStar(require("./libs/global-config/global-config"), exports);

package/dist/libs/global-config/global-config.d.ts

@@ -0,0 +1,19 @@
+import { SqlDbType } from "../crud-pro/models/keys";
+interface IGlobalStaticConfig {
+    /**
+     * CrudStd: 业务系统自定义的修改cfgModel
+     * @param cfgModel
+     * @param appInfo
+     */
+    addCfgModelForCrudStdService(cfgModel: any, appInfo: any): Promise<any>;
+    SystemDbName: string;
+    SystemDbType: SqlDbType;
+}
+declare class GlobalStaticConfig {
+    private configObject;
+    constructor();
+    getConfig(): IGlobalStaticConfig;
+    setConfig(configObject: any): void;
+}
+declare const GLOBAL_STATIC_CONFIG: GlobalStaticConfig;
+export { GLOBAL_STATIC_CONFIG };

package/dist/libs/global-config/global-config.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GLOBAL_STATIC_CONFIG = void 0;
+const keys_1 = require("../crud-pro/models/keys");
+function noop() { }
+class GlobalStaticConfig {
+    constructor() {
+        this.configObject = {
+            addCfgModelForCrudStdService: noop,
+            SystemDbName: 'fatcms',
+            SystemDbType: keys_1.SqlDbType.mysql
+        };
+    }
+    getConfig() {
+        return this.configObject;
+    }
+    setConfig(configObject) {
+        if (!configObject || typeof configObject !== 'object') {
+            throw new Error("参数configObject不能为空");
+        }
+        Object.assign(this.configObject, configObject);
+    }
+}
+const GLOBAL_STATIC_CONFIG = new GlobalStaticConfig();
+exports.GLOBAL_STATIC_CONFIG = GLOBAL_STATIC_CONFIG;

package/dist/models/SystemTables.d.ts

@@ -1,4 +1,3 @@
-import { SqlDbType } from "../libs/crud-pro/models/keys";
 export declare const SystemTables: {
     sys_workbench: string;
     sys_user_account: string;
@@ -22,6 +21,4 @@ export declare const SystemTables: {
     sys_proxyapi: string;
     sys_visit_stats: string;
 };
-export declare const SystemDbName = "fatcms";
-export declare const SystemDbType = SqlDbType.mysql;
 export declare const SystemDevOpsWorkbench = "devops";

package/dist/models/SystemTables.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SystemDevOpsWorkbench = exports.SystemDbType = exports.SystemDbName = exports.SystemTables = void 0;
-const keys_1 = require("../libs/crud-pro/models/keys");
+exports.SystemDevOpsWorkbench = exports.SystemTables = void 0;
 exports.SystemTables = {
     sys_workbench: 'sys_workbench',
     sys_user_account: 'sys_user_account',
@@ -25,6 +24,4 @@ exports.SystemTables = {
     sys_proxyapi: 'sys_proxyapi',
     sys_visit_stats: 'sys_visit_stats',
 };
-exports.SystemDbName = 'fatcms';
-exports.SystemDbType = keys_1.SqlDbType.mysql;
 exports.SystemDevOpsWorkbench = 'devops';

package/dist/service/AuthService.js

@@ -22,6 +22,7 @@ const UserSessionService_1 = require("./UserSessionService");
 const common_dto_1 = require("../libs/utils/common-dto");
 const fatcms_request_1 = require("../libs/utils/fatcms-request");
 const exceptions_1 = require("../libs/crud-pro/exceptions");
+const global_config_1 = require("../libs/global-config/global-config");
 let AuthService = class AuthService {
     /**
      * 明文密码转unsaltedPwd密码
@@ -171,14 +172,15 @@ let AuthService = class AuthService {
      * @private
      */
     async queryUserRoleCodeList(accountId) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const res = await this.curdMixService.executeCrudByCfg({
             condition: { account_id: accountId },
             limit: 10000,
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_perm_user_role,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         });
         const rows = res.getResModel().rows || [];
         const roleCodes = rows.map(({ role_code }) => {
@@ -195,14 +197,15 @@ let AuthService = class AuthService {
         if (!roleCodeList || roleCodeList.length === 0) {
             return [];
         }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const res = await this.curdMixService.executeCrudByCfg({
             condition: { role_code: { $in: roleCodeList } },
             limit: 10000,
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_perm_role_func,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         });
         const rows = res.getResModel().rows || [];
         const funcCodes = rows.map(({ func_code }) => {

package/dist/service/EnumInfoService.js

@@ -18,6 +18,7 @@ const SystemTables_1 = require("../models/SystemTables");
 const parseConfig_1 = require("../libs/utils/parseConfig");
 const RedisCacheService_1 = require("./base/RedisCacheService");
 const CurdMixByLinkToCustomService_1 = require("./curd/CurdMixByLinkToCustomService");
+const global_config_1 = require("../libs/global-config/global-config");
 function filterEmpty(e) {
     return e.label && typeof e.value !== 'undefined';
 }
@@ -70,13 +71,14 @@ let EnumInfoService = class EnumInfoService {
         });
     }
     async queryEnumInfoBySysCfgEnum(code) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const res1 = await this.curdProService.executeCrudByCfg({
             condition: { config_code: code },
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_configs,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         });
         const obj = res1.getOneObj();
         if (!obj) {
@@ -86,13 +88,14 @@ let EnumInfoService = class EnumInfoService {
         return rows.map(e => ({ label: e.label, value: e.value, children: e.children })).filter(filterEmpty);
     }
     async queryEnumInfoItemByDict(code) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const res1 = await this.curdProService.executeCrudByCfg({
             condition: { dict_code: code },
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_data_dict_item,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         });
         const obj = res1.getResRows();
         if (!obj) {

package/dist/service/FileCenterService.js

@@ -20,7 +20,7 @@ const CurdMixService_1 = require("./curd/CurdMixService");
 const keys_1 = require("../libs/crud-pro/models/keys");
 const bizmodels_1 = require("../models/bizmodels");
 const BaseService_1 = require("./base/BaseService");
-const SystemTables_1 = require("../models/SystemTables");
+const global_config_1 = require("../libs/global-config/global-config");
 function getSuffix(s) {
     if (s) {
         const indexOf = s.lastIndexOf('.');
@@ -93,12 +93,13 @@ class FileDB {
         this.curdMixService = curdMixService;
     }
     async getFileInfo(fileKey) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const condition = { file_key: fileKey };
         const cfgModel = {
             sqlTable: 'sys_file',
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
             validateCfg: {
                 'condition.file_key': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.STRING],
             },
@@ -107,11 +108,12 @@ class FileDB {
         return res.getOneObj();
     }
     async saveFileInfo(fileInfo) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const cfgModel = {
             sqlTable: 'sys_file',
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         };
         return await this.curdMixService.executeCrudByCfg({
             data: fileInfo,
@@ -121,20 +123,22 @@ class FileDB {
         }, cfgModel);
     }
     async saveAssetsLog(fileInfo) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const cfgModel = {
             sqlTable: 'sys_assets_log',
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         };
         return await this.curdMixService.executeCrudByCfg({ data: fileInfo }, cfgModel);
     }
     async deleteFileInfo(id) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const cfgModel = {
             sqlTable: 'sys_file',
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_DELETE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
             validateCfg: {
                 'condition.id': [keys_1.KeysOfValidators.REQUIRED, keys_1.KeysOfValidators.NUMBER],
             },

package/dist/service/SysConfigService.js

@@ -15,18 +15,20 @@ const keys_1 = require("../libs/crud-pro/models/keys");
 const SystemTables_1 = require("../models/SystemTables");
 const BaseService_1 = require("./base/BaseService");
 const CurdProService_1 = require("./curd/CurdProService");
+const global_config_1 = require("../libs/global-config/global-config");
 let SysConfigService = class SysConfigService extends BaseService_1.BaseService {
     async getSysConfigOne(config_code) {
         if (!config_code) {
             throw new Error('[getSysConfigOne] config_code required');
         }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const res1 = await this.curdProService.executeCrudByCfg({
             condition: { config_code },
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_configs,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         });
         return res1.getOneObj();
     }

package/dist/service/UserAccountService.js

@@ -18,20 +18,22 @@ const functions_1 = require("../libs/utils/functions");
 const exceptions_1 = require("../libs/crud-pro/exceptions");
 const SystemTables_1 = require("../models/SystemTables");
 const common_dto_1 = require("../libs/utils/common-dto");
+const global_config_1 = require("../libs/global-config/global-config");
 let UserAccountService = class UserAccountService {
     /**
      * 查询用户: 根据loginName查询
      * @param loginName
      */
     async queryUserAccountByLoginName(loginName) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const query = await this.curdMixService.executeCrudByCfg({
             condition: { login_name: loginName },
         }, {
             method: 'UserAccountService.queryUserAccountByLoginName',
             sqlTable: SystemTables_1.SystemTables.sys_user_account,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         });
         const { row } = query.getResModel();
         return row;
@@ -45,6 +47,7 @@ let UserAccountService = class UserAccountService {
         if (!accountIdList || accountIdList.length === 0) {
             return [];
         }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const accountIds = accountIdList.map(userId => {
             return `${userId}`;
         });
@@ -52,8 +55,8 @@ let UserAccountService = class UserAccountService {
             method: 'UserAccountService.queryAccountBasicInfoByIds',
             sqlTable: SystemTables_1.SystemTables.sys_user_account,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         };
         const reqJson = {
             columns: columns,
@@ -75,6 +78,7 @@ let UserAccountService = class UserAccountService {
         if (!loginName) {
             throw new exceptions_1.CommonException(exceptions_1.Exceptions.OTHER_EXCEPTION, 'loginName不存在');
         }
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const pwd_salt = (0, functions_1.createUniqueId)();
         const pwd_md5 = md5(unsaltedPwd + pwd_salt);
         const res1 = await this.curdMixService.executeCrudByCfg({
@@ -83,8 +87,8 @@ let UserAccountService = class UserAccountService {
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_user_account,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_UPDATE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         });
         return common_dto_1.CommonResult.successRes(res1.getResModel());
     }

package/dist/service/VisitStatService.js

@@ -17,6 +17,7 @@ const SystemTables_1 = require("../models/SystemTables");
 const keys_1 = require("../libs/crud-pro/models/keys");
 const bizmodels_1 = require("../models/bizmodels");
 const common_dto_1 = require("../libs/utils/common-dto");
+const global_config_1 = require("../libs/global-config/global-config");
 // 3天 的秒数
 const EXPIRE_TIME = 3 * 24 * 60 * 60;
 const STAT_TYPES = {
@@ -31,6 +32,7 @@ let VisitStatService = class VisitStatService extends BaseService_1.BaseService
         return this.flushVisitStatToDB();
     }
     async flushVisitStatToDB() {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         //  统计昨天的数据。
         const stat_date = new Date(Date.now() - 24 * 3600 * 1000).toISOString().split('T')[0];
         const lockKey = `vs_lock_${stat_date}`;
@@ -74,8 +76,8 @@ let VisitStatService = class VisitStatService extends BaseService_1.BaseService
                             }
                         }, {
                             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_INSERT,
-                            sqlDatabase: SystemTables_1.SystemDbName,
-                            sqlDdType: SystemTables_1.SystemDbType,
+                            sqlDatabase: SystemDbName,
+                            sqlDdType: SystemDbType,
                             sqlTable: SystemTables_1.SystemTables.sys_visit_stats,
                         });
                         await client.del(key);

package/dist/service/WorkbenchService.js

@@ -20,6 +20,7 @@ const exceptions_1 = require("../libs/crud-pro/exceptions");
 const functions_1 = require("../libs/utils/functions");
 const fatcms_request_1 = require("../libs/utils/fatcms-request");
 const MixinUtils_1 = require("../libs/crud-pro/utils/MixinUtils");
+const global_config_1 = require("../libs/global-config/global-config");
 //
 // const lruCache = new LRUCache<string, any>({
 //   max: 500,
@@ -38,14 +39,15 @@ let WorkbenchService = class WorkbenchService extends BaseService_1.BaseService
         await this.getAllWorkbenchInfoMap(true);
     }
     async getAllWorkbenchInfoList(isForceRefresh) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         let listData = lruCache.get(CACHE_KEY_WORKBENCH_LIST);
         if (!listData || isForceRefresh === true) {
             const reqJson = { condition: {}, pageSize: 1000, limit: 1000 };
             const res = await this.curdProService.executeCrudByCfg(reqJson, {
                 sqlTable: SystemTables_1.SystemTables.sys_workbench,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-                sqlDatabase: SystemTables_1.SystemDbName,
-                sqlDdType: SystemTables_1.SystemDbType,
+                sqlDatabase: SystemDbName,
+                sqlDdType: SystemDbType,
             });
             listData = res.getResRows();
             lruCache.set(CACHE_KEY_WORKBENCH_LIST, listData);

package/dist/service/anyapi/AnyApiService.js

@@ -23,6 +23,7 @@ const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
 const WorkbenchService_1 = require("../WorkbenchService");
 const ValidateUtils_1 = require("../../libs/crud-pro/utils/ValidateUtils");
 const ApiBaseService_1 = require("../base/ApiBaseService");
+const global_config_1 = require("../../libs/global-config/global-config");
 const lruCache = new lru_cache_1.LRUCache({
     max: 500,
     ttl: 1000 * 60,
@@ -65,12 +66,13 @@ let AnyApiService = class AnyApiService extends ApiBaseService_1.ApiBaseService
         return anyApi;
     }
     async _getAnyApiMethod(methodCode) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const res = await this.curdMixService.executeCrudByCfg({ condition: { method: methodCode } }, {
             sqlTable: SystemTables_1.SystemTables.sys_anyapi,
             method: `get_sys_anyapi_${methodCode}`,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
             updateCfg: {},
         });
         const obj = res.getOneObj();

package/dist/service/crudstd/CrudStdService.js

@@ -21,6 +21,7 @@ const CrudStdRelationService_1 = require("./CrudStdRelationService");
 const _ = require("lodash");
 const ApiBaseService_1 = require("../base/ApiBaseService");
 const DatabaseName_1 = require("../../libs/crud-pro/utils/DatabaseName");
+const global_config_1 = require("../../libs/global-config/global-config");
 exports.SPECIAL_SETTING_KEY = {
     QUERY_LIST: 'QUERY_LIST',
     QUERY_ONE: 'QUERY_ONE',
@@ -53,6 +54,8 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
         }
         // 根据用户配置，设置关联查询的数据信息。
         await this.crudStdRelationService.addCfgModelColumnsRelation(cfgModel, appInfo);
+        // 业务系统自定义的修改cfgModel
+        await global_config_1.GLOBAL_STATIC_CONFIG.getConfig().addCfgModelForCrudStdService(cfgModel, appInfo);
         return await this.curdMixService.executeCrudByCfg(params, cfgModel);
     }
     /**
@@ -112,12 +115,13 @@ let CrudStdService = class CrudStdService extends ApiBaseService_1.ApiBaseServic
      * @private
      */
     async getCrudStdAppInfo(appCode) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         this.logInfo('getCrudStdAppInfo', appCode);
         const ss = {
             sqlTable: SystemTables_1.SystemTables.sys_app,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         };
         return await this.curdMixService.executeCrudByCfg({ condition: { app_code: appCode } }, ss);
     }

package/dist/service/curd/CurdMixByAccountService.js

@@ -17,10 +17,12 @@ const CurdMixUtils_1 = require("./CurdMixUtils");
 const SystemTables_1 = require("../../models/SystemTables");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
+const global_config_1 = require("../../libs/global-config/global-config");
 const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.accountBasic);
 const TMP_CTX_KEY = _.uniqueId('CurdMixByAccountService');
 let CurdMixByAccountService = class CurdMixByAccountService {
     async handleExecuteContextPrepare(executeContext) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const relations = dictMixUtils.pickColumnRelations(executeContext);
         if (!relations || relations.length === 0) {
             return;
@@ -40,8 +42,8 @@ let CurdMixByAccountService = class CurdMixByAccountService {
             method: 'UserAccountService.queryAccountBasicInfoByIds',
             sqlTable: SystemTables_1.SystemTables.sys_user_account,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         };
         const reqJson = {
             columns: ['nick_name', 'avatar', 'account_id'],

package/dist/service/curd/CurdMixByDictService.js

@@ -18,6 +18,7 @@ const keys_1 = require("../../libs/crud-pro/models/keys");
 const MultiKeyMap_1 = require("../../libs/crud-pro/utils/MultiKeyMap");
 const _ = require("lodash");
 const RedisCacheService_1 = require("../base/RedisCacheService");
+const global_config_1 = require("../../libs/global-config/global-config");
 const TMP_CTX_KEY = _.uniqueId('CurdMixByDictService');
 const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.dict);
 let CurdMixByDictService = class CurdMixByDictService {
@@ -38,6 +39,7 @@ let CurdMixByDictService = class CurdMixByDictService {
         executeContext[TMP_CTX_KEY] = new MultiKeyMap_1.MultiKeyMap(rows, 'dict_code', 'value');
     }
     async getDictItemRows(codes) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const noCacheCodes = [];
         // 从缓存里面取
         let cachedRows = [];
@@ -60,8 +62,8 @@ let CurdMixByDictService = class CurdMixByDictService {
             }, {
                 sqlTable: SystemTables_1.SystemTables.sys_data_dict_item,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-                sqlDatabase: SystemTables_1.SystemDbName,
-                sqlDdType: SystemTables_1.SystemDbType,
+                sqlDatabase: SystemDbName,
+                sqlDdType: SystemDbType,
             });
             selectedRows = res1.getResRows();
             //放到缓存里

package/dist/service/curd/CurdMixBySysConfigService.js

@@ -18,10 +18,12 @@ const SystemTables_1 = require("../../models/SystemTables");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const MultiKeyMap_1 = require("../../libs/crud-pro/utils/MultiKeyMap");
 const parseConfig_1 = require("../../libs/utils/parseConfig");
+const global_config_1 = require("../../libs/global-config/global-config");
 const dictMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.RelatedType.sysCfgEnum);
 const TMP_CTX_KEY = _.uniqueId('CurdMixBySysConfigService');
 let CurdMixBySysConfigService = class CurdMixBySysConfigService {
     async handleExecuteContextPrepare(executeContext) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const codes = dictMixUtils.pickColumnRelationCodes(executeContext);
         if (!codes || codes.length === 0) {
             return;
@@ -31,8 +33,8 @@ let CurdMixBySysConfigService = class CurdMixBySysConfigService {
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_configs,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
         });
         const rows = res1.getResRows();
         const multiKeyMap = new MultiKeyMap_1.MultiKeyMap();

package/dist/service/curd/CurdMixByWorkbenchService.js

@@ -18,6 +18,7 @@ const CurdMixUtils_1 = require("./CurdMixUtils");
 const SystemTables_1 = require("../../models/SystemTables");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const MixinUtils_1 = require("../../libs/crud-pro/utils/MixinUtils");
+const global_config_1 = require("../../libs/global-config/global-config");
 const lruCache = new lru_cache_1.LRUCache({
     max: 500,
     ttl: 1000 * 60 * 5,
@@ -27,6 +28,7 @@ const workbenchMixUtils = new CurdMixUtils_1.CrudMixUtils(CurdMixUtils_1.Related
 const TMP_CTX_KEY = _.uniqueId('CurdMixByWorkbenchService');
 let CurdMixByWorkbenchService = class CurdMixByWorkbenchService {
     async loadWorkbenchListMap() {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         let workbenchListMap = lruCache.get('workbenchListMap');
         if (!workbenchListMap) {
             const reqJson = {
@@ -36,8 +38,8 @@ let CurdMixByWorkbenchService = class CurdMixByWorkbenchService {
             const res = await this.curdProService.executeCrudByCfg(reqJson, {
                 sqlTable: SystemTables_1.SystemTables.sys_workbench,
                 sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
-                sqlDatabase: SystemTables_1.SystemDbName,
-                sqlDdType: SystemTables_1.SystemDbType,
+                sqlDatabase: SystemDbName,
+                sqlDdType: SystemDbType,
             });
             const workbenchList = res.getResRows();
             workbenchListMap = MixinUtils_1.MixinUtils.toNewMap(workbenchList, (obj) => obj.workbench_code);

package/dist/service/proxyapi/ProxyApiLoadService.js

@@ -24,6 +24,7 @@ const WeightedRandom_1 = require("./WeightedRandom");
 const WeightedRoundRobin_1 = require("./WeightedRoundRobin");
 const WorkbenchService_1 = require("../WorkbenchService");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
+const global_config_1 = require("../../libs/global-config/global-config");
 function toUpstreamInfo(config_content) {
     const obj = (0, functions_1.parseJsonObject)(config_content);
     if (!obj) {
@@ -79,6 +80,7 @@ let ProxyApiLoadService = class ProxyApiLoadService extends BaseService_1.BaseSe
         return routeTrie;
     }
     async buildUpstreamMap() {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         //       biz_tag={'upstream'}
         const res = await this.curdProService.executeCrudByCfg({
             condition: {
@@ -86,8 +88,8 @@ let ProxyApiLoadService = class ProxyApiLoadService extends BaseService_1.BaseSe
             },
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_configs,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
         });
         const upstreamMap = {};
@@ -100,12 +102,13 @@ let ProxyApiLoadService = class ProxyApiLoadService extends BaseService_1.BaseSe
         return upstreamMap;
     }
     async loadProxyApiEntity(workbench_code, upstreamMap) {
+        const { SystemDbName, SystemDbType } = global_config_1.GLOBAL_STATIC_CONFIG.getConfig();
         const res = await this.curdProService.executeCrudByCfg({
             condition: {},
         }, {
             sqlTable: SystemTables_1.SystemTables.sys_proxyapi,
-            sqlDatabase: SystemTables_1.SystemDbName,
-            sqlDdType: SystemTables_1.SystemDbType,
+            sqlDatabase: SystemDbName,
+            sqlDdType: SystemDbType,
             sqlSimpleName: keys_1.KeysOfSimpleSQL.SIMPLE_QUERY,
         });
         const rows0 = res.getResRows();

package/package.json

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