@nest-omni/core 4.1.3-3 → 4.1.3-30

package/shared/{serviceRegistryModule.js → service-registry.module.js}

@@ -27,8 +27,6 @@ const typeorm_1 = require("@nestjs/typeorm");
 const schedule_1 = require("@nestjs/schedule");
 const setup_1 = require("@sentry/nestjs/setup");
 const cache_1 = require("../cache");
-const transactional_1 = require("@nestjs-cls/transactional");
-const transactional_adapter_typeorm_1 = require("@nestjs-cls/transactional-adapter-typeorm");
 const nestjs_i18n_1 = require("nestjs-i18n");
 const health_checker_1 = require("../health-checker");
 const nestjs_redis_1 = require("@songkeys/nestjs-redis");
@@ -38,9 +36,10 @@ 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("@nest-omni/transaction");
+const email_log_1 = require("../email-log");
 const providers = [
     services_1.ApiConfigService,
-    services_1.ValidatorService,
     services_1.GeneratorService,
     services_1.TranslationService,
     validators_1.IsExistsValidator,
@@ -61,19 +60,6 @@ const modules = [
         expandVariables: false,
         envFilePath: [process.env.ENV_FILE_PATH, process.env.BASE_ENV_FILE_PATH],
     }),
-    nestjs_cls_1.ClsModule.forRoot({
-        global: true,
-        middleware: { mount: true, saveReq: true },
-        plugins: [
-            new transactional_1.ClsPluginTransactional({
-                imports: [typeorm_1.TypeOrmModule],
-                adapter: new transactional_adapter_typeorm_1.TransactionalAdapterTypeOrm({
-                    dataSourceToken: typeorm_2.DataSource,
-                }),
-                enableTransactionProxy: true,
-            }),
-        ],
-    }),
     nestjs_pino_1.LoggerModule.forRootAsync({
         inject: [services_1.ApiConfigService],
         useFactory: (config) => config.pinoConfig,
@@ -101,10 +87,23 @@ const modules = [
     }),
 ];
 if (services_1.ApiConfigService.toBoolean(process.env.DB_ENABLED, true)) {
+    // 1. 首先导入 TransactionModule
+    modules.push(transaction_1.TransactionModule.forRoot());
+    // 2. 导入 TypeORM 模块，并在初始化后注册数据源
     modules.push(typeorm_1.TypeOrmModule.forRootAsync({
         inject: [services_1.ApiConfigService],
         useFactory: (config) => config.typeormConfig,
     }));
+    // 4. 配置 CLS 模块
+    modules.push(nestjs_cls_1.ClsModule.forRootAsync({
+        imports: [typeorm_1.TypeOrmModule],
+        useFactory(args) {
+            return {
+                middleware: { mount: true, saveReq: true },
+            };
+        },
+        global: true,
+    }));
 }
 if (services_1.ApiConfigService.toBoolean(process.env.BULL_ENABLED)) {
     modules.push(bull_1.BullModule.forRootAsync({
@@ -128,7 +127,6 @@ if (services_1.ApiConfigService.toBoolean(process.env.CACHE_ENABLED)) {
             return {
                 isGlobal: true,
                 redisClient,
-                dataSource,
                 memoryTtl: config.getNumber('CACHE_TTL'),
                 memoryNamespace: config.getString('CACHE_NAMESPACE', 'default'),
                 enableCompression: config.getBoolean('CACHE_COMPRESSION_ENABLED', false),
@@ -165,6 +163,19 @@ if (services_1.ApiConfigService.toBoolean(process.env.SCHEDULE_ENABLED) &&
 if (services_1.ApiConfigService.toBoolean(process.env.SCHEDULE_ENABLED)) {
     modules.push(schedule_1.ScheduleModule.forRoot());
 }
+// Email log transport for Pino
+if (services_1.ApiConfigService.toBoolean(process.env.EMAIL_LOG_ENABLED, false)) {
+    modules.push(email_log_1.EmailLogModule.forRootAsync({
+        inject: [services_1.ApiConfigService],
+        useFactory: (config) => {
+            const emailConfig = config.emailLogConfig;
+            if (!emailConfig) {
+                throw new Error('EMAIL_LOG_ENABLED is true but emailLogConfig is null');
+            }
+            return emailConfig;
+        },
+    }));
+}
 let ServiceRegistryModule = class ServiceRegistryModule {
 };
 exports.ServiceRegistryModule = ServiceRegistryModule;

package/shared/services/api-config.service.d.ts

@@ -5,6 +5,7 @@ import { Params } from 'nestjs-pino';
 import { BullRootModuleOptions } from '@nestjs/bull/dist/interfaces/bull-module-options.interface';
 import { AxiosProxyConfig } from 'axios';
 import { CorsOptions } from '@nestjs/common/interfaces/external/cors-options.interface';
+import { PinoEmailTransport } from '../../email-log';
 export declare class ApiConfigService {
     private configService;
     static rootPath: string;
@@ -47,7 +48,47 @@ export declare class ApiConfigService {
     get isRedisEnabled(): boolean;
     get bullConfig(): BullRootModuleOptions;
     get pinoConfig(): Params;
+    /**
+     * Get Pino multistream configuration with email transport
+     * This method provides additional stream for email logging
+     * Usage: pass to LoggerModule or use with pino.multistream()
+     */
+    get pinoEmailStream(): {
+        level: string;
+        stream: any;
+    };
     get axiosProxyConfig(): AxiosProxyConfig | false;
+    /**
+     * Email log transport configuration
+     * Returns null if email logging is disabled
+     */
+    get emailLogConfig(): {
+        enabled: boolean;
+        to: string[];
+        from: string;
+        level: string;
+        subjectPrefix: string;
+        smtpHost: string;
+        smtpPort: number;
+        smtpUsername: string;
+        smtpPassword: string;
+        smtpSecure: boolean;
+        smtpIgnoreTLSError: boolean;
+        rateLimitMaxEmails: number;
+        rateLimitWindowMs: number;
+        rateLimitBurstSize: number;
+        useHtmlFormat: boolean;
+        includeApps: string[];
+        excludeApps: string[];
+        includeErrors: string[];
+        excludeErrors: string[];
+    };
+    /**
+     * Get Pino email transport instance
+     * This returns a Pino transport that can be used directly with Pino logger
+     * Usage: pino(transport) or add to multistream
+     */
+    get pinoEmailTransport(): PinoEmailTransport;
     static getRootPath(): string;
     static toBoolean(value: string, defaultValue?: any): boolean;
     getNumber(key: string, defaultValue?: number): number;

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

@@ -16,7 +16,9 @@ const config_1 = require("@nestjs/config");
 const lodash_1 = require("lodash");
 const connect_redis_1 = require("connect-redis");
 const ioredis_1 = require("ioredis");
+const pino_1 = require("pino");
 const common_2 = require("../../common");
+const email_log_1 = require("../../email-log");
 let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
     constructor(configService) {
         this.configService = configService;
@@ -47,6 +49,7 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
     }
     get typeormConfig() {
         return {
+            name: 'default',
             autoLoadEntities: true,
             type: 'mysql',
             host: this.getString('DB_HOST'),
@@ -56,7 +59,7 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
             password: this.getString('DB_PASSWORD'),
             database: this.getString('DB_DATABASE'),
             subscribers: [],
-            synchronize: this.isDev,
+            synchronize: this.getBoolean('DB_SYNCHRONIZE', this.isDev),
             migrationsRun: true,
             logging: this.getBoolean('DB_LOG_ENABLED'),
             logger: this.isDev ? 'formatted-console' : 'simple-console',
@@ -203,15 +206,68 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
         };
     }
     get pinoConfig() {
-        const transport = this.isDev
-            ? {
-                target: 'pino-pretty',
+        const emailConfig = this.emailLogConfig;
+        const emailEnabled = (emailConfig === null || emailConfig === void 0 ? void 0 : emailConfig.enabled) || false;
+        // For dev mode without email, use pino-pretty
+        if (this.isDev && !emailEnabled) {
+            return {
+                pinoHttp: {
+                    genReqId: (req) => req.id,
+                    transport: {
+                        target: 'pino-pretty',
+                    },
+                    level: 'debug',
+                    customLogLevel: function (res) {
+                        if (res.statusCode >= 500)
+                            return 'error';
+                        if (res.statusCode >= 400)
+                            return 'warn';
+                        return 'info';
+                    },
+                    wrapSerializers: true,
+                    customProps: (req, res) => {
+                        return {
+                            env: this.nodeEnv,
+                            appName: this.getString('NAME'),
+                            user: req === null || req === void 0 ? void 0 : req.user,
+                            'req.body': req === null || req === void 0 ? void 0 : req.body,
+                            'res.body': res === null || res === void 0 ? void 0 : res.body,
+                        };
+                    },
+                    redact: {
+                        paths: ['req.headers.authorization', 'req.headers.apikey', 'req.headers.cookie'],
+                        remove: true,
+                    },
+                },
+            };
+        }
+        // For production or when email is enabled
+        // Prepare multistream targets
+        const streams = [
+            {
+                level: 'trace',
+                stream: process.stdout,
+            },
+        ];
+        // Add email transport if enabled
+        if (emailEnabled && emailConfig) {
+            try {
+                // Create email transport
+                const emailTransport = new email_log_1.PinoEmailTransport(emailConfig);
+                streams.push({
+                    level: emailConfig.level || 'error',
+                    stream: emailTransport,
+                });
             }
-            : null;
+            catch (error) {
+                console.error('Failed to create Pino email transport:', error);
+            }
+        }
         return {
             pinoHttp: {
                 genReqId: (req) => req.id,
-                transport,
+                // Use multistream for combining console and email output
+                stream: pino_1.default.multistream(streams),
                 level: this.isDev ? 'debug' : 'info',
                 customLogLevel: function (res) {
                     if (res.statusCode >= 500)
@@ -222,21 +278,70 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
                 },
                 wrapSerializers: true,
                 customProps: (req, res) => {
+                    var _a, _b, _c, _d, _e;
+                    // Get protocol, host and port from request
+                    const protocol = req.protocol || 'http';
+                    const hostHeader = req.get('host') || req.hostname || 'localhost';
+                    const hostname = req.hostname || 'localhost';
+                    const port = ((_a = req.socket) === null || _a === void 0 ? void 0 : _a.localPort) || this.appConfig.port || 3000;
+                    // Build baseUrl - if host already includes port, don't add it again
+                    const hasPortInHost = hostHeader.includes(':');
+                    const baseUrl = hasPortInHost
+                        ? `${protocol}://${hostHeader}`
+                        : `${protocol}://${hostHeader}:${port}`;
                     return {
                         env: this.nodeEnv,
                         appName: this.getString('NAME'),
+                        // User information
                         user: req === null || req === void 0 ? void 0 : req.user,
-                        'req.body': req === null || req === void 0 ? void 0 : req.body,
+                        // Request information (for email alerts)
+                        request: req ? {
+                            id: req.id,
+                            method: req.method,
+                            url: req.originalUrl || req.url,
+                            query: req.query,
+                            params: req.params,
+                            body: req.body,
+                            ip: req.ip,
+                            protocol,
+                            host: hostname,
+                            port,
+                            baseUrl,
+                            headers: {
+                                'user-agent': (_b = req.headers) === null || _b === void 0 ? void 0 : _b['user-agent'],
+                                referer: ((_c = req.headers) === null || _c === void 0 ? void 0 : _c.referer) || ((_d = req.headers) === null || _d === void 0 ? void 0 : _d.referrer),
+                                host: (_e = req.headers) === null || _e === void 0 ? void 0 : _e.host,
+                            },
+                        } : undefined,
+                        // Response body
                         'res.body': res === null || res === void 0 ? void 0 : res.body,
                     };
                 },
                 redact: {
-                    paths: ['req.headers.authorization', 'req.headers.apikey'],
+                    paths: ['req.headers.authorization', 'req.headers.apikey', 'req.headers.cookie'],
                     remove: true,
                 },
             },
         };
     }
+    /**
+     * Get Pino multistream configuration with email transport
+     * This method provides additional stream for email logging
+     * Usage: pass to LoggerModule or use with pino.multistream()
+     */
+    get pinoEmailStream() {
+        const emailConfig = this.emailLogConfig;
+        if (!emailConfig || !emailConfig.enabled) {
+            return null;
+        }
+        // Return stream configuration for email transport
+        // The actual stream will be attached by EmailLogModule
+        return {
+            level: emailConfig.level,
+            // This will be replaced with the actual EmailLogTransportService stream
+            stream: null,
+        };
+    }
     get axiosProxyConfig() {
         if (!this.getBoolean('DIRECT_PROXY_ENABLED')) {
             return false;
@@ -246,6 +351,59 @@ let ApiConfigService = ApiConfigService_1 = class ApiConfigService {
             port: this.getNumber('DIRECT_PROXY_PORT'),
         };
     }
+    /**
+     * Email log transport configuration
+     * Returns null if email logging is disabled
+     */
+    get emailLogConfig() {
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        if (!this.getBoolean('EMAIL_LOG_ENABLED', false)) {
+            return null;
+        }
+        return {
+            enabled: true,
+            to: this.getString('EMAIL_LOG_TO')
+                .split(',')
+                .map((e) => e.trim())
+                .filter(Boolean),
+            from: this.getString('EMAIL_LOG_FROM'),
+            level: this.getString('EMAIL_LOG_LEVEL', 'error'),
+            subjectPrefix: this.getString('EMAIL_LOG_SUBJECT_PREFIX', '[Log Alert]'),
+            smtpHost: this.getString('EMAIL_LOG_SMTP_HOST'),
+            smtpPort: this.getNumber('EMAIL_LOG_SMTP_PORT', 587),
+            smtpUsername: this.getString('EMAIL_LOG_SMTP_USERNAME', ''),
+            smtpPassword: this.getString('EMAIL_LOG_SMTP_PASSWORD', ''),
+            smtpSecure: this.getBoolean('EMAIL_LOG_SMTP_SECURE', false),
+            smtpIgnoreTLSError: this.getBoolean('EMAIL_LOG_SMTP_IGNORE_TLS_ERROR', false),
+            rateLimitMaxEmails: this.getNumber('EMAIL_LOG_RATE_LIMIT_MAX_EMAILS', 10),
+            rateLimitWindowMs: this.getNumber('EMAIL_LOG_RATE_LIMIT_WINDOW_MS', 60000),
+            rateLimitBurstSize: this.getNumber('EMAIL_LOG_RATE_LIMIT_BURST_SIZE', 3),
+            useHtmlFormat: this.getBoolean('EMAIL_LOG_USE_HTML_FORMAT', true),
+            includeApps: ((_b = (_a = this.getString('EMAIL_LOG_INCLUDE_APPS', '')) === null || _a === void 0 ? void 0 : _a.split(',')) === null || _b === void 0 ? void 0 : _b.filter(Boolean)) || undefined,
+            excludeApps: ((_d = (_c = this.getString('EMAIL_LOG_EXCLUDE_APPS', '')) === null || _c === void 0 ? void 0 : _c.split(',')) === null || _d === void 0 ? void 0 : _d.filter(Boolean)) || undefined,
+            includeErrors: ((_f = (_e = this.getString('EMAIL_LOG_INCLUDE_ERRORS', '')) === null || _e === void 0 ? void 0 : _e.split(',')) === null || _f === void 0 ? void 0 : _f.filter(Boolean)) || undefined,
+            excludeErrors: ((_h = (_g = this.getString('EMAIL_LOG_EXCLUDE_ERRORS', '')) === null || _g === void 0 ? void 0 : _g.split(',')) === null || _h === void 0 ? void 0 : _h.filter(Boolean)) || undefined,
+        };
+    }
+    /**
+     * Get Pino email transport instance
+     * This returns a Pino transport that can be used directly with Pino logger
+     * Usage: pino(transport) or add to multistream
+     */
+    get pinoEmailTransport() {
+        const config = this.emailLogConfig;
+        if (!config) {
+            return null;
+        }
+        // Create and return email transport
+        try {
+            return new email_log_1.PinoEmailTransport(config);
+        }
+        catch (error) {
+            console.error('Failed to create Pino email transport:', error);
+            return null;
+        }
+    }
     static getRootPath() {
         if (!ApiConfigService_1.rootPath) {
             throw new Error(`rootPath is not set`);

package/shared/services/index.d.ts

@@ -1,4 +1,3 @@
 export * from './api-config.service';
 export * from './generator.service';
 export * from './translation.service';
-export * from './validator.service';

package/shared/services/index.js

@@ -17,4 +17,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./api-config.service"), exports);
 __exportStar(require("./generator.service"), exports);
 __exportStar(require("./translation.service"), exports);
-__exportStar(require("./validator.service"), exports);

package/validators/custom-validate.validator.d.ts

@@ -75,6 +75,7 @@ export declare class CustomValidateValidator implements ValidatorConstraintInter
  * 支持多种验证方式的灵活验证装饰器
  *
  * @example
+ *
  * // 1. 内联函数（同步）
  * @CustomValidate(
  *   (value) => value > 0,

package/validators/custom-validate.validator.js

@@ -145,6 +145,7 @@ exports.CustomValidateValidator = CustomValidateValidator = __decorate([
  * 支持多种验证方式的灵活验证装饰器
  *
  * @example
+ *
  * // 1. 内联函数（同步）
  * @CustomValidate(
  *   (value) => value > 0,

package/validators/file-mimetype.validator.d.ts

@@ -5,8 +5,6 @@ export type FileMimetypeValidatorOptions = {
     message?: string;
 };
 export declare class FileMimetypeValidator extends FileValidator<FileMimetypeValidatorOptions, IFile> {
-    private allowedMimetypes;
-    private message;
     constructor(options: FileMimetypeValidatorOptions);
     buildErrorMessage(): string;
     isValid(file?: IFile): boolean;

package/validators/file-mimetype.validator.js

@@ -5,17 +5,15 @@ const file_validator_interface_1 = require("@nestjs/common/pipes/file/file-valid
 class FileMimetypeValidator extends file_validator_interface_1.FileValidator {
     constructor(options) {
         super(options);
-        this.allowedMimetypes = options.allowedMimetypes;
-        this.message = options.message;
     }
     buildErrorMessage() {
-        if (this.message) {
-            return this.message;
+        if (this.validationOptions.message) {
+            return this.validationOptions.message;
         }
-        return `Invalid file type. Only ${this.allowedMimetypes.join(', ')} are allowed.`;
+        return `Invalid file type. Only ${this.validationOptions.allowedMimetypes.join(', ')} are allowed.`;
     }
     isValid(file) {
-        return this.allowedMimetypes.includes(file.mimetype);
+        return this.validationOptions.allowedMimetypes.includes(file.mimetype);
     }
 }
 exports.FileMimetypeValidator = FileMimetypeValidator;

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

@@ -1,10 +1,7 @@
 import type { ValidationArguments, ValidationOptions, ValidatorConstraintInterface } from 'class-validator';
 import type { EntitySchema, FindOptionsWhere, ObjectType } from 'typeorm';
-import { TransactionHost } from '@nestjs-cls/transactional';
-import { TransactionalAdapterTypeOrm } from '@nestjs-cls/transactional-adapter-typeorm';
 export declare class IsExistsValidator implements ValidatorConstraintInterface {
-    private readonly transactionHost;
-    constructor(transactionHost: TransactionHost<TransactionalAdapterTypeOrm>);
+    constructor();
     /**
      * 解析 Entity 引用，支持多种形式：
      * 1. Entity 类直接引用
@@ -21,9 +18,21 @@ export declare class IsExistsValidator implements ValidatorConstraintInterface {
     validate<E>(value: string, args: IExistsValidationArguments<E>): Promise<boolean>;
     defaultMessage(args: ValidationArguments): string;
 }
+/**
+ * IsExists 配置选项
+ */
+export interface IsExistsOptions {
+    /**
+     * 数据源名称或 DataSource 实例
+     * 用于多数据源场景，指定使用哪个数据源进行验证
+     * 例如：'readonly', 'report', 或直接传入 DataSource 实例
+     */
+    dataSource?: string;
+}
 type ExistsValidationConstraints<E> = [
-    ObjectType<E> | EntitySchema<E> | string | (() => ObjectType<E> | EntitySchema<E> | string),
-    (validationArguments: ValidationArguments) => FindOptionsWhere<E>
+    (ObjectType<E> | EntitySchema<E> | string | (() => ObjectType<E> | EntitySchema<E> | string)),
+    (validationArguments: ValidationArguments) => FindOptionsWhere<E>,
+    IsExistsOptions?
 ];
 interface IExistsValidationArguments<E> extends ValidationArguments {
     constraints: ExistsValidationConstraints<E>;

package/validators/is-exists.validator.js

@@ -23,11 +23,9 @@ exports.IsExists = IsExists;
 const class_validator_1 = require("class-validator");
 const nestjs_i18n_1 = require("nestjs-i18n");
 const common_1 = require("@nestjs/common");
-const transactional_1 = require("@nestjs-cls/transactional");
+const transaction_1 = require("@nest-omni/transaction");
 let IsExistsValidator = class IsExistsValidator {
-    constructor(transactionHost) {
-        this.transactionHost = transactionHost;
-    }
+    constructor() { }
     /**
      * 解析 Entity 引用，支持多种形式：
      * 1. Entity 类直接引用
@@ -88,10 +86,13 @@ let IsExistsValidator = class IsExistsValidator {
     }
     validate(value, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const [entityRef, findCondition] = args.constraints;
+            const [entityRef, findCondition, options] = args.constraints;
             // 解析 Entity 引用
             const entityClass = this.resolveEntity(entityRef, args.property, args.object);
-            const repository = this.transactionHost.tx.getRepository(entityClass);
+            // 获取数据源（支持多数据源）
+            const dataSourceName = (options === null || options === void 0 ? void 0 : options.dataSource) || 'default';
+            const dataSource = (0, transaction_1.getDataSource)(dataSourceName);
+            const repository = dataSource.getRepository(entityClass);
             args.value = value;
             return ((yield repository.count({
                 where: findCondition(args),
@@ -106,7 +107,7 @@ exports.IsExistsValidator = IsExistsValidator;
 exports.IsExistsValidator = IsExistsValidator = __decorate([
     (0, common_1.Injectable)(),
     (0, class_validator_1.ValidatorConstraint)({ name: 'isExists', async: true }),
-    __metadata("design:paramtypes", [transactional_1.TransactionHost])
+    __metadata("design:paramtypes", [])
 ], IsExistsValidator);
 function IsExists(constraints, validationOptions) {
     return (object, propertyName) => {

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

@@ -1,10 +1,7 @@
 import type { ValidationArguments, ValidationOptions, ValidatorConstraintInterface } from 'class-validator';
-import { EntitySchema, FindOptionsWhere, ObjectType } from 'typeorm';
-import { TransactionHost } from '@nestjs-cls/transactional';
-import { TransactionalAdapterTypeOrm } from '@nestjs-cls/transactional-adapter-typeorm';
+import type { EntitySchema, FindOptionsWhere, ObjectType } from 'typeorm';
 export declare class IsUniqueValidator implements ValidatorConstraintInterface {
-    private readonly transactionHost;
-    constructor(transactionHost: TransactionHost<TransactionalAdapterTypeOrm>);
+    constructor();
     /**
      * 解析 Entity 引用，支持多种形式：
      * 1. Entity 类直接引用
@@ -21,9 +18,27 @@ export declare class IsUniqueValidator implements ValidatorConstraintInterface {
     validate<E>(value: string, args: IUniqueValidationArguments<E>): Promise<boolean>;
     defaultMessage(args: ValidationArguments): string;
 }
+/**
+ * IsUnique 配置选项
+ */
+export interface IsUniqueOptions {
+    /**
+     * 手动指定用于判断是否为新建的字段名
+     * 适用于视图（View）等没有主键的场景
+     * 例如：uniqueKeys: ['id'] 或 uniqueKeys: ['id', 'version']
+     */
+    uniqueKeys?: string[];
+    /**
+     * 数据源名称或 DataSource 实例
+     * 用于多数据源场景，指定使用哪个数据源进行验证
+     * 例如：'readonly', 'report', 或直接传入 DataSource 实例
+     */
+    dataSource?: string;
+}
 type UniqueValidationConstraints<E> = [
-    ObjectType<E> | EntitySchema<E> | string | (() => ObjectType<E> | EntitySchema<E> | string),
-    (validationArguments: ValidationArguments) => FindOptionsWhere<E>
+    (ObjectType<E> | EntitySchema<E> | string | (() => ObjectType<E> | EntitySchema<E> | string)),
+    (validationArguments: ValidationArguments) => FindOptionsWhere<E>,
+    IsUniqueOptions?
 ];
 interface IUniqueValidationArguments<E> extends ValidationArguments {
     constraints: UniqueValidationConstraints<E>;

package/validators/is-unique.validator.js

@@ -23,11 +23,9 @@ exports.IsUnique = IsUnique;
 const class_validator_1 = require("class-validator");
 const nestjs_i18n_1 = require("nestjs-i18n");
 const common_1 = require("@nestjs/common");
-const transactional_1 = require("@nestjs-cls/transactional");
+const transaction_1 = require("@nest-omni/transaction");
 let IsUniqueValidator = class IsUniqueValidator {
-    constructor(transactionHost) {
-        this.transactionHost = transactionHost;
-    }
+    constructor() { }
     /**
      * 解析 Entity 引用，支持多种形式：
      * 1. Entity 类直接引用
@@ -84,40 +82,66 @@ let IsUniqueValidator = class IsUniqueValidator {
     }
     validate(value, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const [entityRef, findCondition] = args.constraints;
+            const [entityRef, findCondition, options] = args.constraints;
             // 解析 Entity 引用
             const entityClass = this.resolveEntity(entityRef, args.property, args.object);
-            const repository = this.transactionHost.tx.getRepository(entityClass);
+            // 获取数据源（支持多数据源）
+            const dataSourceName = (options === null || options === void 0 ? void 0 : options.dataSource) || 'default';
+            const dataSource = (0, transaction_1.getDataSource)(dataSourceName);
+            const repository = dataSource.getRepository(entityClass);
             args.value = value;
             let exists;
             const defCon = findCondition(args);
-            const pkCols = repository.metadata
-                .primaryColumns.map((column) => column.propertyName);
-            const isNew = pkCols.some((pk) => args.object[pk]);
-            if (!isNew) {
-                exists =
-                    (yield repository
-                        .count({ where: defCon })) < 1;
+            // 获取用于判断是否为新建的字段
+            // 优先级：手动配置的 uniqueKeys > 实体主键
+            let pkCols;
+            if ((options === null || options === void 0 ? void 0 : options.uniqueKeys) && options.uniqueKeys.length > 0) {
+                // 1. 使用手动指定的字段
+                pkCols = options.uniqueKeys;
+            }
+            else {
+                // 2. 使用实体的主键
+                pkCols = repository.metadata.primaryColumns.map((column) => column.propertyName);
+            }
+            // 如果没有主键也没有 uniqueKeys，使用简化逻辑
+            // 查询条件本身表示唯一性，只要存在记录就不允许
+            if (pkCols.length === 0) {
+                const count = yield repository.count({ where: defCon });
+                exists = count < 1;
+                return exists;
+            }
+            // 修复：检查是否为新建记录
+            // 如果所有 uniqueKeys/主键都没有值（null/undefined），则为新建
+            const isNew = !pkCols.some((pk) => {
+                const pkValue = args.object[pk];
+                return pkValue !== null && pkValue !== undefined && pkValue !== '';
+            });
+            if (isNew) {
+                // 新建场景：简单检查是否存在相同值的记录
+                exists = (yield repository.count({ where: defCon })) < 1;
             }
             else {
+                // 更新场景：需要排除当前记录（通过主键对比）
                 const entities = yield repository
                     .createQueryBuilder()
                     .where(defCon)
-                    .select(pkCols)
                     .limit(2)
-                    .execute();
+                    .getMany();
                 const entityCount = entities.length;
                 if (entityCount === 1) {
+                    // 只有一条记录，检查是否是当前记录本身
                     const entity = entities[0];
                     const oldPk = {};
                     const newPk = {};
-                    pkCols.map((pk) => {
+                    pkCols.forEach((pk) => {
                         oldPk[pk] = entity[pk];
                         newPk[pk] = args.object[pk];
                     });
+                    // 如果主键相同，说明是自己，允许（唯一）
                     exists = JSON.stringify(oldPk) === JSON.stringify(newPk);
                 }
                 else {
+                    // 0条或多条记录
                     exists = entityCount < 1;
                 }
             }
@@ -132,7 +156,7 @@ exports.IsUniqueValidator = IsUniqueValidator;
 exports.IsUniqueValidator = IsUniqueValidator = __decorate([
     (0, common_1.Injectable)(),
     (0, class_validator_1.ValidatorConstraint)({ name: 'isUnique', async: true }),
-    __metadata("design:paramtypes", [transactional_1.TransactionHost])
+    __metadata("design:paramtypes", [])
 ], IsUniqueValidator);
 function IsUnique(constraints, validationOptions) {
     return function (object, propertyName) {