diff --git a/kernel-d-db/db-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/db/starter/SingleDataSourceAutoConfiguration.java b/kernel-d-db/db-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/db/starter/SingleDataSourceAutoConfiguration.java deleted file mode 100644 index d39512de3..000000000 --- a/kernel-d-db/db-spring-boot-starter/src/main/java/cn/stylefeng/roses/kernel/db/starter/SingleDataSourceAutoConfiguration.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright [2020-2030] [https://www.stylefeng.cn] - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Guns采用APACHE LICENSE 2.0开源协议,您在使用过程中,需要注意以下几点: - * - * 1.请不要删除和修改根目录下的LICENSE文件。 - * 2.请不要删除和修改Guns源码头部的版权声明。 - * 3.请保留源码和相关描述文件的项目出处,作者声明等。 - * 4.分发源码时候,请注明软件出处 https://gitee.com/stylefeng/guns - * 5.在修改包名,模块名称,项目代码等时,请注明软件出处 https://gitee.com/stylefeng/guns - * 6.若您的项目无法满足以上几点,可申请商业授权 - */ -package cn.stylefeng.roses.kernel.db.starter; - -import cn.stylefeng.roses.kernel.db.api.factory.DruidDatasourceFactory; -import cn.stylefeng.roses.kernel.db.api.pojo.druid.DruidProperties; -import com.alibaba.druid.pool.DruidDataSource; -import org.springframework.boot.autoconfigure.AutoConfigureBefore; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - -import javax.sql.DataSource; - -/** - * 数据库连接池的配置 - *
- * 如果系统中没有配DataSource,则系统默认加载Druid连接池,并开启Druid的监控 - * - * @author fengshuonan - * @since 2020/11/30 22:24 - */ -@Configuration -@Import(ProjectDruidPropertiesAutoConfiguration.class) -@AutoConfigureBefore(DataSourceAutoConfiguration.class) -@ConditionalOnMissingBean(DataSource.class) -public class SingleDataSourceAutoConfiguration { - - /** - * druid数据库连接池 - * - * @author fengshuonan - * @since 2020/11/30 22:37 - */ - @Bean(initMethod = "init") - public DruidDataSource druidDataSource(DruidProperties druidProperties) { - return DruidDatasourceFactory.createDruidDataSource(druidProperties); - } - -} diff --git a/kernel-d-db/db-spring-boot-starter/src/main/resources/META-INF/spring.factories b/kernel-d-db/db-spring-boot-starter/src/main/resources/META-INF/spring.factories index 3d16a9eef..d7fed1921 100644 --- a/kernel-d-db/db-spring-boot-starter/src/main/resources/META-INF/spring.factories +++ b/kernel-d-db/db-spring-boot-starter/src/main/resources/META-INF/spring.factories @@ -1,5 +1,4 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ - cn.stylefeng.roses.kernel.db.starter.SingleDataSourceAutoConfiguration,\ cn.stylefeng.roses.kernel.db.starter.ProjectDruidPropertiesAutoConfiguration,\ cn.stylefeng.roses.kernel.db.starter.ProjectMyBatisPlusAutoConfiguration,\ cn.stylefeng.roses.kernel.db.starter.ProjectDruidMonitorAutoConfiguration,\