From cdc7ddd76879ec47166b51947754ba946260267b Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 17 九月 2025 15:08:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxtlfwcs-yclk' into jxtlfwcs-yclk
---
src/main/resources/application.yml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cca63c4..b2eee4e 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,7 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=jxtlfasrs-yclk
+ url: jdbc:sqlserver://178.18.1.200:1433;databasename=jxtlfasrs-yclk
username: sa
password: sa@123
mvc:
@@ -34,7 +34,7 @@
enable: false
wms:
- url: 127.0.0.1:8081/clwms
+ url: 127.0.0.1:8080/clwms
# 涓嬩綅鏈洪厤缃�
wcs-slave:
@@ -99,14 +99,14 @@
# LED1
led[0]:
id: 1
- ip: 10.10.10.201
+ ip: 178.18.1.22
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 101
# LED2
led[1]:
id: 2
- ip: 10.10.10.202
+ ip: 178.18.1.21
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
staArr: 102
--
Gitblit v1.9.1