From cab66ddd879dafcee85965e76d52347a5301e5f7 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 30 三月 2026 10:25:30 +0800
Subject: [PATCH] Merge branch 'rcs_master' into jdxaj
---
zy-acs-manager/src/main/resources/application.yml | 58 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/zy-acs-manager/src/main/resources/application.yml b/zy-acs-manager/src/main/resources/application.yml
index e253677..c1cb098 100644
--- a/zy-acs-manager/src/main/resources/application.yml
+++ b/zy-acs-manager/src/main/resources/application.yml
@@ -7,9 +7,7 @@
static-path-pattern: /**
datasource:
driver-class-name: com.mysql.jdbc.Driver
- url: jdbc:mysql://127.0.0.1:3306/zy_rcs1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-# url: jdbc:mysql://127.0.0.1:33066/zy_rcs1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
-# url: jdbc:mysql://mysql:3306/zy_rcs1?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://localhost:3306/rcs_ctu_stable?useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: root
password: xltys1995
type: com.alibaba.druid.pool.DruidDataSource
@@ -42,29 +40,28 @@
maxRequestSize: 100MB
jmx:
enabled: false
- mail:
- host: smtp.qq.com
- username:
- password:
- default-encoding: UTF-8
- properties:
- mail:
- smtp:
- auth: true
- socketFactory:
- class: javax.net.ssl.SSLSocketFactory
- port: 465
redis:
- host: 127.0.0.1
- # host: redis
+ host: localhost
password: xltys1995
port: 6379
-# port: 63799
max: 30
min: 10
timeout: 5000
- index: 3
+ index: 8
+
+convey-plc:
+ host: localhost
+ port: 9090
+ timeout: 15000
+ url: /cv/station/query
+
+uplink:
+ enabled: true
+ host: localhost
+ port: 8082
+ timeout: 30000
+ url: /rsf-open-api/rcs/api/open/task/report
floyd:
enable: false
@@ -92,11 +89,28 @@
logging:
file:
- path: stock/out/rcs-manager/logs
+ path: /stock/out/rcs-manager/logs
config:
+ system-name: @pom.artifactId@
+ system-version: @pom.version@
+ system-mode: OFFLINE
open-office-home: C
swagger-base-package: com.zy.acs
- swagger-title: ACS API鏂囨。
+ swagger-title: RCS API鏂囨。
swagger-version: 1.0
- token-key: KUHSMcYQ4lePt3r6bckz0P13cBJyoonYqInThvQlUnbsFCIcCcZZAbWZ6UNFztYNYPhGdy6eyb8WdIz8FU2Cz396TyTJk3NI2rtXMHBOehRb4WWJ4MdYVVg2oWPyqRQ2
\ No newline at end of file
+ token-key: KUHSMcYQ4lePt3r6bckz0P13cBJyoonYqInThvQlUnbsFCIcCcZZAbWZ6UNFztYNYPhGdy6eyb8WdIz8FU2Cz396TyTJk3NI2rtXMHBOehRb4WWJ4MdYVVg2oWPyqRQ2
+
+charger:
+ modbus:
+ host: 192.168.1.100
+ port: 502
+ unit-id: 1
+ connect-timeout: 3000 # 杩炴帴瓒呮椂锛堟绉掞級
+ transaction-timeout: 5000 # 璇诲啓瓒呮椂锛堟绉掞級
+ retry:
+ max-attempts: 3 # 鍚姩鏃舵渶澶ч噸璇曟鏁�
+ initial-delay: 1000 # 閲嶈瘯闂撮殧锛堟绉掞級
+ heartbeat:
+ enabled: true
+ interval: 30000 # 蹇冭烦闂撮殧锛堟绉掞級
--
Gitblit v1.9.1