midway-fatcms 0.0.1-beta.13 → 0.0.1-beta.16

package/README.md

@@ -1 +1,8 @@
 #midway-fatcms
+
+
+
+* 加密字段：
+http://127.0.0.1:7002/ns/api/helpers/cryptoAes128CBC?input=123
+
+

package/dist/configuration.d.ts

@@ -3,4 +3,5 @@ export declare class ContainerLifeCycle {
     app: koa.Application;
     onConfigLoad(): Promise<any>;
     onReady(): Promise<void>;
+    private startScheduleOnReady;
 }

package/dist/configuration.js

@@ -27,6 +27,7 @@ const global_middleware_1 = require("./middleware/global.middleware");
 const forbidden_middleware_1 = require("./middleware/forbidden.middleware");
 const schedule_1 = require("./schedule");
 const crypto_utils_1 = require("./libs/utils/crypto-utils");
+const scheduleNames_1 = require("./schedule/scheduleNames");
 let ContainerLifeCycle = class ContainerLifeCycle {
     async onConfigLoad() {
         const config = this.app.getConfig();
@@ -50,20 +51,32 @@ let ContainerLifeCycle = class ContainerLifeCycle {
         return newConfig;
     }
     async onReady() {
-        const logger = this.app.getLogger();
-        const config = this.app.getConfig();
-        if (config.fatcmsScheduleService) {
-            // 启动定时任务
-            const scheduleServiceList = ['proxyApiLoadService', 'workbenchService', 'visitStatService', 'asyncTaskRunnerService'];
-            await (0, schedule_1.startSchedule)(this.app, scheduleServiceList);
-            logger.info('ContainerLifeCycle ==> onReady 启动定时任务 ');
-        }
+        /**
+         * 启动定时任务
+         */
+        await this.startScheduleOnReady();
         // add middleware
         this.app.useMiddleware(forbidden_middleware_1.ForbiddenMiddleware);
         this.app.useMiddleware(global_middleware_1.GlobalMiddleware);
         // add filter
         // this.app.useFilter([NotFoundFilter, DefaultErrorFilter]);
     }
+    async startScheduleOnReady() {
+        const logger = this.app.getLogger();
+        const config = this.app.getConfig();
+        const fatcmsScheduleService = config.fatcmsScheduleService;
+        // 关闭定时任务
+        if (fatcmsScheduleService === false || fatcmsScheduleService === null) {
+            return;
+        }
+        let scheduleServiceList = scheduleNames_1.ALL_SCHEDULE_NAMES;
+        // 启动部分定时任务
+        if (Array.isArray(fatcmsScheduleService)) {
+            scheduleServiceList = fatcmsScheduleService;
+        }
+        await (0, schedule_1.startScheduleLoop)(scheduleServiceList);
+        logger.info('ContainerLifeCycle ==> onReady 启动定时任务 ： ' + JSON.stringify(scheduleServiceList));
+    }
 };
 __decorate([
     (0, core_1.App)(),

package/dist/controller/base/BaseApiController.d.ts

@@ -25,7 +25,7 @@ export declare class BaseApiController extends BaseService {
      * @protected
      */
     protected executeSysSimpleSQL(sqlTable: string, sqlSimpleName: KeysOfSimpleSQL, params?: IExecuteSimpleSqlParams): Promise<import("../../libs/crud-pro/models/ExecuteContext").ExecuteContext>;
-    protected get sysDBUtil(): import("../..").DBUtils;
+    protected get sysDBUtil(): import("../..").CrudProQuick;
     private addAccountBasicInfoCfgModel;
     private addWorkbenchBasicInfoCfgModel;
 }

package/dist/controller/gateway/AsyncTaskController.js

@@ -20,6 +20,13 @@ const AsyncTaskModel_1 = require("../../models/AsyncTaskModel");
 const keys_1 = require("../../libs/crud-pro/models/keys");
 const SystemTables_1 = require("../../models/SystemTables");
 const exceptions_1 = require("../../libs/crud-pro/exceptions");
+const permission_middleware_1 = require("../../middleware/permission.middleware");
+function fixMyTasksCondition(body, ctx) {
+    if (!body.condition) {
+        throw new exceptions_1.CommonException("参数不正确");
+    }
+    body.condition.created_by = ctx.userSession.getSessionInfo().accountId;
+}
 function fixCancelBodyData(body, id) {
     if (!body.data || !body.condition) {
         throw new exceptions_1.CommonException("参数不正确");
@@ -30,16 +37,19 @@ function fixCancelBodyData(body, id) {
     body.condition = conditionObj;
     // fix data
     const dataObj = (body.data || {});
-    dataObj.task_status = AsyncTaskModel_1.TaskStatus.CANCELLED;
+    dataObj.task_status = AsyncTaskModel_1.SysAsyncTaskStatus.CANCELLED;
     body.data = dataObj;
 }
-function fixCreateBodyData(body) {
+function fixCreateBodyData(body, ctx) {
     if (!body.data) {
         throw new exceptions_1.CommonException("参数不正确");
     }
+    const sessionInfo = ctx.userSession.getSessionInfo();
     // fix data
     const dataObj = (body.data || {});
-    dataObj.task_status = AsyncTaskModel_1.TaskStatus.PENDING;
+    dataObj.task_status = AsyncTaskModel_1.SysAsyncTaskStatus.PENDING;
+    dataObj.created_by = sessionInfo.accountId;
+    dataObj.created_user_session = JSON.stringify(sessionInfo); // 创建人的session信息。用于执行时的鉴权。
 }
 /**
  * 异步任务框架
@@ -47,11 +57,12 @@ function fixCreateBodyData(body) {
 let AsyncTaskController = class AsyncTaskController extends BaseApiController_1.BaseApiController {
     // 获取任务列表
     async getMyTasks() {
+        fixMyTasksCondition(this.ctx.request.body, this.ctx);
         return this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_async_tasks, keys_1.KeysOfSimpleSQL.SIMPLE_QUERY_PAGE);
     }
     // 创建任务
     async createTask() {
-        fixCreateBodyData(this.ctx.request.body);
+        fixCreateBodyData(this.ctx.request.body, this.ctx);
         const res = await this.executeSysSimpleSQL(SystemTables_1.SystemTables.sys_async_tasks, keys_1.KeysOfSimpleSQL.SIMPLE_INSERT);
         await this.asyncTaskService.startTask();
         return res;
@@ -73,7 +84,7 @@ __decorate([
     __metadata("design:type", AsyncTaskService_1.AsyncTaskService)
 ], AsyncTaskController.prototype, "asyncTaskService", void 0);
 __decorate([
-    (0, core_1.Get)('/getMyTasks'),
+    (0, core_1.Post)('/getMyTasks'),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", []),
     __metadata("design:returntype", Promise)
@@ -92,6 +103,6 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], AsyncTaskController.prototype, "cancelTask", null);
 AsyncTaskController = __decorate([
-    (0, core_1.Controller)('/ns/gw/AsyncTask')
+    (0, core_1.Controller)('/ns/gw/AsyncTask', { middleware: [(0, permission_middleware_1.checkLogin)()] })
 ], AsyncTaskController);
 exports.AsyncTaskController = AsyncTaskController;

package/dist/controller/gateway/CrudMtdGatewayController.d.ts

@@ -3,9 +3,9 @@ import { CommonResult } from '../../libs/utils/common-dto';
 import { WorkbenchService } from '../../service/WorkbenchService';
 import { ApiBaseService } from '../../service/base/ApiBaseService';
 /**
- *    query形式1：GET: /ns/gw/api/crudMtd/getUser?__query_json__=%7B%22condition%22%3A%7B%22id%22%3A2%7D%7D
- *    query形式2：GET: /ns/gw/api/crudMtd/getUser?__query_as__=condition&id=1&name=22
- *    query形式3：GET: /ns/gw/api/crudMtd/createUser?__query_as__=data&__query_pick__=id,name&id=1&name=22
+ *    query形式1：GET: /ns/gw/crudApi/getUser?__query_json__=%7B%22condition%22%3A%7B%22id%22%3A2%7D%7D
+ *    query形式2：GET: /ns/gw/crudApi/getUser?__query_as__=condition&id=1&name=22
+ *    query形式3：GET: /ns/gw/crudApi/createUser?__query_as__=data&__query_pick__=id,name&id=1&name=22
  *
  * 执行单个配置的接口
  */

package/dist/controller/gateway/CrudMtdGatewayController.js

@@ -31,11 +31,11 @@ function pickAsQuery(query_as_pick, query) {
     }
     return query;
 }
-// /ns/gw/api/crudMtd/getUser?__query_as_condition__=id&_query_as_data__=name&&id=1&name=22
+// /ns/gw/crudApi/getUser?__query_as_condition__=id&_query_as_data__=name&&id=1&name=22
 /**
- *    query形式1：GET: /ns/gw/api/crudMtd/getUser?__query_json__=%7B%22condition%22%3A%7B%22id%22%3A2%7D%7D
- *    query形式2：GET: /ns/gw/api/crudMtd/getUser?__query_as__=condition&id=1&name=22
- *    query形式3：GET: /ns/gw/api/crudMtd/createUser?__query_as__=data&__query_pick__=id,name&id=1&name=22
+ *    query形式1：GET: /ns/gw/crudApi/getUser?__query_json__=%7B%22condition%22%3A%7B%22id%22%3A2%7D%7D
+ *    query形式2：GET: /ns/gw/crudApi/getUser?__query_as__=condition&id=1&name=22
+ *    query形式3：GET: /ns/gw/crudApi/createUser?__query_as__=data&__query_pick__=id,name&id=1&name=22
  *
  * 执行单个配置的接口
  */
@@ -51,7 +51,7 @@ let CrudMtdGatewayController = class CrudMtdGatewayController extends ApiBaseSer
         if (!methodInfo || methodInfo.status !== 1) {
             return common_dto_1.CommonResult.errorRes('接口不存在或已下线: ' + methodCode);
         }
-        this.logInfo("methodInfo=== ", methodInfo);
+        this.logInfo('methodInfo=== ', methodInfo);
         const workbench_code_array = methodInfo.workbench_code_array || methodInfo.workbenchCodeArray;
         const isSupport = await this.workbenchService.isSupportCurrentWorkbench(workbench_code_array);
         if (!isSupport) {

package/dist/index.d.ts

@@ -8,6 +8,7 @@ export * from './controller/gateway/FileController';
 export * from './controller/gateway/ProxyApiGatewayController';
 export * from './controller/gateway/PublicApiController';
 export * from './controller/gateway/StaticController';
+export * from './controller/gateway/AsyncTaskController';
 export * from './controller/helpers.controller';
 export * from './controller/home.controller';
 export * from './controller/manage/AnyApiMangeApi';
@@ -63,8 +64,11 @@ export * from './service/curd/CurdMixBySysConfigService';
 export * from './service/curd/CurdMixByWorkbenchService';
 export * from './service/curd/CurdMixService';
 export * from './service/curd/CurdProService';
+export * from './service/curd/CrudProQuick';
 export * from './service/proxyapi/ProxyApiLoadService';
 export * from './service/proxyapi/ProxyApiService';
+export * from './service/asyncTask/AsyncTaskService';
+export * from './service/asyncTask/AsyncTaskRunnerService';
 export * from './models/userSession';
 export * from './models/bizmodels';
 export * from './models/SystemEntities';
@@ -72,6 +76,8 @@ export * from './models/SystemPerm';
 export * from './models/contextLogger';
 export * from './models/devops';
 export * from './models/SystemTables';
+export * from './models/AsyncTaskModel';
+export * from './schedule/index';
 export * from './libs/utils/common-dto';
 export * from './libs/utils/crypto-utils';
 export * from './libs/utils/fatcms-request';
@@ -91,4 +97,5 @@ 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/crud-pro/models/ResModel';
 export * from './libs/global-config/global-config';

package/dist/index.js

@@ -26,6 +26,7 @@ __exportStar(require("./controller/gateway/FileController"), exports);
 __exportStar(require("./controller/gateway/ProxyApiGatewayController"), exports);
 __exportStar(require("./controller/gateway/PublicApiController"), exports);
 __exportStar(require("./controller/gateway/StaticController"), exports);
+__exportStar(require("./controller/gateway/AsyncTaskController"), exports);
 __exportStar(require("./controller/helpers.controller"), exports);
 __exportStar(require("./controller/home.controller"), exports);
 __exportStar(require("./controller/manage/AnyApiMangeApi"), exports);
@@ -81,8 +82,11 @@ __exportStar(require("./service/curd/CurdMixBySysConfigService"), exports);
 __exportStar(require("./service/curd/CurdMixByWorkbenchService"), exports);
 __exportStar(require("./service/curd/CurdMixService"), exports);
 __exportStar(require("./service/curd/CurdProService"), exports);
+__exportStar(require("./service/curd/CrudProQuick"), exports);
 __exportStar(require("./service/proxyapi/ProxyApiLoadService"), exports);
 __exportStar(require("./service/proxyapi/ProxyApiService"), exports);
+__exportStar(require("./service/asyncTask/AsyncTaskService"), exports);
+__exportStar(require("./service/asyncTask/AsyncTaskRunnerService"), exports);
 __exportStar(require("./models/userSession"), exports);
 __exportStar(require("./models/bizmodels"), exports);
 __exportStar(require("./models/SystemEntities"), exports);
@@ -90,6 +94,8 @@ __exportStar(require("./models/SystemPerm"), exports);
 __exportStar(require("./models/contextLogger"), exports);
 __exportStar(require("./models/devops"), exports);
 __exportStar(require("./models/SystemTables"), exports);
+__exportStar(require("./models/AsyncTaskModel"), exports);
+__exportStar(require("./schedule/index"), exports);
 __exportStar(require("./libs/utils/common-dto"), exports);
 __exportStar(require("./libs/utils/crypto-utils"), exports);
 __exportStar(require("./libs/utils/fatcms-request"), exports);
@@ -109,4 +115,5 @@ __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/crud-pro/models/ResModel"), exports);
 __exportStar(require("./libs/global-config/global-config"), exports);

package/dist/libs/crud-pro/CrudPro.d.ts

@@ -32,5 +32,6 @@ declare class CrudPro {
     private executeSQLList;
     private parseRunSqlException;
     private afterExecuteSQLList;
+    private beforeExecuteSQLList;
 }
 export { CrudPro };

package/dist/libs/crud-pro/CrudPro.js

@@ -75,6 +75,8 @@ class CrudPro {
     async executeCrudByCfg(reqJson, cfgJson) {
         const logger = this.executeContext.getLogger();
         logger.info('CurdPro executeCrudByCfg', cfgJson);
+        // 在执行之前可以根据业务需要修改需要执行的内容。
+        await this.beforeExecuteSQLList(reqJson, cfgJson);
         const exeCtx = this.executeContext;
         if (!cfgJson.method) {
             throw new exceptions_1.CommonException(exceptions_1.Exceptions.CFG_METHOD_EMPTY, JSON.stringify(cfgJson));
@@ -127,5 +129,8 @@ class CrudPro {
     async afterExecuteSQLList() {
         return this.executeContext.contextFunc.afterExecuteSQLList();
     }
+    async beforeExecuteSQLList(reqJson, cfgJson) {
+        return this.executeContext.contextFunc.beforeExecuteSQLList(reqJson, cfgJson);
+    }
 }
 exports.CrudPro = CrudPro;

package/dist/libs/crud-pro/defaultConfigs.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_LIMIT = exports.DEFAULT_MAX_LIMIT = exports.defaultCrudProCfg = void 0;
+const keys_1 = require("./models/keys");
 exports.defaultCrudProCfg = {
     sysDatabaseName: 'fatcms',
+    sysDatabaseDbType: keys_1.SqlDbType.mysql,
     sysConfigTableName: 'sys_configs',
     dictItemTableName: 'sys_data_dict_item',
     methodsTableName: 'sys_crud_methods',

package/dist/libs/crud-pro/interfaces.d.ts

@@ -1,6 +1,7 @@
 import { KeysOfAuthType, KeysOfSimpleSQL, KeysOfValidators, SqlDbType } from './models/keys';
 export interface ICrudProCfg {
     sysDatabaseName?: string;
+    sysDatabaseDbType?: SqlDbType;
     methodsTableName?: string;
     methodsCacheTime?: number;
     dictItemTableName?: string;
@@ -154,4 +155,9 @@ export interface ILogger {
     error(msg: any, ...args: any[]): void;
     warn(msg: any, ...args: any[]): void;
 }
+export interface IExecuteUnsafeQueryCtx {
+    sqlTable: string;
+    sqlDatabase: string;
+    sqlDbType: SqlDbType;
+}
 export {};

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

@@ -4,6 +4,7 @@ import { SqlCfgModel } from './SqlCfgModel';
 import { Transaction } from './Transaction';
 import { ICrudProCfg, ILogger, IVisitor } from '../interfaces';
 import { IExecuteContextFunc } from './ExecuteContextFunc';
+import { ResModelFlexible } from "./ResModel";
 declare class ExecuteContext {
     private transaction;
     private logger;
@@ -24,7 +25,7 @@ declare class ExecuteContext {
     getVisitor(): IVisitor;
     getReqModel(): RequestModel;
     setReqModel(reqModel: RequestModel): void;
-    getResModel(): Record<string, any>;
+    getResModel(): ResModelFlexible;
     getOneObj(): any;
     getResRows(): any[];
     setResModelItem(resName: string, data: any): void;

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

@@ -1,4 +1,4 @@
-import { IConnectionPool } from '../interfaces';
+import { IConnectionPool, IRequestCfgModel, IRequestModel } from '../interfaces';
 import { ExecuteContext } from './ExecuteContext';
 import { SqlCfgModel } from './SqlCfgModel';
 import { RequestCfgModel } from './RequestCfgModel';
@@ -10,6 +10,7 @@ export interface IExecuteContextFunc {
     getFunctionMap(): any;
     validateByAuthCfg(cfgModel: RequestCfgModel, reqModel: RequestModel): Promise<any>;
     afterExecuteSQLList(): Promise<any>;
+    beforeExecuteSQLList(reqJson: IRequestModel, cfgJson: IRequestCfgModel): Promise<any>;
 }
 export declare class BaseExecuteContextFunc implements IExecuteContextFunc {
     private executeContext;
@@ -26,6 +27,12 @@ export declare class BaseExecuteContextFunc implements IExecuteContextFunc {
      * @param exeCtx
      */
     afterExecuteSQLList(): Promise<any>;
+    /**
+     * 在执行之前可以根据业务需要修改需要执行的内容
+     * @param reqJson
+     * @param cfgJson
+     */
+    beforeExecuteSQLList(reqJson: IRequestModel, cfgJson: IRequestCfgModel): Promise<any>;
     getExecuteContext(): ExecuteContext;
     setExecuteContext(executeContext: ExecuteContext): void;
 }

package/dist/libs/crud-pro/models/ExecuteContextFunc.js

@@ -54,6 +54,14 @@ class BaseExecuteContextFunc {
     afterExecuteSQLList() {
         return null;
     }
+    /**
+     * 在执行之前可以根据业务需要修改需要执行的内容
+     * @param reqJson
+     * @param cfgJson
+     */
+    beforeExecuteSQLList(reqJson, cfgJson) {
+        return Promise.resolve();
+    }
     getExecuteContext() {
         return this.executeContext;
     }

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

@@ -0,0 +1,16 @@
+interface ResModelAffected {
+    insertId?: string | number;
+    affectedRows: number;
+}
+interface ResModelStandard {
+    row?: any;
+    rows?: any[];
+    total_count?: number;
+    affected?: ResModelAffected;
+    insert_affected?: ResModelAffected;
+    update_affected?: ResModelAffected;
+}
+declare type ResModelFlexible = ResModelStandard & {
+    [key: string]: any;
+};
+export { ResModelAffected, ResModelStandard, ResModelFlexible };

package/dist/libs/crud-pro/models/ResModel.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/libs/crud-pro/services/CrudProCachedCfgService.d.ts

@@ -4,6 +4,7 @@ import { ICurdProServiceHub } from '../models/ServiceHub';
 declare class CrudProCachedCfgService extends CrudProServiceBase {
     constructor(serviceHub: ICurdProServiceHub);
     getCachedCfgByMethod(method: string, isEnableCache: boolean): Promise<IRequestCfgModel | null>;
+    private getCachedCfgByMethodInner;
     private loadMethodInfo;
     private loadMethodInfoList;
 }

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

@@ -17,25 +17,35 @@ class CrudProCachedCfgService extends CrudProServiceBase_1.CrudProServiceBase {
         super(serviceHub);
     }
     async getCachedCfgByMethod(method, isEnableCache) {
+        const methodInfo = await this.getCachedCfgByMethodInner(method, isEnableCache);
+        if (!methodInfo) {
+            return null;
+        }
+        return { ...methodInfo };
+    }
+    async getCachedCfgByMethodInner(method, isEnableCache) {
         // 不使用缓存
         if (!isEnableCache) {
             return await this.loadMethodInfo(method);
         }
         methodCache.setProps({
-            keepTime: 2000,
+            keepTime: 1000 * 60 * 2,
             requestFn: () => this.loadMethodInfoList(),
             getKeyFn: item => item.method,
         });
-        return await methodCache.getItem(method);
+        const methodInfo = await methodCache.getItem(method);
+        if (methodInfo) {
+            return methodInfo;
+        }
+        return await this.loadMethodInfo(method);
     }
     async loadMethodInfo(method) {
-        const { methodsTableName, sysDatabaseName } = this.getContextCfg();
-        const sql = `select *
-                 from ${methodsTableName}
-                 where method = ? `; // 全部加载到内存
+        const { methodsTableName, sysDatabaseName, sysDatabaseDbType } = this.getContextCfg();
+        const sql = `select * from ${methodsTableName} where method = ? `; // 全部加载到内存
         const baseInfo = {
-            tableName: methodsTableName,
-            dbName: sysDatabaseName,
+            sqlTable: methodsTableName,
+            sqlDatabase: sysDatabaseName,
+            sqlDbType: sysDatabaseDbType,
         };
         const [rows] = await this.executeUnsafeQuery(baseInfo, sql, [method]);
         const rows2 = rows;
@@ -45,11 +55,12 @@ class CrudProCachedCfgService extends CrudProServiceBase_1.CrudProServiceBase {
         return null;
     }
     async loadMethodInfoList() {
-        const { methodsTableName, sysDatabaseName } = this.getContextCfg();
+        const { methodsTableName, sysDatabaseName, sysDatabaseDbType } = this.getContextCfg();
         const sql = `select * from ${methodsTableName}`; // 全部加载到内存
         const baseInfo = {
-            tableName: methodsTableName,
-            dbName: sysDatabaseName,
+            sqlTable: methodsTableName,
+            sqlDatabase: sysDatabaseName,
+            sqlDbType: sysDatabaseDbType
         };
         const [rows] = await this.executeUnsafeQuery(baseInfo, sql);
         const rows2 = rows;

package/dist/libs/crud-pro/services/CrudProServiceBase.d.ts

@@ -1,12 +1,8 @@
 import { ICurdProServiceHub } from '../models/ServiceHub';
-import { ICrudProCfg, ILogger, IPoolConnectionClient } from '../interfaces';
+import { ICrudProCfg, IExecuteUnsafeQueryCtx, ILogger, IPoolConnectionClient } from '../interfaces';
 import { SqlCfgModel } from '../models/SqlCfgModel';
 import { ExecuteContext } from '../models/ExecuteContext';
 import { IExecuteContextFunc } from '../models/ExecuteContextFunc';
-interface ExecuteUnsafeQueryCtx {
-    tableName: string;
-    dbName: string;
-}
 declare class CrudProServiceBase {
     protected serviceHub: ICurdProServiceHub;
     constructor(serviceHub: ICurdProServiceHub);
@@ -21,7 +17,7 @@ declare class CrudProServiceBase {
      * @param values
      * @protected
      */
-    protected executeUnsafeQuery(obj: ExecuteUnsafeQueryCtx, sql: string, values?: any): Promise<any[]>;
+    protected executeUnsafeQuery(obj: IExecuteUnsafeQueryCtx, sql: string, values?: any): Promise<any[]>;
     protected getContextCfg(): ICrudProCfg;
     protected getExecuteFunction(funcName: string): any;
 }

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

@@ -45,8 +45,9 @@ class CrudProServiceBase {
      */
     async executeUnsafeQuery(obj, sql, values) {
         const sqlCfgModel = {
-            sqlTable: obj.tableName,
-            sqlDatabase: obj.dbName,
+            sqlTable: obj.sqlTable,
+            sqlDatabase: obj.sqlDatabase,
+            sqlDbType: obj.sqlDbType,
             columns: [],
             columnsRelation: [],
             maxLimit: defaultConfigs_1.DEFAULT_MAX_LIMIT,

package/dist/libs/crud-pro/services/CrudProTableMetaService.d.ts

@@ -4,5 +4,6 @@ import { ITableMeta } from '../interfaces';
 declare class CrudProTableMetaService extends CrudProServiceBase {
     getTableMeta(sqlCfgModel: SqlCfgModel): Promise<ITableMeta>;
     private loadTableMeta;
+    private loadTableColumnInfo;
 }
 export { CrudProTableMetaService };

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

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrudProTableMetaService = void 0;
 const CrudProServiceBase_1 = require("./CrudProServiceBase");
+const keys_1 = require("../models/keys");
+const convertPgType_1 = require("../utils/sqlConvert/convertPgType");
 class CrudProTableMetaCache {
     constructor() {
         this.cacheMap = {};
@@ -39,15 +41,37 @@ class CrudProTableMetaService extends CrudProServiceBase_1.CrudProServiceBase {
             tableColumns: [],
         };
         const baseInfo = {
-            tableName: sqlCfgModel.sqlTable,
-            dbName: sqlCfgModel.sqlDatabase,
+            sqlTable: sqlCfgModel.sqlTable,
+            sqlDatabase: sqlCfgModel.sqlDatabase,
+            sqlDbType: sqlCfgModel.sqlDbType
         };
-        const [tableDescribe] = await this.executeUnsafeQuery(baseInfo, 'describe ' + sqlCfgModel.sqlTable);
-        const tableDescribe2 = JSON.parse(JSON.stringify(tableDescribe));
-        obj.tableColumns = tableDescribe2.map(fieldObj => {
-            return fieldObj['Field'];
-        });
+        obj.tableColumns = await this.loadTableColumnInfo(baseInfo);
         return obj;
     }
+    async loadTableColumnInfo(baseInfo) {
+        if (baseInfo.sqlDbType === keys_1.SqlDbType.mysql) {
+            const [tableDescribe] = await this.executeUnsafeQuery(baseInfo, 'describe ' + baseInfo.sqlTable);
+            const tableDescribe2 = JSON.parse(JSON.stringify(tableDescribe));
+            return tableDescribe2.map(fieldObj => {
+                return fieldObj['Field'];
+            });
+        }
+        else if (baseInfo.sqlDbType === keys_1.SqlDbType.postgres) {
+            const schemaname = 'public';
+            const columnArraySql = `
+      SELECT
+        *
+        FROM information_schema.columns
+        WHERE table_schema = '${schemaname}' and table_name = '${baseInfo.sqlTable}'
+        ORDER BY ordinal_position;
+      `.trim();
+            const queryRes = await this.executeUnsafeQuery(baseInfo, columnArraySql);
+            const rows = (0, convertPgType_1.pickAndConvertPgRows)(queryRes);
+            return rows.map(fieldObj => {
+                return fieldObj['column_name'];
+            });
+        }
+        throw new Error("暂不支持的数据库类型：" + baseInfo.sqlDbType);
+    }
 }
 exports.CrudProTableMetaService = CrudProTableMetaService;

package/dist/libs/crud-pro/utils/DatabaseName.js

@@ -2,14 +2,35 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toDatabaseNameStr = exports.parseDatabaseName = exports.SPLIT_CONST = void 0;
 const keys_1 = require("../models/keys");
-const SPLIT_CONST = "_________";
+const SPLIT_CONST = '_________';
 exports.SPLIT_CONST = SPLIT_CONST;
+const PREFIX_MYSQL = `${keys_1.SqlDbType.mysql}${SPLIT_CONST}`;
+const PREFIX_POSTGRES = `${keys_1.SqlDbType.postgres}${SPLIT_CONST}`;
+const PREFIX_SQLSERVER = `${keys_1.SqlDbType.sqlserver}${SPLIT_CONST}`;
 function parseDatabaseName(databaseName) {
     const dbNameArr = databaseName.split(SPLIT_CONST);
+    if (databaseName.startsWith(PREFIX_MYSQL)) {
+        return {
+            dbType: keys_1.SqlDbType.mysql,
+            dbName: dbNameArr[1],
+        };
+    }
+    if (databaseName.startsWith(PREFIX_POSTGRES)) {
+        return {
+            dbType: keys_1.SqlDbType.postgres,
+            dbName: dbNameArr[1],
+        };
+    }
+    if (databaseName.startsWith(PREFIX_SQLSERVER)) {
+        return {
+            dbType: keys_1.SqlDbType.sqlserver,
+            dbName: dbNameArr[1],
+        };
+    }
     if (dbNameArr.length === 1) {
         return {
             dbType: keys_1.SqlDbType.mysql,
-            dbName: dbNameArr[0]
+            dbName: dbNameArr[0],
         };
     }
     if (dbNameArr.length > 1) {
@@ -17,7 +38,7 @@ function parseDatabaseName(databaseName) {
         const dbType = dbType0;
         return {
             dbType,
-            dbName
+            dbName,
         };
     }
     return null;

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

@@ -16,6 +16,12 @@ interface IGlobalStaticConfig {
      * @param ctx
      */
     bizUpdateCfgModelForCrudMtd(reqJson: any, cfgModel: any, methodInfo: any, ctx: any): Promise<any>;
+    /**
+     * CrudPro: 业务系统自定义的修改cfgModel。这是最底层的！！全局的！！全局的！！全局的！！！
+     * @param reqJson
+     * @param cfgModel
+     */
+    bizUpdateCfgModelForCrudPro(reqJson: any, cfgModel: any): Promise<any>;
     /**
      * 生成用户的账号ID，业务系统可以生成类似工号的ID
      * @param userSubmitData

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

@@ -10,6 +10,7 @@ class GlobalStaticConfig {
         this.configObject = {
             bizUpdateCfgModelForCrudStd: noop,
             bizUpdateCfgModelForCrudMtd: noop,
+            bizUpdateCfgModelForCrudPro: noop,
             generateUserAccountId: null,
             toFatcmsUserAccountId: (bizTableUserId) => {
                 return bizTableUserId;