From 61a0dd8eed6b9cdb8c6e2b979deaae8b8ae85374 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 3 Jun 2020 19:08:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8A=A0=E8=BD=BD=E6=94=B9?= =?UTF-8?q?=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/jeesite/common/io/PropertiesUtils.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 971c21e4..2f77ef0f 100644 --- a/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java +++ b/common/src/main/java/com/jeesite/common/io/PropertiesUtils.java @@ -33,8 +33,11 @@ public class PropertiesUtils { // 默认加载的文件,可通过继承覆盖(若有相同Key,优先加载后面的) public static final String[] DEFAULT_CONFIG_FILE = new String[]{ - "classpath:config/bootstrap.yml", "classpath:bootstrap.yml", - "classpath:config/application.yml", "classpath:application.yml"}; + "classpath:application.yml", "classpath:config/application.yml", + "classpath:bootstrap.yml", "classpath:config/bootstrap.yml", + "file:application.yml", "file:config/application.yml", + "file:bootstrap.yml", "file:config/bootstrap.yml", + }; private static Logger logger = PropertiesUtils.initLogger(); private final Set configSet = SetUtils.newLinkedHashSet();