From 0e3a0ee0cdf674e80e3f85eea2bcfdb5ef4e7355 Mon Sep 17 00:00:00 2001
From: "xie.bx" <Blue_Xie@epam.com>
Date: Mon, 21 Nov 2022 16:21:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/bx/imserver/netty/IMServerGroup.java  | 14 ++++++++++++++
 .../bx/imserver/task/AbstractPullMessageTask.java  |  6 +++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/im-server/src/main/java/com/bx/imserver/netty/IMServerGroup.java b/im-server/src/main/java/com/bx/imserver/netty/IMServerGroup.java
index a740485..60c640e 100644
--- a/im-server/src/main/java/com/bx/imserver/netty/IMServerGroup.java
+++ b/im-server/src/main/java/com/bx/imserver/netty/IMServerGroup.java
@@ -22,6 +22,20 @@ public class IMServerGroup implements CommandLineRunner  {
     @Autowired
     private List<IMServer> imServers;
 
+    /***
+     * 判断服务器是否就绪
+     *
+     * @return
+     **/
+    public boolean isReady(){
+        for(IMServer imServer:imServers){
+            if(!imServer.isReady()){
+                return  false;
+            }
+        }
+        return true;
+    }
+
     @Override
     public void run(String... args) throws Exception {
         // 初始化SERVER_ID
diff --git a/im-server/src/main/java/com/bx/imserver/task/AbstractPullMessageTask.java b/im-server/src/main/java/com/bx/imserver/task/AbstractPullMessageTask.java
index ea4625a..d5dafe4 100644
--- a/im-server/src/main/java/com/bx/imserver/task/AbstractPullMessageTask.java
+++ b/im-server/src/main/java/com/bx/imserver/task/AbstractPullMessageTask.java
@@ -1,6 +1,6 @@
 package com.bx.imserver.task;
 
-import com.bx.imserver.netty.ws.WebSocketServer;
+import com.bx.imserver.netty.IMServerGroup;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +17,7 @@ public  abstract class AbstractPullMessageTask{
     private ExecutorService executorService;
 
     @Autowired
-    private WebSocketServer WSServer;
+    private IMServerGroup serverGroup;
 
     public  AbstractPullMessageTask(){
         this.threadNum = 1;
@@ -38,7 +38,7 @@ public  abstract class AbstractPullMessageTask{
                 @Override
                 public void run() {
                     try{
-                        if(WSServer.isReady()){
+                        if(serverGroup.isReady()){
                             pullMessage();
                         }
                         Thread.sleep(100);