mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Merge branch '2.1.x'
This commit is contained in:
commit
09ad80b3d9
@ -75,11 +75,13 @@ import org.springframework.util.StringUtils;
|
||||
* properties from well known file locations. By default properties will be loaded from
|
||||
* 'application.properties' and/or 'application.yml' files in the following locations:
|
||||
* <ul>
|
||||
* <li>classpath:</li>
|
||||
* <li>file:./config/:</li>
|
||||
* <li>file:./</li>
|
||||
* <li>classpath:config/</li>
|
||||
* <li>file:./config/:</li>
|
||||
* <li>classpath:</li>
|
||||
* </ul>
|
||||
* The list is ordered by precedence (properties defined in locations higher in the list
|
||||
* override those defined in lower locations).
|
||||
* <p>
|
||||
* Alternative search locations and names can be specified using
|
||||
* {@link #setSearchLocations(String)} and {@link #setSearchNames(String)}.
|
||||
|
Loading…
Reference in New Issue
Block a user