From dd25573ebce3450d90d0012a30b12a5185bc7310 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 08 七月 2022 15:49:15 +0800
Subject: [PATCH] update 使用 @param 注释替换 @Parameter 注解 fix 修复 token 无法传递 与 无法持久化问题
---
ruoyi-common/src/main/java/com/ruoyi/common/helper/DataBaseHelper.java | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 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 55a3a41..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 getDataBasyType() {
- DynamicRoutingDataSource ds = (DynamicRoutingDataSource) SpringUtils.getBean(DataSource.class);
- DataSource dataSource = ds.determineDataSource();
- try {
- DatabaseMetaData metaData = dataSource.getConnection().getMetaData();
+ public static DataBaseType getDataBaseType() {
+ DataSource dataSource = DS.determineDataSource();
+ try (Connection conn = dataSource.getConnection()) {
+ DatabaseMetaData metaData = conn.getMetaData();
String databaseProductName = metaData.getDatabaseProductName();
return DataBaseType.find(databaseProductName);
} catch (SQLException e) {
@@ -36,23 +38,23 @@
}
public static boolean isMySql() {
- return DataBaseType.MY_SQL == getDataBasyType();
+ return DataBaseType.MY_SQL == getDataBaseType();
}
public static boolean isOracle() {
- return DataBaseType.ORACLE == getDataBasyType();
+ return DataBaseType.ORACLE == getDataBaseType();
}
public static boolean isPostgerSql() {
- return DataBaseType.POSTGRE_SQL == getDataBasyType();
+ return DataBaseType.POSTGRE_SQL == getDataBaseType();
}
public static boolean isSqlServer() {
- return DataBaseType.SQL_SERVER == getDataBasyType();
+ return DataBaseType.SQL_SERVER == getDataBaseType();
}
public static String findInSet(Object var1, String var2) {
- DataBaseType dataBasyType = getDataBasyType();
+ DataBaseType dataBasyType = getDataBaseType();
String var = Convert.toStr(var1);
if (dataBasyType == DataBaseType.SQL_SERVER) {
// charindex(',100,' , ',0,100,101,') <> 0
--
Gitblit v1.9.3