auto commit and push by cuilan on 2024-03-12 14:46:39

pom.xml

@@ -8,7 +8,7 @@
 
     <groupId>io.github.cuilan</groupId>
     <artifactId>tom-common</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <name>tom-common</name>
     <description>tom common</description>
 

tom-all/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.github.cuilan</groupId>
         <artifactId>tom-common</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>tom-all</artifactId>

tom-bom/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.github.cuilan</groupId>
         <artifactId>tom-common</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>tom-bom</artifactId>

tom-constants/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.github.cuilan</groupId>
         <artifactId>tom-common</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>tom-constants</artifactId>

tom-crypto/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.github.cuilan</groupId>
         <artifactId>tom-common</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>tom-crypto</artifactId>

tom-mybatis-base/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.github.cuilan</groupId>
         <artifactId>tom-common</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>tom-mybatis-base</artifactId>

tom-mybatis-base/src/main/java/io/github/cuilan/tom/mybatisbase/entity/BaseEntity.java

@@ -1,6 +1,7 @@
 package io.github.cuilan.tom.mybatisbase.entity;
 
-import io.github.cuilan.tom.mybatisbase.enums.Action;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -9,40 +10,17 @@
 /**
  * 数据库实体基类
  *
- * @author zhang.yan
- * @since 2021-10-27
+ * @author zhangyan
+ * @since 2023/11/9
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public abstract class BaseEntity extends BaseIdEntity implements Serializable {
+public class BaseEntity extends BaseTimeEntity implements Serializable {
 
     /**
-     * 记录状态
+     * 自增主键
      */
-    private Action action;
-
-    /**
-     * 记录修改时间
-     */
-    private Long actionTime;
-
-    /**
-     * 记录创建时间
-     */
-    private Long createTime;
-
-    /**
-     * 设置action参数
-     *
-     * @param action action
-     */
-    public void setAction(Action action) {
-        long now = System.currentTimeMillis();
-        if (Action.INIT == action) {
-            this.createTime = now;
-        }
-        this.actionTime = now;
-        this.action = action;
-    }
+    @TableId(type = IdType.AUTO)
+    private Long id;
 
 }

tom-mybatis-base/src/main/java/io/github/cuilan/tom/mybatisbase/entity/BaseTenantEntity.java → tom-mybatis-base/src/main/java/io/github/cuilan/tom/mybatisbase/entity/BaseTenantTimeEntity.java

@@ -11,7 +11,7 @@
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class BaseTenantEntity extends BaseEntity {
+public class BaseTenantTimeEntity extends BaseEntity {
 
     /**
      * 租户id

tom-mybatis-base/src/main/java/io/github/cuilan/tom/mybatisbase/entity/BaseTimeEntity.java

@@ -0,0 +1,47 @@
+package io.github.cuilan.tom.mybatisbase.entity;
+
+import io.github.cuilan.tom.mybatisbase.enums.Action;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * 数据库实体基类
+ *
+ * @author zhang.yan
+ * @since 2021-10-27
+ */
+@Data
+public abstract class BaseTimeEntity implements Serializable {
+
+    /**
+     * 记录状态
+     */
+    private Action action;
+
+    /**
+     * 记录修改时间
+     */
+    private Long actionTime;
+
+    /**
+     * 记录创建时间
+     */
+    private Long createTime;
+
+    /**
+     * 设置action参数
+     *
+     * @param action action
+     */
+    public void setAction(Action action) {
+        long now = System.currentTimeMillis();
+        if (Action.INIT == action) {
+            this.createTime = now;
+        }
+        this.actionTime = now;
+        this.action = action;
+    }
+
+}

tom-mybatis-base/src/main/java/io/github/cuilan/tom/mybatisbase/entity/EntityHelper.java

@@ -20,7 +20,7 @@ private EntityHelper() {
      * @param item   实体类
      * @param action action
      */
-    public static void setBaseInfo(BaseEntity item, Action action) {
+    public static void setBaseInfo(BaseTimeEntity item, Action action) {
         Long now = System.currentTimeMillis();
         if (Action.INIT == action) {
             item.setCreateTime(now);

tom-network/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.github.cuilan</groupId>
         <artifactId>tom-common</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>tom-network</artifactId>

tom-redis/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.github.cuilan</groupId>
         <artifactId>tom-common</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>tom-redis</artifactId>

tom-utils/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>io.github.cuilan</groupId>
         <artifactId>tom-common</artifactId>
-        <version>1.0.0</version>
+        <version>1.0.1</version>
     </parent>
 
     <artifactId>tom-utils</artifactId>