From 1c418796b632684fe332c42dcff0dfcaa5c1d5fd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 16 二月 2022 14:50:15 +0800
Subject: [PATCH] #
---
src/main/resources/application.yml | 64 +++++++++++++------------------
1 files changed, 27 insertions(+), 37 deletions(-)
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cd2fe10..7d7e6f9 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,9 +8,12 @@
name: @pom.build.finalName@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
+# url: jdbc:sqlserver://47.97.1.152:51433;databasename=xgmasrs
+# username: sa
+# password: Zoneyung@zy56$
+ url: jdbc:sqlserver://localhost:1433;databasename=xgmasrs
username: sa
- password: Zoneyung@zy56$
+ password: sa@123
mvc:
static-path-pattern: /**
redis:
@@ -33,6 +36,9 @@
swagger:
enable: false
+wms:
+ url: localhost:8080/xgmwms
+
# 涓嬩綅鏈洪厤缃�
wcs-slave:
# 鍙屾繁
@@ -44,8 +50,8 @@
# 鍫嗗灈鏈�1
crn[0]:
id: 1
- ip: 192.168.10.10
- port: 102
+ ip: 10.10.10.10
+ port: 8888
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
@@ -66,8 +72,8 @@
# 鍫嗗灈鏈�2
crn[1]:
id: 2
- ip: 192.168.10.20
- port: 102
+ ip: 10.10.10.13
+ port: 8888
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
@@ -88,8 +94,8 @@
# 鍫嗗灈鏈�3
crn[2]:
id: 3
- ip: 192.168.10.20
- port: 102
+ ip: 10.10.10.16
+ port: 8888
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
@@ -110,8 +116,8 @@
# 鍫嗗灈鏈�4
crn[3]:
id: 4
- ip: 192.168.10.20
- port: 102
+ ip: 10.10.10.19
+ port: 8888
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
@@ -132,8 +138,8 @@
# 鍫嗗灈鏈�5
crn[4]:
id: 5
- ip: 192.168.10.20
- port: 102
+ ip: 10.10.10.22
+ port: 8888
# 鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
offset: 2
demo: false
@@ -154,61 +160,45 @@
# 杈撻�佺嚎
devp[0]:
id: 1
- ip: 192.168.10.100
+ ip: 10.10.10.50
port: 102
rack: 0
- slot: 1
+ slot: 0
# 鍏ュ簱鍙�1
inSta[0]:
- staNo: 301
+ staNo: 176
barcode: ${wcs-slave.barcode[0].id}
- inSta[1]:
- staNo: 110
# 绌烘澘鍏ュ簱鍙�1
emptyInSta[0]:
- staNo: 301
- # 绌烘澘鍏ュ簱鍙�3
- emptyInSta[1]:
- staNo: 126
+ staNo: 176
# 鍑哄簱鍙�1
outSta[0]:
- staNo: 200
+ staNo: 170
# 鍑哄簱鍙�2
outSta[1]:
- staNo: 203
- # 鍑哄簱鍙�3
- outSta[2]:
- staNo: 103
+ staNo: 180
# 鎷ｆ枡鍏ュ簱鍙�
pickSta[0]:
- staNo: 127
- # 鎷ｆ枡鍏ュ簱鍙�
- pickSta[1]:
- staNo: 128
+ staNo: 176
# 鏉＄爜鎵弿浠�
barcode[0]:
id: 1
ip: 192.168.10.130
port: 51236
-# # 鏉＄爜鎵弿浠�
-# barcode[1]:
-# id: 2
-# ip: 192.168.10.131
-# port: 51236
# LED1
led[0]:
id: 1
ip: 192.168.10.211
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 113
+ staArr: 170
# LED2
led[1]:
id: 2
ip: 192.168.10.221
port: 5005
devpPlcId: ${wcs-slave.devp[0].id}
- staArr: 109
+ staArr: 180
--
Gitblit v1.9.1