midway-fatcms 0.0.1-beta.75 → 0.0.1-beta.77

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

@@ -1,16 +1,15 @@
 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 { pickAndConvertRowsByMix } from '../utils/sqlConvert/convertMix';
 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 { IPoolConnectionClient, IPoolConnectionQueryResult } from "@/libs/crud-pro/interfaces";
 
 const { checkFuncCfgValid } = ModelUtils;
 const { isEmpty } = MixinUtils;
@@ -32,20 +31,15 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
     this.logger.info('[CrudProExecuteSqlService] executeSqlCfgModel_before', sqlCfgModel.executeSql, sqlCfgModel.executeSqlArgs);
 
     const exeCtx = this.getExecuteContext();
-    const connection = await this.getTxConnectionBySqlCfg(sqlCfgModel);
+    const connection: IPoolConnectionClient = await this.getTxConnectionBySqlCfg(sqlCfgModel);
     const executeSqlArgs = this.handleExecuteSqlArgsByResModel(exeCtx, sqlCfgModel.executeSqlArgs || []);
 
-    let queryRes: any;
+    let queryRes: IPoolConnectionQueryResult;
 
     if (sqlCfgModel.sqlDbType === SqlDbType.postgres) {
-      // import { PoolClient } from 'pg';
 
-      const pgClient: PoolClient = connection as any;
       const pgSql = replaceQuestionMarks(sqlCfgModel.executeSql, sqlCfgModel.isNativeSQL);
-      queryRes = await pgClient.query({
-        text: pgSql,
-        values: executeSqlArgs || [],
-      });
+      queryRes = await connection.query(pgSql, executeSqlArgs);
 
       this.logger.debug('[CrudProExecuteSqlService] executeSqlCfgModel_postgres', pgSql, executeSqlArgs, sqlCfgModel.resPicker);
 
@@ -62,8 +56,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
       this.logger.debug('[CrudProExecuteSqlService] executeSqlCfgModel_mysql', sqlCfgModel.executeSql, executeSqlArgs, sqlCfgModel.resPicker);
     }
 
-    const sqlRes = pickAndConvertRowsByMix(queryRes, sqlCfgModel.sqlDbType);
-    const resObject = this.toQueryResByResPicker(sqlRes, queryRes, sqlCfgModel);
+    const resObject = this.toQueryResByResPicker(queryRes.rows, queryRes.originRes, sqlCfgModel);
     exeCtx.setResModelItem(sqlCfgModel.resName, resObject);
   }
 
@@ -207,12 +200,11 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
     return result === true;
   }
 
-  private toQueryResByResPicker(sqlRes: any, queryRes: any, sqlCfgModel: SqlCfgModel) {
+  private toQueryResByResPicker(rows: any[], originRes: any, sqlCfgModel: SqlCfgModel) {
     const resPicker = sqlCfgModel.resPicker;
 
     // 返回第一行
     if (KeysOfSqlResPicker.RESULT_FIRST_ROW === resPicker) {
-      const rows = sqlRes as any[];
       if (rows && rows.length > 0) {
         return rows[0];
       }
@@ -221,7 +213,6 @@ class CrudProExecuteSqlService extends CrudProServiceBase {
 
     // $ResultSet[0].total_count ， 只取第一行的的total_count
     if (KeysOfSqlResPicker.RESULT_TOTAL_COUNT === resPicker) {
-      const rows = sqlRes as any[];
       if (isEmpty(rows)) {
         return 0;
       }
@@ -233,31 +224,31 @@ 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(originRes, 'rows[0].id'),
+          affectedRows: _.get(originRes, 'rowCount'),
         };
       }
 
       if (sqlCfgModel.sqlDbType === SqlDbType.sqlserver) {
         return {
-          insertId: _.get(queryRes, 'recordset[0].id'),
-          affectedRows: _.get(queryRes, 'rowsAffected[0]'),
+          insertId: _.get(originRes, 'recordset[0].id'),
+          affectedRows: _.get(originRes, 'rowsAffected[0]'),
         };
       }
 
-      return sqlRes;
+      return rows;
     }
 
     //其他配置：形如： sqlRes[0].total_count
     if (typeof resPicker === 'string') {
       if (resPicker.startsWith('sqlRes')) {
-        return _.get({ sqlRes }, resPicker);
+        return _.get({ sqlRes: rows }, resPicker);
       } else {
         throw new CommonException(Exceptions.RUN_EXECUTE_VALIDATE, 'resPicker必须是以sqlRes开头');
       }
     }
 
-    return sqlRes;
+    return rows;
   }
 }
 

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

