zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix header

Browse Source
This commit is contained in:
Looly
2019-08-28 10:29:34 +08:00
parent 500be4aaba
commit 684bc1b6ae
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
hutool-setting/src/main/java/cn/hutool/setting/SettingLoader.java
View File

@@ -201,22 +201,23 @@ public class SettingLoader {
for (String var : vars) {
key = ReUtil.get(reg_var, var, 1);
if (StrUtil.isNotBlank(key)) {
// 查找变量名对应的值
// 本分组中查找变量名对应的值
String varValue = this.groupedMap.get(group, key);
if (null != varValue) {
// 替换标识
value = value.replace(var, varValue);
} else {
// 跨分组查找
// 跨分组查找
if (null == varValue) {
final List<String> groupAndKey = StrUtil.split(key, CharUtil.DOT, 2);
if (groupAndKey.size() > 1) {
varValue = this.groupedMap.get(groupAndKey.get(0), groupAndKey.get(1));
if (null != varValue) {
// 替换标识
value = value.replace(var, varValue);
}
}
}
// 系统参数中查找
if(null == varValue) {
varValue = System.getProperty(key);
}
if (null != varValue) {
// 替换标识
value = value.replace(var, varValue);
}
}
}
return value;