From eb82090586650a25460939d4bb12895e7ebdd64f Mon Sep 17 00:00:00 2001
From: zkh <1650697374@qq.com>
Date: Mon, 12 Jan 2026 10:11:50 +0800
Subject: [PATCH] =?UTF-8?q?feat(common):=20=E6=B7=BB=E5=8A=A0=20R2dbcBaseE?=
 =?UTF-8?q?ntity=20=E5=9F=BA=E7=A1=80=E5=AE=9E=E4=BD=93=E7=B1=BB=E5=B9=B6?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E7=89=88=E6=9C=AC=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 zkh-common 模块中新增 R2dbcBaseEntity 基础实体类
- 集成 Spring Data JPA 和 R2DBC 相关注解支持
- 添加审计功能支持创建时间和更新时间自动管理
- 实现基础字段如 ID、创建者、更新者等属性定义
- 将父项目及所有子模块版本从 1.5.5 升级至 1.5.6
- 在 zkh-common 中添加 spring-data-relational 依赖支持
---
 pom.xml                                       |  2 +-
 zkh-common/pom.xml                            |  6 +-
 .../vip/jcfd/common/core/R2dbcBaseEntity.java | 72 +++++++++++++++++++
 zkh-data/pom.xml                              |  2 +-
 zkh-file/pom.xml                              |  2 +-
 zkh-log/pom.xml                               |  2 +-
 zkh-web/pom.xml                               |  2 +-
 7 files changed, 82 insertions(+), 6 deletions(-)
 create mode 100644 zkh-common/src/main/java/vip/jcfd/common/core/R2dbcBaseEntity.java

diff --git a/pom.xml b/pom.xml
index a894e68..cd8df1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>vip.jcfd</groupId>
     <artifactId>zkh-framework</artifactId>
-    <version>1.5.5</version>
+    <version>1.5.6</version>
     <packaging>pom</packaging>
     <name>ZKH Framework</name>
     <description>A Java framework for ZKH applications</description>
diff --git a/zkh-common/pom.xml b/zkh-common/pom.xml
index 16ffdda..3d78449 100644
--- a/zkh-common/pom.xml
+++ b/zkh-common/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>vip.jcfd</groupId>
         <artifactId>zkh-framework</artifactId>
-        <version>1.5.5</version>
+        <version>1.5.6</version>
     </parent>
 
     <artifactId>zkh-common</artifactId>
@@ -38,6 +38,10 @@
             <groupId>org.springframework.data</groupId>
             <artifactId>spring-data-jpa</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-relational</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
diff --git a/zkh-common/src/main/java/vip/jcfd/common/core/R2dbcBaseEntity.java b/zkh-common/src/main/java/vip/jcfd/common/core/R2dbcBaseEntity.java
new file mode 100644
index 0000000..d6b6ca9
--- /dev/null
+++ b/zkh-common/src/main/java/vip/jcfd/common/core/R2dbcBaseEntity.java
@@ -0,0 +1,72 @@
+package vip.jcfd.common.core;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.MappedSuperclass;
+import org.springframework.data.annotation.*;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+import org.springframework.data.relational.core.mapping.Column;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+public class R2dbcBaseEntity implements Serializable {
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private Long id;
+
+	@Column("create_time")
+	@CreatedDate
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private LocalDateTime createTime;
+
+	@Column("update_time")
+	@LastModifiedDate
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	private LocalDateTime updateTime;
+
+	@Column("create_by")
+	@CreatedBy
+	private String createBy;
+
+	@Column("update_by")
+	@LastModifiedBy
+	private String updateBy;
+
+	public Long getId() {
+		return id;
+	}
+
+	public void setId(Long id) {
+		this.id = id;
+	}
+
+	public LocalDateTime getCreateTime() {
+		return createTime;
+	}
+
+	public void setCreateTime(LocalDateTime createTime) {
+		this.createTime = createTime;
+	}
+
+	public LocalDateTime getUpdateTime() {
+		return updateTime;
+	}
+
+	public void setUpdateTime(LocalDateTime updateTime) {
+		this.updateTime = updateTime;
+	}
+
+	public String getCreateBy() {
+		return createBy;
+	}
+
+	public void setCreateBy(String createBy) {
+		this.createBy = createBy;
+	}
+}
diff --git a/zkh-data/pom.xml b/zkh-data/pom.xml
index 626680c..78cc252 100644
--- a/zkh-data/pom.xml
+++ b/zkh-data/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>vip.jcfd</groupId>
         <artifactId>zkh-framework</artifactId>
-        <version>1.5.5</version>
+        <version>1.5.6</version>
     </parent>
 
     <artifactId>zkh-data</artifactId>
diff --git a/zkh-file/pom.xml b/zkh-file/pom.xml
index 46be487..67ee0b8 100644
--- a/zkh-file/pom.xml
+++ b/zkh-file/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>vip.jcfd</groupId>
         <artifactId>zkh-framework</artifactId>
-        <version>1.5.5</version>
+        <version>1.5.6</version>
     </parent>
 
     <artifactId>zkh-file</artifactId>
diff --git a/zkh-log/pom.xml b/zkh-log/pom.xml
index a1152ad..2c027e3 100644
--- a/zkh-log/pom.xml
+++ b/zkh-log/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>vip.jcfd</groupId>
         <artifactId>zkh-framework</artifactId>
-        <version>1.5.5</version>
+        <version>1.5.6</version>
     </parent>
 
     <artifactId>zkh-log</artifactId>
diff --git a/zkh-web/pom.xml b/zkh-web/pom.xml
index d723af3..30f4d19 100644
--- a/zkh-web/pom.xml
+++ b/zkh-web/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>vip.jcfd</groupId>
         <artifactId>zkh-framework</artifactId>
-        <version>1.5.5</version>
+        <version>1.5.6</version>
     </parent>
 
     <artifactId>zkh-web</artifactId>