midway-fatcms 0.0.1-beta.2 → 0.0.1-beta.22

package/src/controller/manage/UserAccountManageApi.ts

@@ -7,6 +7,7 @@ import { checkPermission } from '../../middleware/permission.middleware';
 import { SystemFuncCode } from '../../models/SystemPerm';
 import { CommonException, Exceptions } from '../../libs/crud-pro/exceptions';
 import { SystemTables } from '../../models/SystemTables';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 const accountNameBlacklist = new Set(['sa', 'root', 'admin', 'superadmin', 'administrator', 'sys', 'sysop', 'schedule_user']);
 function checkAccountCreateBlacklist(value: string) {
@@ -18,12 +19,12 @@ function checkAccountCreateBlacklist(value: string) {
   }
 }
 
-const LOGIN_NAME_VALIDATE =  [KeysOfValidators.STRING, KeysOfValidators.NAME, 'length:6,50', checkAccountCreateBlacklist]
+const LOGIN_NAME_VALIDATE = [KeysOfValidators.STRING, KeysOfValidators.NAME, 'length:6,50', checkAccountCreateBlacklist];
 
 @Controller('/ns/api/manage/userAccount', { middleware: [checkPermission(SystemFuncCode.UserAccountMangeRead)] })
 export class UserAccountManageApi extends BaseApiController {
   @Inject()
-  ctx: Context;
+  protected ctx: Context;
 
   @Post('/getUserAccountList')
   async getUserAccountList() {
@@ -43,7 +44,7 @@ export class UserAccountManageApi extends BaseApiController {
   async updateUserAccount() {
     return this.executeSysSimpleSQL(SystemTables.sys_user_account, KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
         'data.login_name': LOGIN_NAME_VALIDATE,
         'data.nick_name': [KeysOfValidators.STRING, 'length:3,20', checkAccountCreateBlacklist],
       },
@@ -58,6 +59,11 @@ export class UserAccountManageApi extends BaseApiController {
     const body = this.ctx.request.body as any;
     body.data.account_id = createUniqueId();
 
+    const { generateUserAccountId } = GLOBAL_STATIC_CONFIG.getConfig();
+    if (typeof generateUserAccountId === 'function') {
+      body.data.account_id = await generateUserAccountId(body.data);
+    }
+
     return this.executeSysSimpleSQL(SystemTables.sys_user_account, KeysOfSimpleSQL.SIMPLE_INSERT, {
       validateCfg: {
         'data.login_name': LOGIN_NAME_VALIDATE,
@@ -71,7 +77,7 @@ export class UserAccountManageApi extends BaseApiController {
   async deleteUserAccount() {
     return this.executeSysSimpleSQL(SystemTables.sys_user_account, KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
       },
     });
   }

package/src/controller/manage/WorkbenchMangeApi.ts

@@ -1,11 +1,11 @@
 import { Controller, Inject, Post } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
-import { KeysOfSimpleSQL, KeysOfValidators } from '../../libs/crud-pro/models/keys';
+import { KeysOfSimpleSQL, KeysOfValidators } from '@/libs/crud-pro/models/keys';
 import { BaseApiController } from '../base/BaseApiController';
-import { checkPermission } from '../../middleware/permission.middleware';
-import { SystemFuncCode } from '../../models/SystemPerm';
-import { SystemTables } from '../../models/SystemTables';
-import { WorkbenchService } from '../../service/WorkbenchService';
+import { checkPermission } from '@/middleware/permission.middleware';
+import { SystemFuncCode } from '@/models/SystemPerm';
+import { SystemTables } from '@/models/SystemTables';
+import { WorkbenchService } from '@/service/WorkbenchService';
 
 @Controller('/ns/api/manage/workbench', { middleware: [checkPermission(SystemFuncCode.WorkbenchMangeRead)] })
 export class WorkbenchMangeApi extends BaseApiController {
@@ -33,7 +33,7 @@ export class WorkbenchMangeApi extends BaseApiController {
     const body = this.ctx.request.body as any;
     const dataObj: any = body.data || {};
 
-    dataObj.html_content = dataObj.html_content || "<html>hello</html>";
+    dataObj.html_content = dataObj.html_content || '<html>hello</html>';
 
     return this.executeSysSimpleSQL(SystemTables.sys_workbench, KeysOfSimpleSQL.SIMPLE_INSERT, {
       validateCfg: {
@@ -51,7 +51,7 @@ export class WorkbenchMangeApi extends BaseApiController {
 
     return this.executeSysSimpleSQL(SystemTables.sys_workbench, KeysOfSimpleSQL.SIMPLE_UPDATE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
         'condition.workbench_code': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
       },
     });
@@ -64,7 +64,7 @@ export class WorkbenchMangeApi extends BaseApiController {
 
     return this.executeSysSimpleSQL(SystemTables.sys_workbench, KeysOfSimpleSQL.SIMPLE_DELETE, {
       validateCfg: {
-        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.INTEGER],
+        'condition.id': [KeysOfValidators.REQUIRED, KeysOfValidators.NUMERIC],
         'condition.workbench_code': [KeysOfValidators.REQUIRED, KeysOfValidators.STRING],
       },
     });

package/src/controller/myinfo/AuthController.ts

@@ -1,14 +1,13 @@
 import { Controller, Inject, Post } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
-import axios from 'axios';
 import { BaseApiController } from '../base/BaseApiController';
 import { AuthService } from '../../service/AuthService';
-import {IConsumerUserInfo, ISessionInfo, SESSION_ID_KEY, sessionCookieCfg} from '../../models/userSession';
+import { ISessionInfo, SESSION_ID_KEY, sessionCookieCfg } from '../../models/userSession';
 import { CommonResult } from '../../libs/utils/common-dto';
 import { checkLogin } from '../../middleware/permission.middleware';
-import { assertCsrfToken } from "../../libs/utils/fatcms-request";
-import {WorkbenchService} from "../../service/WorkbenchService";
-import {CommonException} from "../../libs/crud-pro/exceptions";
+import { assertCsrfToken } from '../../libs/utils/fatcms-request';
+import { WorkbenchService } from '../../service/WorkbenchService';
+import { CommonException } from '../../libs/crud-pro/exceptions';
 
 /**
  * 支持使用明文密码和Hash后密码登录。
@@ -23,7 +22,6 @@ export class AuthController extends BaseApiController {
   @Inject()
   private authService: AuthService;
 
-
   @Inject()
   private workbenchService: WorkbenchService;
 
@@ -54,7 +52,6 @@ export class AuthController extends BaseApiController {
       throw new CommonException('WORKBENCH_IS_NOT_FOUND', '站点未找到');
     }
 
-
     const userSessionInfo = await this.authService.createUserSession(loginName, workbench.workbench_code);
 
     this.ctx.cookies.set(SESSION_ID_KEY, userSessionInfo.sessionId, sessionCookieCfg);
@@ -62,67 +59,6 @@ export class AuthController extends BaseApiController {
     return CommonResult.successMsg('登录成功', userSessionInfo);
   }
 
-
-  /**
-   * 使用https://medstatistic.com/账号登录
-   */
-  @Post('/loginByMedStatistic')
-  async loginByMedStatistic(): Promise<CommonResult> {
-
-    const { medStatisticToken } = this.ctx.request.body as any;
-    if (!medStatisticToken) {
-      return CommonResult.errorRes("medStatisticToken is null")
-    }
-
-    const workbench = await this.workbenchService.getCurrentHostWorkbenchInfo();
-    if (!workbench) {
-      throw new CommonException('WORKBENCH_IS_NOT_FOUND', '站点未找到');
-    }
-
-    // 先删除之前的cookie
-    const sessionId = this.ctx.cookies.get(SESSION_ID_KEY, sessionCookieCfg);
-    await this.authService.removeUserSession(sessionId);
-
-
-    let userInfoRes: any = null;
-    try {
-      userInfoRes = await axios.get("https://console.medstatistic.com/api/user/index?lang=zh-cn", {
-        headers: {
-          host: "console.medstatistic.com",
-          origin: "https://console.medstatistic.com",
-          token: medStatisticToken
-        },
-        responseType: 'json'
-      });
-
-    } catch (e) {
-      return CommonResult.errorRes(e?.message || '');
-    }
-
-    const userInfo = userInfoRes?.data?.data;
-
-    if (!userInfo || !userInfo.id) {
-      return CommonResult.errorRes("USER_NOT_EXIST")
-    }
-
-    const consumerUserInfo: IConsumerUserInfo = {
-      workbenchCode: workbench.workbench_code,
-      accountType: 'medstatistic',
-      accountId: userInfo.id,
-      nickName: userInfo.nickname,
-      loginName: `${userInfo.id}_${userInfo.username}`,
-      avatar: userInfo.avatar,
-    };
-
-    const userSessionInfo = await this.authService.createUserSessionForConsumer(consumerUserInfo);
-
-    this.ctx.cookies.set(SESSION_ID_KEY, userSessionInfo.sessionId, sessionCookieCfg);
-
-    return CommonResult.successMsg('登录成功', userSessionInfo);
-  }
-
-
-
   /**
    * 退出
    */
@@ -134,19 +70,17 @@ export class AuthController extends BaseApiController {
     return CommonResult.successMsg('退出成功');
   }
 
-
   /**
    * 避免Session过期，前端需要定时调用此接口刷新
    */
   @Post('/refreshSession', { middleware: [checkLogin()] })
   async refreshSession(): Promise<CommonResult> {
-    const sessionInfo:ISessionInfo = this.ctx.userSession.getSessionInfo();
+    const sessionInfo: ISessionInfo = this.ctx.userSession.getSessionInfo();
     const newSessionInfo: ISessionInfo = await this.authService.refreshSession(sessionInfo);
     this.ctx.cookies.set(SESSION_ID_KEY, newSessionInfo.sessionId, sessionCookieCfg);
     return CommonResult.successRes(newSessionInfo);
   }
 
-
   /**
    * 修改我自己的密码
    */
@@ -156,7 +90,7 @@ export class AuthController extends BaseApiController {
     const loginName = this.ctx.userSession.getSessionInfo().loginName;
 
     if (loginName === 'devopsviewer') {
-      return CommonResult.errorRes("开放体验账号不支持修改密码")
+      return CommonResult.errorRes('开放体验账号不支持修改密码');
     }
 
     return this.userAccountService.chgUserPassword(loginName, unsaltedPwd);

package/src/controller/render/AppRenderController.ts

@@ -1,12 +1,12 @@
-import {Inject, Controller, Get, Param} from '@midwayjs/core';
-import {Context} from '@midwayjs/koa';
-import {BaseApiController} from '../base/BaseApiController';
-import {KeysOfSimpleSQL} from '../../libs/crud-pro/models/keys';
-import {SystemDbName, SystemDbType, SystemTables} from '../../models/SystemTables';
-import {WorkbenchService} from '../../service/WorkbenchService';
-import {createRenderUtils} from "../../libs/utils/render-utils";
-import {privateAES} from "../../libs/utils/crypto-utils";
-
+import { Inject, Controller, Get, Param } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { BaseApiController } from '../base/BaseApiController';
+import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
+import { SystemTables } from '../../models/SystemTables';
+import { WorkbenchService } from '../../service/WorkbenchService';
+import { createRenderUtils } from '../../libs/utils/render-utils';
+import { privateAES } from '../../libs/utils/crypto-utils';
+import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 /**
  * 渲染独立外部应用
@@ -21,52 +21,55 @@ export class AppRenderController extends BaseApiController {
 
   @Get('/:appPath+')
   async home(@Param('appPath') appPath: string): Promise<string> {
+    const { SystemDbName, SystemDbType } = GLOBAL_STATIC_CONFIG.getConfig();
+
     const appPathArr = appPath.split('/');
     const appCode = appPathArr[0];
 
     const res = await this.curdMixService.executeCrudByCfg(
-      {condition: {app_code: appCode}},
+      { condition: { app_code: appCode } },
       {
         sqlTable: SystemTables.sys_app,
         sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY_ONE,
         sqlDatabase: SystemDbName,
-        sqlDdType: SystemDbType,
+        sqlDbType: SystemDbType,
       }
     );
 
-    const {row: appInfo} = res.getResModel();
+    const { row: appInfo } = res.getResModel();
     if (!appInfo) {
       this.ctx.status = 404;
-      return this.ctx.render('404_app', {appCode, errorMsg: ' 应用不存在'});
+      return this.ctx.render('404_app', { appCode, errorMsg: ' 应用不存在' });
     }
 
     if (appInfo.status !== 1) {
       this.ctx.status = 404;
-      return this.ctx.render('404_app', {appCode, errorMsg: ' 应用已下线'});
+      return this.ctx.render('404_app', { appCode, errorMsg: ' 应用已下线' });
     }
 
     const isSupportWorkbench = await this.isSupportCurrentWorkbench(appInfo);
     if (!isSupportWorkbench) {
       this.ctx.status = 404;
-      return this.ctx.render('404_app', {appCode, errorMsg: ' 应用没有绑定此站点'});
+      return this.ctx.render('404_app', { appCode, errorMsg: ' 应用没有绑定此站点' });
     }
 
     const workbenchInfo = await this.workbenchService.getCurrentHostWorkbenchInfo();
 
     const html_content = appInfo.html_content || '<b style="color: red">错误：未配置HTML模版，请检查!!</b>';
     const userInfo = this.getUserSessionInfo();
-    const fatcmscsrftoken = await privateAES.time_encrypt_utf8_base64("" + Date.now());
+    const fatcmscsrftoken = await privateAES.time_encrypt_utf8_base64('' + Date.now());
 
     const utils = createRenderUtils({
       ctx: this.ctx,
-      appInfo, workbenchInfo, userInfo, package_assets: appInfo.package_assets, fatcmscsrftoken
+      appInfo,
+      workbenchInfo,
+      userInfo,
+      package_assets: appInfo.package_assets,
+      fatcmscsrftoken,
     });
-    return this.ctx.renderString(html_content, {appInfo, workbenchInfo, userInfo, utils}, {viewEngine: 'ejs'});
+    return this.ctx.renderString(html_content, { appInfo, workbenchInfo, userInfo, utils }, { viewEngine: 'ejs' });
   }
 
-
-
-
   private async isSupportCurrentWorkbench(appInfo: any): Promise<boolean> {
     if (this.isLocalEnv()) {
       return true;

package/src/controller/test.controller.ts

@@ -1,15 +1,14 @@
-import {Controller, Get, Inject} from '@midwayjs/core';
-import {Context} from '@midwayjs/koa';
-import {CurdMixService} from '../service/curd/CurdMixService';
-import {BaseApiController} from "./base/BaseApiController";
-import {IRequestCfgModel} from "../libs/crud-pro/interfaces";
-import {KeysOfSimpleSQL, SqlDbType} from "../libs/crud-pro/models/keys";
-
+import { Controller, Get, Inject } from '@midwayjs/core';
+import { Context } from '@midwayjs/koa';
+import { CurdMixService } from '../service/curd/CurdMixService';
+import { BaseApiController } from './base/BaseApiController';
+import { IRequestCfgModel } from '../libs/crud-pro/interfaces';
+import { KeysOfSimpleSQL, SqlDbType } from '../libs/crud-pro/models/keys';
 
 // http://127.0.0.1:7002/ns/api/test/testPgQuery
 
 @Controller('/ns/api/test')
-export class TestApiController extends BaseApiController{
+export class TestApiController extends BaseApiController {
   @Inject()
   protected ctx: Context;
 
@@ -19,19 +18,20 @@ export class TestApiController extends BaseApiController{
   @Get('/testPgQuery')
   async testPgQuery() {
     const cfgModel: IRequestCfgModel = {
-      sqlTable: "test_table1",
+      sqlTable: 'test_table1',
       sqlSimpleName: KeysOfSimpleSQL.SIMPLE_QUERY,
-      sqlDatabase: "postgres_test1",
-      sqlDdType: SqlDbType.postgres,
+      sqlDatabase: 'postgres_test1',
+      sqlDbType: SqlDbType.postgres,
       updateCfg: {},
     };
 
-    return this.curdMixService.executeCrudByCfg({
-      condition: {
-        int4: "222"
-      }
-    },cfgModel)
-
+    return this.curdMixService.executeCrudByCfg(
+      {
+        condition: {
+          int4: '222',
+        },
+      },
+      cfgModel
+    );
   }
-
 }

package/src/index.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';
@@ -30,10 +31,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';
@@ -67,5 +64,42 @@ 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';
+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';
+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/crud-pro/models/ResModel';
+
+export * from './libs/global-config/global-config';

package/src/libs/crud-pro/CrudPro.ts

@@ -89,6 +89,9 @@ class CrudPro {
     const logger = this.executeContext.getLogger();
     logger.info('CurdPro executeCrudByCfg', cfgJson);
 
+    // 在执行之前可以根据业务需要修改需要执行的内容。
+    await this.beforeExecuteSQLList(reqJson, cfgJson);
+
     const exeCtx = this.executeContext;
 
     if (!cfgJson.method) {
@@ -153,6 +156,10 @@ class CrudPro {
   private async afterExecuteSQLList() {
     return this.executeContext.contextFunc.afterExecuteSQLList();
   }
+
+  private async beforeExecuteSQLList(reqJson: IRequestModel, cfgJson: IRequestCfgModel) {
+    return this.executeContext.contextFunc.beforeExecuteSQLList(reqJson, cfgJson);
+  }
 }
 
 export { CrudPro };

package/src/libs/crud-pro/defaultConfigs.ts

@@ -1,7 +1,9 @@
 import { ICrudProCfg } from './interfaces';
+import { SqlDbType } from './models/keys';
 
 export const defaultCrudProCfg: ICrudProCfg = {
   sysDatabaseName: 'fatcms',
+  sysDatabaseDbType: SqlDbType.mysql, // 默认系统数据库名称，默认 mysql
   sysConfigTableName: 'sys_configs', // 数据表：通用配置
   dictItemTableName: 'sys_data_dict_item', // 数据表：数据字典，字典项。
   methodsTableName: 'sys_crud_methods',

package/src/libs/crud-pro/interfaces.ts

@@ -1,9 +1,10 @@
 // import { Pool as MysqlPool } from 'mysql2/promise';
 // import { Pool as PostgresPool } from 'pg';
-import {KeysOfAuthType, KeysOfSimpleSQL, KeysOfValidators, SqlDbType} from './models/keys';
+import { KeysOfAuthType, KeysOfSimpleSQL, KeysOfValidators, SqlDbType } from './models/keys';
 
 export interface ICrudProCfg {
   sysDatabaseName?: string; // 默认系统数据库名称，默认 fatcms
+  sysDatabaseDbType?: SqlDbType; // 默认系统数据库名称，默认 mysql
   methodsTableName?: string; // 方法配置的表名，默认 sys_crud_methods
   methodsCacheTime?: number; //内存缓存时间默认 1分钟
   dictItemTableName?: string; // 字典项表名称，默认：sys_data_dict_item
@@ -102,7 +103,7 @@ export interface IBaseCfgModel {
   sqlTable?: string; // 可以为空. originSql中不包含@@table时可以为空
   sqlSchema?: string; // 可以为空
   sqlDatabase?: string; // 可以为空，用此字段进行connection的选择和切换。配合getBizConnectionPool使用
-  sqlDdType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
+  sqlDbType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
   maxLimit?: number; // 最大一次性返回的数量
   columns?: string | string[]; // "columns": "id,name,age,sex,addr",
   columnsRelation?: ColumnRelation[];
@@ -133,7 +134,7 @@ export interface ISqlCfgModel extends IBaseCfgModel {
   originSql?: string; // 有特殊占位符的SQL, 原始的SQL
   validate?: IFuncCfgModel; //执行前，进行校验，校验不通过就抛出异常. 校验函数可以返回 boolean或直接抛出异常
   executeWhen?: IFuncCfgModel; //满足表达式的结果，才能执行。 默认：true 校验函数必须返回 boolean
-  executeSql?: string; // 可以运行的SQL
+  executeSql?: string; // 可以运行的SQL。在postgres/sqlserver环境下也可以使用问号。
   executeSqlArgs?: any[]; //可以运行的SQL的参数
   crudType?: string;
 }
@@ -181,3 +182,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;
+}

package/src/libs/crud-pro/models/ExecuteContext.ts

@@ -7,7 +7,7 @@ import { Transaction } from './Transaction';
 import { ICrudProCfg, ILogger, IVisitor } from '../interfaces';
 import { IExecuteContextFunc } from './ExecuteContextFunc';
 import { defaultCrudProCfg } from '../defaultConfigs';
-
+import { ResModelFlexible } from './ResModel';
 
 class ExecuteContext {
   // 运行前设置的
@@ -20,7 +20,7 @@ class ExecuteContext {
   // 运行时设置的。
   private sqlCfgModels: SqlCfgModel[] = [];
   private reqModel: RequestModel = null;
-  private resModel: Record<string, any> = {};
+  private resModel: ResModelFlexible = {};
   private cfgModel: RequestCfgModel = null;
 
   setTransaction(transaction: Transaction) {
@@ -62,7 +62,7 @@ class ExecuteContext {
     this.reqModel = reqModel;
   }
 
-  getResModel(): Record<string, any> {
+  getResModel(): ResModelFlexible {
     return this.resModel;
   }
 

package/src/libs/crud-pro/models/ExecuteContextFunc.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';
@@ -14,6 +14,7 @@ export interface IExecuteContextFunc {
   getFunctionMap(): any;
   validateByAuthCfg(cfgModel: RequestCfgModel, reqModel: RequestModel): Promise<any>;
   afterExecuteSQLList(): Promise<any>;
+  beforeExecuteSQLList(reqJson: IRequestModel, cfgJson: IRequestCfgModel): Promise<any>;
 }
 
 export class BaseExecuteContextFunc implements IExecuteContextFunc {
@@ -76,6 +77,15 @@ export class BaseExecuteContextFunc implements IExecuteContextFunc {
     return null;
   }
 
+  /**
+   * 在执行之前可以根据业务需要修改需要执行的内容
+   * @param reqJson
+   * @param cfgJson
+   */
+  beforeExecuteSQLList(reqJson: IRequestModel, cfgJson: IRequestCfgModel): Promise<any> {
+    return Promise.resolve();
+  }
+
   getExecuteContext(): ExecuteContext {
     return this.executeContext;
   }

package/src/libs/crud-pro/models/RequestCfgModel.ts

@@ -38,7 +38,7 @@ class RequestCfgModel {
   sqlTable: string; // 可以为空. originSql中不包含@@table时可以为空
   sqlSchema?: string; // 可以为空
   sqlDatabase?: string; // 可以为空，用此字段进行connection的选择和切换。配合getBizConnectionPool使用
-  sqlDdType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
+  sqlDbType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
   maxLimit = DEFAULT_MAX_LIMIT; // 最大一次性返回的数量
   method: string; // 不能为空
   transactionEnable: boolean; // 是否开启事务，默认不开启，每条语句都是autocommit

package/src/libs/crud-pro/models/RequestModel.ts

@@ -2,7 +2,7 @@ import * as _ from 'lodash';
 import { ILimitOffset, IOrderByItem, IRequestModel, IVisitor } from '../interfaces';
 import { MixinUtils } from '../utils/MixinUtils';
 import { CommonException, Exceptions } from '../exceptions';
-import {DEFAULT_LIMIT} from "../defaultConfigs";
+import { DEFAULT_LIMIT } from '../defaultConfigs';
 
 class RequestModel {
   visitor: IVisitor;

package/src/libs/crud-pro/models/ResModel.ts

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

package/src/libs/crud-pro/models/SqlCfgModel.ts

@@ -1,6 +1,6 @@
 import { ColumnRelation, IFuncCfgModel, ISqlCfgModel } from '../interfaces';
 import { MixinUtils } from '../utils/MixinUtils';
-import { KeyOfCrudTypes, KeysOfSqlResPicker, SqlDbType} from './keys';
+import { KeyOfCrudTypes, KeysOfSqlResPicker, SqlDbType } from './keys';
 import { parseJsonObject } from '../../utils/functions';
 
 const { isEmpty } = MixinUtils;
@@ -11,7 +11,7 @@ class SqlCfgModel {
   sqlTable: string; // 可以为空. originSql中不包含@@table时可以为空
   sqlSchema?: string; // 可以为空
   sqlDatabase?: string; // 可以为空，用此字段进行connection的选择和切换。配合getBizConnectionPool使用
-  sqlDdType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
+  sqlDbType?: SqlDbType; // 数据库类型，mysql(默认) 、postgres
   maxLimit: number; // 最大一次性返回的数量
   resName: string;
   resPicker: KeysOfSqlResPicker;

package/src/libs/crud-pro/models/Transaction.ts

@@ -1,14 +1,13 @@
-import {IConnectionPool, IPoolConnectionClient} from '../interfaces';
-import {SqlDbType} from "./keys";
-import {TransactionMySQL} from "./TransactionMySQL";
-import {TransactionPostgres} from "./TransactionPostgres";
-import {TransactionSqlServer} from "./TransactionSqlServer";
+import { IConnectionPool, IPoolConnectionClient } from '../interfaces';
+import { SqlDbType } from './keys';
+import { TransactionMySQL } from './TransactionMySQL';
+import { TransactionPostgres } from './TransactionPostgres';
+import { TransactionSqlServer } from './TransactionSqlServer';
 
 class Transaction {
-
-  private transactionMySQL : TransactionMySQL = new TransactionMySQL();
-  private transactionPostgres : TransactionPostgres  = new TransactionPostgres();
-  private transactionSqlServer : TransactionSqlServer  = new TransactionSqlServer();
+  private transactionMySQL: TransactionMySQL = new TransactionMySQL();
+  private transactionPostgres: TransactionPostgres = new TransactionPostgres();
+  private transactionSqlServer: TransactionSqlServer = new TransactionSqlServer();
 
   private getTxObj(pool: IConnectionPool): TransactionMySQL | TransactionPostgres | TransactionSqlServer {
     if (pool.dbType === SqlDbType.postgres) {