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

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/models/TransactionMySQL.ts

@@ -1,20 +1,28 @@
 import { PoolConnection, Pool } from 'mysql2/promise';
 import { IConnectionPool } from '../interfaces';
+import { CrudMonitor } from "@/libs/crud-pro/utils/CrudMonitor";
 
 class TransactionMySQL {
   private isBeginTransaction = false;
   private connectionMap: Record<string, PoolConnection> = {};
+  private connectionList: PoolConnection[] = [];
 
   /**
    * 获取链接对象
    * @param pool
    */
   public async getTxConnection(pool: IConnectionPool): Promise<PoolConnection> {
+
+    // 尽量复用同一个连接
     let connection = this.connectionMap[pool.poolName];
     if (!connection) {
       const poolInstance: Pool = pool.poolInstance as any;
       connection = await poolInstance.getConnection();
+
       this.connectionMap[pool.poolName] = connection;
+      this.connectionList.push(connection);
+      CrudMonitor.mysqlGetConnectionCount++;
+
       // 开启了事务
       if (this.isBeginTransaction) {
         await connection.beginTransaction();
@@ -37,7 +45,7 @@ class TransactionMySQL {
     if (!this.isBeginTransaction) {
       return;
     }
-    const connections = Object.values(this.connectionMap);
+    const connections = this.connectionList;
     for (let i = 0; i < connections.length; i++) {
       const connection = connections[i];
       await connection.commit();
@@ -51,7 +59,7 @@ class TransactionMySQL {
     if (!this.isBeginTransaction) {
       return;
     }
-    const connections = Object.values(this.connectionMap);
+    const connections = this.connectionList;
     for (let i = 0; i < connections.length; i++) {
       const connection = connections[i];
       await connection.rollback();
@@ -63,15 +71,17 @@ class TransactionMySQL {
    */
   public async releaseTx() {
     // 不管有没有开启事务，都要释放连接。
-    const connections = Object.values(this.connectionMap);
+    const connections = this.connectionList;
     for (let i = 0; i < connections.length; i++) {
       const connection = connections[i];
       try {
+        CrudMonitor.mysqlReleaseConnectionCount++;
         await connection.release();
       } catch (e) {
         console.error(e);
       }
     }
+    this.connectionList = [];
     this.connectionMap = {};
   }
 }

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

@@ -1,5 +1,6 @@
 import { PoolClient, Pool } from 'pg';
 import { IConnectionPool } from '../interfaces';
+import {CrudMonitor} from "@/libs/crud-pro/utils/CrudMonitor";
 
 async function beginTransaction(connection: PoolClient) {
   return await connection.query('BEGIN');
@@ -16,6 +17,7 @@ async function rollback(connection: PoolClient) {
 class TransactionPostgres {
   private isBeginTransaction = false;
   private connectionMap: Record<string, PoolClient> = {};
+  private connectionList: PoolClient[] = [];
 
   /**
    * 获取链接对象
@@ -27,6 +29,8 @@ class TransactionPostgres {
       const poolInstance: Pool = pool.poolInstance as any;
       connection = await poolInstance.connect();
       this.connectionMap[pool.poolName] = connection;
+      this.connectionList.push(connection);
+      CrudMonitor.postgresGetConnectionCount++;
       // 开启了事务
       if (this.isBeginTransaction) {
         await beginTransaction(connection);
@@ -49,7 +53,7 @@ class TransactionPostgres {
     if (!this.isBeginTransaction) {
       return;
     }
-    const connections = Object.values(this.connectionMap);
+    const connections = this.connectionList;
     for (let i = 0; i < connections.length; i++) {
       const connection = connections[i];
       await commit(connection);
@@ -63,7 +67,7 @@ class TransactionPostgres {
     if (!this.isBeginTransaction) {
       return;
     }
-    const connections = Object.values(this.connectionMap);
+    const connections = this.connectionList;
     for (let i = 0; i < connections.length; i++) {
       const connection = connections[i];
       await rollback(connection);
@@ -75,15 +79,17 @@ class TransactionPostgres {
    */
   public async releaseTx() {
     // 不管有没有开启事务，都要释放连接。
-    const connections = Object.values(this.connectionMap);
+    const connections = this.connectionList;
     for (let i = 0; i < connections.length; i++) {
       const connection = connections[i];
       try {
+        CrudMonitor.postgresReleaseConnectionCount++;
         await connection.release();
       } catch (e) {
         console.error(e);
       }
     }
+    this.connectionList = [];
     this.connectionMap = {};
   }
 }

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

@@ -1,5 +1,6 @@
 import { ConnectionPool, Request, Transaction } from 'mssql';
 import { IConnectionPool, IPoolConnectionClient } from '../interfaces';
+import {CrudMonitor} from "@/libs/crud-pro/utils/CrudMonitor";
 
 interface ISqlServerConnection extends IPoolConnectionClient {
   originConnection: ConnectionPool;
@@ -8,7 +9,9 @@ interface ISqlServerConnection extends IPoolConnectionClient {
 class TransactionSqlServer {
   private isBeginTransaction = false;
   private connectionMap: Record<string, ISqlServerConnection> = {};
-  private transactionMap: Record<string, Transaction> = {};
+  private connectionList: ISqlServerConnection[] = [];
+  private transactionList: Transaction[] = [];
+
 
   /**
    * 获取链接对象
@@ -19,10 +22,12 @@ class TransactionSqlServer {
     if (!connection) {
       connection = await this.connectAndCreateConnection(pool);
       this.connectionMap[pool.poolName] = connection;
+      this.connectionList.push(connection);
+      CrudMonitor.mssqlGetConnectionCount++;
 
       // 开启了事务
       if (this.isBeginTransaction) {
-        await this.beginTransaction(pool.poolName);
+        await this.beginTransaction(connection);
       }
     }
     return connection;
@@ -61,7 +66,7 @@ class TransactionSqlServer {
     if (!this.isBeginTransaction) {
       return;
     }
-    const transactions = Object.values(this.transactionMap);
+    const transactions = this.transactionList;
     for (let i = 0; i < transactions.length; i++) {
       const tmpTx = transactions[i];
       await tmpTx.commit();
@@ -75,7 +80,7 @@ class TransactionSqlServer {
     if (!this.isBeginTransaction) {
       return;
     }
-    const transactions = Object.values(this.transactionMap);
+    const transactions = this.transactionList;
     for (let i = 0; i < transactions.length; i++) {
       const tmpTx = transactions[i];
       await tmpTx.rollback();
@@ -86,15 +91,21 @@ class TransactionSqlServer {
    * 释放连接
    */
   public async releaseTx() {
+
+    const connections = this.connectionList || [];
+    for (let i = 0; i < connections.length; i++) {
+      CrudMonitor.mssqlReleaseConnectionCount--;
+    }
+
     this.connectionMap = {};
-    this.transactionMap = {};
+    this.connectionList = [];
+    this.transactionList = [];
   }
 
-  private async beginTransaction(poolName: string) {
-    const connection = this.connectionMap[poolName];
+  private async beginTransaction(connection: ISqlServerConnection) {
     const originConnection: ConnectionPool = connection.originConnection;
     const tmpTx = new Transaction(originConnection);
-    this.transactionMap[poolName] = tmpTx;
+    this.transactionList.push(tmpTx);
     return await tmpTx.begin();
   }
 }

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,
+}