From 5b38bb6b2203949cc66b73713ea1399f45eb6bbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=8B=87?= Date: Tue, 11 Apr 2023 15:20:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B2=E6=8E=89=E9=85=8D=E7=BD=AE=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E9=A9=B1=E5=8A=A8=EF=BC=8C=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=B1=BB=E5=9E=8B=E7=9B=B4=E6=8E=A5?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/base/db/DbConfiguration.java | 15 +++++++++++---- neutrino-proxy-server/src/main/resources/app.yml | 1 - 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DbConfiguration.java b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DbConfiguration.java index 90461392..55f86cca 100644 --- a/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DbConfiguration.java +++ b/neutrino-proxy-server/src/main/java/org/dromara/neutrinoproxy/server/base/db/DbConfiguration.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.core.MybatisSqlSessionFactoryBuilder; import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; import com.zaxxer.hikari.HikariDataSource; -import org.dromara.neutrinoproxy.server.constant.DbTypeEnum; 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.Configuration; import org.noear.solon.annotation.Inject; @@ -32,7 +32,14 @@ public class DbConfiguration { return dataSource; } else if (DbTypeEnum.MYSQL == dbTypeEnum) { 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.setMinimumIdle(5); dataSource.setMaximumPoolSize(20); @@ -57,13 +64,13 @@ public class DbConfiguration { } @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.setDefaultEnumTypeHandler(null); } @Bean - public MybatisSqlSessionFactoryBuilder factoryBuilderNew(){ + public MybatisSqlSessionFactoryBuilder factoryBuilderNew() { return new MybatisSqlSessionFactoryBuilderImpl(); } diff --git a/neutrino-proxy-server/src/main/resources/app.yml b/neutrino-proxy-server/src/main/resources/app.yml index 3c89bb63..d92ac187 100644 --- a/neutrino-proxy-server/src/main/resources/app.yml +++ b/neutrino-proxy-server/src/main/resources/app.yml @@ -27,7 +27,6 @@ neutrino: db: type: ${DB_TYPE:sqlite} url: ${DB_URL:jdbc:sqlite:data.db} - driver-class: ${DB_DRIVER:org.sqlite.JDBC} username: ${DB_USER:} password: ${DB_PASSWORD:}