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

修正属性配置文件表达式为空时可能报错问题。

Browse Source
This commit is contained in:
thinkgem
2018-08-02 21:17:31 +08:00
parent d336c0fcf7
commit 086ca1d882
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,7 +170,7 @@ public class PropertiesUtils {
while(m.find()) { while(m.find()) {
String g = m.group(); String g = m.group();
String keyChild = g.replaceAll("\\$\\{", "").replaceAll("\\}", ""); String keyChild = g.replaceAll("\\$\\{", "").replaceAll("\\}", "");
value = value.replace(g, getProperty(keyChild)); value = StringUtils.replace(value, g, getProperty(keyChild));
} }
return value; return value;
}else{ }else{

14
web/src/main/resources/config/jeesite.yml
View File

@@ -3,17 +3,23 @@
#===== Project settings =====# #===== Project settings =====#
#============================# #============================#
# 产品或项目名称、版本、版权年份 # 产品或项目名称、软件开发公司名称
productName: JeeSite Demo productName: JeeSite Demo
companyName: ThinkGem
# 产品版本、版权年份
productVersion: V4.0 productVersion: V4.0
copyrightYear: 2018 copyrightYear: 2018
# 软件提供商公司或个人名称
companyName: ThinkGem
#是否演示模式 #是否演示模式
demoMode: false demoMode: false
#是否小程序
miniService: true
#是否小程序
miniConfig: true
#============================# #============================#
#===== Database sttings =====# #===== Database sttings =====#
#============================# #============================#