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

package/src/libs/crud-pro/services/CrudProCachedCfgService.ts

@@ -7,46 +7,54 @@ import MemoryRefreshCache from '../utils/MemoryRefreshCache';
 
 const methodCache = new MemoryRefreshCache();
 
-
 function parseMethodInfo(methodInfo: any): any {
   const row: any = camelizeKeys(methodInfo as object); //转换成驼峰
   const configObject = MixinUtils.parseJsonObject(row.moreConfig) || {};
   const sqlCfgList = MixinUtils.parseJsonObject(row.sqlCfgList) || [];
-  return {...configObject, ...row, sqlCfgList};
+  return { ...configObject, ...row, sqlCfgList };
 }
 
-
-
 class CrudProCachedCfgService extends CrudProServiceBase {
   constructor(serviceHub: ICurdProServiceHub) {
     super(serviceHub);
   }
 
   public async getCachedCfgByMethod(method: string, isEnableCache: boolean): Promise<IRequestCfgModel | null> {
+    const methodInfo = await this.getCachedCfgByMethodInner(method, isEnableCache);
+    if (!methodInfo) {
+      return null;
+    }
+    return { ...methodInfo };
+  }
 
+  private async getCachedCfgByMethodInner(method: string, isEnableCache: boolean): Promise<IRequestCfgModel | null> {
     // 不使用缓存
     if (!isEnableCache) {
-      return await this.loadMethodInfo(method)
+      return await this.loadMethodInfo(method);
     }
 
     methodCache.setProps({
-      keepTime: 2000,
+      keepTime: 1000 * 60 * 2, // 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);
   }
 
-
   private async loadMethodInfo(method: string): Promise<any> {
-    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, // // 方法配置的表名，默认 sys_crud_pro_methods
-      dbName: sysDatabaseName,
+      sqlTable: methodsTableName,
+      sqlDatabase: sysDatabaseName,
+      sqlDbType: sysDatabaseDbType,
     };
+
     const [rows] = await this.executeUnsafeQuery(baseInfo, sql, [method]);
     const rows2: any[] = rows as object[];
     if (rows2.length > 0) {
@@ -55,14 +63,13 @@ class CrudProCachedCfgService extends CrudProServiceBase {
     return null;
   }
 
-
-
   private async loadMethodInfoList(): Promise<any[]> {
-    const { methodsTableName, sysDatabaseName } = this.getContextCfg();
+    const { methodsTableName, sysDatabaseName, sysDatabaseDbType } = this.getContextCfg();
     const sql = `select * from ${methodsTableName}`; // 全部加载到内存
     const baseInfo = {
-      tableName: methodsTableName, // // 方法配置的表名，默认 sys_crud_pro_methods
-      dbName: sysDatabaseName,
+      sqlTable: methodsTableName,
+      sqlDatabase: sysDatabaseName,
+      sqlDbType: sysDatabaseDbType,
     };
     const [rows] = await this.executeUnsafeQuery(baseInfo, sql);
     const rows2: any[] = rows as object[];

package/src/libs/crud-pro/services/CrudProExecuteSqlService.ts

@@ -1,16 +1,16 @@
 import * as _ from 'lodash';
-import {PoolClient} from 'pg'
-import {CrudProServiceBase} from './CrudProServiceBase';
-import {SqlCfgModel} from '../models/SqlCfgModel';
-import {KeyOfCrudTypes, KeysOfCustomSQL, KeysOfSqlResPicker, SqlDbType} from '../models/keys';
-import {CommonException, Exceptions} from '../exceptions';
-import {pickAndConvertPgRows} from '../utils/sqlConvert/convertPgType';
-import {replaceQuestionMarks} from "../utils/sqlConvert/convertPgSql";
-import {replaceQuestionMarksForMssql} from "../utils/sqlConvert/convertMsSql";
-import {ModelUtils} from '../utils/ModelUtils';
-import {MixinUtils} from '../utils/MixinUtils';
-import {FuncContext} from '../models/FuncContext';
-import {ExecuteContext} from "../models/ExecuteContext";
+import { PoolClient } from 'pg';
+import { CrudProServiceBase } from './CrudProServiceBase';
+import { SqlCfgModel } from '../models/SqlCfgModel';
+import { KeyOfCrudTypes, KeysOfCustomSQL, KeysOfSqlResPicker, SqlDbType } from '../models/keys';
+import { CommonException, Exceptions } from '../exceptions';
+import { pickAndConvertPgRows } from '../utils/sqlConvert/convertPgType';
+import { replaceQuestionMarks } from '../utils/sqlConvert/convertPgSql';
+import { replaceQuestionMarksForMssql } from '../utils/sqlConvert/convertMsSql';
+import { ModelUtils } from '../utils/ModelUtils';
+import { MixinUtils } from '../utils/MixinUtils';
+import { FuncContext } from '../models/FuncContext';
+import { ExecuteContext } from '../models/ExecuteContext';
 
 const { checkFuncCfgValid } = ModelUtils;
 const { isEmpty } = MixinUtils;
@@ -33,73 +33,62 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
 
     const exeCtx = this.getExecuteContext();
     const connection = await this.getTxConnectionBySqlCfg(sqlCfgModel);
-    const executeSqlArgs = this.handleExecuteSqlArgsByResModel(exeCtx, sqlCfgModel.executeSqlArgs || [])
-
+    const executeSqlArgs = this.handleExecuteSqlArgsByResModel(exeCtx, sqlCfgModel.executeSqlArgs || []);
 
     let sqlRes: any;
-    let queryRes : any;
+    let queryRes: any;
 
-    if (sqlCfgModel.sqlDdType === SqlDbType.postgres) { // import { PoolClient } from 'pg';
+    if (sqlCfgModel.sqlDbType === SqlDbType.postgres) {
+      // import { PoolClient } from 'pg';
 
       const pgClient: PoolClient = connection as any;
       const pgSql = replaceQuestionMarks(sqlCfgModel.executeSql);
 
       this.logger.info('executeSqlCfgModel_postgres', pgSql, executeSqlArgs, sqlCfgModel.resPicker);
 
-
       queryRes = await pgClient.query({
         text: pgSql,
-        values: executeSqlArgs || []
+        values: executeSqlArgs || [],
       });
-      sqlRes = pickAndConvertPgRows(queryRes)
-
-    }
-
-    else if (sqlCfgModel.sqlDdType === SqlDbType.sqlserver) {
-
+      sqlRes = pickAndConvertPgRows(queryRes);
+    } else if (sqlCfgModel.sqlDbType === SqlDbType.sqlserver) {
       const mssql = replaceQuestionMarksForMssql(sqlCfgModel.executeSql);
 
       this.logger.info('executeSqlCfgModel_sqlserver', mssql, executeSqlArgs, sqlCfgModel.resPicker);
       // SQLServer
       queryRes = await connection.query(mssql, executeSqlArgs);
-      sqlRes = _.get(queryRes,'recordsets[0]') || []
-    }
-
-    else {
-
+      sqlRes = _.get(queryRes, 'recordsets[0]') || [];
+    } else {
       this.logger.info('executeSqlCfgModel_mysql', sqlCfgModel.executeSql, executeSqlArgs, sqlCfgModel.resPicker);
 
-
       // MYSQL
       queryRes = await connection.query(sqlCfgModel.executeSql, executeSqlArgs);
-      sqlRes = queryRes[0]
+      sqlRes = queryRes[0];
     }
 
     const resObject = this.toQueryResByResPicker(sqlRes, queryRes, sqlCfgModel);
     exeCtx.setResModelItem(sqlCfgModel.resName, resObject);
   }
 
-
   private handleExecuteSqlArgsByResModel(exeCtx: ExecuteContext, executeSqlArgs: any[]): any[] {
-    return executeSqlArgs.map((arg)=> {
-      if (arg && typeof arg === 'object' && typeof arg.___GENERATE_GET_RES_ATTR___ === 'string' ) {
+    return executeSqlArgs.map(arg => {
+      if (arg && typeof arg === 'object' && typeof arg.___GENERATE_GET_RES_ATTR___ === 'string') {
         const word: string = arg.___GENERATE_GET_RES_ATTR___;
         if (word.startsWith(KeysOfCustomSQL.SQL_PICK_RES_AS_NUMBER)) {
-          const resName = MixinUtils.removeStringPrefix(word, KeysOfCustomSQL.SQL_PICK_RES_AS_NUMBER)
+          const resName = MixinUtils.removeStringPrefix(word, KeysOfCustomSQL.SQL_PICK_RES_AS_NUMBER);
           this.logger.info('handleExecuteSqlArgsByResModel resName', resName);
           this.logger.info('handleExecuteSqlArgsByResModel getResModel', exeCtx.getResModel());
           return Number(exeCtx.getResModelItemLodash(resName) || 0);
         }
         if (word.startsWith(KeysOfCustomSQL.SQL_PICK_RES_AS_STRING)) {
-          const resName = MixinUtils.removeStringPrefix(word, KeysOfCustomSQL.SQL_PICK_RES_AS_STRING)
-          return String(exeCtx.getResModelItemLodash(resName) || "");
+          const resName = MixinUtils.removeStringPrefix(word, KeysOfCustomSQL.SQL_PICK_RES_AS_STRING);
+          return String(exeCtx.getResModelItemLodash(resName) || '');
         }
       }
       return arg;
-    })
+    });
   }
 
-
   private executeSqlCfgModelPreCheck(sqlCfgModel: SqlCfgModel): boolean {
     const crudType = sqlCfgModel.getCrudType();
 
@@ -245,18 +234,18 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
 
     // 增删改res的内容是修改结果：包括： insert\delete\update
     if (KeysOfSqlResPicker.UPDATE_RESULT === resPicker) {
-      if (sqlCfgModel.sqlDdType === SqlDbType.postgres) {
+      if (sqlCfgModel.sqlDbType === SqlDbType.postgres) {
         return {
-          insertId: _.get(queryRes,'rows[0].id'),
-          affectedRows: _.get(queryRes,'rowCount')
-        }
+          insertId: _.get(queryRes, 'rows[0].id'),
+          affectedRows: _.get(queryRes, 'rowCount'),
+        };
       }
 
-      if (sqlCfgModel.sqlDdType === SqlDbType.sqlserver) {
+      if (sqlCfgModel.sqlDbType === SqlDbType.sqlserver) {
         return {
-          insertId: _.get(queryRes,'recordset[0].id'),
-          affectedRows: _.get(queryRes,'rowsAffected[0]')
-        }
+          insertId: _.get(queryRes, 'recordset[0].id'),
+          affectedRows: _.get(queryRes, 'rowsAffected[0]'),
+        };
       }
 
       return sqlRes;
@@ -264,16 +253,15 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
 
     //其他配置：形如： sqlRes[0].total_count
     if (typeof resPicker === 'string') {
-      if (resPicker.startsWith('sqlRes')){
+      if (resPicker.startsWith('sqlRes')) {
         return _.get({ sqlRes }, resPicker);
       } else {
-        throw  new CommonException(Exceptions.RUN_EXECUTE_VALIDATE, 'resPicker必须是以sqlRes开头')
+        throw new CommonException(Exceptions.RUN_EXECUTE_VALIDATE, 'resPicker必须是以sqlRes开头');
       }
     }
 
     return sqlRes;
   }
-
 }
 
 export { CrudProExecuteSqlService };

package/src/libs/crud-pro/services/CrudProGenSqlCondition.ts

@@ -1,11 +1,11 @@
-import {SqlSegArg} from '../models/SqlSegArg';
-import {MixinUtils} from '../utils/MixinUtils';
-import {KeysOfConditions, SqlDbType} from '../models/keys';
-import {CommonException, Exceptions} from '../exceptions';
-import {ICompareCondition, IRequestCondition} from '../interfaces';
-import {TypeUtils} from '../utils/TypeUtils';
-import {SqlCfgModel} from "../models/SqlCfgModel";
-import {toSqlColumnName} from '../utils/sqlConvert/convertColumnName';
+import { SqlSegArg } from '../models/SqlSegArg';
+import { MixinUtils } from '../utils/MixinUtils';
+import { KeysOfConditions, SqlDbType } from '../models/keys';
+import { CommonException, Exceptions } from '../exceptions';
+import { ICompareCondition, IRequestCondition } from '../interfaces';
+import { TypeUtils } from '../utils/TypeUtils';
+import { SqlCfgModel } from '../models/SqlCfgModel';
+import { toSqlColumnName } from '../utils/sqlConvert/convertColumnName';
 
 const { equalsIgnoreCase, isEmpty, isNotEmpty } = MixinUtils;
 const { isBasicType, isNumber } = TypeUtils;
@@ -13,16 +13,14 @@ const { isBasicType, isNumber } = TypeUtils;
 const createFunc = (sqlCfg: SqlCfgModel) => {
   return {
     toSqlColumnName: (columnName: string): string => {
-      return toSqlColumnName(columnName, sqlCfg)
+      return toSqlColumnName(columnName, sqlCfg);
     },
     toMatchSqlColumnName: (columnName: string): string => {
       const arr = columnName.split(',');
-      return arr
-        .map(s => toSqlColumnName(s.trim(), sqlCfg))
-        .join(',');
-    }
-  }
-}
+      return arr.map(s => toSqlColumnName(s.trim(), sqlCfg)).join(',');
+    },
+  };
+};
 
 class ValueChecker {
   checkBasicArrayAndNotEmpty(value0: any, message: string) {
@@ -212,42 +210,31 @@ class CrudProGenSqlCondition {
           tmpArgList.push(value0);
           tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI like concat(?, '%')`; // like前缀匹配
 
-          if (this.sqlCfg.sqlDdType === SqlDbType.postgres) {
-            tmpSql = `${toSqlColumnName(key)} like concat(?, '%')`; // like前缀匹配
+          if (this.sqlCfg.sqlDbType === SqlDbType.postgres) {
+            tmpSql = `${toSqlColumnName(key)} like concat(?::text, '%')`; // like前缀匹配
           }
-
         } else if (equalsIgnoreCase(KeysOfConditions.$NOT_LIKE, compare)) {
           tmpArgList.push(value0);
           tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI not like concat(?, '%')`;
 
-
-          if (this.sqlCfg.sqlDdType === SqlDbType.postgres) {
-            tmpSql = `${toSqlColumnName(key)} not like concat(?, '%')`;
+          if (this.sqlCfg.sqlDbType === SqlDbType.postgres) {
+            tmpSql = `${toSqlColumnName(key)} not like concat(?::text, '%')`;
           }
-
-        }
-
-
-        else if (equalsIgnoreCase(KeysOfConditions.$LIKE_INCLUDE, compare)) {
+        } else if (equalsIgnoreCase(KeysOfConditions.$LIKE_INCLUDE, compare)) {
           tmpArgList.push(value0);
           tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI like concat('%', ?, '%')`; // like包含
 
-          if (this.sqlCfg.sqlDdType === SqlDbType.postgres) {
-            tmpSql = `${toSqlColumnName(key)} like concat('%', ?, '%')`; // like包含
+          if (this.sqlCfg.sqlDbType === SqlDbType.postgres) {
+            tmpSql = `${toSqlColumnName(key)} like concat('%', ?::text, '%')`; // like包含
           }
-
         } else if (equalsIgnoreCase(KeysOfConditions.$NOT_LIKE_INCLUDE, compare)) {
           tmpArgList.push(value0);
-          tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI not like concat('%',?, '%')`;  // like不包含
+          tmpSql = `${toSqlColumnName(key)} COLLATE UTF8MB4_GENERAL_CI not like concat('%',?, '%')`; // like不包含
 
-          if (this.sqlCfg.sqlDdType === SqlDbType.postgres) {
-            tmpSql = `${toSqlColumnName(key)} not like concat('%',?, '%')`;  // like不包含
+          if (this.sqlCfg.sqlDbType === SqlDbType.postgres) {
+            tmpSql = `${toSqlColumnName(key)} not like concat('%',?::text, '%')`; // like不包含
           }
-
-        }
-
-
-        else if (equalsIgnoreCase(KeysOfConditions.$MATCH, compare)) {
+        } else if (equalsIgnoreCase(KeysOfConditions.$MATCH, compare)) {
           tmpArgList.push(value0);
           tmpSql = `match(${toMatchSqlColumnName(key)}) against(?)`;
         } else if (equalsIgnoreCase(KeysOfConditions.$MATCH_BOOL, compare)) {
@@ -328,10 +315,7 @@ class CrudProGenSqlCondition {
           if (!isBasicType(value0)) {
             throwCommonException(KeysOfConditions.$NOT_LIKE, '字符串');
           }
-        }
-
-
-        else if (equalsIgnoreCase(KeysOfConditions.$LIKE_INCLUDE, compare)) {
+        } else if (equalsIgnoreCase(KeysOfConditions.$LIKE_INCLUDE, compare)) {
           if (!isBasicType(value0)) {
             throwCommonException(KeysOfConditions.$LIKE_INCLUDE, '字符串');
           }
@@ -339,10 +323,7 @@ class CrudProGenSqlCondition {
           if (!isBasicType(value0)) {
             throwCommonException(KeysOfConditions.$NOT_LIKE_INCLUDE, '字符串');
           }
-        }
-
-
-        else if (equalsIgnoreCase(KeysOfConditions.$MATCH, compare)) {
+        } else if (equalsIgnoreCase(KeysOfConditions.$MATCH, compare)) {
           if (!isBasicType(value0)) {
             throwCommonException(KeysOfConditions.$MATCH, '字符串');
           }

package/src/libs/crud-pro/services/CrudProGenSqlService.ts

@@ -1,8 +1,8 @@
 import { CrudProServiceBase } from './CrudProServiceBase';
 import { CommonException, Exceptions } from '../exceptions';
 import { MixinUtils } from '../utils/MixinUtils';
-import {KeysOfSimpleSQL, KeysOfSqlResPicker, SqlDbType} from '../models/keys';
-import {RequestCfgModel} from "../models/RequestCfgModel";
+import { KeysOfSimpleSQL, KeysOfSqlResPicker, SqlDbType } from '../models/keys';
+import { RequestCfgModel } from '../models/RequestCfgModel';
 
 const { equalsIgnoreCase, isEmpty, isNotEmpty } = MixinUtils;
 
@@ -96,11 +96,11 @@ class CrudProGenSqlService extends CrudProServiceBase {
    * @param cfgModel
    * @private
    */
-  private generateOriginSqlForDelete(cfgModel: RequestCfgModel) : string {
-    if (cfgModel.sqlDdType === SqlDbType.postgres) {
+  private generateOriginSqlForDelete(cfgModel: RequestCfgModel): string {
+    if (cfgModel.sqlDbType === SqlDbType.postgres) {
       return 'delete from @@table where @@asWhere:condition ';
     }
-    if (cfgModel.sqlDdType === SqlDbType.sqlserver) {
+    if (cfgModel.sqlDbType === SqlDbType.sqlserver) {
       return 'delete from @@table where @@asWhere:condition ';
     }
     return 'delete from @@table where @@asWhere:condition limit 100 '; // 删除操作，不能一次性删除太多
@@ -111,78 +111,63 @@ class CrudProGenSqlService extends CrudProServiceBase {
    * @param cfgModel
    * @private
    */
-  private generateOriginSqlForDuplicateInsert(cfgModel: RequestCfgModel) : string {
-    if (cfgModel.sqlDdType === SqlDbType.postgres) {
-      const uniqueColumn = cfgModel.uniqueColumn ; // id
+  private generateOriginSqlForDuplicateInsert(cfgModel: RequestCfgModel): string {
+    if (cfgModel.sqlDbType === SqlDbType.postgres) {
+      const uniqueColumn = cfgModel.uniqueColumn; // id
       if (!Array.isArray(uniqueColumn) || uniqueColumn.length === 0) {
-        throw new CommonException(Exceptions.CFG_ERROR_POSTGRES_UNIQUE_COLUMNS_NULL)
+        throw new CommonException(Exceptions.CFG_ERROR_POSTGRES_UNIQUE_COLUMNS_NULL);
       }
-      const unique_column = uniqueColumn.map((s)=>{
-        return `"${s}"`;
-      }).join(",")
+      const unique_column = uniqueColumn
+        .map(s => {
+          return `"${s}"`;
+        })
+        .join(',');
       return `insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data ) ON CONFLICT (${unique_column}) DO UPDATE set @@asUpdate:data `; // 关键字的前后，必须有空格
     }
 
-
-    if (cfgModel.sqlDdType === SqlDbType.sqlserver) {
-      const uniqueColumn = cfgModel.uniqueColumn ; // id
+    if (cfgModel.sqlDbType === SqlDbType.sqlserver) {
+      const uniqueColumn = cfgModel.uniqueColumn; // id
       if (uniqueColumn.length !== 1) {
         throw new CommonException(Exceptions.CFG_UNIQUE_COLUMN_COUNT_MUST_ONE);
       }
 
       const uniqueColumnStr = uniqueColumn[0];
-      const uniqueColumnVal = "@@data." + uniqueColumnStr;
-
-      const sql = "" +
-        `IF EXISTS (SELECT 1 FROM @@table WHERE [${uniqueColumnStr}] = ${uniqueColumnVal})` +
-        "BEGIN\n" +
-        "    UPDATE @@table\n" +
-        "    SET @@asUpdate:data\n" +
-        `    WHERE [${uniqueColumnStr}] = ${uniqueColumnVal} ;\n` +
-        "END\n" +
-        "ELSE\n" +
-        "BEGIN\n" +
-        "    INSERT INTO @@table ( @@asInsertKeys:data )\n" +
-        "    VALUES ( @@asInsertValues:data );\n" +
-        "END";
+      const uniqueColumnVal = '@@data.' + uniqueColumnStr;
+
+      const sql = '' + `IF EXISTS (SELECT 1 FROM @@table WHERE [${uniqueColumnStr}] = ${uniqueColumnVal})` + 'BEGIN\n' + '    UPDATE @@table\n' + '    SET @@asUpdate:data\n' + `    WHERE [${uniqueColumnStr}] = ${uniqueColumnVal} ;\n` + 'END\n' + 'ELSE\n' + 'BEGIN\n' + '    INSERT INTO @@table ( @@asInsertKeys:data )\n' + '    VALUES ( @@asInsertValues:data );\n' + 'END';
 
       return sql;
     }
 
-
     return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data )  on duplicate key update @@asUpdate:data '; // 关键字的前后，必须有空格
   }
 
-
   /**
    * 创建插入语句
    * @param cfgModel
    * @private
    */
   private generateOriginSqlForInsert(cfgModel: RequestCfgModel): string {
-    if (cfgModel.sqlDdType === SqlDbType.postgres) {
+    if (cfgModel.sqlDbType === SqlDbType.postgres) {
       return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data ) RETURNING * ';
     }
-    if (cfgModel.sqlDdType === SqlDbType.sqlserver) {
+    if (cfgModel.sqlDbType === SqlDbType.sqlserver) {
       return 'insert into @@table ( @@asInsertKeys:data ) OUTPUT INSERTED.* values( @@asInsertValues:data ) ';
     }
     return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data )'; // 关键字的前后，必须有空格
   }
 
-
-
-
   private async generateExecuteSql() {
     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.selectNotEmpty(sqlCfgModel.sqlDdType, sqlDdType);
+      sqlCfgModel.sqlDbType = MixinUtils.selectNotEmpty(sqlCfgModel.sqlDbType, sqlDbType);
       sqlCfgModel.sqlDatabase = MixinUtils.selectNotEmpty(sqlCfgModel.sqlDatabase, sqlDatabase);
       sqlCfgModel.sqlSchema = MixinUtils.selectNotEmpty(sqlCfgModel.sqlSchema, sqlSchema);
       sqlCfgModel.sqlTable = MixinUtils.selectNotEmpty(sqlCfgModel.sqlTable, sqlTable);
@@ -195,8 +180,6 @@ class CrudProGenSqlService extends CrudProServiceBase {
       exeCtx.getSqlCfgModels().push(sqlCfgModel);
     }
   }
-
-
 }
 
 export { CrudProGenSqlService };

package/src/libs/crud-pro/services/CrudProOriginToExecuteSql.ts

@@ -1,21 +1,20 @@
-import {CrudProServiceBase} from './CrudProServiceBase';
-import {SqlCfgModel} from '../models/SqlCfgModel';
-import {MixinUtils} from '../utils/MixinUtils';
-import {SqlSegArg} from '../models/SqlSegArg';
-import {KeysOfCustomSQL, SqlDbType} from '../models/keys';
-import {RequestModel} from '../models/RequestModel';
-import {CommonException, Exceptions} from '../exceptions';
-import {RequestCfgModel} from '../models/RequestCfgModel';
-import {ModelUtils} from '../utils/ModelUtils';
-import {FuncContext} from '../models/FuncContext';
-import {TypeUtils} from '../utils/TypeUtils';
-import {sqlFuncUtils} from '../utils/SqlFuncUtils';
-import {toSqlColumnName, toSqlColumnNamesJoin} from '../utils/sqlConvert/convertColumnName';
-import {CrudProGenSqlCondition} from "./CrudProGenSqlCondition";
+import { CrudProServiceBase } from './CrudProServiceBase';
+import { SqlCfgModel } from '../models/SqlCfgModel';
+import { MixinUtils } from '../utils/MixinUtils';
+import { SqlSegArg } from '../models/SqlSegArg';
+import { KeysOfCustomSQL, SqlDbType } from '../models/keys';
+import { RequestModel } from '../models/RequestModel';
+import { CommonException, Exceptions } from '../exceptions';
+import { RequestCfgModel } from '../models/RequestCfgModel';
+import { ModelUtils } from '../utils/ModelUtils';
+import { FuncContext } from '../models/FuncContext';
+import { TypeUtils } from '../utils/TypeUtils';
+import { sqlFuncUtils } from '../utils/SqlFuncUtils';
+import { toSqlColumnName, toSqlColumnNamesJoin } from '../utils/sqlConvert/convertColumnName';
+import { CrudProGenSqlCondition } from './CrudProGenSqlCondition';
 
 const KEYS_CUSTOM_PATTERN = /@@[0-9a-zA-Z:._]+/gm;
 
-
 /**
  * 存在任何需要排除的
  * @param columns
@@ -52,10 +51,9 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase {
     const argList = [];
     let executeSql = originSql;
 
-
     // 发现有需要被替换的变量。
     if (sqlArgModelMap) {
-       executeSql = originSql.replace(KEYS_CUSTOM_PATTERN, word => {
+      executeSql = originSql.replace(KEYS_CUSTOM_PATTERN, word => {
         if (!word) {
           return '';
         }
@@ -73,7 +71,6 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase {
       });
     }
 
-
     sqlCfgModel.executeSqlArgs = argList;
     sqlCfgModel.executeSql = executeSql;
   }
@@ -115,12 +112,10 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase {
       return this.generateOffsetLimit(reqCfg, sqlCfg, reqModel);
     } else if (word === KeysOfCustomSQL.SQL_ORDER_BYS) {
       return this.generateOrderBys(reqModel, sqlCfg);
-    } else if ((
-        word.startsWith(KeysOfCustomSQL.SQL_GET_DATA_ATTR_START) ||
-        word.startsWith(KeysOfCustomSQL.SQL_GET_CONDITION_ATTR_START)) && word.indexOf('.') > 0) {
+    } else if ((word.startsWith(KeysOfCustomSQL.SQL_GET_DATA_ATTR_START) || word.startsWith(KeysOfCustomSQL.SQL_GET_CONDITION_ATTR_START)) && word.indexOf('.') > 0) {
       return this.generateGetAttr(reqModel, word); //// data.xxx, condition.xxx
     } else if (word.startsWith(KeysOfCustomSQL.SQL_PICK_RES_AS_NUMBER) || word.startsWith(KeysOfCustomSQL.SQL_PICK_RES_AS_STRING)) {
-      return this.generatePickResAs(reqModel,  word); //  @@pickResAsNumber:replies_count
+      return this.generatePickResAs(reqModel, word); //  @@pickResAsNumber:replies_count
     } else if (word.startsWith(KeysOfCustomSQL.SQL_AS_UPDATE)) {
       return this.generateDataUpdate(reqModel, sqlCfg, MixinUtils.removeStringPrefix(word, KeysOfCustomSQL.SQL_AS_UPDATE));
     } else if (word.startsWith(KeysOfCustomSQL.SQL_AS_INSERT_KEYS)) {
@@ -200,7 +195,7 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase {
         result.push(reqColumn);
       }
     }
-    return new SqlSegArg(toSqlColumnNamesJoin(result,sqlCfgModel));
+    return new SqlSegArg(toSqlColumnNamesJoin(result, sqlCfgModel));
   }
 
   /**
@@ -226,12 +221,12 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase {
     const reqLimit = req.limit;
     const limit = Math.min(maxLimit, reqLimit);
 
-    if (sqlCfg.sqlDdType === SqlDbType.postgres) {
+    if (sqlCfg.sqlDbType === SqlDbType.postgres) {
       return new SqlSegArg(' LIMIT ? OFFSET ? ', [limit, req.offset]);
     }
 
-    if (sqlCfg.sqlDdType === SqlDbType.sqlserver) {
-      return new SqlSegArg(' OFFSET ? ROWS FETCH NEXT ? ROWS ONLY ', [ req.offset, limit]);
+    if (sqlCfg.sqlDbType === SqlDbType.sqlserver) {
+      return new SqlSegArg(' OFFSET ? ROWS FETCH NEXT ? ROWS ONLY ', [req.offset, limit]);
     }
 
     return new SqlSegArg(' limit ?,? ', [req.offset, limit]);
@@ -250,11 +245,12 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase {
     return new SqlSegArg(sql);
   }
 
-
   private generatePickResAs(req: RequestModel, world: string): SqlSegArg {
-    return new SqlSegArg(' ? ', [{
+    return new SqlSegArg(' ? ', [
+      {
         ___GENERATE_GET_RES_ATTR___: world,
-    }]);
+      },
+    ]);
   }
 
   private generateGetAttr(req: RequestModel, word: string): SqlSegArg {

package/src/libs/crud-pro/services/CrudProServiceBase.ts

@@ -1,6 +1,6 @@
 import * as _ from 'lodash';
 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 { MixinUtils } from '../utils/MixinUtils';
@@ -19,11 +19,6 @@ function createBuildInExecuteFuncMap() {
   };
 }
 
-interface ExecuteUnsafeQueryCtx {
-  tableName: string;
-  dbName: string;
-}
-
 const buildInExecuteFuncMap = createBuildInExecuteFuncMap();
 
 class CrudProServiceBase {
@@ -60,10 +55,11 @@ class CrudProServiceBase {
    * @param values
    * @protected
    */
-  protected async executeUnsafeQuery(obj: ExecuteUnsafeQueryCtx, sql: string, values?: any) {
+  protected async executeUnsafeQuery(obj: IExecuteUnsafeQueryCtx, sql: string, values?: any) {
     const sqlCfgModel: any = {
-      sqlTable: obj.tableName,
-      sqlDatabase: obj.dbName,
+      sqlTable: obj.sqlTable,
+      sqlDatabase: obj.sqlDatabase,
+      sqlDbType: obj.sqlDbType,
       columns: [],
       columnsRelation: [],
       maxLimit: DEFAULT_MAX_LIMIT,