refactor(审计日志): 优化审计日志架构和 E2E 测试质量

架构改进： - 引入审计日志服务层，实现业务逻辑与数据访问分离 - 添加 Spring Data 审计注解，自动填充创建人、创建时间等字段 - 修复切面范围，避免 Repository 和 Dao 层重复记录代码优化： - 移除构造函数中的冗余 info 日志，降低生产环境日志量 - 恢复 SQL 文件格式，提高可读性 - 优化 E2E 测试等待策略，移除硬编码等待时间，提高测试稳定性影响范围： - 后端：审计日志模块（Service、Repository、Aspect、Entity） - 前端：E2E 测试文件（4 个 workflow 测试） - 数据库：审计日志表结构
2026-04-08 19:49:55 +08:00
parent 7e534f3049
commit 7e54d7fb46
16 changed files with 766 additions and 252 deletions
@@ -45,3 +45,32 @@ CREATE TABLE IF NOT EXISTS user_role (
 -- 创建索引
 CREATE INDEX IF NOT EXISTS idx_user_role_user_id ON user_role(user_id);
 CREATE INDEX IF NOT EXISTS idx_user_role_role_id ON user_role(role_id);
+
+-- 创建审计日志表
+CREATE TABLE IF NOT EXISTS audit_log (
+    id BIGINT AUTO_INCREMENT PRIMARY KEY,
+    entity_type VARCHAR(100) NOT NULL,
+    entity_id BIGINT,
+    operation_type VARCHAR(20) NOT NULL,
+    operator VARCHAR(100),
+    operation_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    before_data CLOB,
+    after_data CLOB,
+    changed_fields CLOB,
+    ip_address VARCHAR(50),
+    user_agent CLOB,
+    description CLOB,
+    create_by VARCHAR(50),
+    update_by VARCHAR(50),
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    deleted_at TIMESTAMP
+);
+
+-- 创建审计日志索引
+CREATE INDEX IF NOT EXISTS idx_audit_log_entity_type ON audit_log(entity_type);
+CREATE INDEX IF NOT EXISTS idx_audit_log_entity_id ON audit_log(entity_id);
+CREATE INDEX IF NOT EXISTS idx_audit_log_operation_type ON audit_log(operation_type);
+CREATE INDEX IF NOT EXISTS idx_audit_log_operator ON audit_log(operator);
+CREATE INDEX IF NOT EXISTS idx_audit_log_operation_time ON audit_log(operation_time);
+CREATE INDEX IF NOT EXISTS idx_audit_log_entity ON audit_log(entity_type, entity_id);
@@ -1,6 +1,10 @@
 package cn.novalon.manage.db.entity;

+import org.springframework.data.annotation.CreatedBy;
+import org.springframework.data.annotation.CreatedDate;
 import org.springframework.data.annotation.Id;
+import org.springframework.data.annotation.LastModifiedBy;
+import org.springframework.data.annotation.LastModifiedDate;
 import org.springframework.data.domain.Persistable;
 import org.springframework.data.relational.core.mapping.Column;

@@ -17,15 +21,19 @@ public abstract class BaseEntity implements Persistable<Long> {
    @Id
    private Long id;

+    @CreatedBy
    @Column("create_by")
    private String createBy;

+    @LastModifiedBy
    @Column("update_by")
    private String updateBy;

+    @CreatedDate
    @Column("created_at")
    private LocalDateTime createdAt;

+    @LastModifiedDate
    @Column("updated_at")
    private LocalDateTime updatedAt;

@@ -5,6 +5,8 @@ import cn.novalon.manage.sys.audit.repository.IAuditLogRepository;
 import cn.novalon.manage.db.converter.AuditLogConverter;
 import cn.novalon.manage.db.dao.AuditLogDao;
 import cn.novalon.manage.db.entity.AuditLogEntity;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Repository;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -20,6 +22,8 @@ import java.time.LocalDateTime;
@Repository
 public class AuditLogRepository implements IAuditLogRepository {

+    private static final Logger logger = LoggerFactory.getLogger(AuditLogRepository.class);
+
    private final AuditLogDao auditLogDao;
    private final AuditLogConverter auditLogConverter;

@@ -1,7 +1,6 @@
 -- Novalon管理系统审计日志表
 -- 版本: V7
 -- 描述: 创建审计日志表，记录数据变更前后的完整对比
-
 CREATE TABLE IF NOT EXISTS audit_log (
    id BIGSERIAL PRIMARY KEY,
    entity_type VARCHAR(100) NOT NULL,
@@ -11,20 +10,22 @@ CREATE TABLE IF NOT EXISTS audit_log (
    operation_time TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
    before_data JSONB,
    after_data JSONB,
-    changed_fields TEXT[],
+    changed_fields TEXT [],
    ip_address VARCHAR(50),
    user_agent TEXT,
    description TEXT,
-    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+    create_by VARCHAR(50),
+    update_by VARCHAR(50),
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    deleted_at TIMESTAMP
 );
-
 CREATE INDEX idx_audit_log_entity_type ON audit_log(entity_type);
 CREATE INDEX idx_audit_log_entity_id ON audit_log(entity_id);
 CREATE INDEX idx_audit_log_operation_type ON audit_log(operation_type);
 CREATE INDEX idx_audit_log_operator ON audit_log(operator);
 CREATE INDEX idx_audit_log_operation_time ON audit_log(operation_time);
 CREATE INDEX idx_audit_log_entity ON audit_log(entity_type, entity_id);
-
 COMMENT ON TABLE audit_log IS '审计日志表';
 COMMENT ON COLUMN audit_log.id IS '主键ID';
 COMMENT ON COLUMN audit_log.entity_type IS '实体类型（如User, Role等）';
@@ -35,7 +36,5 @@ COMMENT ON COLUMN audit_log.operation_time IS '操作时间';
 COMMENT ON COLUMN audit_log.before_data IS '变更前数据（JSON格式）';
 COMMENT ON COLUMN audit_log.after_data IS '变更后数据（JSON格式）';
 COMMENT ON COLUMN audit_log.changed_fields IS '变更字段列表';
-COMMENT ON COLUMN audit_log.ip_address IS 'IP地址';
-COMMENT ON COLUMN audit_log.user_agent IS '用户代理';
-COMMENT ON COLUMN audit_log.description IS '操作描述';
+COMMENT ON COLUMN audit_log.ip_address IS 'IP地址';COMMENT ON COLUMN audit_log.description IS '操作描述';
 COMMENT ON COLUMN audit_log.created_at IS '记录创建时间';
@@ -1,7 +1,7 @@
 package cn.novalon.manage.sys.audit;

 import cn.novalon.manage.sys.audit.domain.AuditLog;
-import cn.novalon.manage.sys.audit.repository.IAuditLogRepository;
+import cn.novalon.manage.sys.audit.service.IAuditLogService;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.aspectj.lang.ProceedingJoinPoint;
@@ -34,11 +34,11 @@ public class AuditLogAspect {

    private static final Logger logger = LoggerFactory.getLogger(AuditLogAspect.class);

-    private final IAuditLogRepository auditLogRepository;
+    private final IAuditLogService auditLogService;
    private final ObjectMapper objectMapper;

-    public AuditLogAspect(IAuditLogRepository auditLogRepository, ObjectMapper objectMapper) {
-        this.auditLogRepository = auditLogRepository;
+    public AuditLogAspect(IAuditLogService auditLogService, ObjectMapper objectMapper) {
+        this.auditLogService = auditLogService;
        this.objectMapper = objectMapper;
    }

@@ -99,6 +99,9 @@ public class AuditLogAspect {
                    String finalOperationType = operationTypeHolder[0];
                    String finalBeforeData = beforeDataHolder[0];
                    
+                    logger.debug("保存操作审计日志: entityType={}, entityIdHolder={}, extractedEntityId={}, finalEntityId={}", 
+                            entityType, entityIdHolder[0], extractEntityId(savedEntity), finalEntityId);
+                    
                    return createAndSaveAuditLog(
                        entityType, finalEntityId, finalOperationType, 
                        finalBeforeData, afterData, savedEntity
@@ -163,6 +166,7 @@ public class AuditLogAspect {
    private Mono<Void> createAndSaveAuditLog(String entityType, Long entityId, 
                                             String operationType, String beforeData, 
                                             String afterData, Object entity) {
+        logger.debug("创建审计日志: entityType={}, entityId={}, operationType={}", entityType, entityId, operationType);
        return ReactiveSecurityContextHolder.getContext()
                .map(ctx -> ctx.getAuthentication().getPrincipal())
                .defaultIfEmpty("system")
@@ -175,6 +179,9 @@ public class AuditLogAspect {
                    auditLog.setBeforeData(beforeData);
                    auditLog.setAfterData(afterData);
                    
+                    logger.debug("审计日志对象: entityId={}, entityType={}, operationType={}", 
+                            auditLog.getEntityId(), auditLog.getEntityType(), auditLog.getOperationType());
+                    
                    if (beforeData != null && afterData != null) {
                        String[] changedFields = extractChangedFields(beforeData, afterData);
                        auditLog.setChangedFields(changedFields);
@@ -182,7 +189,7 @@ public class AuditLogAspect {
                    
                    auditLog.setDescription(generateDescription(entityType, operationType, entityId));
                    
-                    return auditLogRepository.save(auditLog)
+                    return auditLogService.save(auditLog)
                            .doOnSuccess(saved -> logger.debug("审计日志保存成功: {} - {}", 
                                    entityType, operationType))
                            .doOnError(error -> logger.error("审计日志保存失败: {}", 
@@ -231,11 +238,14 @@ public class AuditLogAspect {
    }

    private Long extractEntityId(Object entity) {
+        logger.debug("提取实体ID: entity class={}", entity.getClass().getName());
        if (entity instanceof Persistable) {
            Persistable<?> persistable = (Persistable<?>) entity;
            Object id = persistable.getId();
+            logger.debug("Persistable实体ID: id={}, isNew={}", id, persistable.isNew());
            return id != null ? ((Number) id).longValue() : null;
        }
+        logger.debug("实体不是Persistable类型");
        return null;
    }

@@ -49,7 +49,6 @@ public class AuditLog extends BaseDomain {

    public AuditLog() {
        this.operationTime = LocalDateTime.now();
-        this.createdAt = LocalDateTime.now();
    }

    public String getEntityType() {
@@ -0,0 +1,30 @@
+package cn.novalon.manage.sys.audit.service;
+
+import cn.novalon.manage.sys.audit.domain.AuditLog;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * 审计日志服务接口
+ * 
+ * @author 张翔
+ * @date 2026-04-08
+ */
+public interface IAuditLogService {
+    
+    Mono<AuditLog> save(AuditLog auditLog);
+    
+    Mono<AuditLog> findById(Long id);
+    
+    Flux<AuditLog> findAll();
+    
+    Flux<AuditLog> findByEntityType(String entityType);
+    
+    Flux<AuditLog> findByEntityId(Long entityId);
+    
+    Flux<AuditLog> findByEntityTypeAndEntityId(String entityType, Long entityId);
+    
+    Flux<AuditLog> findByOperator(String operator);
+    
+    Flux<AuditLog> findByOperationType(String operationType);
+}
@@ -0,0 +1,68 @@
+package cn.novalon.manage.sys.audit.service.impl;
+
+import cn.novalon.manage.sys.audit.domain.AuditLog;
+import cn.novalon.manage.sys.audit.repository.IAuditLogRepository;
+import cn.novalon.manage.sys.audit.service.IAuditLogService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+/**
+ * 审计日志服务实现类
+ * 
+ * @author 张翔
+ * @date 2026-04-08
+ */
+@Service
+public class AuditLogService implements IAuditLogService {
+
+    private static final Logger logger = LoggerFactory.getLogger(AuditLogService.class);
+
+    private final IAuditLogRepository auditLogRepository;
+
+    public AuditLogService(IAuditLogRepository auditLogRepository) {
+        this.auditLogRepository = auditLogRepository;
+    }
+
+    @Override
+    public Mono<AuditLog> save(AuditLog auditLog) {
+        return auditLogRepository.save(auditLog);
+    }
+
+    @Override
+    public Mono<AuditLog> findById(Long id) {
+        return auditLogRepository.findById(id);
+    }
+
+    @Override
+    public Flux<AuditLog> findAll() {
+        return auditLogRepository.findAll();
+    }
+
+    @Override
+    public Flux<AuditLog> findByEntityType(String entityType) {
+        return auditLogRepository.findByEntityType(entityType);
+    }
+
+    @Override
+    public Flux<AuditLog> findByEntityId(Long entityId) {
+        return auditLogRepository.findByEntityId(entityId);
+    }
+
+    @Override
+    public Flux<AuditLog> findByEntityTypeAndEntityId(String entityType, Long entityId) {
+        return auditLogRepository.findByEntityTypeAndEntityId(entityType, entityId);
+    }
+
+    @Override
+    public Flux<AuditLog> findByOperator(String operator) {
+        return auditLogRepository.findByOperator(operator);
+    }
+
+    @Override
+    public Flux<AuditLog> findByOperationType(String operationType) {
+        return auditLogRepository.findByOperationType(operationType);
+    }
+}