🐛 Fixing a bug. close #3575 代码生成器连接sqlserver报错,无法获取到库中的表
This commit is contained in:
1 parent
bb375e389c
commit
036bf65280
1 file changed
+11
-4
+11
-4
@@ -19,6 +19,7 @@ package com.pig4cloud.pigx.common.datasource.config;
|
|||||||
|
|
||||||
import com.baomidou.dynamic.datasource.provider.AbstractJdbcDataSourceProvider;
|
import com.baomidou.dynamic.datasource.provider.AbstractJdbcDataSourceProvider;
|
||||||
import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty;
|
import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DataSourceProperty;
|
||||||
|
import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.druid.DruidConfig;
|
||||||
import com.pig4cloud.pigx.common.datasource.support.DataSourceConstants;
|
import com.pig4cloud.pigx.common.datasource.support.DataSourceConstants;
|
||||||
import com.pig4cloud.pigx.common.datasource.util.DsConfTypeEnum;
|
import com.pig4cloud.pigx.common.datasource.util.DsConfTypeEnum;
|
||||||
import com.pig4cloud.pigx.common.datasource.util.DsJdbcUrlEnum;
|
import com.pig4cloud.pigx.common.datasource.util.DsJdbcUrlEnum;
|
||||||
@@ -66,6 +67,10 @@ public class JdbcDynamicDataSourceProvider extends AbstractJdbcDataSourceProvide
|
|||||||
Integer confType = rs.getInt(DataSourceConstants.DS_CONFIG_TYPE);
|
Integer confType = rs.getInt(DataSourceConstants.DS_CONFIG_TYPE);
|
||||||
String dsType = rs.getString(DataSourceConstants.DS_TYPE);
|
String dsType = rs.getString(DataSourceConstants.DS_TYPE);
|
||||||
|
|
||||||
|
DataSourceProperty property = new DataSourceProperty();
|
||||||
|
property.setUsername(username);
|
||||||
|
property.setPassword(stringEncryptor.decrypt(password));
|
||||||
|
|
||||||
String url;
|
String url;
|
||||||
// JDBC 配置形式
|
// JDBC 配置形式
|
||||||
DsJdbcUrlEnum urlEnum = DsJdbcUrlEnum.get(dsType);
|
DsJdbcUrlEnum urlEnum = DsJdbcUrlEnum.get(dsType);
|
||||||
@@ -73,6 +78,11 @@ public class JdbcDynamicDataSourceProvider extends AbstractJdbcDataSourceProvide
|
|||||||
url = rs.getString(DataSourceConstants.DS_JDBC_URL);
|
url = rs.getString(DataSourceConstants.DS_JDBC_URL);
|
||||||
}
|
}
|
||||||
else if (DsJdbcUrlEnum.MSSQL.getDbName().equals(dsType)) {
|
else if (DsJdbcUrlEnum.MSSQL.getDbName().equals(dsType)) {
|
||||||
|
// Druid Config
|
||||||
|
DruidConfig druidConfig = new DruidConfig();
|
||||||
|
druidConfig.setValidationQuery("select 'x'");
|
||||||
|
property.setDruid(druidConfig);
|
||||||
|
|
||||||
String host = rs.getString(DataSourceConstants.DS_HOST);
|
String host = rs.getString(DataSourceConstants.DS_HOST);
|
||||||
String port = rs.getString(DataSourceConstants.DS_PORT);
|
String port = rs.getString(DataSourceConstants.DS_PORT);
|
||||||
String dsName = rs.getString(DataSourceConstants.DS_NAME);
|
String dsName = rs.getString(DataSourceConstants.DS_NAME);
|
||||||
@@ -85,11 +95,8 @@ public class JdbcDynamicDataSourceProvider extends AbstractJdbcDataSourceProvide
|
|||||||
String dsName = rs.getString(DataSourceConstants.DS_NAME);
|
String dsName = rs.getString(DataSourceConstants.DS_NAME);
|
||||||
url = String.format(urlEnum.getUrl(), host, port, dsName);
|
url = String.format(urlEnum.getUrl(), host, port, dsName);
|
||||||
}
|
}
|
||||||
|
|
||||||
DataSourceProperty property = new DataSourceProperty();
|
|
||||||
property.setUsername(username);
|
|
||||||
property.setPassword(stringEncryptor.decrypt(password));
|
|
||||||
property.setUrl(url);
|
property.setUrl(url);
|
||||||
|
|
||||||
map.put(name, property);
|
map.put(name, property);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user