From e04f0981da6554606359e6de4e91b752a64aae6c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期六, 29 三月 2025 15:59:20 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/thread/impl/NyShuttleThread.java |   23 ++++++++++++++++-------
 1 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
index b1d324c..c025b26 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -78,6 +78,7 @@
             while (true) {
                 try {
                     listenSocketMessage();
+                    listenInit();//鐩戝惉鍒濆鍖栦簨浠�
                 } catch (Exception e) {
                     e.printStackTrace();
                 }
@@ -136,7 +137,6 @@
         Thread otherThread = new Thread(() -> {
             while (true) {
                 try {
-                    listenInit();//鐩戝惉鍒濆鍖栦簨浠�
                     saveLog();//淇濆瓨鏁版嵁
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -202,7 +202,7 @@
                 JSONObject body = response.getJSONObject("body");
                 if (body.containsKey("workingMode")) {
                     //read
-                    socketReadResults.add(result);
+                    socketReadResults.add(body);
                     return;
                 }
             }
@@ -743,12 +743,21 @@
             return false;
         }
 
+        if (this.shuttleProtocol.getMode() == 0) {
+            return true;
+        }
+
+        if (!this.shuttleProtocol.getErrorCode().equals("0")) {
+            return true;
+        }
+
         InnerSuhttleExtend extend = (InnerSuhttleExtend) this.shuttleProtocol.getExtend();
-        boolean res = this.shuttleProtocol.getMode() == 0
-                && !this.shuttleProtocol.getErrorCode().equals("0")
-                && extend.getSuspendState() == 1
-                ;
-        return res;
+
+        if (extend.getSuspendState() == 1) {
+            return true;
+        }
+
+        return false;
     }
 
     @Override

--
Gitblit v1.9.1