From c8ca14407cd83d0e03fb017ad97c0464bd0c42c4 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 18 三月 2025 10:46:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 12 +++++-------
1 files changed, 5 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 02824c8..d7dfba6 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -220,7 +220,6 @@
JSONObject resultResponse = JSON.parseObject(socketResult.get("response").toString());
JSONObject resultBody = JSON.parseObject(resultResponse.get("body").toString());
String responseType = resultBody.get("responseType").toString();
- String responseTaskId = resultBody.get("taskId").toString();
if (DEBUG) {
result = socketResult;
break;
@@ -230,8 +229,11 @@
continue;//鍝嶅簲绫诲瀷涓庤姹傜被鍨嬩笉涓�鑷达紝涓嶅湪璋冭瘯妯″紡涓�
}
- if (taskId != null && !responseTaskId.equals(taskId)) {
- continue;//鍝嶅簲ID涓庤姹侷D涓嶄竴鑷达紝涓嶅湪璋冭瘯妯″紡涓�
+ if (taskId != null) {
+ String responseTaskId = resultBody.get("taskId").toString();
+ if (!responseTaskId.equals(taskId)) {
+ continue;//鍝嶅簲ID涓庤姹侷D涓嶄竴鑷达紝涓嶅湪璋冭瘯妯″紡涓�
+ }
}
result = socketResult;
@@ -464,18 +466,14 @@
for (NyShuttleHttpCommand requestCommand : commandList) {
while (true) {
- int i = 0;
- i++;
JSONObject result = requestCommand(requestCommand);
if (result == null) {
// return response;//璇锋眰澶辫触
- News.info("Socket鍛戒护涓嬪彂澶辫触锛屼换鍔℃暟鎹�={}锛屾鏁�={}", JSON.toJSON(requestCommand), i);
continue;//璇锋眰澶辫触灏濊瘯閲嶆柊璇锋眰
}
this.shuttleProtocol.setSendTime(System.currentTimeMillis());//鎸囦护涓嬪彂鏃堕棿
response.setMessage(JSON.toJSONString(result));
response.setResult(true);
- News.info("Socket鍛戒护涓嬪彂鎴愬姛锛屼换鍔℃暟鎹�={}锛屾鏁�={}锛屽搷搴旀暟鎹�={}", JSON.toJSON(requestCommand), i, JSON.toJSONString(result));
break;
}
}
--
Gitblit v1.9.1