支持springboot带减号的key写法,自动转换为驼峰格式。
This commit is contained in:
@@ -126,7 +126,7 @@ public class PropertiesUtils {
|
|||||||
YamlPropertiesFactoryBean bean = new YamlPropertiesFactoryBean();
|
YamlPropertiesFactoryBean bean = new YamlPropertiesFactoryBean();
|
||||||
bean.setResources(resource);
|
bean.setResources(resource);
|
||||||
for (Map.Entry<Object,Object> entry : bean.getObject().entrySet()){
|
for (Map.Entry<Object,Object> entry : bean.getObject().entrySet()){
|
||||||
properties.put(ObjectUtils.toString(entry.getKey()),
|
properties.put(getStandardKey(ObjectUtils.toString(entry.getKey())),
|
||||||
ObjectUtils.toString(entry.getValue()));
|
ObjectUtils.toString(entry.getValue()));
|
||||||
}
|
}
|
||||||
configSet.add(location);
|
configSet.add(location);
|
||||||
@@ -181,7 +181,7 @@ public class PropertiesUtils {
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
String value = properties.getProperty(key);
|
String value = properties.getProperty(getStandardKey(key));
|
||||||
if (value != null){
|
if (value != null){
|
||||||
Matcher m = p1.matcher(value);
|
Matcher m = p1.matcher(value);
|
||||||
while(m.find()) {
|
while(m.find()) {
|
||||||
@@ -231,6 +231,27 @@ public class PropertiesUtils {
|
|||||||
return ObjectUtils.toLong(getProperty(key, defValue));
|
return ObjectUtils.toLong(getProperty(key, defValue));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取标准key,去减号并将后一个字母转换为大写
|
||||||
|
* @author Think Gem
|
||||||
|
*/
|
||||||
|
private String getStandardKey(String key) {
|
||||||
|
StringBuilder sb = new StringBuilder();
|
||||||
|
boolean upperCase = false;
|
||||||
|
for (int i = 0; i < key.length(); i++) {
|
||||||
|
char c = key.charAt(i);
|
||||||
|
if (c == '-') {
|
||||||
|
upperCase = true;
|
||||||
|
} else if (upperCase) {
|
||||||
|
sb.append(Character.toUpperCase(c));
|
||||||
|
upperCase = false;
|
||||||
|
} else {
|
||||||
|
sb.append(c);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return sb.toString();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 设置环境属性
|
* 设置环境属性
|
||||||
* @param environment
|
* @param environment
|
||||||
|
|||||||
Reference in New Issue
Block a user