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

优化命名

Browse Source
This commit is contained in:
redkale
2023-01-30 21:15:42 +08:00
parent 9bafeccd38
commit afaf97aaf8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1246,8 +1246,8 @@ public final class Application {
logger.info("Load CacheSource resourceName = " + sourceName + ", source = " + source + " in " + (System.currentTimeMillis() - st) + " ms"); logger.info("Load CacheSource resourceName = " + sourceName + ", source = " + source + " in " + (System.currentTimeMillis() - st) + " ms");
return source; return source;
} }
if (!sourceConf.getValue(AbstractCacheSource.CACHE_SOURCE_SOURCE, "").isEmpty()) { if (!sourceConf.getValue(AbstractCacheSource.CACHE_SOURCE_RESOURCE, "").isEmpty()) {
CacheSource source = loadCacheSource(sourceConf.getValue(AbstractCacheSource.CACHE_SOURCE_SOURCE), autoMemory); CacheSource source = loadCacheSource(sourceConf.getValue(AbstractCacheSource.CACHE_SOURCE_RESOURCE), autoMemory);
if (source != null) { if (source != null) {
resourceFactory.register(sourceName, CacheSource.class, source); resourceFactory.register(sourceName, CacheSource.class, source);
} }
@@ -1289,8 +1289,8 @@ public final class Application {
logger.info("Load DataSource resourceName = " + sourceName + ", source = " + source); logger.info("Load DataSource resourceName = " + sourceName + ", source = " + source);
return source; return source;
} }
if (!sourceConf.getValue(AbstractDataSource.DATA_SOURCE_SOURCE, "").isEmpty()) { if (!sourceConf.getValue(AbstractDataSource.DATA_SOURCE_RESOURCE, "").isEmpty()) {
DataSource source = loadDataSource(sourceConf.getValue(AbstractDataSource.DATA_SOURCE_SOURCE), autoMemory); DataSource source = loadDataSource(sourceConf.getValue(AbstractDataSource.DATA_SOURCE_RESOURCE), autoMemory);
if (source != null) { if (source != null) {
if (source instanceof DataMemorySource && DataMemorySource.isSearchType(sourceConf)) { if (source instanceof DataMemorySource && DataMemorySource.isSearchType(sourceConf)) {
resourceFactory.register(sourceName, SearchSource.class, source); resourceFactory.register(sourceName, SearchSource.class, source);

2
src/main/java/org/redkale/source/AbstractCacheSource.java
View File

@@ -25,7 +25,7 @@ import org.redkale.util.*;
public abstract class AbstractCacheSource extends AbstractService implements CacheSource, AutoCloseable, Resourcable { public abstract class AbstractCacheSource extends AbstractService implements CacheSource, AutoCloseable, Resourcable {
//@since 2.8.0 复用另一source资源 //@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 //@since 2.7.0
public static final String CACHE_SOURCE_URL = "url"; public static final String CACHE_SOURCE_URL = "url";

2
src/main/java/org/redkale/source/AbstractDataSource.java
View File

@@ -40,7 +40,7 @@ import org.redkale.util.*;
public abstract class AbstractDataSource extends AbstractService implements DataSource, AutoCloseable, Resourcable { public abstract class AbstractDataSource extends AbstractService implements DataSource, AutoCloseable, Resourcable {
//@since 2.8.0 复用另一source资源 //@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 //@since 2.7.0 格式: x.x.x.x:yyyy
public static final String DATA_SOURCE_PROXY_ADDRESS = "proxy-address"; public static final String DATA_SOURCE_PROXY_ADDRESS = "proxy-address";