lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化PropertiesAgent

Browse Source
This commit is contained in:
Redkale
2022-11-25 17:14:23 +08:00
parent 232accc0da
commit 53f7e5d337
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/redkale/boot/Application.java
View File

@@ -813,7 +813,7 @@ public final class Application {
if (compileMode) { if (compileMode) {
this.propertiesAgent.compile(propertiesConf); this.propertiesAgent.compile(propertiesConf);
} else { } else {
this.propertiesAgent.init(resourceFactory, appProperties, sourceProperties, propertiesConf); this.propertiesAgent.init(this, resourceFactory, propertiesConf);
} }
logger.info("PropertiesAgent (type = " + this.propertiesAgent.getClass().getSimpleName() + ") init in " + (System.currentTimeMillis() - s) + " ms"); logger.info("PropertiesAgent (type = " + this.propertiesAgent.getClass().getSimpleName() + ") init in " + (System.currentTimeMillis() - s) + " ms");
break; break;

15
src/main/java/org/redkale/boot/PropertiesAgent.java
View File

@@ -40,12 +40,11 @@ public abstract class PropertiesAgent {
/** /**
* 初始化配置源，配置项需要写入appProperties，并监听配置项的变化 * 初始化配置源，配置项需要写入appProperties，并监听配置项的变化
* *
* @param application Application
* @param factory 依赖注入资源工厂 * @param factory 依赖注入资源工厂
* @param appProperties 全局property.开头的配置项
* @param sourceProperties 全局source数据源的配置项
* @param conf 节点配置 * @param conf 节点配置
*/ */
public abstract void init(ResourceFactory factory, Properties appProperties, Properties sourceProperties, AnyValue conf); public abstract void init(Application application, ResourceFactory factory, AnyValue conf);
/** /**
* 销毁动作 * 销毁动作
@@ -61,15 +60,15 @@ public abstract class PropertiesAgent {
|| key.startsWith("mimetype.property.") ? key : ("property." + key); || key.startsWith("mimetype.property.") ? key : ("property." + key);
} }
protected void putProperties(Properties appProperties, Properties sourceProperties, Properties newProps) { protected void putResourceProperties(Application application, Properties newProps) {
newProps.forEach((k, v) -> putProperties(appProperties, sourceProperties, k.toString(), v)); newProps.forEach((k, v) -> putResourceProperties(application, k.toString(), v));
} }
protected void putProperties(Properties appProperties, Properties sourceProperties, String key, Object value) { protected void putResourceProperties(Application application, String key, Object value) {
if (key.startsWith("redkale.datasource.") || key.startsWith("redkale.datasource[") if (key.startsWith("redkale.datasource.") || key.startsWith("redkale.datasource[")
|| key.startsWith("redkale.cachesource.") || key.startsWith("redkale.cachesource[")) { || key.startsWith("redkale.cachesource.") || key.startsWith("redkale.cachesource[")) {
sourceProperties.put(key, value); application.sourceProperties.put(key, value);
} }
appProperties.put(key, value); application.appProperties.put(key, value);
} }
} }