Преглед на файлове

不在强制要求配置数据源。

mxd преди 4 години
родител
ревизия
74b70604ea
променени са 1 файла, в които са добавени 6 реда и са изтрити 3 реда
  1. 6 3
      src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java

+ 6 - 3
src/main/java/org/ssssssss/magicapi/spring/boot/starter/MagicAPIAutoConfiguration.java

@@ -174,10 +174,13 @@ public class MagicAPIAutoConfiguration implements WebMvcConfigurer {
 	 */
 	@Bean
 	@ConditionalOnMissingBean(MagicDynamicDataSource.class)
-	@ConditionalOnBean({DataSource.class})
-	public MagicDynamicDataSource magicDynamicDataSource(DataSource dataSource) {
+	public MagicDynamicDataSource magicDynamicDataSource(@Autowired(required = false) DataSource dataSource) {
 		MagicDynamicDataSource dynamicDataSource = new MagicDynamicDataSource();
-		dynamicDataSource.put(dataSource);
+		if(dataSource != null){
+			dynamicDataSource.put(dataSource);
+		}else {
+			logger.warn("当前数据源未配置");
+		}
 		return dynamicDataSource;
 	}