From 16dc3511ec4235fe9eb6dc8246733b285edc1f20 Mon Sep 17 00:00:00 2001 From: zhouhao Date: Wed, 26 Jul 2017 12:32:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=95=B0=E6=8D=AE=E6=BA=90?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/datasource/DefaultJdbcExecutor.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DefaultJdbcExecutor.java b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DefaultJdbcExecutor.java index f64f409e4..4153ce1dc 100644 --- a/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DefaultJdbcExecutor.java +++ b/hsweb-datasource/hsweb-datasource-api/src/main/java/org/hswebframework/web/datasource/DefaultJdbcExecutor.java @@ -16,14 +16,19 @@ import java.util.Objects; */ @Transactional(rollbackFor = Throwable.class) public class DefaultJdbcExecutor extends AbstractJdbcSqlExecutor { - + + protected String getDatasourceId() { + String id = DataSourceHolder.switcher().currentDataSourceId(); + return id == null ? "default" : id; + } + @Override public Connection getConnection() { DataSource dataSource = DataSourceHolder.currentDataSource().getNative(); Connection connection = DataSourceUtils.getConnection(dataSource); boolean isConnectionTransactional = DataSourceUtils.isConnectionTransactional(connection, dataSource); if (logger.isDebugEnabled()) { - logger.debug("DataSource ({}) JDBC Connection [{}] will {}be managed by Spring", DataSourceHolder.switcher().currentDataSourceId(), connection, (isConnectionTransactional ? "" : "not ")); + logger.debug("DataSource ({}) JDBC Connection [{}] will {}be managed by Spring", getDatasourceId(), connection, (isConnectionTransactional ? "" : "not ")); } return connection; } @@ -31,7 +36,7 @@ public class DefaultJdbcExecutor extends AbstractJdbcSqlExecutor { @Override public void releaseConnection(Connection connection) throws SQLException { if (logger.isDebugEnabled()) { - logger.debug("Releasing DataSource ({}) JDBC Connection [{}]", DataSourceHolder.switcher().currentDataSourceId(), connection); + logger.debug("Releasing DataSource ({}) JDBC Connection [{}]", getDatasourceId(), connection); } DataSourceUtils.releaseConnection(connection, DataSourceHolder.currentDataSource().getNative()); }