修改 bean 的获取

pom.xml

@@ -5,7 +5,7 @@
     <groupId>cn.zhangfusheng</groupId>
     <artifactId>paoding-rose-jade</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.4</version>
+    <version>2.0.5</version>
     <name>paoding-rose-jade</name>
 
     <parent>

src/main/java/net/paoding/rose/jade/context/spring/SpringDataSourceFactoryDelegate.java

@@ -36,13 +36,14 @@ public class SpringDataSourceFactoryDelegate implements DataSourceFactory {
             String catlogBeanName = StringUtils.isEmpty(catalog) ? beanName : beanName + "." + catalog;
             ListableBeanFactory beanFactory = this.beanFactory;
             if (beanFactory != null) {
-                if (beanFactory.containsBeanDefinition(catlogBeanName)) {
+                if (beanFactory.containsBeanDefinition(catlogBeanName) || beanFactory.containsBean(catlogBeanName)) {
                     dataSourceFactory = beanFactory.getBean(catlogBeanName, DataSourceFactory.class);
-                } else if (beanFactory.containsBeanDefinition(beanName)) {
+                } else if (beanFactory.containsBeanDefinition(beanName) || beanFactory.containsBean(beanName)) {
                     dataSourceFactory = beanFactory.getBean(beanName, DataSourceFactory.class);
                 } else {
                     dataSourceFactory = new SpringDataSourceFactory(beanFactory);
                 }
+                assert dataSourceFactory != null;
                 dataSourceFactoryMap.put(key, dataSourceFactory);
             }
         }