Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
LEDfan committed Jun 20, 2024
2 parents 88aae52 + 9f1c796 commit d2c1dc3
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ public static void main(String[] args) {
boolean hasExternalConfig = Files.exists(Paths.get(CONFIG_FILENAME))
|| System.getProperty("spring.config.location") != null
|| System.getenv("SPRING_CONFIG_LOCATION") != null
|| Arrays.asList(args).contains("--spring.config.location");
|| Arrays.stream(args).anyMatch(s -> s.contains("--spring.config.location"));

if (!hasExternalConfig) {
app.setAdditionalProfiles(CONFIG_DEMO_PROFILE);
Expand Down

0 comments on commit d2c1dc3

Please sign in to comment.