From cfb5a68740880c52c9acada94f25a06614f2407a Mon Sep 17 00:00:00 2001
From: qlsxk <qlsxk@qq.com>
Date: 星期六, 11 十月 2025 10:07:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/impl/NyShuttleThread.java | 4 +++-
src/main/resources/application.yml | 2 +-
src/main/java/com/zy/core/ServerBootstrap.java | 20 +++++++++++---------
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/core/ServerBootstrap.java b/src/main/java/com/zy/core/ServerBootstrap.java
index 08bdeb2..3aaf637 100644
--- a/src/main/java/com/zy/core/ServerBootstrap.java
+++ b/src/main/java/com/zy/core/ServerBootstrap.java
@@ -82,17 +82,19 @@
}
private void initFakeThread(){
- ThreadHandler thread = new FakeNyShuttleThread(redisUtil, gatewayPort, enableFake, enableFakeDeviceThread);
- new Thread(thread).start();
- SlaveConnection.put(SlaveType.FakeThread, 1, thread);
+ if (enableFake) {
+ ThreadHandler thread = new FakeNyShuttleThread(redisUtil, gatewayPort, enableFake, enableFakeDeviceThread);
+ new Thread(thread).start();
+ SlaveConnection.put(SlaveType.FakeThread, 1, thread);
- ThreadHandler thread2 = new FakeZyForkLiftThread(redisUtil);
- new Thread(thread2).start();
- SlaveConnection.put(SlaveType.FakeThread, 2, thread2);
+ ThreadHandler thread2 = new FakeZyForkLiftThread(redisUtil);
+ new Thread(thread2).start();
+ SlaveConnection.put(SlaveType.FakeThread, 2, thread2);
- ThreadHandler thread3 = new FakeNyLiftThread(redisUtil);
- new Thread(thread3).start();
- SlaveConnection.put(SlaveType.FakeThread, 3, thread3);
+ ThreadHandler thread3 = new FakeNyLiftThread(redisUtil);
+ new Thread(thread3).start();
+ SlaveConnection.put(SlaveType.FakeThread, 3, thread3);
+ }
}
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 9f54ac8..b04f6d2 100644
--- a/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
+++ b/src/main/java/com/zy/core/thread/impl/NyShuttleThread.java
@@ -64,6 +64,7 @@
);
Thread.sleep(200);
} catch (Exception e) {
+ closeSocket();
e.printStackTrace();
}
}
@@ -301,6 +302,8 @@
return false;
}
+ this.lastConnectTime = System.currentTimeMillis();
+
if(this.deviceConfig.getFake()) {
return fakeConnect();
}else {
@@ -310,7 +313,6 @@
deviceSocket.setSoTimeout(10000);
deviceSocket.setKeepAlive(true);
this.socket = deviceSocket;
- this.lastConnectTime = System.currentTimeMillis();
log.info(MessageFormat.format("銆恵0}銆戝洓鍚戠┛姊溅Socket閾炬帴鎴愬姛 ===>> [id:{1}] [ip:{2}] [port:{3}]", DateUtils.convert(new Date()), deviceConfig.getDeviceNo(), deviceConfig.getIp(), deviceConfig.getPort()));
}
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 77eef45..d45ce15 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -30,6 +30,6 @@
# 缃戝叧绔彛
gatewayPort: 8888
# 鍚姩妯℃嫙鍣�
- enableFake: true
+ enableFake: false
# 鍚姩妯℃嫙鍣ㄨ澶囩嚎绋�
enableFakeDeviceThread: true
\ No newline at end of file
--
Gitblit v1.9.1