From af5081bc0d0668d526a204076557a171097ddb8d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 二月 2026 14:02:59 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into ctu_conveyor

---
 zy-acs-manager/src/main/resources/application.yml |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/zy-acs-manager/src/main/resources/application.yml b/zy-acs-manager/src/main/resources/application.yml
index 94987b1..c1aec68 100644
--- a/zy-acs-manager/src/main/resources/application.yml
+++ b/zy-acs-manager/src/main/resources/application.yml
@@ -53,6 +53,15 @@
 convey-plc:
   host: 10.10.10.222
   port: 9090
+  timeout: 15000
+  url: /cv/station/query
+
+uplink:
+  enabled: true
+  host: 10.10.10.251
+  port: 8082
+  timeout: 30000
+  url: /rsf-open-api/rcs/api/open/task/report
 
 floyd:
   enable: false

--
Gitblit v1.9.1