This commit is contained in:
开源海哥 2023-04-25 16:25:32 +08:00
parent b80cce4911
commit 283b578989
2 changed files with 9 additions and 27 deletions

View File

@ -241,27 +241,10 @@ public class FlexGlobalConfig {
return defaultConfig; return defaultConfig;
} }
/**
* 指定默认全局配置允许手动在多源时方便由注解指定默认源
*
* <code><pre>
* @Configuration
* public class Config{
* @Bean(value = "db1", typed = true) //默认
* public DataSource db1(@Inject("${demo.db1}") HikariDataSource ds) {
* return ds;
* }
*
* @Bean("db2")
* public DataSource db1(@Inject("${demo.db2}") HikariDataSource ds) {
* return ds;
* }
* }
* </pre></code>
*
* @param config 全局配置
*/
public static void setDefaultConfig(FlexGlobalConfig config) { public static void setDefaultConfig(FlexGlobalConfig config) {
if (config == null) {
throw new NullPointerException("config must not be null.");
}
defaultConfig = config; defaultConfig = config;
} }
@ -273,7 +256,6 @@ public class FlexGlobalConfig {
return globalConfigs.get(environmentId); return globalConfigs.get(environmentId);
} }
public static synchronized void setConfig(String id, FlexGlobalConfig config) { public static synchronized void setConfig(String id, FlexGlobalConfig config) {
setConfig(id, config, true); setConfig(id, config, true);
} }
@ -283,11 +265,11 @@ public class FlexGlobalConfig {
* *
* @param id 环境id * @param id 环境id
* @param config 全局配置 * @param config 全局配置
* @param autoDefault 自动指定默认全局配置在多源时方便由注解指定默认源 * @param copyToDefault 自动指定默认全局配置在多源时方便由注解指定默认源
*/ */
public static synchronized void setConfig(String id, FlexGlobalConfig config, boolean autoDefault) { public static synchronized void setConfig(String id, FlexGlobalConfig config, boolean copyToDefault) {
//first setConfigcopy the config to default //first setConfigcopy the config to default
if (autoDefault && globalConfigs.isEmpty()) { if (copyToDefault && globalConfigs.isEmpty()) {
defaultConfig.setSqlSessionFactory(config.sqlSessionFactory); defaultConfig.setSqlSessionFactory(config.sqlSessionFactory);
defaultConfig.setDbType(config.dbType); defaultConfig.setDbType(config.dbType);

View File

@ -88,7 +88,7 @@ public class MybatisAdapterFlex extends MybatisAdapterDefault {
/** /**
* 获取全局配置 * 获取全局配置
* */ */
public FlexGlobalConfig getGlobalConfig() { public FlexGlobalConfig getGlobalConfig() {
return globalConfig; return globalConfig;
} }