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

package/dist/index.js

@@ -48,10 +48,6 @@ __exportStar(require("./controller/manage/SysConfigMangeApi"), exports);
 __exportStar(require("./controller/manage/SystemInfoManageApi"), exports);
 __exportStar(require("./controller/manage/UserAccountManageApi"), exports);
 __exportStar(require("./controller/manage/WorkbenchMangeApi"), exports);
-__exportStar(require("./controller/medstatistic/MedAdminController"), exports);
-__exportStar(require("./controller/medstatistic/MedClientController"), exports);
-__exportStar(require("./controller/medstatistic/MedMessageService"), exports);
-__exportStar(require("./controller/medstatistic/MedScoreService"), exports);
 __exportStar(require("./controller/myinfo/AuthController"), exports);
 __exportStar(require("./controller/myinfo/MyInfoController"), exports);
 __exportStar(require("./controller/render/AppRenderController"), exports);
@@ -61,6 +57,7 @@ __exportStar(require("./filter/notfound.filter"), exports);
 __exportStar(require("./middleware/forbidden.middleware"), exports);
 __exportStar(require("./middleware/global.middleware"), exports);
 __exportStar(require("./middleware/tx.middleware"), exports);
+__exportStar(require("./middleware/permission.middleware"), exports);
 __exportStar(require("./service/AuthService"), exports);
 __exportStar(require("./service/EnumInfoService"), exports);
 __exportStar(require("./service/FileCenterService"), exports);
@@ -86,3 +83,30 @@ __exportStar(require("./service/curd/CurdMixService"), exports);
 __exportStar(require("./service/curd/CurdProService"), exports);
 __exportStar(require("./service/proxyapi/ProxyApiLoadService"), exports);
 __exportStar(require("./service/proxyapi/ProxyApiService"), exports);
+__exportStar(require("./models/userSession"), exports);
+__exportStar(require("./models/bizmodels"), exports);
+__exportStar(require("./models/SystemEntities"), exports);
+__exportStar(require("./models/SystemPerm"), exports);
+__exportStar(require("./models/contextLogger"), exports);
+__exportStar(require("./models/devops"), exports);
+__exportStar(require("./models/SystemTables"), exports);
+__exportStar(require("./libs/utils/common-dto"), exports);
+__exportStar(require("./libs/utils/crypto-utils"), exports);
+__exportStar(require("./libs/utils/fatcms-request"), exports);
+__exportStar(require("./libs/utils/functions"), exports);
+__exportStar(require("./libs/utils/ordernum-utils"), exports);
+__exportStar(require("./libs/utils/parseConfig"), exports);
+__exportStar(require("./libs/crud-pro/CrudPro"), exports);
+__exportStar(require("./libs/crud-pro/defaultConfigs"), exports);
+__exportStar(require("./libs/crud-pro/exceptions"), exports);
+__exportStar(require("./libs/crud-pro/interfaces"), exports);
+__exportStar(require("./libs/crud-pro/models/ExecuteContext"), exports);
+__exportStar(require("./libs/crud-pro/models/FuncContext"), exports);
+__exportStar(require("./libs/crud-pro/models/RequestModel"), exports);
+__exportStar(require("./libs/crud-pro/models/SqlCfgModel"), exports);
+__exportStar(require("./libs/crud-pro/models/Transaction"), exports);
+__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/crud-pro/interfaces.d.ts

@@ -86,7 +86,7 @@ export interface IBaseCfgModel {
     sqlTable?: string;
     sqlSchema?: string;
     sqlDatabase?: string;
-    sqlDdType?: SqlDbType;
+    sqlDbType?: SqlDbType;
     maxLimit?: number;
     columns?: string | string[];
     columnsRelation?: ColumnRelation[];

package/dist/libs/crud-pro/models/RequestCfgModel.d.ts

@@ -13,7 +13,7 @@ declare class RequestCfgModel {
     sqlTable: string;
     sqlSchema?: string;
     sqlDatabase?: string;
-    sqlDdType?: SqlDbType;
+    sqlDbType?: SqlDbType;
     maxLimit: number;
     method: string;
     transactionEnable: boolean;

package/dist/libs/crud-pro/models/SqlCfgModel.d.ts

@@ -6,7 +6,7 @@ declare class SqlCfgModel {
     sqlTable: string;
     sqlSchema?: string;
     sqlDatabase?: string;
-    sqlDdType?: SqlDbType;
+    sqlDbType?: SqlDbType;
     maxLimit: number;
     resName: string;
     resPicker: KeysOfSqlResPicker;

package/dist/libs/crud-pro/services/CrudProExecuteSqlService.js

@@ -32,7 +32,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
         const executeSqlArgs = this.handleExecuteSqlArgsByResModel(exeCtx, sqlCfgModel.executeSqlArgs || []);
         let sqlRes;
         let queryRes;
-        if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.postgres) { // import { PoolClient } from 'pg';
+        if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.postgres) { // import { PoolClient } from 'pg';
             const pgClient = connection;
             const pgSql = (0, convertPgSql_1.replaceQuestionMarks)(sqlCfgModel.executeSql);
             this.logger.info('executeSqlCfgModel_postgres', pgSql, executeSqlArgs, sqlCfgModel.resPicker);
@@ -42,7 +42,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
             });
             sqlRes = (0, convertPgType_1.pickAndConvertPgRows)(queryRes);
         }
