From f70951d374cc7859c00edbf2685127ae3934529c Mon Sep 17 00:00:00 2001
From: zendwang <wangzhenxian@idadt.com>
Date: 星期一, 05 十二月 2022 17:59:58 +0800
Subject: [PATCH] update 单元格合并判断cellValue是否相等方法调整
---
ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java b/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java
index c1adea3..1960356 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java
@@ -9,6 +9,7 @@
import lombok.NoArgsConstructor;
import javax.sql.DataSource;
+import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
@@ -20,14 +21,15 @@
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public class DataBaseHelper {
+ private static final DynamicRoutingDataSource DS = SpringUtils.getBean(DynamicRoutingDataSource.class);
+
/**
* 鑾峰彇褰撳墠鏁版嵁搴撶被鍨�
*/
public static DataBaseType getDataBaseType() {
- DynamicRoutingDataSource ds = (DynamicRoutingDataSource) SpringUtils.getBean(DataSource.class);
- DataSource dataSource = ds.determineDataSource();
- try {
- DatabaseMetaData metaData = dataSource.getConnection().getMetaData();
+ DataSource dataSource = DS.determineDataSource();
+ try (Connection conn = dataSource.getConnection()) {
+ DatabaseMetaData metaData = conn.getMetaData();
String databaseProductName = metaData.getDatabaseProductName();
return DataBaseType.find(databaseProductName);
} catch (SQLException e) {
--
Gitblit v1.9.3