manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

支持命令行指定属性文件： -Dspring.config.location=x:/app.yml

Browse Source
This commit is contained in:
thinkgem
2018-06-12 20:31:12 +08:00
parent 94c38ee018
commit 8b07f0b136
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/src/main/java/com/jeesite/common/io/PropertiesUtils.java
View File

@@ -21,6 +21,7 @@ import org.springframework.core.io.Resource;
import com.jeesite.common.collect.SetUtils; import com.jeesite.common.collect.SetUtils;
import com.jeesite.common.lang.ObjectUtils; import com.jeesite.common.lang.ObjectUtils;
import com.jeesite.common.lang.StringUtils;
/** /**
* Properties工具类， 可载入多个properties、yml文件， * Properties工具类， 可载入多个properties、yml文件，
@@ -58,6 +59,16 @@ public class PropertiesUtils {
for (String configFile : DEFAULT_CONFIG_FILE){ for (String configFile : DEFAULT_CONFIG_FILE){
configFiles.add(configFile); configFiles.add(configFile);
} }
String customConfig = System.getProperty("spring.config.location");
if (StringUtils.isNotBlank(customConfig)){
if (!customConfig.contains("$")){
customConfig = org.springframework.util.StringUtils.cleanPath(customConfig);
if (!ResourceUtils.isUrl(customConfig)){
customConfig = ResourceUtils.FILE_URL_PREFIX + customConfig;
}
}
configFiles.add(customConfig);
}
logger.debug("Loading jeesite config: {}", configFiles); logger.debug("Loading jeesite config: {}", configFiles);
INSTANCE = new PropertiesUtils(configFiles.toArray(new String[configFiles.size()])); INSTANCE = new PropertiesUtils(configFiles.toArray(new String[configFiles.size()]));
} }