midway-fatcms 0.0.1-beta.18 → 0.0.1-beta.19

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.sqlDbType === 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.sqlDbType === 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();
 
@@ -247,16 +236,16 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
     if (KeysOfSqlResPicker.UPDATE_RESULT === resPicker) {
       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.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) {
@@ -215,39 +213,28 @@ class CrudProGenSqlCondition {
           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.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.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.sqlDbType === SqlDbType.postgres) {
-            tmpSql = `${toSqlColumnName(key)} not like concat('%',?::text, '%')`;  // like不包含
+            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,7 +96,7 @@ class CrudProGenSqlService extends CrudProServiceBase {
    * @param cfgModel
    * @private
    */
-  private generateOriginSqlForDelete(cfgModel: RequestCfgModel) : string {
+  private generateOriginSqlForDelete(cfgModel: RequestCfgModel): string {
     if (cfgModel.sqlDbType === SqlDbType.postgres) {
       return 'delete from @@table where @@asWhere:condition ';
     }
@@ -111,49 +111,37 @@ class CrudProGenSqlService extends CrudProServiceBase {
    * @param cfgModel
    * @private
    */
-  private generateOriginSqlForDuplicateInsert(cfgModel: RequestCfgModel) : string {
+  private generateOriginSqlForDuplicateInsert(cfgModel: RequestCfgModel): string {
     if (cfgModel.sqlDbType === SqlDbType.postgres) {
-      const uniqueColumn = cfgModel.uniqueColumn ; // id
+      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.sqlDbType === SqlDbType.sqlserver) {
-      const uniqueColumn = cfgModel.uniqueColumn ; // id
+      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
@@ -169,9 +157,6 @@ class CrudProGenSqlService extends CrudProServiceBase {
     return 'insert into @@table ( @@asInsertKeys:data ) values( @@asInsertValues:data )'; // 关键字的前后，必须有空格
   }
 
-
-
-
   private async generateExecuteSql() {
     const exeCtx = this.getExecuteContext();
 
@@ -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));
   }
 
   /**
@@ -231,7 +226,7 @@ class CrudProOriginToExecuteSql extends CrudProServiceBase {
     }
 
     if (sqlCfg.sqlDbType === SqlDbType.sqlserver) {
-      return new SqlSegArg(' OFFSET ? ROWS FETCH NEXT ? ROWS ONLY ', [ req.offset, limit]);
+      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, IExecuteUnsafeQueryCtx, 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,7 +19,6 @@ function createBuildInExecuteFuncMap() {
   };
 }
 
-
 const buildInExecuteFuncMap = createBuildInExecuteFuncMap();
 
 class CrudProServiceBase {

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

@@ -47,7 +47,7 @@ class CrudProTableMetaService extends CrudProServiceBase {
     const baseInfo: IExecuteUnsafeQueryCtx = {
       sqlTable: sqlCfgModel.sqlTable,
       sqlDatabase: sqlCfgModel.sqlDatabase,
-      sqlDbType: sqlCfgModel.sqlDbType
+      sqlDbType: sqlCfgModel.sqlDbType,
     };
 
     obj.tableColumns = await this.loadTableColumnInfo(baseInfo);
@@ -55,19 +55,14 @@ class CrudProTableMetaService extends CrudProServiceBase {
     return obj;
   }
 
-
-
-  private async loadTableColumnInfo(baseInfo: IExecuteUnsafeQueryCtx): Promise<string[]>{
-   
-    if(baseInfo.sqlDbType === SqlDbType.mysql) {
+  private async loadTableColumnInfo(baseInfo: IExecuteUnsafeQueryCtx): Promise<string[]> {
+    if (baseInfo.sqlDbType === 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 === SqlDbType.postgres) {
+    } else if (baseInfo.sqlDbType === SqlDbType.postgres) {
       const schemaname = 'public';
       const columnArraySql = `
       SELECT
@@ -77,17 +72,14 @@ class CrudProTableMetaService extends CrudProServiceBase {
         ORDER BY ordinal_position;
       `.trim();
       const queryRes = await this.executeUnsafeQuery(baseInfo, columnArraySql);
-      const rows = pickAndConvertPgRows(queryRes)
+      const rows = pickAndConvertPgRows(queryRes);
       return rows.map(fieldObj => {
         return fieldObj['column_name'];
       });
     }
 
-        
-    throw new Error("暂不支持的数据库类型：" + baseInfo.sqlDbType)
+    throw new Error('暂不支持的数据库类型：' + baseInfo.sqlDbType);
   }
-
-
 }
 
 export { CrudProTableMetaService };

package/src/libs/crud-pro/utils/DateTimeUtils.ts

@@ -9,10 +9,10 @@ const DateTimeUtils = {
   getCurrentTimeStampSecond(): number {
     return Math.floor(Date.now() / 1000);
   },
-  getCurrentDateFormat(format:string): string {
+  getCurrentDateFormat(format: string): string {
     return moment(Date.now()).format(format);
   },
-  getYesterdayDateFormat(format:string): string {
+  getYesterdayDateFormat(format: string): string {
     return moment(Date.now()).add(-1, 'day').format(format);
   },
 };

package/src/libs/crud-pro/utils/MixinUtils.ts

@@ -50,7 +50,7 @@ const MixinUtils = {
   },
 
   startsWith(str1: string, str2: string): boolean {
-    if (typeof str1 === "string" && typeof str2 === "string") {
+    if (typeof str1 === 'string' && typeof str2 === 'string') {
       return str1.startsWith(str2);
     }
     return false;

package/src/libs/crud-pro/utils/ValidateUtils.ts

@@ -143,9 +143,8 @@ function validateByCfgString(validateCfg: KeysOfValidators | string, itemValue:
     return;
   }
 
-
   // 必填
-  if ("required" === validateCfg) {
+  if ('required' === validateCfg) {
     if (isEmpty(itemValue)) {
       throw new CommonException(Exceptions.VALIDATE_ERR, "'参数校验错误，字段 " + errPath + ' 不满足校验配置：' + validateCfg);
     }
@@ -157,7 +156,6 @@ function validateByCfgString(validateCfg: KeysOfValidators | string, itemValue:
     return;
   }
 
-
   // 校验失败
   if (!validateByCfgStringInner(validateCfg, itemValue)) {
     throw new CommonException(Exceptions.VALIDATE_ERR, "'参数校验错误，字段 " + errPath + ' 不满足校验配置：' + validateCfg);

package/src/libs/crud-pro/utils/pool/MySQLUtils.ts

@@ -1,6 +1,6 @@
 import { createPool } from 'mysql2/promise';
 import { IConnectionPool } from '../../interfaces';
-import {SqlDbType} from "../../models/keys";
+import { SqlDbType } from '../../models/keys';
 
 const POOL_CACHE_MAP: Record<string, IConnectionPool> = {};
 

package/src/libs/crud-pro/utils/pool/PostgresUtils.ts

@@ -1,6 +1,6 @@
-import {Pool} from 'pg';
-import {IConnectionPool} from '../../interfaces';
-import {SqlDbType} from "../../models/keys";
+import { Pool } from 'pg';
+import { IConnectionPool } from '../../interfaces';
+import { SqlDbType } from '../../models/keys';
 
 const POOL_CACHE_MAP: Record<string, IConnectionPool> = {};
 

package/src/libs/crud-pro/utils/pool/SqlServerUtils.ts

@@ -1,6 +1,6 @@
-import {ConnectionPool} from 'mssql';
-import {IConnectionPool} from '../../interfaces';
-import {SqlDbType} from "../../models/keys";
+import { ConnectionPool } from 'mssql';
+import { IConnectionPool } from '../../interfaces';
+import { SqlDbType } from '../../models/keys';
 
 const POOL_CACHE_MAP: Record<string, IConnectionPool> = {};
 

package/src/libs/global-config/global-config.ts

@@ -19,8 +19,6 @@ interface IGlobalStaticConfig {
    */
   bizUpdateCfgModelForCrudMtd(reqJson: any, cfgModel: any, methodInfo: any, ctx: any): Promise<any>;
 
-
-
   /**
    * CrudPro: 业务系统自定义的修改cfgModel。这是最底层的！！全局的！！全局的！！全局的！！！
    * @param reqJson
@@ -28,15 +26,12 @@ interface IGlobalStaticConfig {
    */
   bizUpdateCfgModelForCrudPro(reqJson: any, cfgModel: any): Promise<any>;
 
-
-
   /**
    * 生成用户的账号ID，业务系统可以生成类似工号的ID
    * @param userSubmitData
    */
   generateUserAccountId(userSubmitData: any): Promise<string>;
 
-
   /**
    * 将业务系统表中的userId映射为fatcms的UserAccountId
    * @param bizTableUserId 业余系统表中的UserId