调整动态环境配置文件加载、事件总线服务启动逻辑

monkeychen · Sep 17, 2017 · 2109af3 · 2109af3
1 parent 7e54e34
commit 2109af3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/xspring-core/src/main/java/org/xspring/XspringConfiguration.java b/xspring-core/src/main/java/org/xspring/XspringConfiguration.java
@@ -32,6 +32,8 @@
                 "classpath:/config/xspring.properties",
                 "file:./xspring.properties",
                 "file:./config/xspring.properties",
+                "classpath:/config/env.properties",
+                "file:./config/env.properties",
         },
         ignoreResourceNotFound = true
 )

diff --git a/xspring-core/src/main/java/org/xspring/core/environment/EnvironmentInitializer.java b/xspring-core/src/main/java/org/xspring/core/environment/EnvironmentInitializer.java
@@ -45,7 +45,8 @@ public class EnvironmentInitializer implements SmartLifecycle, InitializingBean
     private ScheduledExecutorService scheduledExecutorService;
 
     private String[] profileLocations = new String[]{
-            ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + "/config/env.properties"
+            ResourcePatternResolver.CLASSPATH_ALL_URL_PREFIX + "/config/env.properties",
+            ResourceUtils.FILE_URL_PREFIX + "./config/env.properties"
     };
 
     private boolean isRunning = false;