From f8f2af2f55163a127ce59e8646ee7dcdc5c51745 Mon Sep 17 00:00:00 2001 From: ludj Date: Fri, 2 Dec 2022 11:08:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/nl/modules/wql/core/db/DBConnection.java | 6 ++++-- .../org/nl/modules/wql/core/db/DBPoolSpring.java | 12 +++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/wql/core/db/DBConnection.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/wql/core/db/DBConnection.java index 4fd8099..392c21a 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/wql/core/db/DBConnection.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/wql/core/db/DBConnection.java @@ -1,9 +1,9 @@ package org.nl.modules.wql.core.db; +import cn.hutool.db.Db; import lombok.extern.slf4j.Slf4j; import org.nl.modules.wql.WQLCore; import org.nl.modules.wql.util.SpringContextHolder; -import org.springframework.jdbc.datasource.DataSourceUtils; import javax.sql.DataSource; import java.sql.Connection; @@ -169,7 +169,9 @@ public class DBConnection { name = WQLCore.defalutDBName; } DataSource dataSource = (DataSource) SpringContextHolder.getApplicationContext().getBean(name); - DataSourceUtils.releaseConnection(conn, dataSource); +// DataSourceUtils.releaseConnection(conn, dataSource); + + Db.use(dataSource).closeConnection(conn); return; } try { diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/wql/core/db/DBPoolSpring.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/wql/core/db/DBPoolSpring.java index c77bde9..e175b84 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/wql/core/db/DBPoolSpring.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/wql/core/db/DBPoolSpring.java @@ -1,10 +1,9 @@ package org.nl.modules.wql.core.db; +import cn.hutool.db.Db; import lombok.extern.slf4j.Slf4j; import org.nl.modules.wql.WQLCore; import org.nl.modules.wql.util.SpringContextHolder; -import org.springframework.jdbc.datasource.DataSourceUtils; - import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; @@ -78,8 +77,9 @@ public class DBPoolSpring { public static Connection getConnection(String name) { Connection conn = null; try { - DataSource dataSource = (DataSource) SpringContextHolder.getBean(name); - conn = DataSourceUtils.getConnection(dataSource); + DataSource dataSource = SpringContextHolder.getBean(name); + conn=Db.use(dataSource).getConnection(); +// conn = DataSourceUtils.getConnection(dataSource); } catch (Exception e) { log.error("不能获得Spring连接池中的数据库连接:" + e.toString()); } @@ -120,7 +120,9 @@ public class DBPoolSpring { // conn.close(); // } DataSource dataSource = (DataSource) SpringContextHolder.getBean(name); - DataSourceUtils.releaseConnection(conn, dataSource); +// DataSourceUtils.releaseConnection(conn, dataSource); + + Db.use(dataSource).closeConnection(conn); // } catch (SQLException e) { // log.error("数据库连接关闭:"+e.toString() ); // }