From a36406c3db7eae9e85d8d3b8aa6d1dab5753c8c7 Mon Sep 17 00:00:00 2001
From: MiniDay <372403923@qq.com>
Date: Wed, 13 Mar 2024 17:48:57 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=80=82=E9=85=8D=E4=BB=93=E9=BC=A0?=
 =?UTF-8?q?=E7=90=83=E6=9B=B4=E6=96=B0=20jedis=20=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mc/plugin/ball/common/api/BallAPI.java         | 14 ++++++++++----
 .../ball/common/listener/BallRedisListener.java    |  2 +-
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
index f5aeb11..b7c4010 100644
--- a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
+++ b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/api/BallAPI.java
@@ -16,12 +16,12 @@ import cn.hamster3.mc.plugin.ball.common.listener.BallRedisListener;
 import cn.hamster3.mc.plugin.core.common.api.CoreAPI;
 import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
 import cn.hamster3.mc.plugin.core.lib.net.kyori.adventure.text.Component;
+import cn.hamster3.mc.plugin.core.lib.redis.clients.jedis.Jedis;
 import com.google.common.eventbus.AsyncEventBus;
 import com.google.common.eventbus.EventBus;
 import lombok.Getter;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import redis.clients.jedis.Jedis;
 
 import javax.sql.DataSource;
 import java.sql.*;
@@ -490,7 +490,9 @@ public abstract class BallAPI {
         for (int i = 0; i < channel.length; i++) {
             channel[i] = ballConfig.getChannelPrefix() + channel[i];
         }
-        redisSub.subscribe(BallRedisListener.INSTANCE, channel);
+        CoreAPI.getInstance().getExecutorService().submit(
+                () -> redisSub.subscribe(BallRedisListener.INSTANCE, channel)
+        );
     }
 
     /**
@@ -499,7 +501,9 @@ public abstract class BallAPI {
      * @param channel 频道名称
      */
     public void subscribeIgnorePrefix(@NotNull String... channel) {
-        redisSub.subscribe(BallRedisListener.INSTANCE, channel);
+        CoreAPI.getInstance().getExecutorService().submit(
+                () -> redisSub.subscribe(BallRedisListener.INSTANCE, channel)
+        );
     }
 
     /**
@@ -508,7 +512,9 @@ public abstract class BallAPI {
      * @param patterns 频道名称正则表达式
      */
     public void subscribePatterns(@NotNull String patterns) {
-        redisSub.psubscribe(BallRedisListener.INSTANCE, patterns);
+        CoreAPI.getInstance().getExecutorService().submit(
+                () -> redisSub.psubscribe(BallRedisListener.INSTANCE, patterns)
+        );
     }
 
 //    /**
diff --git a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallRedisListener.java b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallRedisListener.java
index d18715b..6de5cfc 100644
--- a/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallRedisListener.java
+++ b/ball-common/src/main/java/cn/hamster3/mc/plugin/ball/common/listener/BallRedisListener.java
@@ -4,8 +4,8 @@ import cn.hamster3.mc.plugin.ball.common.api.BallAPI;
 import cn.hamster3.mc.plugin.ball.common.data.BallMessage;
 import cn.hamster3.mc.plugin.ball.common.event.message.MessageReceivedEvent;
 import cn.hamster3.mc.plugin.core.common.api.CoreAPI;
+import cn.hamster3.mc.plugin.core.lib.redis.clients.jedis.JedisPubSub;
 import com.google.common.eventbus.EventBus;
-import redis.clients.jedis.JedisPubSub;
 
 public class BallRedisListener extends JedisPubSub {
     public static final BallRedisListener INSTANCE = new BallRedisListener();