@nest-omni/core 4.1.3-14 → 4.1.3-17

package/audit/audit.module.js

@@ -37,6 +37,9 @@ let AuditModule = AuditModule_1 = class AuditModule {
         var _a, _b;
         const auditConnectionName = ((_a = config === null || config === void 0 ? void 0 : config.connections) === null || _a === void 0 ? void 0 : _a.audit) || 'default';
         const monitoredConnections = ((_b = config === null || config === void 0 ? void 0 : config.connections) === null || _b === void 0 ? void 0 : _b.monitored) || ['default'];
+        console.log('[AuditModule] auditConnectionName:', auditConnectionName);
+        console.log('[AuditModule] monitoredConnections:', monitoredConnections);
+        console.log('[AuditModule] config:', JSON.stringify(config === null || config === void 0 ? void 0 : config.connections));
         // 创建多个订阅者提供者，每个监听的数据库连接一个
         const subscriberProviders = monitoredConnections.map((connectionName) => ({
             provide: `AUDIT_SUBSCRIBER_${connectionName}`,
@@ -134,6 +137,7 @@ let AuditModule = AuditModule_1 = class AuditModule {
                 services_1.TransactionAuditService,
                 services_1.OperationDescriptionService,
                 services_1.AuditActionService,
+                services_1.ManualAuditLogService,
                 interceptors_1.AuditInterceptor,
                 interceptors_1.AuditActionInterceptor,
                 ...subscriberProviders,
@@ -146,6 +150,7 @@ let AuditModule = AuditModule_1 = class AuditModule {
                 services_1.TransactionAuditService,
                 services_1.OperationDescriptionService,
                 services_1.AuditActionService,
+                services_1.ManualAuditLogService,
                 interceptors_1.AuditInterceptor,
                 interceptors_1.AuditActionInterceptor,
                 (0, typeorm_1.getRepositoryToken)(entities_1.AuditActionSummaryEntity),
@@ -262,6 +267,7 @@ let AuditModule = AuditModule_1 = class AuditModule {
                 services_1.TransactionAuditService,
                 services_1.OperationDescriptionService,
                 services_1.AuditActionService,
+                services_1.ManualAuditLogService,
                 interceptors_1.AuditInterceptor,
                 interceptors_1.AuditActionInterceptor,
             ],
@@ -273,6 +279,7 @@ let AuditModule = AuditModule_1 = class AuditModule {
                 services_1.TransactionAuditService,
                 services_1.OperationDescriptionService,
                 services_1.AuditActionService,
+                services_1.ManualAuditLogService,
                 interceptors_1.AuditInterceptor,
                 interceptors_1.AuditActionInterceptor,
             ],

package/audit/services/entity-audit.service.js

@@ -33,6 +33,7 @@ const audit_strategy_service_1 = require("./audit-strategy.service");
 const multi_database_service_1 = require("./multi-database.service");
 const dto_1 = require("../../common/dto");
 const entity_audit_decorator_1 = require("../decorators/entity-audit.decorator");
+const transaction_1 = require("@nest-omni/transaction");
 /**
  * 实体审计服务
  */
@@ -248,7 +249,7 @@ let EntityAuditService = class EntityAuditService {
             try {
                 // 获取指定的数据库连接
                 const connectionName = options.connectionName || 'default';
-                const dataSource = yield this.multiDbService.getDataSource(connectionName);
+                const dataSource = (0, transaction_1.getDataSource)(connectionName);
                 const repository = dataSource.getRepository(entityType);
                 // 恢复实体
                 const restoreData = Object.assign({}, auditLog.oldValue);

package/audit/services/manual-audit-log.service.js

@@ -292,8 +292,8 @@ let ManualAuditLogService = class ManualAuditLogService {
 exports.ManualAuditLogService = ManualAuditLogService;
 exports.ManualAuditLogService = ManualAuditLogService = __decorate([
     (0, common_1.Injectable)(),
-    __param(0, (0, typeorm_1.InjectRepository)(entities_1.ManualOperationLogEntity, 'audit')),
-    __param(1, (0, typeorm_1.InjectRepository)(entities_1.EntityTransactionEntity, 'audit')),
+    __param(0, (0, typeorm_1.InjectRepository)(entities_1.ManualOperationLogEntity)),
+    __param(1, (0, typeorm_1.InjectRepository)(entities_1.EntityTransactionEntity)),
     __metadata("design:paramtypes", [typeorm_2.Repository,
         typeorm_2.Repository,
         audit_context_service_1.AuditContextService,

package/audit/services/multi-database.service.d.ts

@@ -1,4 +1,3 @@
-import { DataSource } from 'typeorm';
 import { ModuleRef } from '@nestjs/core';
 /**
  * 多数据库连接管理服务
@@ -7,10 +6,6 @@ export declare class MultiDatabaseService {
     private readonly moduleRef;
     private readonly config?;
     constructor(moduleRef: ModuleRef, config?: any);
-    /**
-     * 获取指定连接的 DataSource
-     */
-    getDataSource(connectionName?: string): Promise<DataSource>;
     /**
      * 获取所有监听的数据库连接
      */

package/audit/services/multi-database.service.js

@@ -11,19 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var __param = (this && this.__param) || function (paramIndex, decorator) {
     return function (target, key) { decorator(target, key, paramIndex); }
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MultiDatabaseService = void 0;
 const common_1 = require("@nestjs/common");
-const typeorm_1 = require("@nestjs/typeorm");
 const core_1 = require("@nestjs/core");
 /**
  * 多数据库连接管理服务
@@ -33,20 +23,6 @@ let MultiDatabaseService = class MultiDatabaseService {
         this.moduleRef = moduleRef;
         this.config = config;
     }
-    /**
-     * 获取指定连接的 DataSource
-     */
-    getDataSource() {
-        return __awaiter(this, arguments, void 0, function* (connectionName = 'default') {
-            try {
-                const dataSource = this.moduleRef.get((0, typeorm_1.getDataSourceToken)(connectionName), { strict: false });
-                return dataSource;
-            }
-            catch (error) {
-                throw new Error(`Failed to get DataSource for connection: ${connectionName}`);
-            }
-        });
-    }
     /**
      * 获取所有监听的数据库连接
      */

package/audit/services/transaction-audit.service.js

@@ -30,6 +30,7 @@ const enums_1 = require("../enums");
 const audit_context_service_1 = require("./audit-context.service");
 const entity_audit_service_1 = require("./entity-audit.service");
 const multi_database_service_1 = require("./multi-database.service");
+const transaction_1 = require("@nest-omni/transaction");
 /**
  * 事务审计服务
  */
@@ -140,7 +141,7 @@ let TransactionAuditService = class TransactionAuditService {
                 let connectionFound = false;
                 for (const connectionName of monitoredConnections) {
                     try {
-                        const dataSource = yield this.multiDbService.getDataSource(connectionName);
+                        const dataSource = (0, transaction_1.getDataSource)(connectionName);
                         const metadata = dataSource.getMetadata(entity.entityType);
                         if (metadata) {
                             if (!grouped[connectionName]) {
@@ -173,7 +174,7 @@ let TransactionAuditService = class TransactionAuditService {
      */
     rollbackEntitiesInConnection(connectionName, entities) {
         return __awaiter(this, void 0, void 0, function* () {
-            const dataSource = yield this.multiDbService.getDataSource(connectionName);
+            const dataSource = (0, transaction_1.getDataSource)(connectionName);
             // 使用事务执行回滚
             yield dataSource.transaction((manager) => __awaiter(this, void 0, void 0, function* () {
                 for (const entity of entities) {

package/cache/dependencies/db.dependency.d.ts

@@ -1,5 +1,5 @@
 import { DataSource } from 'typeorm';
-import type { CacheDependency } from '../interfaces/cache-dependency.interface';
+import type { CacheDependency } from '../interfaces';
 /**
  * Options for DbDependency
  */
@@ -96,7 +96,7 @@ export declare class DbDependency implements CacheDependency {
     static getDataSource(): DataSource | null;
     /**
      * Get DataSource for executing queries
-     * Priority: 1. Specific dataSourceName from options, 2. Default from DataSourceUtil, 3. Fallback
+     * Priority: 1. Specific dataSourceName from options, 2. Default from getDataSourceByName, 3. Fallback
      */
     private getDataSource;
     getKey(): string;

package/cache/dependencies/db.dependency.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbDependency = void 0;
-const data_source_util_1 = require("../../transaction/data-source.util");
+const transaction_1 = require("@nest-omni/transaction");
 /**
  * Database-based cache dependency
  *
@@ -100,13 +100,13 @@ class DbDependency {
     }
     /**
      * Get DataSource for executing queries
-     * Priority: 1. Specific dataSourceName from options, 2. Default from DataSourceUtil, 3. Fallback
+     * Priority: 1. Specific dataSourceName from options, 2. Default from getDataSourceByName, 3. Fallback
      */
     getDataSource() {
         var _a;
-        // Try to get from DataSourceUtil first (supports dynamic data sources from transactions)
+        // Try to get from getDataSourceByName first
         const dsName = ((_a = this.options) === null || _a === void 0 ? void 0 : _a.dataSourceName) || DbDependency.defaultDataSourceName;
-        const dataSource = data_source_util_1.DataSourceUtil.getDataSourceSafe(dsName);
+        const dataSource = (0, transaction_1.getDataSource)(dsName);
         if (dataSource) {
             return dataSource;
         }

package/decorators/field.decorators.d.ts

@@ -69,7 +69,7 @@ export declare function FQDNFieldOptional(options?: Omit<ApiPropertyOptions, 'ty
 export declare function DateField(options?: Omit<ApiPropertyOptions, 'type'> & IDateFieldOptions): PropertyDecorator;
 export declare function DateFieldOptional(options?: Omit<ApiPropertyOptions, 'type' | 'required'> & IDateFieldOptions): PropertyDecorator;
 export declare function IpFieldOptional(options?: Omit<ApiPropertyOptions, 'type'> & IIPFieldOptions & IStringFieldOptions): PropertyDecorator;
-export declare function IpField(options: Omit<ApiPropertyOptions, 'type'> & IStringFieldOptions & IIPFieldOptions): PropertyDecorator;
+export declare function IpField(options?: Omit<ApiPropertyOptions, 'type'> & IStringFieldOptions & IIPFieldOptions): PropertyDecorator;
 export declare function ObjectField(options?: Omit<ApiPropertyOptions, 'type'> & IFieldOptions): PropertyDecorator;
 export declare function ObjectFieldOptional(options?: Omit<ApiPropertyOptions, 'type'> & IFieldOptions): PropertyDecorator;
 export declare function TimeZoneField(options?: Omit<ApiPropertyOptions, 'type'> & IStringFieldOptions): PropertyDecorator;

package/http-client/examples/proxy-from-environment.example.d.ts

@@ -3,7 +3,7 @@
  *
  * 本文件演示如何在 HTTP Client 中使用代理环境变量支持
  */
-import { HttpClientService } from '@nest-omni/core';
+import { HttpClientService } from '../';
 /**
  * 示例 1: 使用环境变量配置代理 (推荐方式)
  *

package/http-client/examples/proxy-from-environment.example.js

@@ -22,11 +22,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var _a, _b, _c, _d, _e, _f;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.environmentVariablesExamples = exports.httpClientModuleConfig = exports.ProxyUtilityExample = exports.DevelopmentProxyExample = exports.EnterpriseProxyExample = exports.MixedProxyExample = exports.NoProxyExample = exports.ProxyWithAuthExample = exports.ProxyFromEnvironmentExample = void 0;
 const common_1 = require("@nestjs/common");
-const core_1 = require("@nest-omni/core");
+const __1 = require("../");
 /**
  * 示例 1: 使用环境变量配置代理 (推荐方式)
  *
@@ -66,7 +65,7 @@ let ProxyFromEnvironmentExample = class ProxyFromEnvironmentExample {
 };
 exports.ProxyFromEnvironmentExample = ProxyFromEnvironmentExample;
 __decorate([
-    (0, core_1.HttpUseProxy)({
+    (0, __1.HttpUseProxy)({
         enabled: true,
         fromEnvironment: true,
     }),
@@ -76,7 +75,7 @@ __decorate([
 ], ProxyFromEnvironmentExample.prototype, "fetchWithProxyFromEnv", null);
 exports.ProxyFromEnvironmentExample = ProxyFromEnvironmentExample = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [typeof (_a = typeof core_1.HttpClientService !== "undefined" && core_1.HttpClientService) === "function" ? _a : Object])
+    __metadata("design:paramtypes", [__1.HttpClientService])
 ], ProxyFromEnvironmentExample);
 /**
  * 示例 2: 带认证的代理环境变量
@@ -97,7 +96,7 @@ let ProxyWithAuthExample = class ProxyWithAuthExample {
 };
 exports.ProxyWithAuthExample = ProxyWithAuthExample;
 __decorate([
-    (0, core_1.HttpUseProxy)({
+    (0, __1.HttpUseProxy)({
         enabled: true,
         fromEnvironment: true,
     }),
@@ -107,7 +106,7 @@ __decorate([
 ], ProxyWithAuthExample.prototype, "fetchWithAuthenticatedProxy", null);
 exports.ProxyWithAuthExample = ProxyWithAuthExample = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [typeof (_b = typeof core_1.HttpClientService !== "undefined" && core_1.HttpClientService) === "function" ? _b : Object])
+    __metadata("design:paramtypes", [__1.HttpClientService])
 ], ProxyWithAuthExample);
 /**
  * 示例 3: NO_PROXY 使用示例
@@ -141,7 +140,7 @@ let NoProxyExample = class NoProxyExample {
 };
 exports.NoProxyExample = NoProxyExample;
 __decorate([
-    (0, core_1.HttpUseProxy)({
+    (0, __1.HttpUseProxy)({
         enabled: true,
         fromEnvironment: true,
     }),
@@ -150,7 +149,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], NoProxyExample.prototype, "fetchExternalApi", null);
 __decorate([
-    (0, core_1.HttpUseProxy)({
+    (0, __1.HttpUseProxy)({
         enabled: true,
         fromEnvironment: true,
     }),
@@ -159,7 +158,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], NoProxyExample.prototype, "fetchInternalApi", null);
 __decorate([
-    (0, core_1.HttpUseProxy)({
+    (0, __1.HttpUseProxy)({
         enabled: true,
         fromEnvironment: true,
     }),
@@ -169,7 +168,7 @@ __decorate([
 ], NoProxyExample.prototype, "fetchLocalhost", null);
 exports.NoProxyExample = NoProxyExample = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [typeof (_c = typeof core_1.HttpClientService !== "undefined" && core_1.HttpClientService) === "function" ? _c : Object])
+    __metadata("design:paramtypes", [__1.HttpClientService])
 ], NoProxyExample);
 /**
  * 示例 4: 混合使用 - 部分请求使用代理，部分不使用
@@ -193,7 +192,7 @@ let MixedProxyExample = class MixedProxyExample {
 };
 exports.MixedProxyExample = MixedProxyExample;
 __decorate([
-    (0, core_1.HttpUseProxy)({
+    (0, __1.HttpUseProxy)({
         enabled: true,
         fromEnvironment: true,
     }),
@@ -203,7 +202,7 @@ __decorate([
 ], MixedProxyExample.prototype, "fetchWithProxy", null);
 exports.MixedProxyExample = MixedProxyExample = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [typeof (_d = typeof core_1.HttpClientService !== "undefined" && core_1.HttpClientService) === "function" ? _d : Object])
+    __metadata("design:paramtypes", [__1.HttpClientService])
 ], MixedProxyExample);
 /**
  * 示例 5: 企业环境中的实际使用场景
@@ -248,7 +247,7 @@ let EnterpriseProxyExample = class EnterpriseProxyExample {
 };
 exports.EnterpriseProxyExample = EnterpriseProxyExample;
 __decorate([
-    (0, core_1.HttpUseProxy)({
+    (0, __1.HttpUseProxy)({
         enabled: true,
         fromEnvironment: true,
     }),
@@ -257,7 +256,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], EnterpriseProxyExample.prototype, "fetchFromExternalApi", null);
 __decorate([
-    (0, core_1.HttpUseProxy)({
+    (0, __1.HttpUseProxy)({
         enabled: true,
         fromEnvironment: true,
     }),
@@ -266,7 +265,7 @@ __decorate([
     __metadata("design:returntype", Promise)
 ], EnterpriseProxyExample.prototype, "fetchFromInternalService", null);
 __decorate([
-    (0, core_1.HttpUseProxy)({
+    (0, __1.HttpUseProxy)({
         enabled: true,
         fromEnvironment: true,
     }),
@@ -276,7 +275,7 @@ __decorate([
 ], EnterpriseProxyExample.prototype, "fetchFromK8sService", null);
 exports.EnterpriseProxyExample = EnterpriseProxyExample = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [typeof (_e = typeof core_1.HttpClientService !== "undefined" && core_1.HttpClientService) === "function" ? _e : Object])
+    __metadata("design:paramtypes", [__1.HttpClientService])
 ], EnterpriseProxyExample);
 /**
  * 示例 6: 开发环境调试代理
@@ -301,7 +300,7 @@ let DevelopmentProxyExample = class DevelopmentProxyExample {
 };
 exports.DevelopmentProxyExample = DevelopmentProxyExample;
 __decorate([
-    (0, core_1.HttpUseProxy)({
+    (0, __1.HttpUseProxy)({
         enabled: process.env.NODE_ENV === 'development',
         fromEnvironment: true,
     }),
@@ -311,7 +310,7 @@ __decorate([
 ], DevelopmentProxyExample.prototype, "debugRequest", null);
 exports.DevelopmentProxyExample = DevelopmentProxyExample = __decorate([
     (0, common_1.Injectable)(),
-    __metadata("design:paramtypes", [typeof (_f = typeof core_1.HttpClientService !== "undefined" && core_1.HttpClientService) === "function" ? _f : Object])
+    __metadata("design:paramtypes", [__1.HttpClientService])
 ], DevelopmentProxyExample);
 /**
  * 示例 7: 程序化检查代理配置
@@ -319,7 +318,7 @@ exports.DevelopmentProxyExample = DevelopmentProxyExample = __decorate([
 let ProxyUtilityExample = class ProxyUtilityExample {
     checkProxyConfiguration() {
         return __awaiter(this, void 0, void 0, function* () {
-            const { ProxyEnvironmentParser } = yield Promise.resolve().then(() => require('@nest-omni/core'));
+            const { ProxyEnvironmentParser } = yield Promise.resolve().then(() => require('../'));
             // 检查是否设置了代理环境变量
             const hasProxy = ProxyEnvironmentParser.hasProxyEnvironment();
             console.log('Has proxy environment:', hasProxy);

package/http-client/services/logging.service.js

@@ -26,7 +26,6 @@ const http_log_entity_1 = require("../entities/http-log.entity");
 const request_id_util_1 = require("../utils/request-id.util");
 const context_extractor_util_1 = require("../utils/context-extractor.util");
 const call_stack_extractor_util_1 = require("../utils/call-stack-extractor.util");
-const transaction_1 = require("../../transaction");
 /**
  * HTTP日志服务
  * 基于Spring Boot的请求日志记录机制，集成现有的ContextProvider
@@ -106,8 +105,8 @@ let HttpLoggingService = HttpLoggingService_1 = class HttpLoggingService {
                     this.logger.log(logMessage, logData);
                     break;
             }
-            if (!this.logRepository) {
-                this.logRepository = transaction_1.TransactionContextService.getDataSource().getRepository(loggingOptions.databaseLogging.tableName);
+            if (!this.logRepository && this.dataSource) {
+                this.logRepository = this.dataSource.getRepository(loggingOptions.databaseLogging.tableName);
             }
             // 数据库日志记录
             if (databaseLogging && this.logRepository) {

package/index.d.ts

@@ -11,7 +11,6 @@ export * from './validators';
 export * from './validator-json';
 export * from './helpers';
 export * from './providers';
-export * from './transaction';
 export * from './redis-lock';
 export * from './cache';
 export * from './http-client';
@@ -20,3 +19,4 @@ export * from './setup';
 export * from './health-checker';
 export * from './audit';
 export * from './file-upload';
+export * from '@nest-omni/transaction';

package/index.js

@@ -28,7 +28,6 @@ __exportStar(require("./validators"), exports);
 __exportStar(require("./validator-json"), exports);
 __exportStar(require("./helpers"), exports);
 __exportStar(require("./providers"), exports);
-__exportStar(require("./transaction"), exports);
 // Lock module
 __exportStar(require("./redis-lock"), exports);
 // Cache module
@@ -45,3 +44,4 @@ __exportStar(require("./health-checker"), exports);
 __exportStar(require("./audit"), exports);
 // File upload module
 __exportStar(require("./file-upload"), exports);
+__exportStar(require("@nest-omni/transaction"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nest-omni/core",
-  "version": "4.1.3-14",
+  "version": "4.1.3-17",
   "description": "A comprehensive NestJS framework for building enterprise-grade applications with best practices",
   "main": "index.js",
   "types": "index.d.ts",
@@ -54,6 +54,7 @@
   "dependencies": {
     "@dataui/crud": "^5.3.4",
     "@dataui/crud-typeorm": "^5.3.4",
+    "@nest-omni/transaction": "^1.0.0",
     "@nestjs/bull": "^11.0.4",
     "@nestjs/common": "^11.1.7",
     "@nestjs/config": "^4.0.2",
@@ -79,6 +80,7 @@
     "dotenv": "^17.2.3",
     "express": "^5.1.0",
     "express-session": "^1.18.2",
+    "fast-csv": "^5.0.5",
     "hygen": "^6.2.11",
     "ioredis": "^5.8.2",
     "libphonenumber-js": "^1.12.25",
@@ -98,7 +100,6 @@
     "sprintf-js": "^1.1.3",
     "typeorm": "^0.3.27",
     "uuid": "^13.0.0",
-    "fast-csv": "^5.0.5",
     "xlsx": "git+https://git.sheetjs.com/sheetjs/sheetjs.git#v0.20.3"
   },
   "peerDependencies": {}

package/setup/bootstrap.setup.d.ts

@@ -1,3 +1,3 @@
-import "../common/boilerplate.polyfill";
+import '../common/boilerplate.polyfill';
 import type { NestExpressApplication } from '@nestjs/platform-express';
 export declare function bootstrapSetup(AppModule: any, SetupSwagger: any): Promise<NestExpressApplication<import("http").Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse>>>;

package/shared/service-registry.module.js

@@ -36,7 +36,7 @@ const redis_lock_1 = require("../redis-lock");
 const typeorm_2 = require("typeorm");
 const vault_1 = require("../vault");
 const validators_1 = require("../validators");
-const transaction_1 = require("../transaction");
+const transaction_1 = require("@nest-omni/transaction");
 const providers = [
     services_1.ApiConfigService,
     services_1.GeneratorService,
@@ -87,25 +87,12 @@ const modules = [
 ];
 if (services_1.ApiConfigService.toBoolean(process.env.DB_ENABLED, true)) {
     // 1. 首先导入 TransactionModule
-    modules.push(transaction_1.TransactionModule.forRoot({
-        defaultDataSource: 'default',
-        enableDynamicRegistration: true,
-    }));
+    modules.push(transaction_1.TransactionModule.forRoot());
     // 2. 导入 TypeORM 模块，并在初始化后注册数据源
     modules.push(typeorm_1.TypeOrmModule.forRootAsync({
         inject: [services_1.ApiConfigService],
         useFactory: (config) => config.typeormConfig,
     }));
-    // 3. 添加数据源注册服务，在应用启动时注册 DataSource
-    providers.push({
-        provide: 'DATASOURCE_REGISTRAR',
-        useFactory: (dataSource) => __awaiter(void 0, void 0, void 0, function* () {
-            // 手动注册 default 数据源到 DataSourceUtil
-            (0, transaction_1.addDataSource)('default', dataSource, true);
-            return dataSource;
-        }),
-        inject: [typeorm_2.DataSource],
-    });
     // 4. 配置 CLS 模块
     modules.push(nestjs_cls_1.ClsModule.forRootAsync({
         imports: [typeorm_1.TypeOrmModule],

package/shared/services/api-config.service.js

@@ -47,6 +47,7 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
     }
     get typeormConfig() {
         return {
+            name: 'default',
             autoLoadEntities: true,
             type: 'mysql',
             host: this.getString('DB_HOST'),

package/validators/is-exists.validator.d.ts

@@ -1,5 +1,5 @@
 import type { ValidationArguments, ValidationOptions, ValidatorConstraintInterface } from 'class-validator';
-import type { DataSource, EntitySchema, FindOptionsWhere, ObjectType } from 'typeorm';
+import type { EntitySchema, FindOptionsWhere, ObjectType } from 'typeorm';
 export declare class IsExistsValidator implements ValidatorConstraintInterface {
     constructor();
     /**
@@ -15,11 +15,6 @@ export declare class IsExistsValidator implements ValidatorConstraintInterface {
      * 例如：appId -> App, userId -> User
      */
     private inferEntityNameFromProperty;
-    /**
-     * 获取数据源
-     * 支持多数据源配置，保持向后兼容
-     */
-    private getDataSource;
     validate<E>(value: string, args: IExistsValidationArguments<E>): Promise<boolean>;
     defaultMessage(args: ValidationArguments): string;
 }
@@ -32,7 +27,7 @@ export interface IsExistsOptions {
      * 用于多数据源场景，指定使用哪个数据源进行验证
      * 例如：'readonly', 'report', 或直接传入 DataSource 实例
      */
-    dataSource?: string | DataSource;
+    dataSource?: string;
 }
 type ExistsValidationConstraints<E> = [
     (ObjectType<E> | EntitySchema<E> | string | (() => ObjectType<E> | EntitySchema<E> | string)),

package/validators/is-exists.validator.js

@@ -23,8 +23,7 @@ exports.IsExists = IsExists;
 const class_validator_1 = require("class-validator");
 const nestjs_i18n_1 = require("nestjs-i18n");
 const common_1 = require("@nestjs/common");
-const transaction_1 = require("../transaction");
-const transaction_2 = require("../transaction");
+const transaction_1 = require("@nest-omni/transaction");
 let IsExistsValidator = class IsExistsValidator {
     constructor() { }
     /**
@@ -85,27 +84,6 @@ let IsExistsValidator = class IsExistsValidator {
         const entityName = name.charAt(0).toUpperCase() + name.slice(1) + 'Entity';
         return entityName;
     }
-    /**
-     * 获取数据源
-     * 支持多数据源配置，保持向后兼容
-     */
-    getDataSource(dataSourceOrName) {
-        // 1. 如果传入的是 DataSource 实例，直接返回
-        if (dataSourceOrName && typeof dataSourceOrName !== 'string') {
-            return dataSourceOrName;
-        }
-        // 2. 如果传入的是数据源名称，获取对应的数据源
-        if (typeof dataSourceOrName === 'string') {
-            return (0, transaction_2.getDataSource)(dataSourceOrName);
-        }
-        // 3. 默认：尝试从请求上下文获取，然后获取 default 数据源
-        try {
-            return transaction_1.TransactionContextService.getDataSource();
-        }
-        catch (_a) {
-            return (0, transaction_2.getDataSource)('default');
-        }
-    }
     validate(value, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const [entityRef, findCondition, options] = args.constraints;
@@ -113,7 +91,7 @@ let IsExistsValidator = class IsExistsValidator {
             const entityClass = this.resolveEntity(entityRef, args.property, args.object);
             // 获取数据源（支持多数据源）
             const dataSourceName = (options === null || options === void 0 ? void 0 : options.dataSource) || 'default';
-            const dataSource = this.getDataSource(dataSourceName);
+            const dataSource = (0, transaction_1.getDataSource)(dataSourceName);
             const repository = dataSource.getRepository(entityClass);
             args.value = value;
             return ((yield repository.count({

package/validators/is-unique.validator.d.ts

@@ -1,5 +1,5 @@
 import type { ValidationArguments, ValidationOptions, ValidatorConstraintInterface } from 'class-validator';
-import type { DataSource, EntitySchema, FindOptionsWhere, ObjectType } from 'typeorm';
+import type { EntitySchema, FindOptionsWhere, ObjectType } from 'typeorm';
 export declare class IsUniqueValidator implements ValidatorConstraintInterface {
     constructor();
     /**
@@ -15,11 +15,6 @@ export declare class IsUniqueValidator implements ValidatorConstraintInterface {
      * 例如：appId -> App, userId -> User
      */
     private inferEntityNameFromProperty;
-    /**
-     * 获取数据源
-     * 支持多数据源配置，保持向后兼容
-     */
-    private getDataSource;
     validate<E>(value: string, args: IUniqueValidationArguments<E>): Promise<boolean>;
     defaultMessage(args: ValidationArguments): string;
 }
@@ -38,7 +33,7 @@ export interface IsUniqueOptions {
      * 用于多数据源场景，指定使用哪个数据源进行验证
      * 例如：'readonly', 'report', 或直接传入 DataSource 实例
      */
-    dataSource?: string | DataSource;
+    dataSource?: string;
 }
 type UniqueValidationConstraints<E> = [
     (ObjectType<E> | EntitySchema<E> | string | (() => ObjectType<E> | EntitySchema<E> | string)),