From 8c43ec408d63cde863c8390197afc8788ccffbae Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Tue, 31 Mar 2026 20:57:52 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81id=E8=87=AA=E5=A2=9E=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=B8=BA=E9=9B=AA=E8=8A=B1=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../push/dal/dataobject/retry/MessageRetryHistoryDO.java      | 2 +-
 .../src/main/resources/application.yaml                       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/dal/dataobject/retry/MessageRetryHistoryDO.java b/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/dal/dataobject/retry/MessageRetryHistoryDO.java
index 93df1bc..c08820a 100644
--- a/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/dal/dataobject/retry/MessageRetryHistoryDO.java
+++ b/msgpush-module-push/msgpush-module-push-server/src/main/java/com/njcn/msgpush/module/push/dal/dataobject/retry/MessageRetryHistoryDO.java
@@ -15,7 +15,7 @@ import java.time.LocalDateTime;
 @TableName("push_message_retry_history")
 @EqualsAndHashCode(callSuper = true)
 public class MessageRetryHistoryDO extends BaseDO {
-    private Integer id;
+    private Long id;
 
     /**
      * 关联 message_record 的 message_id
diff --git a/msgpush-module-push/msgpush-module-push-server/src/main/resources/application.yaml b/msgpush-module-push/msgpush-module-push-server/src/main/resources/application.yaml
index b9439f5..0cb6755 100644
--- a/msgpush-module-push/msgpush-module-push-server/src/main/resources/application.yaml
+++ b/msgpush-module-push/msgpush-module-push-server/src/main/resources/application.yaml
@@ -61,10 +61,10 @@ mybatis-plus:
     map-underscore-to-camel-case: true # 虽然默认为 true ，但是还是显示去指定下。
   global-config:
     db-config:
-      id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。
+      id-type: ASSIGN_ID # 分配 ID，默认使用雪花算法
+      #      id-type: NONE # “智能”模式，基于 IdTypeEnvironmentPostProcessor + 数据源的类型，自动适配成 AUTO、INPUT 模式。
       #      id-type: AUTO # 自增 ID，适合 MySQL 等直接自增的数据库
       #      id-type: INPUT # 用户输入 ID，适合 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库
-      #      id-type: ASSIGN_ID # 分配 ID，默认使用雪花算法。注意，Oracle、PostgreSQL、Kingbase、DB2、H2 数据库时，需要去除实体类上的 @KeySequence 注解
       logic-delete-value: 1 # 逻辑已删除值(默认为 1)
       logic-not-delete-value: 0 # 逻辑未删除值(默认为 0)
     banner: false # 关闭控制台的 Banner 打印