manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ServiceSupport的类移动到support子包下。

Browse Source
This commit is contained in:
thinkgem
2018-11-17 21:45:13 +08:00
parent 89749e064e
commit 92f8cc8a92
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/src/main/java/com/jeesite/common/io/PropertiesUtils.java
View File

@@ -175,12 +175,11 @@ public class PropertiesUtils {
} }
String value = properties.getProperty(key); String value = properties.getProperty(key);
if (value != null){ if (value != null){
// 支持嵌套取值的问题 key=${xx}/yy
Matcher m = p1.matcher(value); Matcher m = p1.matcher(value);
while(m.find()) { while(m.find()) {
String g = m.group(); String g = m.group();
String keyChild = g.replaceAll("\\$\\{", "").replaceAll("\\}", ""); String childKey = g.replaceAll("\\$\\{|\\}", "");
value = StringUtils.replace(value, g, getProperty(keyChild)); value = StringUtils.replace(value, g, getProperty(childKey));
} }
return value; return value;
}else{ }else{