From 2de4173f02cc9525949eb20e60595019b9be9a3f Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 09 六月 2025 19:43:05 +0800
Subject: [PATCH] 部署服务器

---
 src/main/resources/application.yml |  140 ++++++++++++++++++++++++++--------------------
 1 files changed, 80 insertions(+), 60 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index f19488f..366baa0 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -8,7 +8,8 @@
     name: @pom.build.finalName@
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-    url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdqzasrs
+    url: jdbc:sqlserver://192.168.2.201:1433;databasename=mdqzasrs
+#    url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdqzasrs
     username: sa
     password: sa@123
   mvc:
@@ -48,7 +49,7 @@
   # 鍫嗗灈鏈�1
   crn[0]:
     id: 1
-    ip: 10.10.10.1
+    ip: 192.168.2.1
     port: 102
     rack: 0
     slot: 0
@@ -57,22 +58,22 @@
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
-      staNo: 1093
-      row: 3
-      bay: 1
+      devpPlcId: ${wcs-slave.devp[2].id}
+      staNo: 1096
+      row: 4
+      bay: 0
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[2].id}
       staNo: 1093
       row: 3
-      bay: 1
+      bay: 0
       lev: 1
   # 鍫嗗灈鏈�2
   crn[1]:
     id: 2
-    ip: 10.10.10.10
+    ip: 192.168.2.11
     port: 102
     rack: 0
     slot: 0
@@ -81,22 +82,22 @@
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[2].id}
       staNo: 1104
       row: 6
-      bay: 1
+      bay: 0
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[2].id}
       staNo: 1099
       row: 5
-      bay: 1
+      bay: 0
       lev: 1
   # 鍫嗗灈鏈�3
   crn[2]:
     id: 3
-    ip: 10.10.10.20
+    ip: 192.168.2.21
     port: 102
     rack: 0
     slot: 0
@@ -105,22 +106,22 @@
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�
     crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[2].id}
       staNo: 1102
       row: 7
-      bay: 1
+      bay: 0
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[2].id}
       staNo: 1107
       row: 8
-      bay: 1
+      bay: 0
       lev: 1
   # 鍫嗗灈鏈�4
   crn[3]:
     id: 4
-    ip: 10.10.10.30
+    ip: 192.168.2.31
     port: 102
     rack: 0
     slot: 0
@@ -129,75 +130,60 @@
     demo: false
     # 鍫嗗灈鏈哄叆搴撶珯鐐�1
     crnInStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 1050
       row: 11
-      bay: 1
+      bay: 0
       lev: 1
     # 鍫嗗灈鏈哄叆搴撶珯鐐�2
     crnInStn[1]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 1049
       row: 12
-      bay: 1
+      bay: 0
       lev: 1
     # 鍫嗗灈鏈哄嚭搴撶珯鐐�
     crnOutStn[0]:
-      devpPlcId: ${wcs-slave.devp[0].id}
+      devpPlcId: ${wcs-slave.devp[1].id}
       staNo: 1056
       row: 9
-      bay: 1
+      bay: 0
+      lev: 1
+    # 鍫嗗灈鏈哄嚭搴撶珯鐐�
+    crnOutStn[1]:
+      devpPlcId: ${wcs-slave.devp[1].id}
+      staNo: 1057
+      row: 10
+      bay: 0
       lev: 1
 
   # 杈撻�佺嚎1
   devp[0]:
     id: 1
-    ip: 10.10.10.18
+    ip: 192.168.2.60
     port: 102
     rack: 0
     slot: 0
     # 鍏ュ簱鍙�1
     inSta[0]:
-      staNo: 1011
+      staNo: 1006
       barcode: ${wcs-slave.barcode[0].id}
-      backSta: 1010
       led: ${wcs-slave.led[0].id}
     # 鍏ュ簱鍙�2
     inSta[1]:
-      staNo: 1007
+      staNo: 1012
       barcode: ${wcs-slave.barcode[1].id}
-      backSta: 1008
       led: ${wcs-slave.led[1].id}
     # 鍏ュ簱鍙�3
     inSta[2]:
-      staNo: 1017
-      barcode: ${wcs-slave.barcode[1].id}
-      backSta: 1016
-      led: ${wcs-slave.led[1].id}
+      staNo: 1018
+      barcode: ${wcs-slave.barcode[2].id}
+      led: ${wcs-slave.led[2].id}
     # 鍏ュ簱鍙�4
     inSta[3]:
-      staNo: 1042
-      barcode: ${wcs-slave.barcode[1].id}
-      backSta: 1043
-      led: ${wcs-slave.led[1].id}
-    # 绌烘澘鍏ュ簱鍙�1
-    emptyInSta[0]:
-      staNo: 1042
-      barcode: ${wcs-slave.barcode[0].id}
-      backSta: 1043
-      led: ${wcs-slave.led[2].id}
-    # 绌烘澘鍏ュ簱鍙�2
-    emptyInSta[1]:
-      staNo: 1017
-      barcode: ${wcs-slave.barcode[1].id}
-      backSta: 1016
+      staNo: 1041
+      barcode: ${wcs-slave.barcode[3].id}
       led: ${wcs-slave.led[3].id}
-    # 绌烘澘鍏ュ簱鍙�3
-    emptyInSta[2]:
-      staNo: 1007
-      barcode: ${wcs-slave.barcode[2].id}
-      backSta: 1008
-      led: ${wcs-slave.led[4].id}
     # 鍑哄簱鍙�1
     outSta[0]:
       staNo: 1024
@@ -214,26 +200,60 @@
     outSta[3]:
       staNo: 1016
       led: ${wcs-slave.led[1].id}
-
+  # 杈撻�佺嚎2
+  devp[1]:
+    id: 2
+    ip: 192.168.2.80
+    port: 102
+    rack: 0
+    slot: 0
+  # 杈撻�佺嚎3
+  devp[2]:
+    id: 3
+    ip: 192.168.2.100
+    port: 102
+    rack: 0
+    slot: 0
+  # 缃愯绾�1
+  devp[3]:
+    id: 4
+    ip: 192.168.1.10
+    port: 102
+    rack: 0
+    slot: 0
+  # 缃愯绾�2
+  devp[4]:
+    id: 5
+    ip: 192.168.1.30
+    port: 102
+    rack: 0
+    slot: 0
+  # 缃愯绾�3
+  devp[5]:
+    id: 6
+    ip: 192.168.1.50
+    port: 102
+    rack: 0
+    slot: 0
   # 鏉$爜鎵弿浠�1
   barcode[0]:
     id: 1
-    ip: 10.10.10.121
+    ip: 192.168.2.63
     port: 51236
   # 鏉$爜鎵弿浠�2
   barcode[1]:
     id: 2
-    ip: 10.10.10.122
+    ip: 192.168.2.64
     port: 51236
   # 鏉$爜鎵弿浠�3
   barcode[2]:
     id: 3
-    ip: 10.10.10.122
+    ip: 192.168.2.67
     port: 51236
   # 鏉$爜鎵弿浠�4
   barcode[3]:
     id: 4
-    ip: 10.10.10.122
+    ip: 192.168.2.68
     port: 51236
 
   # LED1

--
Gitblit v1.9.1