fix(config): 统一配置键名并修复 EnvironmentInitializer 属性读取
- 统一使用 kenaito.config.baseUrl 替代 kenaito.config.base.url - 更新示例配置参数(appName、profile、数据库配置键名) - EnvironmentInitializer 添加从 Spring Environment 提取 kenaito.config.* 属性的逻辑 - .gitignore 添加 target 目录忽略规则
This commit is contained in:
+2
-2
@@ -245,7 +245,7 @@ public class ConfigcenterContext {
|
||||
env = getProperty("kenaito.config.profile", "dev");
|
||||
Validate.notBlank(env, "[kenaito.config.profile] is required");
|
||||
|
||||
setApiBaseUrl(getAnyProperty("kenaito.config.baseUrl", "kenaito.config.base.url"));
|
||||
setApiBaseUrl(getAnyProperty("kenaito.config.baseUrl", "kenaito.config.baseUrl"));
|
||||
|
||||
version = getProperty("kenaito.config.version", "latest");
|
||||
ignoreGlobal = getBoolean("kenaito.config.global-ignore", false);
|
||||
@@ -269,7 +269,7 @@ public class ConfigcenterContext {
|
||||
}
|
||||
|
||||
public void setApiBaseUrl(String apiBaseUrl) {
|
||||
Validate.notBlank(apiBaseUrl, "[kenaito.config.base.url] is required");
|
||||
Validate.notBlank(apiBaseUrl, "[kenaito.config.baseUrl] is required");
|
||||
String[] urls = apiBaseUrl.split(",|;");
|
||||
this.apiBaseUrls = new String[urls.length];
|
||||
for (int i = 0; i < urls.length; i++) {
|
||||
|
||||
+13
@@ -26,6 +26,19 @@ public class KenaitoEnvironmentInitializer implements EnvironmentPostProcessor {
|
||||
public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {
|
||||
if (ccContext.isRemoteEnabled() && !ccContext.isProcessed()) {
|
||||
Properties properties = new Properties();
|
||||
// Extract kenaito.config.* properties from Spring Environment
|
||||
environment.getPropertySources().forEach(ps -> {
|
||||
if (ps instanceof org.springframework.core.env.EnumerablePropertySource) {
|
||||
for (String key : ((org.springframework.core.env.EnumerablePropertySource<?>) ps).getPropertyNames()) {
|
||||
if (key.startsWith("kenaito.config.") || key.equals("spring.application.name")) {
|
||||
String val = environment.getProperty(key);
|
||||
if (val != null) {
|
||||
properties.setProperty(key, val);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
ccContext.init(properties, true);
|
||||
ccContext.mergeRemoteProperties(properties);
|
||||
PropertiesPropertySource propertySource = new PropertiesPropertySource(ConfigcenterContext.MANAGER_PROPERTY_SOURCE, properties);
|
||||
|
||||
Reference in New Issue
Block a user