!24 干掉配置数据库驱动,根据数据库类型直接添加

Merge pull request !24 from Tany/dev
This commit is contained in:
傲世孤尘
2023-04-11 07:26:10 +00:00
committed by Gitee
2 changed files with 11 additions and 5 deletions
@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.MybatisSqlSessionFactoryBuilder;
import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.core.config.GlobalConfig;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import com.zaxxer.hikari.HikariDataSource; import com.zaxxer.hikari.HikariDataSource;
import org.dromara.neutrinoproxy.server.constant.DbTypeEnum;
import org.apache.ibatis.solon.annotation.Db; import org.apache.ibatis.solon.annotation.Db;
import org.dromara.neutrinoproxy.server.constant.DbTypeEnum;
import org.noear.solon.annotation.Bean; import org.noear.solon.annotation.Bean;
import org.noear.solon.annotation.Configuration; import org.noear.solon.annotation.Configuration;
import org.noear.solon.annotation.Inject; import org.noear.solon.annotation.Inject;
@@ -32,7 +32,14 @@ public class DbConfiguration {
return dataSource; return dataSource;
} else if (DbTypeEnum.MYSQL == dbTypeEnum) { } else if (DbTypeEnum.MYSQL == dbTypeEnum) {
HikariDataSource dataSource = new HikariDataSource(); HikariDataSource dataSource = new HikariDataSource();
dataSource.setDriverClassName(dbConfig.getDriverClass()); String driver = "com.mysql.cj.jdbc.Driver";
try {
Class.forName(driver);
} catch (ClassNotFoundException e) {
// 对类名的判断,异常则说明不存在:
driver = "com.mysql.jdbc.Driver";
}
dataSource.setDriverClassName(driver);
dataSource.setJdbcUrl(dbConfig.getUrl()); dataSource.setJdbcUrl(dbConfig.getUrl());
dataSource.setMinimumIdle(5); dataSource.setMinimumIdle(5);
dataSource.setMaximumPoolSize(20); dataSource.setMaximumPoolSize(20);
@@ -57,13 +64,13 @@ public class DbConfiguration {
} }
@Bean @Bean
public void db1_ext2(@Db("db") MybatisConfiguration config){ public void db1_ext2(@Db("db") MybatisConfiguration config) {
config.getTypeHandlerRegistry().register("fun.asgc.neutrino.proxy.server.dal"); config.getTypeHandlerRegistry().register("fun.asgc.neutrino.proxy.server.dal");
config.setDefaultEnumTypeHandler(null); config.setDefaultEnumTypeHandler(null);
} }
@Bean @Bean
public MybatisSqlSessionFactoryBuilder factoryBuilderNew(){ public MybatisSqlSessionFactoryBuilder factoryBuilderNew() {
return new MybatisSqlSessionFactoryBuilderImpl(); return new MybatisSqlSessionFactoryBuilderImpl();
} }
@@ -27,7 +27,6 @@ neutrino:
db: db:
type: ${DB_TYPE:sqlite} type: ${DB_TYPE:sqlite}
url: ${DB_URL:jdbc:sqlite:data.db} url: ${DB_URL:jdbc:sqlite:data.db}
driver-class: ${DB_DRIVER:org.sqlite.JDBC}
username: ${DB_USER:} username: ${DB_USER:}
password: ${DB_PASSWORD:} password: ${DB_PASSWORD:}