From 8023121d1591ff87a89a5422314af1d79a3d7068 Mon Sep 17 00:00:00 2001
From: lixinyang <1040862701@qq.com>
Date: Sat, 10 Aug 2024 06:54:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E5=BB=B6=E6=97=B6=E7=BA=BF=E7=A8=8B?=
 =?UTF-8?q?=E6=B1=A0=E8=B0=83=E5=BA=A6=E6=96=B9=E6=B3=95=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF):=20=E5=B0=86=E5=BE=AE=E5=A6=99=E6=8D=A2?=
 =?UTF-8?q?=E6=88=90=E7=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 im-commom/src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/im-commom/src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java b/im-commom/src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java
index 353dcaf..29493ff 100644
--- a/im-commom/src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java
+++ b/im-commom/src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java
@@ -79,7 +79,7 @@ public class RedisMQPullTask implements CommandLineRunner {
                     if (!EXECUTOR.isShutdown()) {
                         if (datas.size() < batchSize) {
                             // 数据已经消费完，等待下一个周期继续拉取
-                            EXECUTOR.schedule(this, period, TimeUnit.MICROSECONDS);
+                            EXECUTOR.schedule(this, period, TimeUnit.MILLISECONDS);
                         } else {
                             // 数据没有消费完，直接开启下一个消费周期
                             EXECUTOR.execute(this);

From fe31d260c3e66f29bdbb4c726e7038b5167f8f27 Mon Sep 17 00:00:00 2001
From: lixinyang <1040862701@qq.com>
Date: Sat, 10 Aug 2024 07:04:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(redis=20leftPop=E6=9C=89bug=E9=80=A0?=
 =?UTF-8?q?=E6=88=90=E6=B6=88=E6=81=AF=E4=B8=A2=E5=A4=B1):=20=E5=A1=AB?=
 =?UTF-8?q?=E8=A1=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java      | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/im-commom/src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java b/im-commom/src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java
index 29493ff..cd367c8 100644
--- a/im-commom/src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java
+++ b/im-commom/src/main/java/com/bx/imcommon/mq/RedisMQPullTask.java
@@ -102,6 +102,9 @@ public class RedisMQPullTask implements CommandLineRunner {
                 objects.add(obj);
                 obj = redisMQTemplate.opsForList().leftPop(key);
             }
+            if (!Objects.isNull(obj)){
+                objects.add(obj);
+            }
         }
         return objects;
     }