@nest-omni/core 4.1.3-20 → 4.1.3-23

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

@@ -21,7 +21,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EntityAuditService = void 0;
+exports.EntityAuditService = exports.AUDIT_CONSTANTS = void 0;
+exports.registerEntityClass = registerEntityClass;
+exports.getEntityClass = getEntityClass;
 const common_1 = require("@nestjs/common");
 const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
@@ -31,14 +33,46 @@ const enums_1 = require("../enums");
 const audit_context_service_1 = require("./audit-context.service");
 const audit_strategy_service_1 = require("./audit-strategy.service");
 const multi_database_service_1 = require("./multi-database.service");
+const operation_description_service_1 = require("./operation-description.service");
 const dto_1 = require("../../common/dto");
 const entity_audit_decorator_1 = require("../decorators/entity-audit.decorator");
 const transaction_1 = require("@nest-omni/transaction");
+/**
+ * 审计配置常量
+ */
+exports.AUDIT_CONSTANTS = {
+    /** 深度比较的最大深度限制 */
+    MAX_DIFF_DEPTH: 5,
+    /** 深度比较的最大键数量限制 */
+    MAX_KEYS: 100,
+    /** 描述的最大长度 */
+    MAX_DESCRIPTION_LENGTH: 1000,
+    /** 哈希截断长度 */
+    HASH_TRUNCATE_LENGTH: 64,
+    /** 部分掩码显示的字符数 */
+    PARTIAL_MASK_CHARS: 2,
+};
+/**
+ * 实体类注册表 - 用于在运行时通过 entityType 字符串获取实体类引用
+ */
+const ENTITY_CLASS_REGISTRY = new Map();
+/**
+ * 注册实体类到注册表
+ */
+function registerEntityClass(entityType, entityClass) {
+    ENTITY_CLASS_REGISTRY.set(entityType, entityClass);
+}
+/**
+ * 获取实体类
+ */
+function getEntityClass(entityType) {
+    return ENTITY_CLASS_REGISTRY.get(entityType);
+}
 /**
  * 实体审计服务
  */
 let EntityAuditService = class EntityAuditService {
-    constructor(auditLogRepository, transactionRepository, manualOperationRepository, entityManager, contextService, multiDbService, auditStrategy = new audit_strategy_service_1.DefaultAuditStrategy(), config, auditConnectionName, actionSummaryRepository) {
+    constructor(auditLogRepository, transactionRepository, manualOperationRepository, entityManager, contextService, multiDbService, auditStrategy = new audit_strategy_service_1.DefaultAuditStrategy(), config, auditConnectionName, actionSummaryRepository, descriptionService) {
         this.auditLogRepository = auditLogRepository;
         this.transactionRepository = transactionRepository;
         this.manualOperationRepository = manualOperationRepository;
@@ -48,6 +82,7 @@ let EntityAuditService = class EntityAuditService {
         this.auditStrategy = auditStrategy;
         this.config = config;
         this.actionSummaryRepository = actionSummaryRepository;
+        this.descriptionService = descriptionService;
         this.auditConnectionName = auditConnectionName || 'default';
     }
     /**
@@ -55,7 +90,6 @@ let EntityAuditService = class EntityAuditService {
      */
     logEntityChange(entityType_1, entityId_1, operation_1, oldValue_1, newValue_1) {
         return __awaiter(this, arguments, void 0, function* (entityType, entityId, operation, oldValue, newValue, metadata = {}) {
-            var _a, _b;
             // 检查是否应该记录
             if (!this.auditStrategy.shouldRecord(entityType, operation)) {
                 return null;
@@ -72,9 +106,19 @@ let EntityAuditService = class EntityAuditService {
             const filteredNewValue = this.filterAndMaskFields(newValue, fieldFilter);
             // 计算变更字段
             const changedFields = this.calculateChangedFields(filteredOldValue, filteredNewValue);
-            const changedFieldPaths = this.calculateChangedFieldPaths(filteredOldValue, filteredNewValue);
+            // 生成字段级别的变更详情（前后对比）
+            // CREATE 操作不需要 changeDetails，因为只有新值没有旧值
+            const changeDetails = operation === enums_1.AuditOperation.CREATE
+                ? undefined
+                : this.generateChangeDetails(entityType, filteredOldValue, filteredNewValue, changedFields);
             // 获取上下文信息
             const context = yield this.contextService.getCurrentContext();
+            // 准备模板键和参数
+            const templateKey = metadata.operationTemplateKey || `${entityType}.${operation.toLowerCase()}`;
+            const descriptionParams = Object.assign({ entityType,
+                entityId, operation: operation.toLowerCase(), changedFields: changedFields.join(', '), changedFieldsCount: changedFields.length }, metadata.descriptionParams);
+            // 生成描述（优先使用模板）
+            const description = yield this.generateDescriptionFromTemplate(templateKey, descriptionParams, operation, entityType, entityId, changedFields);
             // 创建审计日志
             const auditLog = this.auditLogRepository.create({
                 entityType,
@@ -83,16 +127,15 @@ let EntityAuditService = class EntityAuditService {
                 oldValue: filteredOldValue,
                 newValue: filteredNewValue,
                 changedFields,
-                changedFieldPaths: changedFieldPaths.join(','),
+                changeDetails,
                 userId: context.userId || metadata.userId,
                 username: context.username || metadata.username,
                 requestId: context.requestId || metadata.requestId,
                 requestIp: context.requestIp || metadata.requestIp,
                 userAgent: context.userAgent || metadata.userAgent,
-                description: this.generateDescription(operation, entityType, entityId, changedFields),
-                hashChain: ((_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.security) === null || _b === void 0 ? void 0 : _b.hashChainEnabled)
-                    ? yield this.generateHashChain(entityType, entityId, filteredNewValue)
-                    : undefined,
+                description,
+                operationTemplateKey: templateKey,
+                descriptionParams,
                 // 新增：审计动作关联字段
                 auditActionId: metadata.auditActionId,
                 auditActionName: metadata.auditActionName,
@@ -201,7 +244,9 @@ let EntityAuditService = class EntityAuditService {
             }
             // 获取当前实体状态
             const repository = this.entityManager.getRepository(entityType);
-            const currentEntity = yield repository.findOne({ where: { id: entityId } });
+            const currentEntity = yield repository.findOne({
+                where: { id: entityId },
+            });
             if (!currentEntity) {
                 return {
                     canRestore: false,
@@ -287,34 +332,91 @@ let EntityAuditService = class EntityAuditService {
         });
     }
     /**
-     * 计算变更字段
+     * 计算变更字段（支持嵌套路径）
      */
     calculateChangedFields(oldValue, newValue) {
-        const changedFields = [];
-        // 获取所有字段
-        const allFields = new Set([...Object.keys(oldValue || {}), ...Object.keys(newValue || {})]);
-        // 比较每个字段
-        for (const field of allFields) {
-            const oldVal = oldValue === null || oldValue === void 0 ? void 0 : oldValue[field];
-            const newVal = newValue === null || newValue === void 0 ? void 0 : newValue[field];
-            if (!this.deepEqual(oldVal, newVal)) {
-                changedFields.push(field);
-            }
-        }
-        return changedFields;
+        // 使用 deepDiff 获取所有变更，包括嵌套字段
+        const diffChanges = this.deepDiff(oldValue, newValue);
+        // 将路径数组转换为点号分隔的字符串
+        return diffChanges.map(change => change.path.join('.'));
     }
     /**
-     * 计算变更字段路径
+     * 生成字段级别的变更详情（前后对比，支持嵌套路径和装饰器值映射）
      */
-    calculateChangedFieldPaths(oldValue, newValue) {
-        const changedPaths = [];
-        // 使用深度比较获取变更路径
-        const diff = this.deepDiff(oldValue, newValue);
-        // 提取路径
-        for (const change of diff) {
-            changedPaths.push(change.path.join('.'));
+    generateChangeDetails(entityType, oldValue, newValue, changedFields) {
+        const changeDetails = [];
+        // 使用 deepDiff 获取详细变更信息
+        const diffChanges = this.deepDiff(oldValue, newValue);
+        // 尝试获取实体类（用于装饰器值映射）
+        const entityClass = getEntityClass(entityType);
+        for (const change of diffChanges) {
+            const pathStr = change.path.join('.');
+            const oldVal = change.oldValue;
+            const newVal = change.newValue;
+            const fieldName = change.path[0]; // 顶层字段名
+            // 确定变更类型
+            let changeType;
+            if (change.type === 'ADD') {
+                changeType = enums_1.ChangeType.ADDED;
+            }
+            else if (change.type === 'REMOVE') {
+                changeType = enums_1.ChangeType.REMOVED;
+            }
+            else {
+                changeType = enums_1.ChangeType.MODIFIED;
+            }
+            // 尝试从装饰器获取字段标签（支持多语言）
+            let fieldLabels;
+            let displayOldValue;
+            let displayNewValue;
+            if (entityClass) {
+                try {
+                    // 获取字段标签（多语言）
+                    const supportedLanguages = ['zh', 'en', 'ja'];
+                    fieldLabels = {};
+                    for (const lang of supportedLanguages) {
+                        const label = (0, entity_audit_decorator_1.getFieldLabel)(entityClass, pathStr, lang);
+                        if (label && label !== pathStr) {
+                            fieldLabels[lang] = label;
+                        }
+                    }
+                    // 获取字段值的标签（多语言值映射）
+                    if (oldVal !== null && oldVal !== undefined) {
+                        const oldValueLabel = (0, entity_audit_decorator_1.getFieldValueLabel)(entityClass, fieldName, oldVal, 'zh');
+                        if (oldValueLabel !== oldVal) {
+                            // 如果有映射值，创建多语言映射
+                            displayOldValue = {};
+                            for (const lang of supportedLanguages) {
+                                displayOldValue[lang] = (0, entity_audit_decorator_1.getFieldValueLabel)(entityClass, fieldName, oldVal, lang);
+                            }
+                        }
+                    }
+                    if (newVal !== null && newVal !== undefined) {
+                        const newValueLabel = (0, entity_audit_decorator_1.getFieldValueLabel)(entityClass, fieldName, newVal, 'zh');
+                        if (newValueLabel !== newVal) {
+                            // 如果有映射值，创建多语言映射
+                            displayNewValue = {};
+                            for (const lang of supportedLanguages) {
+                                displayNewValue[lang] = (0, entity_audit_decorator_1.getFieldValueLabel)(entityClass, fieldName, newVal, lang);
+                            }
+                        }
+                    }
+                }
+                catch (error) {
+                    // 忽略错误，使用默认值
+                }
+            }
+            changeDetails.push({
+                fieldName: pathStr,
+                fieldLabels: Object.keys(fieldLabels || {}).length > 0 ? fieldLabels : undefined,
+                oldValue: oldVal,
+                newValue: newVal,
+                displayOldValue,
+                displayNewValue,
+                changeType,
+            });
         }
-        return changedPaths;
+        return changeDetails;
     }
     /**
      * 深度比较对象
@@ -346,9 +448,9 @@ let EntityAuditService = class EntityAuditService {
      * 深度差异比较
      */
     deepDiff(oldObj, newObj, path = [], visited = new WeakSet()) {
-        var _a;
+        var _a, _b;
         const changes = [];
-        const maxDepth = ((_a = this.config) === null || _a === void 0 ? void 0 : _a.maxDiffDepth) || 5;
+        const maxDepth = (_b = (_a = this.config) === null || _a === void 0 ? void 0 : _a.maxDiffDepth) !== null && _b !== void 0 ? _b : exports.AUDIT_CONSTANTS.MAX_DIFF_DEPTH;
         // 防止过深
         if (path.length > maxDepth) {
             return changes;
@@ -405,6 +507,16 @@ let EntityAuditService = class EntityAuditService {
         }
         // 处理对象
         const allKeys = new Set([...Object.keys(oldObj), ...Object.keys(newObj)]);
+        // 添加键数量限制，防止内存溢出
+        if (allKeys.size > exports.AUDIT_CONSTANTS.MAX_KEYS) {
+            changes.push({
+                path,
+                type: 'CHANGE',
+                oldValue: `[Object with too many keys: ${allKeys.size}]`,
+                newValue: `[Object with too many keys: ${allKeys.size}]`,
+            });
+            return changes;
+        }
         for (const key of allKeys) {
             const oldVal = oldObj[key];
             const newVal = newObj[key];
@@ -511,35 +623,13 @@ let EntityAuditService = class EntityAuditService {
      */
     partialMaskValue(value) {
         const strValue = String(value);
-        if (strValue.length <= 4) {
+        const maskChars = exports.AUDIT_CONSTANTS.PARTIAL_MASK_CHARS;
+        if (strValue.length <= maskChars * 2) {
             return '*'.repeat(strValue.length);
         }
-        return (strValue.substring(0, 2) +
-            '*'.repeat(strValue.length - 4) +
-            strValue.substring(strValue.length - 2));
-    }
-    /**
-     * 生成哈希链
-     */
-    generateHashChain(entityType, entityId, data) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            // 获取上一个审计记录的哈希
-            const lastLog = yield this.auditLogRepository.findOne({
-                where: { entityType, entityId },
-                order: { createdAt: 'DESC' },
-            });
-            const previousHash = ((_a = lastLog === null || lastLog === void 0 ? void 0 : lastLog.hashChain) === null || _a === void 0 ? void 0 : _a.currentHash) || '';
-            // 计算当前数据的哈希
-            const currentData = JSON.stringify(data);
-            const hashAlgorithm = ((_c = (_b = this.config) === null || _b === void 0 ? void 0 : _b.security) === null || _c === void 0 ? void 0 : _c.hashAlgorithm) || 'sha256';
-            const currentHash = (0, crypto_1.createHash)(hashAlgorithm).update(currentData + previousHash).digest('hex');
-            return {
-                previousHash,
-                currentHash,
-                algorithm: hashAlgorithm,
-            };
-        });
+        return (strValue.substring(0, maskChars) +
+            '*'.repeat(strValue.length - maskChars * 2) +
+            strValue.substring(strValue.length - maskChars));
     }
     /**
      * 生成描述（支持多语言）
@@ -550,6 +640,28 @@ let EntityAuditService = class EntityAuditService {
      * @param language 语言（默认中文）
      * @param entityClass 实体类（可选，用于获取实体标签）
      */
+    /**
+     * 使用模板生成描述（优先使用 OperationDescriptionService）
+     */
+    generateDescriptionFromTemplate(templateKey, descriptionParams, operation, entityType, entityId, changedFields) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // 优先尝试使用 OperationDescriptionService
+            if (this.descriptionService) {
+                try {
+                    const templateDescription = yield this.descriptionService.generateDescription(templateKey, descriptionParams, 'zh');
+                    // 如果成功获取到模板描述且不是原始的 templateKey，则使用它
+                    if (templateDescription && templateDescription !== templateKey) {
+                        return templateDescription;
+                    }
+                }
+                catch (error) {
+                    // 模板服务失败，降级到原有方式
+                }
+            }
+            // 降级：使用原有的描述生成逻辑
+            return this.generateDescription(operation, entityType, entityId, changedFields);
+        });
+    }
     generateDescription(operation, entityType, entityId, changedFields, language = 'zh', entityClass) {
         const operationText = {
             [enums_1.AuditOperation.CREATE]: '创建',
@@ -611,7 +723,7 @@ let EntityAuditService = class EntityAuditService {
      */
     logEntityChangeWithTemplate(data) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e;
             // 检查是否应该记录
             if (!this.auditStrategy.shouldRecord(data.entityType, data.operation)) {
                 return null;
@@ -628,7 +740,6 @@ let EntityAuditService = class EntityAuditService {
             const filteredNewValue = this.filterAndMaskFields(data.newValue || {}, fieldFilter);
             // 计算变更字段
             const changedFields = data.changedFields || this.calculateChangedFields(filteredOldValue, filteredNewValue);
-            const changedFieldPaths = this.calculateChangedFieldPaths(filteredOldValue, filteredNewValue);
             // 获取上下文信息
             const context = yield this.contextService.getCurrentContext();
             // 如果没有提供操作模板键，使用默认模板
@@ -643,21 +754,16 @@ let EntityAuditService = class EntityAuditService {
                 oldValue: filteredOldValue,
                 newValue: filteredNewValue,
                 changedFields,
-                changedFieldPaths: changedFieldPaths.join(','),
                 userId: context.userId || ((_a = data.metadata) === null || _a === void 0 ? void 0 : _a.userId),
                 username: context.username || ((_b = data.metadata) === null || _b === void 0 ? void 0 : _b.username),
                 requestId: context.requestId || ((_c = data.metadata) === null || _c === void 0 ? void 0 : _c.requestId),
                 requestIp: context.requestIp || ((_d = data.metadata) === null || _d === void 0 ? void 0 : _d.requestIp),
                 userAgent: context.userAgent || ((_e = data.metadata) === null || _e === void 0 ? void 0 : _e.userAgent),
                 description: this.generateDescription(data.operation, data.entityType, data.entityId, changedFields),
-                hashChain: ((_g = (_f = this.config) === null || _f === void 0 ? void 0 : _f.security) === null || _g === void 0 ? void 0 : _g.hashChainEnabled)
-                    ? yield this.generateHashChain(data.entityType, data.entityId, filteredNewValue)
-                    : undefined,
                 // 新增字段
                 operationTemplateKey,
                 descriptionParams,
                 changeDetails: data.changeDetails,
-                rollbackActions: data.rollbackActions,
             });
             // 保存变更日志
             const savedLog = yield this.auditLogRepository.save(auditLog);
@@ -680,7 +786,6 @@ let EntityAuditService = class EntityAuditService {
                 userId: data.userId || context.userId,
                 username: data.username || context.username,
                 requestIp: data.requestIp || context.requestIp,
-                rollbackActions: data.rollbackActions || [],
             });
             return yield this.manualOperationRepository.save(manualLog);
         });
@@ -822,7 +927,12 @@ let EntityAuditService = class EntityAuditService {
                 queryBuilder.andWhere('action.username LIKE :username', { username: `%${options.username}%` });
             }
             if (options.actionName) {
-                queryBuilder.andWhere('action.actionName = :actionName', { actionName: options.actionName });
+                // 支持模糊匹配动作名
+                queryBuilder.andWhere('action.actionName LIKE :actionName', { actionName: `%${options.actionName}%` });
+            }
+            // 新增：全局关键词搜索（搜索多个字段）
+            if (options.keyword) {
+                queryBuilder.andWhere('(action.username LIKE :keyword OR action.actionName LIKE :keyword OR action.description LIKE :keyword)', { keyword: `%${options.keyword}%` });
             }
             if (options.success !== undefined) {
                 queryBuilder.andWhere('action.success = :success', { success: options.success });
@@ -850,9 +960,11 @@ let EntityAuditService = class EntityAuditService {
     }
     /**
      * 查询单个审计动作的详细信息（包含关联的实体变更）
+     * @param actionId 动作ID
+     * @param language 语言代码 (zh/en/ja)，默认 zh
      */
-    getAuditActionDetail(actionId) {
-        return __awaiter(this, void 0, void 0, function* () {
+    getAuditActionDetail(actionId_1) {
+        return __awaiter(this, arguments, void 0, function* (actionId, language = 'zh') {
             if (!this.actionSummaryRepository) {
                 throw new Error('AuditActionSummaryEntity repository not available');
             }
@@ -863,29 +975,32 @@ let EntityAuditService = class EntityAuditService {
             if (!summary) {
                 throw new Error(`Audit action with id ${actionId} not found`);
             }
+            // 动态生成多语言描述
+            const description = yield this.generateLocalizedDescription(summary.operationTemplateKey, summary.actionName, summary.descriptionParams, summary.success, language);
             // 查询关联的实体变更
             const entityChanges = yield this.auditLogRepository.find({
                 where: { auditActionId: actionId },
                 order: { sequenceInAction: 'ASC' },
             });
-            // 分析每个实体的详细变化
+            // 分析每个实体的详细变化（支持多语言）
             const detailedChanges = entityChanges.map((change) => {
-                const fieldChanges = this.analyzeFieldChanges(change.oldValue || {}, change.newValue || {}, change.operation);
+                // 使用数据库中存储的 changeDetails，并根据语言转换
+                const changeDetails = this.localizeChangeDetails(change.changeDetails, language);
                 return {
                     id: change.id,
                     entityType: change.entityType,
                     entityId: change.entityId,
                     operation: change.operation,
-                    operationLabel: this.getOperationLabel(change.operation),
+                    operationLabel: this.getOperationLabel(change.operation, language),
                     description: change.description,
                     sequenceInAction: change.sequenceInAction,
                     createdAt: change.createdAt,
                     // 数据快照
                     oldValue: change.oldValue,
                     newValue: change.newValue,
-                    // 详细的字段变化分析
-                    fieldChanges,
-                    changedFieldsCount: fieldChanges.length,
+                    // 详细的字段变化分析 (使用本地化的 changeDetails)
+                    changeDetails,
+                    changedFieldsCount: (changeDetails === null || changeDetails === void 0 ? void 0 : changeDetails.length) || 0,
                     changedFields: change.changedFields,
                 };
             });
@@ -902,12 +1017,12 @@ let EntityAuditService = class EntityAuditService {
                 })),
             };
             return {
-                // 汇总信息
+                // 汇总信息（使用本地化描述）
                 summary: {
                     id: summary.id,
                     actionName: summary.actionName,
                     operationTemplateKey: summary.operationTemplateKey,
-                    description: summary.description,
+                    description,
                     descriptionParams: summary.descriptionParams,
                     success: summary.success,
                     errorMessage: summary.errorMessage,
@@ -932,6 +1047,88 @@ let EntityAuditService = class EntityAuditService {
             };
         });
     }
+    /**
+     * 生成本地化的描述文本
+     */
+    generateLocalizedDescription(templateKey, actionName, params, success, language) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            let template;
+            // 1. 尝试从模板服务获取多语言模板
+            if (templateKey && this.descriptionService) {
+                try {
+                    template = yield this.descriptionService.getTemplate(templateKey, language);
+                }
+                catch (error) {
+                    // 如果获取模板失败，继续使用默认逻辑
+                }
+            }
+            // 2. 如果没有模板，使用默认格式
+            if (!template) {
+                const actionLabels = {
+                    zh: { success: '执行操作', fail: '执行操作失败' },
+                    en: { success: 'Executed operation', fail: 'Operation failed' },
+                    ja: { success: '操作を実行', fail: '操作が失敗しました' },
+                };
+                const label = ((_a = actionLabels[language]) === null || _a === void 0 ? void 0 : _a[success ? 'success' : 'fail']) || actionLabels.zh[success ? 'success' : 'fail'];
+                template = `${label}: ${actionName}`;
+            }
+            // 3. 执行模板替换
+            return this.replaceTemplatePlaceholders(template, params);
+        });
+    }
+    /**
+     * 替换模板中的占位符
+     * @param template 模板字符串，如 "创建了产品 {name}，价格 ¥{price}"
+     * @param params 参数对象，如 { name: "iPhone", price: 999 }
+     * @returns 替换后的字符串
+     */
+    replaceTemplatePlaceholders(template, params) {
+        let result = template;
+        // 匹配 {paramName} 格式的占位符
+        const placeholderPattern = /\{([^}]+)\}/g;
+        result = result.replace(placeholderPattern, (match, paramName) => {
+            // 支持嵌套属性访问，如 {user.name}
+            const value = this.getNestedValue(params, paramName);
+            return value !== undefined && value !== null ? String(value) : match;
+        });
+        return result;
+    }
+    /**
+     * 获取嵌套对象的值
+     * @param obj 对象
+     * @param path 路径，如 "user.name" 或 "user.profile.age"
+     * @returns 值或 undefined
+     */
+    getNestedValue(obj, path) {
+        return path.split('.').reduce((current, key) => {
+            return current === null || current === void 0 ? void 0 : current[key];
+        }, obj);
+    }
+    /**
+     * 本地化 changeDetails（根据语言转换 fieldLabel 和 displayValue）
+     */
+    localizeChangeDetails(changeDetails, language) {
+        if (!changeDetails)
+            return undefined;
+        return changeDetails.map((detail) => {
+            var _a, _b, _c, _d, _e;
+            return (Object.assign(Object.assign({}, detail), { fieldLabel: ((_a = detail.fieldLabels) === null || _a === void 0 ? void 0 : _a[language]) || detail.fieldName, displayOldValue: (_c = (_b = detail.displayOldValue) === null || _b === void 0 ? void 0 : _b[language]) !== null && _c !== void 0 ? _c : detail.oldValue, displayNewValue: (_e = (_d = detail.displayNewValue) === null || _d === void 0 ? void 0 : _d[language]) !== null && _e !== void 0 ? _e : detail.newValue }));
+        });
+    }
+    /**
+     * 获取操作标签（支持多语言）
+     */
+    getOperationLabel(operation, language = 'zh') {
+        var _a, _b;
+        const labels = {
+            CREATE: { zh: '创建', en: 'Create', ja: '作成' },
+            UPDATE: { zh: '更新', en: 'Update', ja: '更新' },
+            DELETE: { zh: '删除', en: 'Delete', ja: '削除' },
+            RESTORE: { zh: '恢复', en: 'Restore', ja: '復元' },
+        };
+        return ((_a = labels[operation]) === null || _a === void 0 ? void 0 : _a[language]) || ((_b = labels[operation]) === null || _b === void 0 ? void 0 : _b.zh) || operation;
+    }
     /**
      * 分析字段变化（支持多语言）
      * @param oldValue 旧值
@@ -1030,18 +1227,6 @@ let EntityAuditService = class EntityAuditService {
         }
         return String(value);
     }
-    /**
-     * 获取操作标签
-     */
-    getOperationLabel(operation) {
-        const labels = {
-            [enums_1.AuditOperation.CREATE]: '创建',
-            [enums_1.AuditOperation.UPDATE]: '更新',
-            [enums_1.AuditOperation.DELETE]: '删除',
-            [enums_1.AuditOperation.RESTORE]: '恢复',
-        };
-        return labels[operation] || operation;
-    }
     /**
      * 按字段分组统计
      */
@@ -1068,10 +1253,12 @@ exports.EntityAuditService = EntityAuditService = __decorate([
     __param(8, (0, common_1.Inject)('AUDIT_CONNECTION_NAME')),
     __param(9, (0, common_1.Optional)()),
     __param(9, (0, typeorm_1.InjectRepository)(entities_1.AuditActionSummaryEntity)),
+    __param(10, (0, common_1.Optional)()),
     __metadata("design:paramtypes", [typeorm_2.Repository,
         typeorm_2.Repository,
         typeorm_2.Repository,
         typeorm_2.EntityManager,
         audit_context_service_1.AuditContextService,
-        multi_database_service_1.MultiDatabaseService, Object, Object, String, typeorm_2.Repository])
+        multi_database_service_1.MultiDatabaseService, Object, Object, String, typeorm_2.Repository,
+        operation_description_service_1.OperationDescriptionService])
 ], EntityAuditService);

package/audit/services/manual-audit-log.service.d.ts

@@ -7,7 +7,6 @@ import { AuditTransactionStatus } from '../enums';
  * 手动审计日志服务
  *
  * 提供标准的依赖注入方式记录操作日志
- * @deprecated 静态方法已废弃,请使用依赖注入方式
  */
 export declare class ManualAuditLogService {
     private readonly manualLogRepository;

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

@@ -33,7 +33,6 @@ const crypto_1 = require("crypto");
  * 手动审计日志服务
  *
  * 提供标准的依赖注入方式记录操作日志
- * @deprecated 静态方法已废弃,请使用依赖注入方式
  */
 let ManualAuditLogService = class ManualAuditLogService {
     constructor(manualLogRepository, transactionRepository, contextService, dataSource) {
@@ -99,7 +98,7 @@ let ManualAuditLogService = class ManualAuditLogService {
      */
     logOperation(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { templateKey, description, descriptionTemplate, descriptionParams, userId, username, requestIp, rollbackActions, transactionId, autoCreateTransaction = true, } = options;
+            const { templateKey, description, descriptionTemplate, descriptionParams, userId, username, requestIp, transactionId, autoCreateTransaction = true, } = options;
             // 验证参数：至少提供一种模式
             if (!templateKey && !description && !descriptionTemplate) {
                 throw new Error('ManualAuditLogService.log() requires one of: templateKey, description, or descriptionTemplate');
@@ -135,7 +134,6 @@ let ManualAuditLogService = class ManualAuditLogService {
                 userId: finalUserId,
                 username: finalUsername,
                 requestIp: finalRequestIp,
-                rollbackActions: rollbackActions || [],
             });
             return this.manualLogRepository.save(manualLog);
         });

package/audit/subscribers/entity-audit.subscriber.d.ts

@@ -9,6 +9,7 @@ export declare class EntityAuditSubscriber implements EntitySubscriberInterface<
     private readonly entityAuditService;
     private readonly contextService;
     private readonly auditStrategy;
+    private readonly logger;
     constructor(entityAuditService: EntityAuditService, contextService: AuditContextService, auditStrategy: DefaultAuditStrategy, dataSource: DataSource);
     /**
      * 在实体插入后记录审计日志