From 9d24e3f484b92fa18cad86b4f2eb7382ca6e792b Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 18 五月 2023 16:09:25 +0800
Subject: [PATCH] 数据源配置，通过ui配置application.yml
---
src/main/java/com/zy/common/utils/YamlUtils.java | 3 +++
src/main/resources/application-prod.yml | 2 +-
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/YamlUtils.java b/src/main/java/com/zy/common/utils/YamlUtils.java
index 218d4d2..9e2a425 100644
--- a/src/main/java/com/zy/common/utils/YamlUtils.java
+++ b/src/main/java/com/zy/common/utils/YamlUtils.java
@@ -174,6 +174,9 @@
}
} else {
String data = dataResource.getData();
+ if (data == null) {
+ data = "";
+ }
map.put(dataResource.getName(), data);
}
}
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index d302ce5..881591e 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -63,7 +63,7 @@
id: 2
slot: 0
demo: false
- doubleLocs: null #鍙屾繁搴撲綅鎺掑彿 1,4,5,8,9,12,13,16
+ doubleLocs: #鍙屾繁搴撲綅鎺掑彿 1,4,5,8,9,12,13,16
barcode[1]:
port: 51236
ip: 10.10.10.52
--
Gitblit v1.9.1