chore: 更新Docker和CI配置

- 更新Woodpecker CI配置 - 更新Docker Compose配置 - 更新应用主类配置 - 更新网关路由服务 - 更新审计日志相关代码
2026-04-15 23:38:03 +08:00
parent 38dc055a27
commit 60fb84e306
11 changed files with 398 additions and 204 deletions
@@ -47,9 +47,8 @@ public class AuditLogController {
    public Flux<AuditLog> query(AuditLogQueryRequest request) {
        if (request.getEntityType() != null && request.getEntityId() != null) {
            return auditLogService.findByEntityTypeAndEntityId(
-                request.getEntityType(), 
-                request.getEntityId()
-            );
+                    request.getEntityType(),
+                    request.getEntityId());
        } else if (request.getEntityType() != null) {
            return auditLogService.findByEntityType(request.getEntityType());
        } else if (request.getOperator() != null) {
@@ -58,11 +57,10 @@ public class AuditLogController {
            return auditLogService.findByOperationType(request.getOperationType());
        } else if (request.getStartTime() != null && request.getEndTime() != null) {
            return auditLogService.findByOperationTimeBetween(
-                request.getStartTime(), 
-                request.getEndTime()
-            );
+                    request.getStartTime(),
+                    request.getEndTime());
        }
-        
+
        return Flux.empty();
    }

@@ -97,10 +95,8 @@ public class AuditLogController {
    @GetMapping("/time-range")
    @Operation(summary = "按时间范围查询", description = "根据时间范围查询审计日志")
    public Flux<AuditLog> findByTimeRange(
-            @Parameter(description = "开始时间") 
-            @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
-            @Parameter(description = "结束时间") 
-            @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime) {
+            @Parameter(description = "开始时间") @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startTime,
+            @Parameter(description = "结束时间") @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime endTime) {
        return auditLogService.findByOperationTimeBetween(startTime, endTime);
    }

@@ -108,7 +104,7 @@ public class AuditLogController {
    @Operation(summary = "审计日志统计", description = "获取审计日志的统计信息")
    public Mono<AuditLogStatistics> getStatistics() {
        AuditLogStatistics statistics = new AuditLogStatistics();
-        
+
        return Mono.just(statistics);
    }

@@ -138,4 +138,30 @@ public class AuditLog extends BaseDomain {
    public void setDescription(String description) {
        this.description = description;
    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        AuditLog auditLog = (AuditLog) o;
+        return java.util.Objects.equals(entityType, auditLog.entityType) &&
+               java.util.Objects.equals(entityId, auditLog.entityId) &&
+               java.util.Objects.equals(operationType, auditLog.operationType) &&
+               java.util.Objects.equals(operator, auditLog.operator) &&
+               java.util.Objects.equals(operationTime, auditLog.operationTime) &&
+               java.util.Objects.equals(beforeData, auditLog.beforeData) &&
+               java.util.Objects.equals(afterData, auditLog.afterData) &&
+               java.util.Arrays.equals(changedFields, auditLog.changedFields) &&
+               java.util.Objects.equals(ipAddress, auditLog.ipAddress) &&
+               java.util.Objects.equals(userAgent, auditLog.userAgent) &&
+               java.util.Objects.equals(description, auditLog.description);
+    }
+
+    @Override
+    public int hashCode() {
+        return java.util.Objects.hash(super.hashCode(), entityType, entityId, operationType, operator, 
+                                     operationTime, beforeData, afterData, java.util.Arrays.hashCode(changedFields), 
+                                     ipAddress, userAgent, description);
+    }
 }
@@ -100,4 +100,38 @@ public class AuditLogQueryRequest {
    public void setSize(Integer size) {
        this.size = size;
    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        AuditLogQueryRequest that = (AuditLogQueryRequest) o;
+        return java.util.Objects.equals(entityType, that.entityType) &&
+               java.util.Objects.equals(entityId, that.entityId) &&
+               java.util.Objects.equals(operationType, that.operationType) &&
+               java.util.Objects.equals(operator, that.operator) &&
+               java.util.Objects.equals(startTime, that.startTime) &&
+               java.util.Objects.equals(endTime, that.endTime) &&
+               java.util.Objects.equals(page, that.page) &&
+               java.util.Objects.equals(size, that.size);
+    }
+
+    @Override
+    public int hashCode() {
+        return java.util.Objects.hash(entityType, entityId, operationType, operator, startTime, endTime, page, size);
+    }
+
+    @Override
+    public String toString() {
+        return "AuditLogQueryRequest{" +
+                "entityType='" + entityType + '\'' +
+                ", entityId=" + entityId +
+                ", operationType='" + operationType + '\'' +
+                ", operator='" + operator + '\'' +
+                ", startTime=" + startTime +
+                ", endTime=" + endTime +
+                ", page=" + page +
+                ", size=" + size +
+                '}';
+    }
 }