diff --git a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java index 76952d1a..288652b2 100644 --- a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java +++ b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java @@ -170,7 +170,7 @@ public class PropertiesUtils { while(m.find()) { String g = m.group(); String keyChild = g.replaceAll("\\$\\{", "").replaceAll("\\}", ""); - value = value.replace(g, getProperty(keyChild)); + value = StringUtils.replace(value, g, getProperty(keyChild)); } return value; }else{ diff --git a/web/src/main/resources/config/jeesite.yml b/web/src/main/resources/config/jeesite.yml index fd57ecbd..3efe48f6 100644 --- a/web/src/main/resources/config/jeesite.yml +++ b/web/src/main/resources/config/jeesite.yml @@ -3,17 +3,23 @@ #===== Project settings =====# #============================# -# 产品或项目名称、版本、版权年份 +# 产品或项目名称、软件开发公司名称 productName: JeeSite Demo +companyName: ThinkGem + +# 产品版本、版权年份 productVersion: V4.0 copyrightYear: 2018 -# 软件提供商公司或个人名称 -companyName: ThinkGem - #是否演示模式 demoMode: false +#是否小程序 +miniService: true + +#是否小程序 +miniConfig: true + #============================# #===== Database sttings =====# #============================#