dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8168 from dataease/pr@dev@fixdataset

Browse Source 
refactor: 回退
This commit is contained in:
taojinlong 2024-02-26 19:12:28 +08:00 committed by GitHub
commit 197858beee
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java
View File

@ -581,11 +581,11 @@ public class JdbcProvider extends DefaultJdbcProvider {
if (isDefaultClassLoader(customDriver)) {
driverClassName = defaultDriver;
jdbcClassLoader = extendedJdbcClassLoader;
// for (DataSourceType value : SpringContextUtil.getApplicationContext().getBeansOfType(DataSourceType.class).values()) {
// if (value.getType().equalsIgnoreCase(datasourceRequest.getDatasource().getType())) {
// surpportVersions = value.getSurpportVersions();
// }
// }
for (DataSourceType value : SpringContextUtil.getApplicationContext().getBeansOfType(DataSourceType.class).values()) {
if (value.getType().equalsIgnoreCase(datasourceRequest.getDatasource().getType())) {
surpportVersions = value.getSurpportVersions();
}
}
} else {
if (deDriver == null) {
deDriver = deDriverMapper.selectByPrimaryKey(customDriver);
@ -601,7 +601,6 @@ public class JdbcProvider extends DefaultJdbcProvider {
Thread.currentThread().setContextClassLoader(jdbcClassLoader);
conn = driverClass.connect(jdbcurl, props);
} catch (Exception e) {
e.printStackTrace();
throw e;
} finally {
Thread.currentThread().setContextClassLoader(classLoader);