diff --git a/xspring-core/src/main/java/org/xspring/XspringConfiguration.java b/xspring-core/src/main/java/org/xspring/XspringConfiguration.java index d49074c..b83ccad 100644 --- 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 index 955c8d9..ea04cec 100644 --- 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;