From 8b07f0b136de43963beff702f394dc8341943e8e Mon Sep 17 00:00:00 2001 From: thinkgem Date: Tue, 12 Jun 2018 20:31:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=91=BD=E4=BB=A4=E8=A1=8C?= =?UTF-8?q?=E6=8C=87=E5=AE=9A=E5=B1=9E=E6=80=A7=E6=96=87=E4=BB=B6=EF=BC=9A?= =?UTF-8?q?=20-Dspring.config.location=3Dx:/app.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jeesite/common/io/PropertiesUtils.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 1aaeef2b..d0bcdcfa 100644 --- a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java +++ b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java @@ -21,6 +21,7 @@ import org.springframework.core.io.Resource; import com.jeesite.common.collect.SetUtils; import com.jeesite.common.lang.ObjectUtils; +import com.jeesite.common.lang.StringUtils; /** * Properties工具类， 可载入多个properties、yml文件， @@ -58,6 +59,16 @@ public class PropertiesUtils { for (String configFile : DEFAULT_CONFIG_FILE){ configFiles.add(configFile); } + String customConfig = System.getProperty("spring.config.location"); + if (StringUtils.isNotBlank(customConfig)){ + if (!customConfig.contains("$")){ + customConfig = org.springframework.util.StringUtils.cleanPath(customConfig); + if (!ResourceUtils.isUrl(customConfig)){ + customConfig = ResourceUtils.FILE_URL_PREFIX + customConfig; + } + } + configFiles.add(customConfig); + } logger.debug("Loading jeesite config: {}", configFiles); INSTANCE = new PropertiesUtils(configFiles.toArray(new String[configFiles.size()])); }