From b2e9d1f13a8a88e2963f504926234589fa2d2787 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 11 四月 2025 13:45:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs
---
src/main/resources/application.yml | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7d70dc0..975905c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -13,7 +13,7 @@
driver-class-name: com.mysql.jdbc.Driver
url: jdbc:mysql://127.0.0.1:3306/fyxc_shuttle?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
- password: zhangchao
+ password: root
mvc:
static-path-pattern: /**
redis:
@@ -44,16 +44,16 @@
# 涓嬩綅鏈洪厤缃�
wcs-slave:
- # # 鍥涘悜绌挎杞�1
- # shuttle[0]:
- # id: 1
- # ip: 192.168.10.81
- # port: 8888
- # rack: 0
- # slot: 0
- # threadImpl: NyShuttleThread
- # 鍥涘悜绌挎杞�2
+ # 鍥涘悜绌挎杞�1
shuttle[0]:
+ id: 1
+ ip: 192.168.10.81
+ port: 8888
+ rack: 0
+ slot: 0
+ threadImpl: NyShuttleThread
+ # 鍥涘悜绌挎杞�2
+ shuttle[1]:
id: 2
ip: 192.168.10.83
port: 8888
@@ -68,8 +68,10 @@
threadImpl: NyLiftThread
row: 2
bay: 3
- standByRow: 2
- standByBay: 1
+ standByInRow: 2
+ standByInBay: 1
+ standByOutRow: 2
+ standByOutBay: 2
staRow: 2
staBay: 1
devp[0]:
--
Gitblit v1.9.1