@@ -2,7 +2,7 @@ import { CrudProServiceBase } from './CrudProServiceBase';
 import { SqlCfgModel } from '../models/SqlCfgModel';
 import { IExecuteUnsafeQueryCtx, ITableMeta } from '../interfaces';
 import { SqlDbType } from '../models/keys';
-import { pickAndConvertRowsByMix } from '../utils/sqlConvert/convertMix';
+// import { pickAndConvertRowsByMix } from '../utils/sqlConvert/convertMix';
 
 class CrudProTableMetaCache {
   private cacheMap: Record<string, ITableMeta> = {};
@@ -58,7 +58,7 @@ class CrudProTableMetaService extends CrudProServiceBase {
   private async loadTableColumnInfo(baseInfo: IExecuteUnsafeQueryCtx): Promise<string[]> {
     if (baseInfo.sqlDbType === SqlDbType.mysql) {
       const queryRes = await this.executeUnsafeQuery(baseInfo, 'describe ' + baseInfo.sqlTable);
-      const tableDescribe = pickAndConvertRowsByMix(queryRes, baseInfo.sqlDbType);
+      const tableDescribe = queryRes.rows || []; //pickAndConvertRowsByMix(queryRes, baseInfo.sqlDbType);
       const tableDescribe2 = JSON.parse(JSON.stringify(tableDescribe));
       return tableDescribe2.map(fieldObj => {
         return fieldObj['Field'];
@@ -73,7 +73,7 @@ class CrudProTableMetaService extends CrudProServiceBase {
         ORDER BY ordinal_position;
       `.trim();
       const queryRes = await this.executeUnsafeQuery(baseInfo, columnArraySql);
-      const tableDescribe = pickAndConvertRowsByMix(queryRes, baseInfo.sqlDbType);
+      const tableDescribe = queryRes.rows || [];
       return tableDescribe.map(fieldObj => {
         return fieldObj['column_name'];
       });

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

@@ -0,0 +1,13 @@
+
+const CrudMonitor = {
+  mysqlGetConnectionCount: 0,
+  mysqlReleaseConnectionCount: 0,
+  postgresGetConnectionCount: 0,
+  postgresReleaseConnectionCount: 0,
+  mssqlGetConnectionCount: 0,
+  mssqlReleaseConnectionCount: 0,
+}
+
+export  {
+  CrudMonitor,
+}

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

@@ -280,6 +280,9 @@ const MixinUtils = {
     }
     return value;
   },
+  sleepMs(ms: number): Promise<any> {
+    return new Promise(resolve => setTimeout(resolve, ms));
+  }
 };
 
 export { MixinUtils };

package/src/libs/crud-pro/utils/sqlConvert/convertMix.ts

@@ -1,24 +1,24 @@
-import { SqlDbType } from '../../models/keys';
-import { pickAndConvertPgRows } from './convertPgType';
-import * as _ from 'lodash';
-
-function pickAndConvertRowsByMix(connectionQueryRes: any, sqlDbType: SqlDbType): any[] | any {
-  if (!connectionQueryRes) {
-    throw new Error('[pickAndConvertRowsByMix] error, connectionQueryRes is null ');
-  }
-
-  if (sqlDbType === SqlDbType.postgres) {
-    return pickAndConvertPgRows(connectionQueryRes);
-  }
-
-  if (sqlDbType === SqlDbType.mysql) {
-    return connectionQueryRes[0];
-  }
-
-  if (sqlDbType === SqlDbType.sqlserver) {
-    return _.get(connectionQueryRes, 'recordsets[0]') || [];
-  }
-  throw new Error('[pickAndConvertRowsByMix] error sqlDbType, sqlDbType = ' + sqlDbType);
-}
-
-export { pickAndConvertRowsByMix };
+// import { SqlDbType } from '../../models/keys';
+// import { pickAndConvertPgRows } from './convertPgType';
+// import * as _ from 'lodash';
+//
+// function pickAndConvertRowsByMix(connectionQueryRes: any, sqlDbType: SqlDbType): any[] | any {
+//   if (!connectionQueryRes) {
+//     throw new Error('[pickAndConvertRowsByMix] error, connectionQueryRes is null ');
+//   }
+//
+//   if (sqlDbType === SqlDbType.postgres) {
+//     return pickAndConvertPgRows(connectionQueryRes);
+//   }
+//
+//   if (sqlDbType === SqlDbType.mysql) {
+//     return connectionQueryRes[0];
+//   }
+//
+//   if (sqlDbType === SqlDbType.sqlserver) {
+//     return _.get(connectionQueryRes, 'recordsets[0]') || [];
+//   }
+//   throw new Error('[pickAndConvertRowsByMix] error sqlDbType, sqlDbType = ' + sqlDbType);
+// }
+//
+// export { pickAndConvertRowsByMix };

package/src/models/userSession.ts

@@ -28,6 +28,7 @@ interface ISessionInfo {
   privateKey: string; // 私钥
   bizExt?: any;
   sessionIdCreatedAt: number
+  sessionSavedAt: number
 }
 
 interface IConsumerUserInfo {
@@ -63,6 +64,7 @@ function createEmptySessionInfo(superAdmin: boolean): ISessionInfo {
     publicKey: '',
     privateKey: '',
     sessionIdCreatedAt: 0,
+    sessionSavedAt: 0
   };
 }
 

package/src/schedule/anonymousContext.ts

@@ -17,7 +17,8 @@ const anonymousUserInfo: ISessionInfo = {
   accountType: SYS_ACCOUNT_TYPE,
   publicKey: '',
   privateKey: '',
-  sessionIdCreatedAt: 0
+  sessionIdCreatedAt: 0,
+  sessionSavedAt: 0
 };
 
 const anonymousWorkbenchInfo: IWorkbenchEntity = {

package/src/service/AuthService.ts

@@ -118,6 +118,7 @@ export class AuthService {
       publicKey,
       privateKey,
       sessionIdCreatedAt: Date.now(),
+      sessionSavedAt: Date.now()
     };
 
     await this.userSessionService.saveUserSession(sessionInfo);
@@ -159,6 +160,7 @@ export class AuthService {
       publicKey,
       privateKey,
       sessionIdCreatedAt: Date.now(),
+      sessionSavedAt: Date.now(),
     };
 
     if (bizExt && typeof bizExt === 'object') {
@@ -273,9 +275,13 @@ export class AuthService {
 
 
   async refreshSession(sessionInfo: ISessionInfo): Promise<ISessionInfo> {
+    if (sessionInfo.sessionSavedAt && Date.now() - sessionInfo.sessionSavedAt < 1000 * 60 * 5) {
+      return sessionInfo;
+    }
+
     const roleCodes = await this.queryUserRoleCodeList(sessionInfo.accountId);
     const functionCodes = await this.queryFunctionCodeList(roleCodes);
-    const newSessionInfo: ISessionInfo = {...sessionInfo, roleCodes, functionCodes};
+    const newSessionInfo: ISessionInfo = {...sessionInfo, roleCodes, functionCodes, sessionSavedAt:  Date.now()};
     await this.userSessionService.saveUserSession(newSessionInfo);
     return newSessionInfo;
   }

package/dist/libs/crud-pro/utils/sqlConvert/convertPgType.d.ts

@@ -1,2 +0,0 @@
-declare function pickAndConvertPgRows(result: any): any[];
-export { pickAndConvertPgRows };

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

@@ -1,128 +0,0 @@
-"use strict";
-//
-// // 定义 PostgreSQL 数据类型 OID 映射
-// const PG_TYPE_OIDS = {
-//   INT2: 21,    // smallint
-//   INT4: 23,    // integer
-//   INT8: 20,    // bigint
-//   FLOAT4: 700, // real
-//   FLOAT8: 701, // double precision
-//   NUMERIC: 1700, // numeric
-//   MONEY: 790,   // money
-//   BOOL: 16,     // boolean
-//   DATE: 1082,   // date
-//   TIMESTAMP: 1114, // timestamp without time zone
-//   TIMESTAMPTZ: 1184, // timestamp with time zone
-//   JSON: 114,    // json
-//   JSONB: 3802,  // jsonb
-// };
-//
-//
-//
-// /**
-//  * 将 PostgreSQL 数据类型转换为 JavaScript 类型
-//  * @param {any} value - 原始值
-//  * @param {number} oid - 数据类型 OID
-//  * @returns {any} 转换后的值
-//  */
-// function convertPgType(value: any, oid: any) {
-//   // 如果值为 null，直接返回
-//   if (value === null) {
-//     return null;
-//   }
-//
-//   const typeOfValue = typeof value;
-//   if (typeOfValue === 'undefined') {
-//     return null;
-//   }
-//   if (typeOfValue === 'number' || typeOfValue === "boolean" || typeOfValue === "object") {
-//     return value;
-//   }
-//   if (typeOfValue === 'bigint') {
-//     return value.toString()
-//   }
-//
-//   switch (oid) {
-//     // 整数类型（全部转为 Number）
-//     case PG_TYPE_OIDS.INT2: // smallint
-//     case PG_TYPE_OIDS.INT4: // integer
-//       return Number(value);
-//     case PG_TYPE_OIDS.INT8: // bigint
-//       return value;
-//
-//     // 浮点类型
-//     case PG_TYPE_OIDS.FLOAT4: // real
-//     case PG_TYPE_OIDS.FLOAT8: // double precision
-//     case PG_TYPE_OIDS.NUMERIC: // numeric
-//     case PG_TYPE_OIDS.MONEY: // money
-//       return Number(value);
-//
-//     // 布尔类型
-//     case PG_TYPE_OIDS.BOOL:
-//       if (typeof value === 'boolean') {
-//         return value;
-//       }
-//       return value === 't' || value === 'true' || value === true;
-//
-//     // 日期/时间类型
-//     case PG_TYPE_OIDS.DATE:
-//       return new Date(value).toISOString().split('T')[0];
-//
-//     case PG_TYPE_OIDS.TIMESTAMP:
-//     case PG_TYPE_OIDS.TIMESTAMPTZ:
-//       return new Date(value).toISOString();
-//
-//     // JSON 类型
-//     case PG_TYPE_OIDS.JSON:
-//     case PG_TYPE_OIDS.JSONB:
-//       // try {
-//       //   return JSON.parse(value);
-//       // } catch (e) {
-//       //   return value; // 解析失败时返回原始值
-//       // }
-//
-//     // 默认不转换
-//     default:
-//       return value;
-//   }
-// }
-//
-//
-// /**
-//  * 获取并转换PG查询结果的数据类型
-//  * @param result
-//  */
-// function pickAndConvertPgRows(result: any): any[] {
-//   if (!result || !Array.isArray(result.rows)) {
-//     return [];
-//   }
-//
-//   console.log('',convertPgType)
-//   try {
-//     // 获取字段类型 OID
-//     const fieldTypes = result.fields.map((field: any) => field.dataTypeID);
-//
-//     // 转换每一行的数据类型
-//     return result.rows.map((row:any) => {
-//       const convertedRow = {};
-//       Object.keys(row).forEach((key, index) => {
-//         const value = row[key];
-//         const oid = fieldTypes[index];
-//         convertedRow[key] = convertPgType(value, oid);
-//       });
-//       return convertedRow;
-//     });
-//   } catch (e) {
-//     console.error('pickAndConvertPgRows', e);
-//   }
-//   return [];
-// }
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pickAndConvertPgRows = void 0;
-function pickAndConvertPgRows(result) {
-    if (!result || !Array.isArray(result.rows)) {
-        return [];
-    }
-    return result.rows;
-}
-exports.pickAndConvertPgRows = pickAndConvertPgRows;

package/src/libs/crud-pro/utils/sqlConvert/convertPgType.ts

@@ -1,127 +0,0 @@
-//
-// // 定义 PostgreSQL 数据类型 OID 映射
-// const PG_TYPE_OIDS = {
-//   INT2: 21,    // smallint
-//   INT4: 23,    // integer
-//   INT8: 20,    // bigint
-//   FLOAT4: 700, // real
-//   FLOAT8: 701, // double precision
-//   NUMERIC: 1700, // numeric
-//   MONEY: 790,   // money
-//   BOOL: 16,     // boolean
-//   DATE: 1082,   // date
-//   TIMESTAMP: 1114, // timestamp without time zone
-//   TIMESTAMPTZ: 1184, // timestamp with time zone
-//   JSON: 114,    // json
-//   JSONB: 3802,  // jsonb
-// };
-//
-//
-//
-// /**
-//  * 将 PostgreSQL 数据类型转换为 JavaScript 类型
-//  * @param {any} value - 原始值
-//  * @param {number} oid - 数据类型 OID
-//  * @returns {any} 转换后的值
-//  */
-// function convertPgType(value: any, oid: any) {
-//   // 如果值为 null，直接返回
-//   if (value === null) {
-//     return null;
-//   }
-//
-//   const typeOfValue = typeof value;
-//   if (typeOfValue === 'undefined') {
-//     return null;
-//   }
-//   if (typeOfValue === 'number' || typeOfValue === "boolean" || typeOfValue === "object") {
-//     return value;
-//   }
-//   if (typeOfValue === 'bigint') {
-//     return value.toString()
-//   }
-//
-//   switch (oid) {
-//     // 整数类型（全部转为 Number）
-//     case PG_TYPE_OIDS.INT2: // smallint
-//     case PG_TYPE_OIDS.INT4: // integer
-//       return Number(value);
-//     case PG_TYPE_OIDS.INT8: // bigint
-//       return value;
-//
-//     // 浮点类型
-//     case PG_TYPE_OIDS.FLOAT4: // real
-//     case PG_TYPE_OIDS.FLOAT8: // double precision
-//     case PG_TYPE_OIDS.NUMERIC: // numeric
-//     case PG_TYPE_OIDS.MONEY: // money
-//       return Number(value);
-//
-//     // 布尔类型
-//     case PG_TYPE_OIDS.BOOL:
-//       if (typeof value === 'boolean') {
-//         return value;
-//       }
-//       return value === 't' || value === 'true' || value === true;
-//
-//     // 日期/时间类型
-//     case PG_TYPE_OIDS.DATE:
-//       return new Date(value).toISOString().split('T')[0];
-//
-//     case PG_TYPE_OIDS.TIMESTAMP:
-//     case PG_TYPE_OIDS.TIMESTAMPTZ:
-//       return new Date(value).toISOString();
-//
-//     // JSON 类型
-//     case PG_TYPE_OIDS.JSON:
-//     case PG_TYPE_OIDS.JSONB:
-//       // try {
-//       //   return JSON.parse(value);
-//       // } catch (e) {
-//       //   return value; // 解析失败时返回原始值
-//       // }
-//
-//     // 默认不转换
-//     default:
-//       return value;
-//   }
-// }
-//
-//
-// /**
-//  * 获取并转换PG查询结果的数据类型
-//  * @param result
-//  */
-// function pickAndConvertPgRows(result: any): any[] {
-//   if (!result || !Array.isArray(result.rows)) {
-//     return [];
-//   }
-//
-//   console.log('',convertPgType)
-//   try {
-//     // 获取字段类型 OID
-//     const fieldTypes = result.fields.map((field: any) => field.dataTypeID);
-//
-//     // 转换每一行的数据类型
-//     return result.rows.map((row:any) => {
-//       const convertedRow = {};
-//       Object.keys(row).forEach((key, index) => {
-//         const value = row[key];
-//         const oid = fieldTypes[index];
-//         convertedRow[key] = convertPgType(value, oid);
-//       });
-//       return convertedRow;
-//     });
-//   } catch (e) {
-//     console.error('pickAndConvertPgRows', e);
-//   }
-//   return [];
-// }
-
-function pickAndConvertPgRows(result: any): any[] {
-  if (!result || !Array.isArray(result.rows)) {
-    return [];
-  }
-  return result.rows;
-}
-
-export { pickAndConvertPgRows };