From b6fa74e9efd2d109ad8891337e7c59c9b6c62cc6 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 17 十一月 2025 08:53:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/config/ModbusConfig.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/config/ModbusConfig.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/config/ModbusConfig.java
index a6cb76b..47e1a4b 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/config/ModbusConfig.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/config/ModbusConfig.java
@@ -14,14 +14,19 @@
@Bean(name = "CMJ1ModbusTcp")
public ModbusTcp CMJ1ModbusTcp() {
-// return new ModbusTcp("127.0.0.1");
- return new ModbusTcp("192.168.30.160");
+// ModbusTcp modbusTcp=new ModbusTcp("127.0.0.1");
+ ModbusTcp modbusTcp=new ModbusTcp("192.168.30.160");
+ modbusTcp.setConnectTimeout(3000);
+ return modbusTcp;
+
}
@Bean(name = "CMJ2ModbusTcp")
public ModbusTcp CMJ2ModbusTcp() {
-// return new ModbusTcp("127.0.0.1");
- return new ModbusTcp("192.168.30.162");
+// ModbusTcp modbusTcp=new ModbusTcp("127.0.0.1");
+ ModbusTcp modbusTcp=new ModbusTcp("192.168.30.162");
+ modbusTcp.setConnectTimeout(3000);
+ return modbusTcp;
}
}
--
Gitblit v1.8.0