From 61ab4a21cb198580ab115462f7b1e59730684ca8 Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Mon, 25 Mar 2019 09:53:04 +0800
Subject: [PATCH] Fix spring.config.additional-location default config

---
 src/main/java/cc/ryanc/halo/Application.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/cc/ryanc/halo/Application.java b/src/main/java/cc/ryanc/halo/Application.java
index fabb2283a..5cbc632a2 100755
--- a/src/main/java/cc/ryanc/halo/Application.java
+++ b/src/main/java/cc/ryanc/halo/Application.java
@@ -27,7 +27,8 @@ public class Application {
     private final static Logger LOG = Logger.getLogger(Application.class);
 
     public static void main(String[] args) {
-        System.setProperty("spring.config.additional-location", "file:${user.home}/halo/");
+        // Customize the spring config location
+        System.setProperty("spring.config.location", "classpath:/,classpath:/config/,file:./,file:./config/,file:${user.home}/halo/,file:${user.home}/halo-dev");
 
         // Run application
         SpringApplication.run(Application.class, args);