test/nutzboot
1
0
Fork 0
mirror of https://gitee.com/nutz/nutzboot.git synced 2024-12-02 03:38:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

1、修正加载路径使用path

Browse Source 
2、修改动态读取配置项名称为：nutz.boot.configure.properties.dir
This commit is contained in:
wentao 2018-01-13 23:04:33 +08:00
parent c1dac72b29
commit 6f83fc2268
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nutzboot-core/src/main/java/org/nutz/boot/config/impl/PropertiesConfigureLoader.java
View File

@ -65,9 +65,8 @@ public class PropertiesConfigureLoader extends AbstractConfigureLoader {
}
}
// 如果当前文件夹存在application.properties,读取之
String applicationPath = getPath("application.properties");
try {
File tmp = new File(applicationPath);
File tmp = new File(getPath(path));
if (tmp.exists() && tmp.canRead()) {
try (FileInputStream ins = new FileInputStream(tmp)) {
conf.load(Streams.utf8r(ins), false);
@ -78,8 +77,8 @@ public class PropertiesConfigureLoader extends AbstractConfigureLoader {
}
// 如果conf内含有configDir配置，则读取configDir下的所有配置文件
// 配置示例： configDir=config, 那么读取的就是jar包当前目录下config子目录下的所有properties文件
if(conf.has("configDir")) {
String configDir = getPath(conf.get("configDir"));
if(conf.has("nutz.boot.configure.properties.dir")) {
String configDir = getPath(conf.get("nutz.boot.configure.properties.dir"));
for(String fileName: getFiles(configDir, "properties")) {
try {
File tmp = new File(getPath(fileName));