From e641c7fbc7cda2b28f8518f8c7ec20629821af3a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 18 五月 2023 16:06:30 +0800
Subject: [PATCH] 数据源配置，通过ui配置application.yml
---
src/main/java/com/zy/common/utils/YamlUtils.java | 3 ++-
src/main/resources/application-prod.yml | 22 +++++++++++-----------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/YamlUtils.java b/src/main/java/com/zy/common/utils/YamlUtils.java
index 25d8046..218d4d2 100644
--- a/src/main/java/com/zy/common/utils/YamlUtils.java
+++ b/src/main/java/com/zy/common/utils/YamlUtils.java
@@ -112,7 +112,8 @@
String[] split = trim.split(":");
String lineName = split[0];
if (lineName.equals(name)) {
- lines[idx] = line + " #" + dataResource.getMemo();
+ String[] split1 = line.split("#");
+ lines[idx] = split1[0] + " #" + dataResource.getMemo();
}
idx++;
}
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index fec68b0..d302ce5 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -1,28 +1,28 @@
wcs-slave:
crn[0]: #鍫嗗灈鏈�1
rack: 0
- offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
- crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
staNo: 210
row: 1
bay: 41
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
staNo: 209
row: 2
bay: 41
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
staNo: 105
row: 1
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
ip: 10.10.10.3
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
staNo: 106
row: 2
bay: 1
@@ -33,28 +33,28 @@
demo: false
crn[1]: #鍫嗗灈鏈�2
rack: 0
- offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
+ offset: 2 #鍋忕Щ閲忥紝褰撳爢鍨涙満绔欑偣鍒楀彿=1鏃讹紝鍋忕Щ閲�=2
port: 102
- crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[1]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
staNo: 206
row: 3
bay: 41
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
- crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
+ crnInStn[1]: #鍫嗗灈鏈哄叆搴撶珯鐐�2
staNo: 205
row: 4
bay: 41
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
- crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
+ crnOutStn[0]: #鍫嗗灈鏈哄嚭搴撶珯鐐�
staNo: 109
row: 3
bay: 1
lev: 1
devpPlcId: ${wcs-slave.devp[0].id}
ip: 10.10.10.10
- crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
+ crnInStn[0]: #鍫嗗灈鏈哄叆搴撶珯鐐�1
staNo: 110
row: 4
bay: 1
@@ -63,7 +63,7 @@
id: 2
slot: 0
demo: false
- doubleLocs: #鍙屾繁搴撲綅鎺掑彿 1,4,5,8,9,12,13,16
+ doubleLocs: null #鍙屾繁搴撲綅鎺掑彿 1,4,5,8,9,12,13,16
barcode[1]:
port: 51236
ip: 10.10.10.52
--
Gitblit v1.9.1