From afaf97aaf8678f971197086696d0e2b1f1866184 Mon Sep 17 00:00:00 2001 From: redkale Date: Mon, 30 Jan 2023 21:15:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/org/redkale/boot/Application.java | 8 ++++---- src/main/java/org/redkale/source/AbstractCacheSource.java | 2 +- src/main/java/org/redkale/source/AbstractDataSource.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/redkale/boot/Application.java b/src/main/java/org/redkale/boot/Application.java index 12c02dc36..73f966131 100644 --- a/src/main/java/org/redkale/boot/Application.java +++ b/src/main/java/org/redkale/boot/Application.java @@ -1246,8 +1246,8 @@ public final class Application { logger.info("Load CacheSource resourceName = " + sourceName + ", source = " + source + " in " + (System.currentTimeMillis() - st) + " ms"); return source; } - if (!sourceConf.getValue(AbstractCacheSource.CACHE_SOURCE_SOURCE, "").isEmpty()) { - CacheSource source = loadCacheSource(sourceConf.getValue(AbstractCacheSource.CACHE_SOURCE_SOURCE), autoMemory); + if (!sourceConf.getValue(AbstractCacheSource.CACHE_SOURCE_RESOURCE, "").isEmpty()) { + CacheSource source = loadCacheSource(sourceConf.getValue(AbstractCacheSource.CACHE_SOURCE_RESOURCE), autoMemory); if (source != null) { resourceFactory.register(sourceName, CacheSource.class, source); } @@ -1289,8 +1289,8 @@ public final class Application { logger.info("Load DataSource resourceName = " + sourceName + ", source = " + source); return source; } - if (!sourceConf.getValue(AbstractDataSource.DATA_SOURCE_SOURCE, "").isEmpty()) { - DataSource source = loadDataSource(sourceConf.getValue(AbstractDataSource.DATA_SOURCE_SOURCE), autoMemory); + if (!sourceConf.getValue(AbstractDataSource.DATA_SOURCE_RESOURCE, "").isEmpty()) { + DataSource source = loadDataSource(sourceConf.getValue(AbstractDataSource.DATA_SOURCE_RESOURCE), autoMemory); if (source != null) { if (source instanceof DataMemorySource && DataMemorySource.isSearchType(sourceConf)) { resourceFactory.register(sourceName, SearchSource.class, source); diff --git a/src/main/java/org/redkale/source/AbstractCacheSource.java b/src/main/java/org/redkale/source/AbstractCacheSource.java index f8794fde6..ff11ae082 100644 --- a/src/main/java/org/redkale/source/AbstractCacheSource.java +++ b/src/main/java/org/redkale/source/AbstractCacheSource.java @@ -25,7 +25,7 @@ import org.redkale.util.*; public abstract class AbstractCacheSource extends AbstractService implements CacheSource, AutoCloseable, Resourcable { //@since 2.8.0 复用另一source资源 - public static final String CACHE_SOURCE_SOURCE = "source"; + public static final String CACHE_SOURCE_RESOURCE = "resource"; //@since 2.7.0 public static final String CACHE_SOURCE_URL = "url"; diff --git a/src/main/java/org/redkale/source/AbstractDataSource.java b/src/main/java/org/redkale/source/AbstractDataSource.java index 397922b85..b0f510d8c 100644 --- a/src/main/java/org/redkale/source/AbstractDataSource.java +++ b/src/main/java/org/redkale/source/AbstractDataSource.java @@ -40,7 +40,7 @@ import org.redkale.util.*; public abstract class AbstractDataSource extends AbstractService implements DataSource, AutoCloseable, Resourcable { //@since 2.8.0 复用另一source资源 - public static final String DATA_SOURCE_SOURCE = "source"; + public static final String DATA_SOURCE_RESOURCE = "resource"; //@since 2.7.0 格式: x.x.x.x:yyyy public static final String DATA_SOURCE_PROXY_ADDRESS = "proxy-address";