-        else if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+        else if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
             const mssql = (0, convertMsSql_1.replaceQuestionMarksForMssql)(sqlCfgModel.executeSql);
             this.logger.info('executeSqlCfgModel_sqlserver', mssql, executeSqlArgs, sqlCfgModel.resPicker);
             // SQLServer
@@ -198,13 +198,13 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
         }
         // 增删改res的内容是修改结果：包括： insert\delete\update
         if (keys_1.KeysOfSqlResPicker.UPDATE_RESULT === resPicker) {
-            if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.postgres) {
+            if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
                 return {
                     insertId: _.get(queryRes, 'rows[0].id'),
                     affectedRows: _.get(queryRes, 'rowCount')
                 };
             }
-            if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+            if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
                 return {
                     insertId: _.get(queryRes, 'recordset[0].id'),
                     affectedRows: _.get(queryRes, 'rowsAffected[0]')

package/dist/libs/crud-pro/services/CrudProGenSqlCondition.js

@@ -192,28 +192,28 @@ class CrudProGenSqlCondition {
                 else if (equalsIgnoreCase(keys_1.KeysOfConditions.$LIKE, compare)) {
                     tmpArgList.push(value0);
                     tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI like concat(?, '%')`; // like前缀匹配
-                    if (this.sqlCfg.sqlDdType === keys_1.SqlDbType.postgres) {
+                    if (this.sqlCfg.sqlDbType === keys_1.SqlDbType.postgres) {
                         tmpSql = `${toSqlColumnName(key)} like concat(?, '%')`; // like前缀匹配
                     }
                 }
                 else if (equalsIgnoreCase(keys_1.KeysOfConditions.$NOT_LIKE, compare)) {
                     tmpArgList.push(value0);
                     tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI not like concat(?, '%')`;
-                    if (this.sqlCfg.sqlDdType === keys_1.SqlDbType.postgres) {
+                    if (this.sqlCfg.sqlDbType === keys_1.SqlDbType.postgres) {
                         tmpSql = `${toSqlColumnName(key)} not like concat(?, '%')`;
                     }
                 }
                 else if (equalsIgnoreCase(keys_1.KeysOfConditions.$LIKE_INCLUDE, compare)) {
                     tmpArgList.push(value0);
                     tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI like concat('%', ?, '%')`; // like包含
-                    if (this.sqlCfg.sqlDdType === keys_1.SqlDbType.postgres) {
+                    if (this.sqlCfg.sqlDbType === keys_1.SqlDbType.postgres) {
                         tmpSql = `${toSqlColumnName(key)} like concat('%', ?, '%')`; // like包含
                     }
                 }
                 else if (equalsIgnoreCase(keys_1.KeysOfConditions.$NOT_LIKE_INCLUDE, compare)) {
                     tmpArgList.push(value0);
                     tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI not like concat('%',?, '%')`; // like不包含
-                    if (this.sqlCfg.sqlDdType === keys_1.SqlDbType.postgres) {
+                    if (this.sqlCfg.sqlDbType === keys_1.SqlDbType.postgres) {
                         tmpSql = `${toSqlColumnName(key)} not like concat('%',?, '%')`; // like不包含
                     }
                 }

package/dist/libs/crud-pro/services/CrudProGenSqlService.js

@@ -91,10 +91,10 @@ class CrudProGenSqlService extends CrudProServiceBase_1.CrudProServiceBase {
      * @private
      */
     generateOriginSqlForDelete(cfgModel) {
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.postgres) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
             return 'delete from @@table where @@asWhere:condition ';
         }
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
             return 'delete from @@table where @@asWhere:condition ';
         }
         return 'delete from @@table where @@asWhere:condition limit 100 '; // 删除操作，不能一次性删除太多
@@ -105,7 +105,7 @@ class CrudProGenSqlService extends CrudProServiceBase_1.CrudProServiceBase {
      * @private
      */
     generateOriginSqlForDuplicateInsert(cfgModel) {
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.postgres) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
             const uniqueColumn = cfgModel.uniqueColumn; // id
             if (!Array.isArray(uniqueColumn) || uniqueColumn.length === 0) {
                 throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_ERROR_POSTGRES_UNIQUE_COLUMNS_NULL);
@@ -115,7 +115,7 @@ class CrudProGenSqlService extends CrudProServiceBase_1.CrudProServiceBase {
             }).join(",");
             return `insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data ) ON CONFLICT (${unique_column}) DO UPDATE set @@asUpdate:data `; // 关键字的前后，必须有空格
         }
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
             const uniqueColumn = cfgModel.uniqueColumn; // id
             if (uniqueColumn.length !== 1) {
                 throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_UNIQUE_COLUMN_COUNT_MUST_ONE);
@@ -144,10 +144,10 @@ class CrudProGenSqlService extends CrudProServiceBase_1.CrudProServiceBase {
      * @private
      */
     generateOriginSqlForInsert(cfgModel) {
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.postgres) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
             return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data ) RETURNING * ';
         }
-        if (cfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+        if (cfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
             return 'insert into @@table ( @@asInsertKeys:data ) OUTPUT INSERTED.* values( @@asInsertValues:data ) ';
         }
         return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data )'; // 关键字的前后，必须有空格
@@ -156,10 +156,10 @@ class CrudProGenSqlService extends CrudProServiceBase_1.CrudProServiceBase {
         const exeCtx = this.getExecuteContext();
         const reqCfgModel = exeCtx.getCfgModel();
         const sqlCfgList = reqCfgModel.sqlCfgList || [];
-        const { sqlTable, sqlSchema, sqlDatabase, sqlDdType, maxLimit, columns, columnsRelation } = reqCfgModel;
+        const { sqlTable, sqlSchema, sqlDatabase, sqlDbType, maxLimit, columns, columnsRelation } = reqCfgModel;
         for (let i = 0; i < sqlCfgList.length; i++) {
             const sqlCfgModel = sqlCfgList[i];
-            sqlCfgModel.sqlDdType = MixinUtils_1.MixinUtils.selectNotEmpty(sqlCfgModel.sqlDdType, sqlDdType);
+            sqlCfgModel.sqlDbType = MixinUtils_1.MixinUtils.selectNotEmpty(sqlCfgModel.sqlDbType, sqlDbType);
             sqlCfgModel.sqlDatabase = MixinUtils_1.MixinUtils.selectNotEmpty(sqlCfgModel.sqlDatabase, sqlDatabase);
             sqlCfgModel.sqlSchema = MixinUtils_1.MixinUtils.selectNotEmpty(sqlCfgModel.sqlSchema, sqlSchema);
             sqlCfgModel.sqlTable = MixinUtils_1.MixinUtils.selectNotEmpty(sqlCfgModel.sqlTable, sqlTable);

package/dist/libs/crud-pro/services/CrudProOriginToExecuteSql.js

@@ -198,10 +198,10 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase_1.CrudProServiceBase
         const maxLimit = ModelUtils_1.ModelUtils.getMaxLimit(sqlCfg, requestCfg);
         const reqLimit = req.limit;
         const limit = Math.min(maxLimit, reqLimit);
-        if (sqlCfg.sqlDdType === keys_1.SqlDbType.postgres) {
+        if (sqlCfg.sqlDbType === keys_1.SqlDbType.postgres) {
             return new SqlSegArg_1.SqlSegArg(' LIMIT ? OFFSET ? ', [limit, req.offset]);
         }
-        if (sqlCfg.sqlDdType === keys_1.SqlDbType.sqlserver) {
+        if (sqlCfg.sqlDbType === keys_1.SqlDbType.sqlserver) {
             return new SqlSegArg_1.SqlSegArg(' OFFSET ? ROWS FETCH NEXT ? ROWS ONLY ', [req.offset, limit]);
         }
         return new SqlSegArg_1.SqlSegArg(' limit ?,? ', [req.offset, limit]);

package/dist/libs/crud-pro/utils/sqlConvert/convertColumnName.js

@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toSqlColumnNamesJoin = exports.toSqlColumnName = void 0;
 const keys_1 = require("../../models/keys");
 function toSqlColumnName(columnName, sqlCfgModel) {
-    if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.postgres) {
+    if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
         return '"' + columnName + '"';
     }
-    if (sqlCfgModel.sqlDdType === keys_1.SqlDbType.sqlserver) {
+    if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
         return '[' + columnName + ']';
     }
     return '`' + columnName + '`';

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

@@ -0,0 +1,39 @@
+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;
+}
+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,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GLOBAL_STATIC_CONFIG = void 0;
+const keys_1 = require("../crud-pro/models/keys");
+const noop = () => {
+    return Promise.resolve();
+};
+class GlobalStaticConfig {
+    constructor() {
+        this.configObject = {
+            bizUpdateCfgModelForCrudStd: noop,
+            bizUpdateCfgModelForCrudMtd: noop,
+            generateUserAccountId: null,
+            toFatcmsUserAccountId: (bizTableUserId) => {
+                return bizTableUserId;
+            },
+            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密码
@@ -116,7 +117,7 @@ let AuthService = class AuthService {
             sessionId,
             accountId,
             workbenchCode,
-            accountType: userSession_1.SYS_ACCOUNT_TYPE
+            accountType: userSession_1.SYS_ACCOUNT_TYPE,
         };
         await this.userSessionService.saveUserSession(sessionInfo);
         return {
@@ -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,
+            sqlDbType: 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,
+            sqlDbType: 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,
+            sqlDbType: 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,
+            sqlDbType: 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,
+            sqlDbType: 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,
+            sqlDbType: 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,
+            sqlDbType: 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,
+            sqlDbType: 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,
+            sqlDbType: 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,
+            sqlDbType: 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,
+            sqlDbType: 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,
+            sqlDbType: 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,
+                            sqlDbType: 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,
+                sqlDbType: SystemDbType,
             });
             listData = res.getResRows();
             lruCache.set(CACHE_KEY_WORKBENCH_LIST, listData);