From 1a56f6f4a0c2b8fc61bfde8bd3418a9731b87647 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期五, 25 十月 2024 12:38:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhtwcs' into tzhtwcs
---
src/main/resources/application.yml | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d1a9ecd..ba30efc 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,8 +9,8 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
url: jdbc:sqlserver://localhost:1433;databasename=tzhtasrs
- username: SA
- password: SQLsqlserver1234
+ username: sa
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -211,25 +211,53 @@
ip: 10.10.10.201
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 102
+ staArr: 100
# LED2
led[1]:
id: 2
ip: 10.10.10.202
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 103
+ staArr: 102
# LED3
led[2]:
id: 3
ip: 10.10.10.203
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 202
+ staArr: 104
# LED4
led[3]:
id: 4
ip: 10.10.10.204
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 204
+ staArr: 106
+ # LED1
+ led[4]:
+ id: 5
+ ip: 10.10.10.201
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 101
+ # LED2
+ led[5]:
+ id: 6
+ ip: 10.10.10.202
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 103
+ # LED3
+ led[6]:
+ id: 7
+ ip: 10.10.10.203
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 105
+ # LED4
+ led[7]:
+ id: 8
+ ip: 10.10.10.204
+ port: 5005
+ devpPlcId: ${wcs-slave.devp[0].id}
+ staArr: 107
--
Gitblit v1.9.1