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

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

@@ -2,91 +2,60 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TransactionSqlServer = void 0;
 const mssql_1 = require("mssql");
-class TransactionSqlServer {
-    constructor() {
-        this.isBeginTransaction = false;
-        this.connectionMap = {};
-        this.transactionMap = {};
-    }
-    /**
-     * 获取链接对象
-     * @param pool
-     */
-    async getTxConnection(pool) {
-        let connection = this.connectionMap[pool.poolName];
-        if (!connection) {
-            connection = await this.connectAndCreateConnection(pool);
-            this.connectionMap[pool.poolName] = connection;
-            // 开启了事务
-            if (this.isBeginTransaction) {
-                await this.beginTransaction(pool.poolName);
+const CrudMonitor_1 = require("../../../libs/crud-pro/utils/CrudMonitor");
+const _ = require("lodash");
+class SqlServerConnectionClient {
+    constructor(originConnection) {
+        this.originConnection = originConnection;
+    }
+    async query(sql, values) {
+        const request = new mssql_1.Request(this.originConnection);
+        if (Array.isArray(values)) {
+            for (let i = 0; i < values.length; i++) {
+                const index = i + 1;
+                const value = values[i];
+                request.input(`fatcms_ms${index}`, value);
             }
         }
-        return connection;
-    }
-    async connectAndCreateConnection(pool) {
-        const poolInstance = pool.poolInstance;
-        const originConnection = await poolInstance.connect();
+        const res = await request.query(sql);
+        const rows = _.get(res, 'recordsets[0]') || [];
         return {
-            originConnection,
-            query: (sql, values) => {
-                const request = new mssql_1.Request(originConnection);
-                if (Array.isArray(values)) {
-                    for (let i = 0; i < values.length; i++) {
-                        const index = i + 1;
-                        const value = values[i];
-                        request.input(`fatcms_ms${index}`, value);
-                    }
-                }
-                return request.query(sql);
-            },
+            rows,
+            originRes: res
         };
     }
-    /**
-     * 开始事务
-     */
-    beginTx() {
-        this.isBeginTransaction = true;
+    async beginTransaction() {
+        const originConnection = this.originConnection;
+        const tmpTx = new mssql_1.Transaction(originConnection);
+        this.sqlServerTransaction = tmpTx;
+        return await tmpTx.begin();
     }
-    /**
-     * 提交事务
-     */
-    async commitTx() {
-        if (!this.isBeginTransaction) {
-            return;
-        }
-        const transactions = Object.values(this.transactionMap);
-        for (let i = 0; i < transactions.length; i++) {
-            const tmpTx = transactions[i];
-            await tmpTx.commit();
-        }
+    async commit() {
+        const tmpTx = this.sqlServerTransaction;
+        await tmpTx.commit();
     }
-    /**
-     * 事务回滚
-     */
-    async rollbackTx() {
-        if (!this.isBeginTransaction) {
-            return;
+    async rollback() {
+        const tmpTx = this.sqlServerTransaction;
+        await tmpTx.rollback();
+    }
+    async release() {
+        try {
+            CrudMonitor_1.CrudMonitor.postgresReleaseConnectionCount++;
         }
-        const transactions = Object.values(this.transactionMap);
-        for (let i = 0; i < transactions.length; i++) {
-            const tmpTx = transactions[i];
-            await tmpTx.rollback();
+        catch (e) {
+            console.log('[crud-pro] SqlServerConnectionClient release ', e);
         }
     }
+}
+class TransactionSqlServer {
     /**
-     * 释放连接
+     * 获取链接对象
+     * @param pool
      */
-    async releaseTx() {
-        this.connectionMap = {};
-        this.transactionMap = {};
-    }
-    async beginTransaction(poolName) {
-        const connection = this.connectionMap[poolName];
-        const originConnection = connection.originConnection;
-        const tmpTx = new mssql_1.Transaction(originConnection);
-        this.transactionMap[poolName] = tmpTx;
-        return await tmpTx.begin();
+    async getTxConnection(pool) {
+        const poolInstance = pool.poolInstance;
+        const originConnection = await poolInstance.connect();
+        return new SqlServerConnectionClient(originConnection);
     }
 }
 exports.TransactionSqlServer = TransactionSqlServer;

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

@@ -4,7 +4,7 @@ exports.CrudProCachedCfgService = void 0;
 const humps_1 = require("humps");
 const CrudProServiceBase_1 = require("./CrudProServiceBase");
 const MixinUtils_1 = require("../utils/MixinUtils");
-const convertMix_1 = require("../utils/sqlConvert/convertMix");
+// import { pickAndConvertRowsByMix } from '../utils/sqlConvert/convertMix';
 const MemoryRefreshCache_1 = require("../utils/MemoryRefreshCache");
 const methodCache = new MemoryRefreshCache_1.default();
 function parseMethodInfo(methodInfo) {
@@ -49,7 +49,7 @@ class CrudProCachedCfgService extends CrudProServiceBase_1.CrudProServiceBase {
             sqlDbType: sysDatabaseDbType,
         };
         const queryRes = await this.executeUnsafeQuery(baseInfo, sql, [method]);
-        const rows2 = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, sysDatabaseDbType);
+        const rows2 = queryRes.rows || [];
         if (rows2.length > 0) {
             return parseMethodInfo(rows2[0]);
         }
@@ -64,7 +64,7 @@ class CrudProCachedCfgService extends CrudProServiceBase_1.CrudProServiceBase {
             sqlDbType: sysDatabaseDbType,
         };
         const queryRes = await this.executeUnsafeQuery(baseInfo, sql);
-        const rows2 = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, sysDatabaseDbType);
+        const rows2 = queryRes.rows || [];
         return rows2.map(row => {
             return parseMethodInfo(row);
         });

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

@@ -5,7 +5,6 @@ const _ = require("lodash");
 const CrudProServiceBase_1 = require("./CrudProServiceBase");
 const keys_1 = require("../models/keys");
 const exceptions_1 = require("../exceptions");
-const convertMix_1 = require("../utils/sqlConvert/convertMix");
 const convertPgSql_1 = require("../utils/sqlConvert/convertPgSql");
 const convertMsSql_1 = require("../utils/sqlConvert/convertMsSql");
 const ModelUtils_1 = require("../utils/ModelUtils");
@@ -32,13 +31,8 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
         const executeSqlArgs = this.handleExecuteSqlArgsByResModel(exeCtx, sqlCfgModel.executeSqlArgs || []);
         let queryRes;
         if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.postgres) {
-            // import { PoolClient } from 'pg';
-            const pgClient = connection;
             const pgSql = (0, convertPgSql_1.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);
         }
         else if (sqlCfgModel.sqlDbType === keys_1.SqlDbType.sqlserver) {
@@ -52,8 +46,7 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
             queryRes = await connection.query(sqlCfgModel.executeSql, executeSqlArgs);
             this.logger.debug('[CrudProExecuteSqlService] executeSqlCfgModel_mysql', sqlCfgModel.executeSql, executeSqlArgs, sqlCfgModel.resPicker);
         }
-        const sqlRes = (0, convertMix_1.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);
     }
     handleExecuteSqlArgsByResModel(exeCtx, executeSqlArgs) {
@@ -175,11 +168,10 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
         }
         return result === true;
     }
-    toQueryResByResPicker(sqlRes, queryRes, sqlCfgModel) {
+    toQueryResByResPicker(rows, originRes, sqlCfgModel) {
         const resPicker = sqlCfgModel.resPicker;
         // 返回第一行
         if (keys_1.KeysOfSqlResPicker.RESULT_FIRST_ROW === resPicker) {
-            const rows = sqlRes;
             if (rows && rows.length > 0) {
                 return rows[0];
             }
@@ -187,7 +179,6 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
         }
         // $ResultSet[0].total_count ， 只取第一行的的total_count
         if (keys_1.KeysOfSqlResPicker.RESULT_TOTAL_COUNT === resPicker) {
-            const rows = sqlRes;
             if (isEmpty(rows)) {
                 return 0;
             }
@@ -198,28 +189,28 @@ class CrudProExecuteSqlService extends CrudProServiceBase_1.CrudProServiceBase {
         if (keys_1.KeysOfSqlResPicker.UPDATE_RESULT === resPicker) {
             if (sqlCfgModel.sqlDbType === keys_1.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 === keys_1.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 exceptions_1.CommonException(exceptions_1.Exceptions.RUN_EXECUTE_VALIDATE, 'resPicker必须是以sqlRes开头');
             }
         }
-        return sqlRes;
+        return rows;
     }
 }
 exports.CrudProExecuteSqlService = CrudProExecuteSqlService;

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

@@ -17,7 +17,7 @@ declare class CrudProServiceBase {
      * @param values
      * @protected
      */
-    protected executeUnsafeQuery(obj: IExecuteUnsafeQueryCtx, sql: string, values?: any): Promise<any[]>;
+    protected executeUnsafeQuery(obj: IExecuteUnsafeQueryCtx, sql: string, values?: any): Promise<import("../interfaces").IPoolConnectionQueryResult>;
     protected getContextCfg(): ICrudProCfg;
     protected getExecuteFunction(funcName: string): any;
 }

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CrudProTableMetaService = void 0;
 const CrudProServiceBase_1 = require("./CrudProServiceBase");
 const keys_1 = require("../models/keys");
-const convertMix_1 = require("../utils/sqlConvert/convertMix");
+// import { pickAndConvertRowsByMix } from '../utils/sqlConvert/convertMix';
 class CrudProTableMetaCache {
     constructor() {
         this.cacheMap = {};
@@ -51,7 +51,7 @@ class CrudProTableMetaService extends CrudProServiceBase_1.CrudProServiceBase {
     async loadTableColumnInfo(baseInfo) {
         if (baseInfo.sqlDbType === keys_1.SqlDbType.mysql) {
             const queryRes = await this.executeUnsafeQuery(baseInfo, 'describe ' + baseInfo.sqlTable);
-            const tableDescribe = (0, convertMix_1.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'];
@@ -67,7 +67,7 @@ class CrudProTableMetaService extends CrudProServiceBase_1.CrudProServiceBase {
         ORDER BY ordinal_position;
       `.trim();
             const queryRes = await this.executeUnsafeQuery(baseInfo, columnArraySql);
-            const tableDescribe = (0, convertMix_1.pickAndConvertRowsByMix)(queryRes, baseInfo.sqlDbType);
+            const tableDescribe = queryRes.rows || [];
             return tableDescribe.map(fieldObj => {
                 return fieldObj['column_name'];
             });

package/dist/libs/crud-pro/utils/CrudMonitor.d.ts

@@ -0,0 +1,9 @@
+declare const CrudMonitor: {
+    mysqlGetConnectionCount: number;
+    mysqlReleaseConnectionCount: number;
+    postgresGetConnectionCount: number;
+    postgresReleaseConnectionCount: number;
+    mssqlGetConnectionCount: number;
+    mssqlReleaseConnectionCount: number;
+};
+export { CrudMonitor, };

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

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CrudMonitor = void 0;
+const CrudMonitor = {
+    mysqlGetConnectionCount: 0,
+    mysqlReleaseConnectionCount: 0,
+    postgresGetConnectionCount: 0,
+    postgresReleaseConnectionCount: 0,
+    mssqlGetConnectionCount: 0,
+    mssqlReleaseConnectionCount: 0,
+};
+exports.CrudMonitor = CrudMonitor;

package/dist/libs/crud-pro/utils/MixinUtils.d.ts

@@ -35,5 +35,6 @@ declare const MixinUtils: {
     hasAny(a: string[], b: string[]): boolean;
     selectNotEmpty(a: any, b: any): any;
     parseValueByType(value: any, targetType: string): any;
+    sleepMs(ms: number): Promise<any>;
 };
 export { MixinUtils };

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

@@ -251,5 +251,8 @@ const MixinUtils = {
         }
         return value;
     },
+    sleepMs(ms) {
+        return new Promise(resolve => setTimeout(resolve, ms));
+    }
 };
 exports.MixinUtils = MixinUtils;

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

@@ -1,3 +0,0 @@
-import { SqlDbType } from '../../models/keys';
-declare function pickAndConvertRowsByMix(connectionQueryRes: any, sqlDbType: SqlDbType): any[] | any;
-export { pickAndConvertRowsByMix };

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

@@ -1,22 +1,24 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.pickAndConvertRowsByMix = void 0;
-const keys_1 = require("../../models/keys");
-const convertPgType_1 = require("./convertPgType");
-const _ = require("lodash");
-function pickAndConvertRowsByMix(connectionQueryRes, sqlDbType) {
-    if (!connectionQueryRes) {
-        throw new Error('[pickAndConvertRowsByMix] error, connectionQueryRes is null ');
-    }
-    if (sqlDbType === keys_1.SqlDbType.postgres) {
-        return (0, convertPgType_1.pickAndConvertPgRows)(connectionQueryRes);
-    }
-    if (sqlDbType === keys_1.SqlDbType.mysql) {
-        return connectionQueryRes[0];
-    }
-    if (sqlDbType === keys_1.SqlDbType.sqlserver) {
-        return _.get(connectionQueryRes, 'recordsets[0]') || [];
-    }
-    throw new Error('[pickAndConvertRowsByMix] error sqlDbType, sqlDbType = ' + sqlDbType);
-}
-exports.pickAndConvertRowsByMix = 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/dist/models/userSession.d.ts

@@ -21,6 +21,7 @@ interface ISessionInfo {
     privateKey: string;
     bizExt?: any;
     sessionIdCreatedAt: number;
+    sessionSavedAt: number;
 }
 interface IConsumerUserInfo {
     workbenchCode: string;

package/dist/models/userSession.js

@@ -31,6 +31,7 @@ function createEmptySessionInfo(superAdmin) {
         publicKey: '',
         privateKey: '',
         sessionIdCreatedAt: 0,
+        sessionSavedAt: 0
     };
 }
 class UserSessionInfo {

package/dist/schedule/anonymousContext.js

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

package/dist/service/AuthService.js

@@ -95,6 +95,7 @@ let AuthService = class AuthService {
             publicKey,
             privateKey,
             sessionIdCreatedAt: Date.now(),
+            sessionSavedAt: Date.now()
         };
         await this.userSessionService.saveUserSession(sessionInfo);
         return sessionInfo;
@@ -129,6 +130,7 @@ let AuthService = class AuthService {
             publicKey,
             privateKey,
             sessionIdCreatedAt: Date.now(),
+            sessionSavedAt: Date.now(),
         };
         if (bizExt && typeof bizExt === 'object') {
             sessionInfo.bizExt = bizExt;
@@ -223,9 +225,12 @@ let AuthService = class AuthService {
         return this.userSessionService.removeUserSession(sessionId);
     }
     async refreshSession(sessionInfo) {
+        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 = { ...sessionInfo, roleCodes, functionCodes };
+        const newSessionInfo = { ...sessionInfo, roleCodes, functionCodes, sessionSavedAt: Date.now() };
         await this.userSessionService.saveUserSession(newSessionInfo);
         return newSessionInfo;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "midway-fatcms",
-  "version": "0.0.1-beta.75",
+  "version": "0.0.1-beta.77",
   "description": "This is a midway component sample",
   "main": "dist/index.js",
   "typings": "index.d.ts",

package/src/controller/base/BaseApiController.ts

@@ -186,7 +186,7 @@ export class BaseApiController extends BaseService {
 
   protected async decodeBodyBySession<T>(body: any): Promise<any> {
     if (!this.ctx.userSession?.isLogin()) {
-      throw new Error('[decodeBodyBySessionId] 用户必须登录');
+      throw new Error('身份安全校验不通过, 用户必须先登录');
     }
 
     const sessionInfo = this.getUserSessionInfo();
@@ -196,12 +196,17 @@ export class BaseApiController extends BaseService {
       return body;
     }
 
+    const { privateKey, publicKey, accountId } = sessionInfo;
+    const serverPayload1 = md5(publicKey + accountId);
+    if (serverPayload1 !== secretBody0.payload1) {
+      throw new Error('身份安全校验不通过，请重新登录')
+    }
+
     const secretBody = {
       secretPayload: secretBody0.payload2,
       secretKey: secretBody0.payload4,
     };
 
-    const { privateKey, publicKey } = sessionInfo;
     const secretPayload: string = secretBody.secretPayload;
     const secretKey: string = secretBody.secretKey; // 使用RSA加密的AES密钥
     const aesKey = await AsymmetricCrypto.decrypt(privateKey, secretKey); // 解密AES密钥

package/src/controller/manage/SuperAdminManageApi.ts

@@ -1,12 +1,12 @@
 import { Controller, Inject, Post, Get } from '@midwayjs/core';
 import { Context } from '@midwayjs/koa';
-import { VisitStatService } from '../../service/VisitStatService';
-import { KeysOfSimpleSQL } from '../../libs/crud-pro/models/keys';
+import { VisitStatService } from '@/service/VisitStatService';
+import { KeysOfSimpleSQL } from '@/libs/crud-pro/models/keys';
 import { BaseApiController } from '../base/BaseApiController';
-import { checkRole } from '../../middleware/permission.middleware';
-import { SystemFuncCodeNameMap, SystemRoleCode, SystemRoleCodeNameMap } from '../../models/SystemPerm';
-import { SystemTables } from '../../models/SystemTables';
-import { CommonResult } from '../../libs/utils/common-dto';
+import { checkRole } from '@/middleware/permission.middleware';
+import { SystemFuncCodeNameMap, SystemRoleCode, SystemRoleCodeNameMap } from '@/models/SystemPerm';
+import { SystemTables } from '@/models/SystemTables';
+import { CommonResult } from '@/libs/utils/common-dto';
 import { GLOBAL_STATIC_CONFIG } from '@/libs/global-config/global-config';
 
 @Controller('/ns/api/manage/superAdmin', { middleware: [checkRole(SystemRoleCode.SuperAdmin)] })

package/src/controller/manage/SystemInfoManageApi.ts

@@ -5,6 +5,7 @@ import { BaseApiController } from '../base/BaseApiController';
 import { checkPermission } from '../../middleware/permission.middleware';
 import { SystemFuncCode } from '../../models/SystemPerm';
 import { CommonResult } from '../../libs/utils/common-dto';
+import {CrudMonitor} from "@/libs/crud-pro/utils/CrudMonitor";
 
 @Controller('/ns/api/manage/systemInfo', { middleware: [checkPermission(SystemFuncCode.SystemInfoManageApiRead)] })
 export class SystemInfoManageApi extends BaseApiController {
@@ -48,6 +49,7 @@ export class SystemInfoManageApi extends BaseApiController {
       timeInfo,
       envInfo,
       networkInfo,
+      crudMonitorInfo: CrudMonitor
     });
   }
 }

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

@@ -124,6 +124,11 @@ class CrudPro {
     // 执行SQL执行之后的的处理
     await this.afterExecuteSQLList();
 
+
+    // 再次尝试释放一下资源。避免因为不正确的使用方式导致，连接未释放。
+    const txObj = this.executeContext.getTransaction();
+    await txObj.releaseTxOnlyReleased();
+
     return exeCtx;
   }
 

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

@@ -23,8 +23,17 @@ export interface IConnectionPool {
   poolInstance: any; //MysqlPool | PostgresPool;
 }
 
+export interface IPoolConnectionQueryResult {
+  rows: any[];
+  originRes: any;
+}
 export interface IPoolConnectionClient {
-  query: (sql: string, values: any[]) => Promise<any[]>;
+  query: (sql: string, values: any[]) => Promise<IPoolConnectionQueryResult>;
+  release: () => Promise<any>;
+  commit: () => Promise<any>;
+  rollback: () => Promise<any>;
+  beginTransaction: () => Promise<any>;
+  originConnection: any;
 }
 
 /**