From 086ca1d882d9fdc5496099757acfe4d37ccc0dee Mon Sep 17 00:00:00 2001 From: thinkgem Date: Thu, 2 Aug 2018 21:17:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=B1=9E=E6=80=A7=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E8=A1=A8=E8=BE=BE=E5=BC=8F=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E6=97=B6=E5=8F=AF=E8=83=BD=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/jeesite/common/io/PropertiesUtils.java | 2 +- web/src/main/resources/config/jeesite.yml | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) 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 =====# #============================#